Add builder classes for all serializers and parsers. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/95e832e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/95e832e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/95e832e1
Branch: refs/heads/master Commit: 95e832e1a5f68a0c55c8dc1dd900c1d25d225a84 Parents: d59d737 Author: JamesBognar <[email protected]> Authored: Fri Mar 10 08:50:51 2017 -0800 Committer: JamesBognar <[email protected]> Committed: Fri Mar 10 08:50:51 2017 -0800 ---------------------------------------------------------------------- .../apache/juneau/jena/RdfCommonContext.java | 4 +- .../java/org/apache/juneau/jena/RdfParser.java | 747 +------ .../apache/juneau/jena/RdfParserBuilder.java | 728 +++++++ .../apache/juneau/jena/RdfParserContext.java | 26 +- .../org/apache/juneau/jena/RdfSerializer.java | 919 +-------- .../juneau/jena/RdfSerializerBuilder.java | 890 +++++++++ .../juneau/jena/RdfSerializerContext.java | 36 +- .../juneau/jena/RdfSerializerSession.java | 2 +- .../java/org/apache/juneau/jena/package.html | 52 +- .../java/org/apache/juneau/BeanConfigTest.java | 162 +- .../java/org/apache/juneau/BeanFilterTest.java | 4 +- .../java/org/apache/juneau/BeanMapTest.java | 27 +- .../java/org/apache/juneau/ClassMetaTest.java | 14 +- .../test/java/org/apache/juneau/ComboTest.java | 73 +- .../org/apache/juneau/ContextFactoryTest.java | 823 -------- .../org/apache/juneau/DataConversionTest.java | 2 +- .../org/apache/juneau/IgnoredClassesTest.java | 30 +- .../java/org/apache/juneau/MediaRangeTest.java | 13 +- .../java/org/apache/juneau/PojoSwapTest.java | 4 +- .../org/apache/juneau/PropertyStoreTest.java | 823 ++++++++ .../test/java/org/apache/juneau/TestUtils.java | 40 +- .../java/org/apache/juneau/VisibilityTest.java | 120 +- .../org/apache/juneau/XmlValidatorParser.java | 7 +- .../juneau/XmlValidatorParserBuilder.java | 26 + .../a/rttests/RoundTripAddClassAttrsTest.java | 43 +- .../a/rttests/RoundTripBeanInheritanceTest.java | 2 +- .../juneau/a/rttests/RoundTripBeanMapsTest.java | 66 +- .../juneau/a/rttests/RoundTripClassesTest.java | 2 +- .../juneau/a/rttests/RoundTripDTOsTest.java | 2 +- .../juneau/a/rttests/RoundTripEnumTest.java | 4 +- .../juneau/a/rttests/RoundTripGenericsTest.java | 2 +- .../a/rttests/RoundTripLargeObjectsTest.java | 21 +- .../juneau/a/rttests/RoundTripMapsTest.java | 13 +- .../RoundTripNumericConstructorsTest.java | 3 +- .../rttests/RoundTripObjectsAsStringsTest.java | 2 +- .../RoundTripObjectsWithSpecialMethodsTest.java | 2 +- .../RoundTripPrimitiveObjectBeansTest.java | 2 +- .../a/rttests/RoundTripPrimitivesBeansTest.java | 2 +- .../a/rttests/RoundTripReadOnlyBeansTest.java | 2 +- .../a/rttests/RoundTripSimpleObjectsTest.java | 2 +- .../apache/juneau/a/rttests/RoundTripTest.java | 119 +- .../a/rttests/RoundTripToObjectMapsTest.java | 2 +- .../a/rttests/RoundTripTransformBeansTest.java | 21 +- .../a/rttests/RoundTripTrimStringsTest.java | 6 +- .../java/org/apache/juneau/csv/CsvTest.java | 2 +- .../org/apache/juneau/dto/atom/AtomTest.java | 8 +- .../apache/juneau/dto/cognos/CognosXmlTest.java | 13 +- .../apache/juneau/dto/html5/Html5ComboTest.java | 2 +- .../dto/html5/Html5TemplateComboTest.java | 5 +- .../juneau/dto/jsonschema/JsonSchemaTest.java | 4 +- .../org/apache/juneau/html/BasicHtmlTest.java | 5 +- .../apache/juneau/html/CommonParserTest.java | 10 +- .../java/org/apache/juneau/html/CommonTest.java | 118 +- .../java/org/apache/juneau/html/HtmlTest.java | 46 +- .../org/apache/juneau/ini/ConfigFileTest.java | 4 +- .../apache/juneau/jena/CommonParserTest.java | 32 +- .../java/org/apache/juneau/jena/CommonTest.java | 131 +- .../org/apache/juneau/jena/CommonXmlTest.java | 22 +- .../org/apache/juneau/jena/RdfParserTest.java | 9 +- .../java/org/apache/juneau/jena/RdfTest.java | 66 +- .../apache/juneau/json/CommonParserTest.java | 10 +- .../java/org/apache/juneau/json/CommonTest.java | 113 +- .../juneau/json/JsonParserEdgeCasesTest.java | 12 +- .../java/org/apache/juneau/json/JsonTest.java | 12 +- .../org/apache/juneau/svl/vars/IfVarTest.java | 4 +- .../apache/juneau/svl/vars/SwitchVarTest.java | 4 +- .../juneau/transforms/BeanFilterTest.java | 8 +- .../apache/juneau/transforms/BeanMapTest.java | 6 +- .../ByteArrayBase64SwapComboTest.java | 25 +- .../transforms/CalendarSwapComboTest.java | 30 +- .../juneau/transforms/CalendarSwapTest.java | 16 +- .../juneau/transforms/DateSwapComboTest.java | 28 +- .../apache/juneau/transforms/DateSwapTest.java | 12 +- .../juneau/transforms/EnumerationSwapTest.java | 2 +- .../juneau/transforms/IteratorSwapTest.java | 2 +- .../juneau/transforms/LocalizedDatesTest.java | 10 +- .../juneau/transforms/ReaderFilterTest.java | 9 +- .../urlencoding/CommonParser_UonTest.java | 13 +- .../CommonParser_UrlEncodingTest.java | 15 +- .../juneau/urlencoding/Common_UonTest.java | 110 +- .../urlencoding/Common_UrlEncodingTest.java | 109 +- .../juneau/urlencoding/UonParserReaderTest.java | 1 + .../juneau/urlencoding/UonParserTest.java | 1 + .../juneau/urlencoding/UonSerializerTest.java | 1 + .../urlencoding/UrlEncodingParserTest.java | 2 +- .../urlencoding/UrlEncodingSerializerTest.java | 6 +- .../org/apache/juneau/utils/PojoQueryTest.java | 4 +- .../org/apache/juneau/utils/PojoRestTest.java | 8 +- .../apache/juneau/utils/StringUtilsTest.java | 2 +- .../juneau/utils/StringVarResolverTest.java | 58 +- .../org/apache/juneau/xml/CommonParserTest.java | 6 +- .../java/org/apache/juneau/xml/CommonTest.java | 113 +- .../org/apache/juneau/xml/CommonXmlTest.java | 2 +- .../org/apache/juneau/xml/XmlContentTest.java | 4 +- .../org/apache/juneau/xml/XmlParserTest.java | 2 +- .../java/org/apache/juneau/xml/XmlTest.java | 340 ++-- juneau-core/.gitignore | 1 + .../src/main/java/org/apache/juneau/.DS_Store | Bin 0 -> 6148 bytes .../java/org/apache/juneau/BeanContext.java | 42 +- .../main/java/org/apache/juneau/BeanMap.java | 4 +- .../main/java/org/apache/juneau/Context.java | 10 +- .../java/org/apache/juneau/ContextFactory.java | 1344 ------------- .../main/java/org/apache/juneau/CoreApi.java | 1552 --------------- .../main/java/org/apache/juneau/CoreObject.java | 114 ++ .../org/apache/juneau/CoreObjectBuilder.java | 1429 ++++++++++++++ .../main/java/org/apache/juneau/Lockable.java | 86 - .../java/org/apache/juneau/LockedException.java | 30 - .../main/java/org/apache/juneau/MediaRange.java | 1 - .../java/org/apache/juneau/PropertyStore.java | 1384 +++++++++++++ .../main/java/org/apache/juneau/Session.java | 2 +- .../java/org/apache/juneau/annotation/Pojo.java | 4 +- .../java/org/apache/juneau/csv/CsvParser.java | 60 + .../org/apache/juneau/csv/CsvParserBuilder.java | 456 +++++ .../org/apache/juneau/csv/CsvParserContext.java | 53 + .../org/apache/juneau/csv/CsvParserSession.java | 111 ++ .../org/apache/juneau/csv/CsvSerializer.java | 33 +- .../apache/juneau/csv/CsvSerializerBuilder.java | 528 +++++ .../apache/juneau/csv/CsvSerializerContext.java | 53 + .../apache/juneau/csv/CsvSerializerSession.java | 46 + .../java/org/apache/juneau/dto/atom/Common.java | 2 +- .../org/apache/juneau/dto/atom/CommonEntry.java | 2 +- .../java/org/apache/juneau/dto/atom/Entry.java | 3 +- .../org/apache/juneau/dto/atom/Generator.java | 2 +- .../java/org/apache/juneau/dto/atom/Icon.java | 2 +- .../java/org/apache/juneau/dto/atom/Logo.java | 2 +- .../java/org/apache/juneau/dto/atom/Person.java | 3 +- .../org/apache/juneau/dto/atom/package.html | 16 +- .../juneau/dto/html5/HtmlElementVoid.java | 3 +- .../apache/juneau/encoders/EncoderGroup.java | 69 +- .../juneau/encoders/EncoderGroupBuilder.java | 109 + .../apache/juneau/html/HtmlDocSerializer.java | 528 +---- .../juneau/html/HtmlDocSerializerContext.java | 20 +- .../juneau/html/HtmlDocSerializerSession.java | 2 +- .../java/org/apache/juneau/html/HtmlParser.java | 467 +---- .../apache/juneau/html/HtmlParserBuilder.java | 484 +++++ .../apache/juneau/html/HtmlParserContext.java | 14 +- .../juneau/html/HtmlSchemaDocSerializer.java | 29 +- .../org/apache/juneau/html/HtmlSerializer.java | 705 +------ .../juneau/html/HtmlSerializerBuilder.java | 706 +++++++ .../juneau/html/HtmlSerializerContext.java | 26 +- .../juneau/html/HtmlSerializerSession.java | 2 +- .../juneau/html/HtmlStrippedDocSerializer.java | 9 + .../org/apache/juneau/ini/ConfigFileImpl.java | 9 +- .../apache/juneau/ini/ConfigFileWrapped.java | 7 +- .../java/org/apache/juneau/ini/package.html | 2 +- .../apache/juneau/internal/JuneauLogger.java | 18 +- .../juneau/jso/JavaSerializedObjectParser.java | 51 - .../jso/JavaSerializedObjectSerializer.java | 52 - .../java/org/apache/juneau/jso/JsoParser.java | 59 + .../org/apache/juneau/jso/JsoParserBuilder.java | 457 +++++ .../org/apache/juneau/jso/JsoSerializer.java | 61 + .../apache/juneau/jso/JsoSerializerBuilder.java | 529 +++++ .../java/org/apache/juneau/json/JsonParser.java | 468 +---- .../apache/juneau/json/JsonParserBuilder.java | 457 +++++ .../apache/juneau/json/JsonParserContext.java | 14 +- .../apache/juneau/json/JsonParserSession.java | 1 - .../juneau/json/JsonSchemaSerializer.java | 42 +- .../json/JsonSchemaSerializerBuilder.java | 545 +++++ .../org/apache/juneau/json/JsonSerializer.java | 654 +----- .../juneau/json/JsonSerializerBuilder.java | 594 ++++++ .../juneau/json/JsonSerializerContext.java | 20 +- .../juneau/json/JsonSerializerSession.java | 2 +- .../java/org/apache/juneau/json/package.html | 10 +- .../apache/juneau/msgpack/MsgPackParser.java | 444 +---- .../juneau/msgpack/MsgPackParserBuilder.java | 457 +++++ .../juneau/msgpack/MsgPackParserContext.java | 16 +- .../juneau/msgpack/MsgPackParserSession.java | 1 - .../juneau/msgpack/MsgPackSerializer.java | 509 +---- .../msgpack/MsgPackSerializerBuilder.java | 528 +++++ .../msgpack/MsgPackSerializerContext.java | 16 +- .../msgpack/MsgPackSerializerSession.java | 3 +- .../main/java/org/apache/juneau/package.html | 9 +- .../apache/juneau/parser/InputStreamParser.java | 9 + .../java/org/apache/juneau/parser/Parser.java | 556 +----- .../org/apache/juneau/parser/ParserBuilder.java | 571 ++++++ .../org/apache/juneau/parser/ParserContext.java | 14 +- .../org/apache/juneau/parser/ParserGroup.java | 1139 +---------- .../juneau/parser/ParserGroupBuilder.java | 864 ++++++++ .../apache/juneau/parser/ParserListener.java | 2 +- .../org/apache/juneau/parser/ReaderParser.java | 9 + .../java/org/apache/juneau/parser/package.html | 2 +- .../juneau/plaintext/PlainTextParser.java | 27 +- .../plaintext/PlainTextParserBuilder.java | 457 +++++ .../juneau/plaintext/PlainTextSerializer.java | 27 +- .../plaintext/PlainTextSerializerBuilder.java | 528 +++++ .../serializer/OutputStreamSerializer.java | 11 +- .../apache/juneau/serializer/Serializer.java | 886 +-------- .../juneau/serializer/SerializerBuilder.java | 896 +++++++++ .../juneau/serializer/SerializerContext.java | 36 +- .../juneau/serializer/SerializerGroup.java | 1310 +----------- .../serializer/SerializerGroupBuilder.java | 983 +++++++++ .../juneau/serializer/SerializerSession.java | 2 +- .../juneau/serializer/WriterSerializer.java | 8 + .../org/apache/juneau/serializer/package.html | 2 +- .../apache/juneau/soap/SoapXmlSerializer.java | 9 + .../juneau/soap/SoapXmlSerializerBuilder.java | 590 ++++++ .../main/java/org/apache/juneau/svl/MapVar.java | 1 + .../main/java/org/apache/juneau/svl/Var.java | 2 +- .../java/org/apache/juneau/svl/VarResolver.java | 93 +- .../apache/juneau/svl/VarResolverBuilder.java | 109 + .../apache/juneau/svl/VarResolverContext.java | 81 +- .../apache/juneau/svl/VarResolverSession.java | 26 +- .../java/org/apache/juneau/svl/package.html | 10 +- .../transform/AnnotationBeanFilterBuilder.java | 16 +- .../juneau/transform/BeanFilterBuilder.java | 38 +- .../transform/InterfaceBeanFilterBuilder.java | 4 +- .../org/apache/juneau/transform/PojoSwap.java | 2 +- .../apache/juneau/transform/SurrogateSwap.java | 6 +- .../org/apache/juneau/transform/package.html | 46 +- .../java/org/apache/juneau/uon/UonParser.java | 800 ++++++++ .../org/apache/juneau/uon/UonParserBuilder.java | 495 +++++ .../org/apache/juneau/uon/UonParserContext.java | 74 + .../org/apache/juneau/uon/UonParserSession.java | 118 ++ .../java/org/apache/juneau/uon/UonReader.java | 195 ++ .../org/apache/juneau/uon/UonSerializer.java | 386 ++++ .../apache/juneau/uon/UonSerializerBuilder.java | 570 ++++++ .../apache/juneau/uon/UonSerializerContext.java | 100 + .../apache/juneau/uon/UonSerializerSession.java | 88 + .../java/org/apache/juneau/uon/UonWriter.java | 281 +++ .../juneau/uon/doc-files/Example_HTML.png | Bin 0 -> 136001 bytes .../org/apache/juneau/uon/doc-files/rfc_uon.txt | 294 +++ .../java/org/apache/juneau/uon/package.html | 1339 +++++++++++++ .../apache/juneau/urlencoding/UonParser.java | 1191 ----------- .../juneau/urlencoding/UonParserContext.java | 73 - .../juneau/urlencoding/UonParserSession.java | 118 -- .../apache/juneau/urlencoding/UonReader.java | 195 -- .../juneau/urlencoding/UonSerializer.java | 869 -------- .../urlencoding/UonSerializerContext.java | 99 - .../urlencoding/UonSerializerSession.java | 88 - .../apache/juneau/urlencoding/UonWriter.java | 281 --- .../juneau/urlencoding/UrlEncodingContext.java | 25 +- .../juneau/urlencoding/UrlEncodingParser.java | 500 +---- .../urlencoding/UrlEncodingParserBuilder.java | 513 +++++ .../urlencoding/UrlEncodingParserContext.java | 56 +- .../urlencoding/UrlEncodingParserSession.java | 5 +- .../urlencoding/UrlEncodingSerializer.java | 616 +----- .../UrlEncodingSerializerBuilder.java | 590 ++++++ .../UrlEncodingSerializerContext.java | 56 +- .../UrlEncodingSerializerSession.java | 7 +- .../org/apache/juneau/urlencoding/package.html | 20 +- .../java/org/apache/juneau/utils/PojoQuery.java | 4 +- .../java/org/apache/juneau/xml/XmlBeanMeta.java | 1 + .../org/apache/juneau/xml/XmlDocSerializer.java | 29 +- .../java/org/apache/juneau/xml/XmlParser.java | 604 +----- .../org/apache/juneau/xml/XmlParserBuilder.java | 616 ++++++ .../org/apache/juneau/xml/XmlParserContext.java | 24 +- .../org/apache/juneau/xml/XmlParserSession.java | 2 +- .../juneau/xml/XmlSchemaDocSerializer.java | 12 +- .../apache/juneau/xml/XmlSchemaSerializer.java | 22 +- .../juneau/xml/XmlSchemaSerializerBuilder.java | 570 ++++++ .../org/apache/juneau/xml/XmlSerializer.java | 795 +------- .../apache/juneau/xml/XmlSerializerBuilder.java | 717 +++++++ .../apache/juneau/xml/XmlSerializerContext.java | 28 +- .../apache/juneau/xml/XmlSerializerSession.java | 2 +- .../java/org/apache/juneau/xml/package.html | 75 +- juneau-core/src/main/javadoc/overview.html | 362 ++-- .../examples/rest/DockerRegistryResource.java | 3 +- .../juneau/examples/rest/PhotosResource.java | 18 + .../juneau/examples/rest/SqlQueryResource.java | 2 +- .../examples/rest/SystemPropertiesResource.java | 2 +- .../juneau/examples/rest/TempDirResource.java | 2 +- .../examples/rest/TumblrParserResource.java | 5 +- .../examples/rest/addressbook/ClientTest.java | 5 +- .../examples/rest/AddressBookResourceTest.java | 38 +- .../juneau/examples/rest/RestTestcase.java | 5 +- .../juneau/examples/rest/RootResourcesTest.java | 33 +- .../SampleRemoteableServicesResourceTest.java | 26 +- .../examples/rest/SamplesMicroservice.java | 110 ++ .../juneau/examples/rest/SamplesRestClient.java | 69 - .../juneau/examples/rest/TestMicroservice.java | 72 - .../rest/TestMultiPartFormPostsTest.java | 4 +- .../apache/juneau/examples/rest/TestUtils.java | 40 +- .../apache/juneau/examples/rest/_TestSuite.java | 4 +- .../core/json/JsonConfigurationExample.java | 8 +- .../juneau/microservice/Microservice.java | 19 +- .../apache/juneau/microservice/Resource.java | 8 +- .../juneau/microservice/ResourceGroup.java | 8 +- .../juneau/microservice/RestMicroservice.java | 3 +- .../org/apache/juneau/microservice/package.html | 2 + .../microservice/resources/ConfigResource.java | 2 +- .../juneau/rest/client/ResponsePattern.java | 2 +- .../org/apache/juneau/rest/client/RestCall.java | 424 +++- .../juneau/rest/client/RestCallLogger.java | 2 +- .../apache/juneau/rest/client/RestClient.java | 1148 +---------- .../juneau/rest/client/RestClientBuilder.java | 1864 ++++++++++++++++++ .../org/apache/juneau/rest/client/RetryOn.java | 10 + .../org/apache/juneau/rest/client/SSLOpts.java | 2 +- .../rest/client/SerializedNameValuePair.java | 3 +- .../org/apache/juneau/rest/client/package.html | 70 +- .../apache/juneau/rest/jaxrs/BaseProvider.java | 26 +- .../juneau/rest/jaxrs/DefaultProvider.java | 9 +- .../rest/jaxrs/rdf/DefaultJenaProvider.java | 12 +- .../juneau/rest/test/AcceptCharsetResource.java | 10 + .../rest/test/CharsetEncodingsResource.java | 10 + .../rest/test/DefaultContentTypesResource.java | 24 +- .../apache/juneau/rest/test/GroupsResource.java | 18 +- .../juneau/rest/test/InheritanceResource.java | 30 +- .../juneau/rest/test/NlsPropertyResource.java | 6 + .../juneau/rest/test/OnPostCallResource.java | 5 + .../juneau/rest/test/OnPreCallResource.java | 5 + .../apache/juneau/rest/test/ParamsResource.java | 4 +- .../juneau/rest/test/ParsersResource.java | 20 + .../juneau/rest/test/PropertiesResource.java | 10 + .../juneau/rest/test/SerializersResource.java | 21 + .../juneau/rest/test/AcceptCharsetTest.java | 32 +- .../rest/test/BeanContextPropertiesTest.java | 7 +- .../juneau/rest/test/CallbackStringsTest.java | 2 +- .../juneau/rest/test/CharsetEncodingsTest.java | 30 +- .../juneau/rest/test/ClientVersionTest.java | 37 +- .../org/apache/juneau/rest/test/ConfigTest.java | 3 +- .../apache/juneau/rest/test/ContentTest.java | 157 +- .../rest/test/DefaultContentTypesTest.java | 200 +- .../juneau/rest/test/ErrorConditionsTest.java | 13 +- .../org/apache/juneau/rest/test/GroupsTest.java | 35 +- .../org/apache/juneau/rest/test/GzipTest.java | 90 +- .../juneau/rest/test/InheritanceTest.java | 16 +- .../apache/juneau/rest/test/LargePojosTest.java | 13 +- .../apache/juneau/rest/test/MessagesTest.java | 5 +- .../juneau/rest/test/NlsPropertyTest.java | 9 +- .../org/apache/juneau/rest/test/NlsTest.java | 20 +- .../juneau/rest/test/NoParserInputTest.java | 17 +- .../apache/juneau/rest/test/OnPostCallTest.java | 24 +- .../apache/juneau/rest/test/OnPreCallTest.java | 8 +- .../juneau/rest/test/OptionsWithoutNlsTest.java | 8 +- .../rest/test/OverlappingMethodsTest.java | 10 +- .../org/apache/juneau/rest/test/ParamsTest.java | 47 +- .../apache/juneau/rest/test/ParsersTest.java | 60 +- .../org/apache/juneau/rest/test/PathTest.java | 5 +- .../org/apache/juneau/rest/test/PathsTest.java | 5 +- .../apache/juneau/rest/test/PropertiesTest.java | 11 +- .../apache/juneau/rest/test/RestClientTest.java | 29 +- .../juneau/rest/test/SerializersTest.java | 48 +- .../juneau/rest/test/StaticFilesTest.java | 5 +- .../juneau/rest/test/TestMicroservice.java | 63 + .../apache/juneau/rest/test/TestRestClient.java | 69 - .../org/apache/juneau/rest/test/TestUtils.java | 6 +- .../apache/juneau/rest/test/TransformsTest.java | 9 +- .../org/apache/juneau/rest/test/UrisTest.java | 21 +- .../apache/juneau/rest/test/UrlContentTest.java | 11 +- .../juneau/rest/test/UrlPathPatternTest.java | 4 +- .../org/apache/juneau/rest/RestRequest.java | 10 +- .../org/apache/juneau/rest/RestServlet.java | 167 +- .../apache/juneau/rest/RestServletContext.java | 24 +- .../apache/juneau/rest/RestServletDefault.java | 7 +- .../juneau/rest/annotation/RestResource.java | 5 + .../rest/jena/RestServletJenaDefault.java | 6 +- .../java/org/apache/juneau/rest/package.html | 18 +- .../apache/juneau/rest/remoteable/package.html | 9 +- 348 files changed, 30462 insertions(+), 22463 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/95e832e1/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCommonContext.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCommonContext.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCommonContext.java index 4c7b5d6..c806198 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCommonContext.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCommonContext.java @@ -539,8 +539,8 @@ public interface RdfCommonContext { * * <h5 class='section'>Example:</h5> * <p class='bcode'> - * WriterSerializer s = <jk>new</jk> RdfSerializer.XmlAbbrev().setLooseCollections(<jk>true</jk>); - * ReaderParser p = <jk>new</jk> RdfParser.Xml().setLooseCollections(<jk>true</jk>); + * WriterSerializer s = <jk>new</jk> RdfSerializerBuilder().xmlabbrev().looseCollections(<jk>true</jk>).build(); + * ReaderParser p = <jk>new</jk> RdfParserBuilder().xml().looseCollections(<jk>true</jk>).build(); * * List<MyBean> l = createListOfMyBeans(); * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/95e832e1/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java index c842505..2d927dc 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java @@ -15,18 +15,14 @@ package org.apache.juneau.jena; import static org.apache.juneau.internal.StringUtils.*; import static org.apache.juneau.jena.Constants.*; import static org.apache.juneau.jena.RdfCommonContext.*; -import static org.apache.juneau.jena.RdfParserContext.*; import java.lang.reflect.*; import java.util.*; import org.apache.juneau.*; import org.apache.juneau.annotation.*; -import org.apache.juneau.jena.annotation.*; import org.apache.juneau.parser.*; import org.apache.juneau.transform.*; -import org.apache.juneau.xml.*; -import org.apache.juneau.xml.annotation.*; import com.hp.hpl.jena.rdf.model.*; import com.hp.hpl.jena.util.iterator.*; @@ -57,55 +53,107 @@ import com.hp.hpl.jena.util.iterator.*; public class RdfParser extends ReaderParser { /** Default XML parser, all default settings.*/ - public static final RdfParser DEFAULT_XML = new RdfParser.Xml().lock(); + public static final RdfParser DEFAULT_XML = new RdfParser(PropertyStore.create()); /** Default Turtle parser, all default settings.*/ - public static final RdfParser DEFAULT_TURTLE = new RdfParser.Turtle().lock(); + public static final RdfParser DEFAULT_TURTLE = new Turtle(PropertyStore.create()); /** Default N-Triple parser, all default settings.*/ - public static final RdfParser DEFAULT_NTRIPLE = new RdfParser.NTriple().lock(); + public static final RdfParser DEFAULT_NTRIPLE = new NTriple(PropertyStore.create()); /** Default N3 parser, all default settings.*/ - public static final RdfParser DEFAULT_N3 = new RdfParser.N3().lock(); - + public static final RdfParser DEFAULT_N3 = new N3(PropertyStore.create()); + /** Consumes RDF/XML input */ @Consumes("text/xml+rdf") public static class Xml extends RdfParser { - /** Constructor */ - public Xml() { - setLanguage(LANG_RDF_XML); + + /** + * Constructor. + * @param propertyStore The property store containing all the settings for this object. + */ + public Xml(PropertyStore propertyStore) { + super(propertyStore); + } + + @Override + protected ObjectMap getOverrideProperties() { + return super.getOverrideProperties().append(RDF_language, LANG_RDF_XML); } } /** Consumes N-Triple input */ @Consumes(value="text/n-triple") public static class NTriple extends RdfParser { - /** Constructor */ - public NTriple() { - setLanguage(LANG_NTRIPLE); + + /** + * Constructor. + * @param propertyStore The property store containing all the settings for this object. + */ + public NTriple(PropertyStore propertyStore) { + super(propertyStore); + } + + @Override + protected ObjectMap getOverrideProperties() { + return super.getOverrideProperties().append(RDF_language, LANG_NTRIPLE); } } /** Consumes Turtle input */ @Consumes(value="text/turtle") public static class Turtle extends RdfParser { - /** Constructor */ - public Turtle() { - setLanguage(LANG_TURTLE); + + /** + * Constructor. + * @param propertyStore The property store containing all the settings for this object. + */ + public Turtle(PropertyStore propertyStore) { + super(propertyStore); + } + + @Override + protected ObjectMap getOverrideProperties() { + return super.getOverrideProperties().append(RDF_language, LANG_TURTLE); } } /** Consumes N3 input */ @Consumes(value="text/n3") public static class N3 extends RdfParser { - /** Constructor */ - public N3() { - setLanguage(LANG_N3); + + /** + * Constructor. + * @param propertyStore The property store containing all the settings for this object. + */ + public N3(PropertyStore propertyStore) { + super(propertyStore); + } + + @Override + protected ObjectMap getOverrideProperties() { + return super.getOverrideProperties().append(RDF_language, LANG_N3); } } + private final RdfParserContext ctx; + + /** + * Constructor. + * @param propertyStore The property store containing all the settings for this object. + */ + public RdfParser(PropertyStore propertyStore) { + super(propertyStore); + this.ctx = createContext(RdfParserContext.class); + } + + @Override /* CoreObject */ + public RdfParserBuilder builder() { + return new RdfParserBuilder(propertyStore); + } + @SuppressWarnings({"unchecked", "rawtypes"}) @Override /* ReaderParser */ protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception { @@ -398,7 +446,6 @@ public class RdfParser extends ReaderParser { } } - // TODO Auto-generated method stub return m; } @@ -425,660 +472,6 @@ public class RdfParser extends ReaderParser { @Override /* Parser */ public RdfParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) { - return new RdfParserSession(getContext(RdfParserContext.class), op, input, javaMethod, outer, locale, timeZone, mediaType); - } - - - //-------------------------------------------------------------------------------- - // Properties - //-------------------------------------------------------------------------------- - - /** - * <b>Configuration property:</b> Trim whitespace from text elements. - * <p> - * <ul> - * <li><b>Name:</b> <js>"RdfParser.trimWhitespace"</js> - * <li><b>Data type:</b> <code>Boolean</code> - * <li><b>Default:</b> <jk>false</jk> - * <li><b>Session-overridable:</b> <jk>true</jk> - * </ul> - * <p> - * If <jk>true</jk>, whitespace in text elements will be automatically trimmed. - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>This is equivalent to calling <code>setProperty(<jsf>RDF_trimWhitespace</jsf>, value)</code>. - * </ul> - * - * @param value The new value for this property. - * @return This object (for method chaining). - * @throws LockedException If {@link #lock()} was called on this class. - * @see RdfParserContext#RDF_trimWhitespace - */ - public RdfParser setTrimWhitespace(boolean value) throws LockedException { - return setProperty(RDF_trimWhitespace, value); - } - - /** - * <b>Configuration property:</b> RDF language. - * <p> - * <ul> - * <li><b>Name:</b> <js>"Rdf.language"</js> - * <li><b>Data type:</b> <code>String</code> - * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js> - * </ul> - * <p> - * Can be any of the following: - * <ul class='spaced-list'> - * <li><js>"RDF/XML"</js> - * <li><js>"RDF/XML-ABBREV"</js> - * <li><js>"N-TRIPLE"</js> - * <li><js>"N3"</js> - General name for the N3 writer. - * Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when created. - * Default is the pretty writer but can be overridden with system property <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>. - * <li><js>"N3-PP"</js> - Name of the N3 pretty writer. - * The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding one-referenced bNodes. - * <li><js>"N3-PLAIN"</js> - Name of the N3 plain writer. - * The plain writer writes records by subject. - * <li><js>"N3-TRIPLES"</js> - Name of the N3 triples writer. - * This writer writes one line per statement, like N-Triples, but does N3-style prefixing. - * <li><js>"TURTLE"</js> - Turtle writer. - * http://www.dajobe.org/2004/01/turtle/ - * </ul> - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>This is equivalent to calling <code>setProperty(<jsf>RDF_language</jsf>, value)</code>. - * </ul> - * - * @param value The new value for this property. - * @return This object (for method chaining). - * @throws LockedException If {@link #lock()} was called on this class. - * @see RdfParserContext#RDF_language - */ - public RdfParser setLanguage(String value) throws LockedException { - return setProperty(RDF_language, value); - } - - /** - * <b>Configuration property:</b> XML namespace for Juneau properties. - * <p> - * <ul> - * <li><b>Name:</b> <js>"Rdf.juneauNs"</js> - * <li><b>Data type:</b> {@link Namespace} - * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneau/'</js>}</code> - * </ul> - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>This is equivalent to calling <code>setProperty(<jsf>RDF_juneauNs</jsf>, value)</code>. - * </ul> - * - * @param value The new value for this property. - * @return This object (for method chaining). - * @throws LockedException If {@link #lock()} was called on this class. - * @see RdfParserContext#RDF_juneauNs - */ - public RdfParser setJuneauNs(Namespace value) throws LockedException { - return setProperty(RDF_juneauNs, value); - } - - /** - * <b>Configuration property:</b> Default XML namespace for bean properties. - * <p> - * <ul> - * <li><b>Name:</b> <js>"Rdf.juneauBpNs"</js> - * <li><b>Data type:</b> {@link Namespace} - * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code> - * </ul> - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>This is equivalent to calling <code>setProperty(<jsf>RDF_juneauBpNs</jsf>, value)</code>. - * </ul> - * - * @param value The new value for this property. - * @return This object (for method chaining). - * @throws LockedException If {@link #lock()} was called on this class. - * @see RdfParserContext#RDF_juneauBpNs - */ - public RdfParser setJuneauBpNs(Namespace value) throws LockedException { - return setProperty(RDF_juneauBpNs, value); - } - - /** - * <b>Configuration property:</b> Reuse XML namespaces when RDF namespaces not specified. - * <p> - * <ul> - * <li><b>Name:</b> <js>"Rdf.useXmlNamespaces"</js> - * <li><b>Data type:</b> <code>Boolean</code> - * <li><b>Default:</b> <jk>true</jk> - * </ul> - * <p> - * When specified, namespaces defined using {@link XmlNs} and {@link Xml} will be inherited by the RDF serializers. - * Otherwise, namespaces will be defined using {@link RdfNs} and {@link Rdf}. - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>This is equivalent to calling <code>setProperty(<jsf>RDF_useXmlNamespaces</jsf>, value)</code>. - * </ul> - * - * @param value The new value for this property. - * @return This object (for method chaining). - * @throws LockedException If {@link #lock()} was called on this class. - * @see RdfParserContext#RDF_useXmlNamespaces - */ - public RdfParser setUseXmlNamespaces(boolean value) throws LockedException { - return setProperty(RDF_useXmlNamespaces, value); - } - - /** - * <b>Configuration property:</b> RDF format for representing collections and arrays. - * <p> - * <ul> - * <li><b>Name:</b> <js>"Rdf.collectionFormat"</js> - * <li><b>Data type:</b> <code>RdfCollectionFormat</code> - * <li><b>Default:</b> <js>"DEFAULT"</js> - * </ul> - * <p> - * Possible values: - * <ul class='spaced-list'> - * <li><js>"DEFAULT"</js> - Default format. The default is an RDF Sequence container. - * <li><js>"SEQ"</js> - RDF Sequence container. - * <li><js>"BAG"</js> - RDF Bag container. - * <li><js>"LIST"</js> - RDF List container. - * <li><js>"MULTI_VALUED"</js> - Multi-valued properties. - * </ul> - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements in the collection will get lost. - * </ul> - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>This is equivalent to calling <code>setProperty(<jsf>RDF_collectionFormat</jsf>, value)</code>. - * <li>This introduces a slight performance penalty. - * </ul> - * - * @param value The new value for this property. - * @return This object (for method chaining). - * @throws LockedException If {@link #lock()} was called on this class. - * @see RdfCommonContext#RDF_collectionFormat - */ - public RdfParser setCollectionFormat(RdfCollectionFormat value) throws LockedException { - return setProperty(RDF_collectionFormat, value); - } - - /** - * <b>Configuration property:</b> Collections should be serialized and parsed as loose collections. - * <p> - * <ul> - * <li><b>Name:</b> <js>"Rdf.looseCollections"</js> - * <li><b>Data type:</b> <code>Boolean</code> - * <li><b>Default:</b> <jk>false</jk> - * </ul> - * <p> - * When specified, collections of resources are handled as loose collections of resources in RDF instead of - * resources that are children of an RDF collection (e.g. Sequence, Bag). - * <p> - * Note that this setting is specialized for RDF syntax, and is incompatible with the concept of - * losslessly representing POJO models, since the tree structure of these POJO models are lost - * when serialized as loose collections. - * <p> - * This setting is typically only useful if the beans being parsed into do not have a bean property - * annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}. - * - * <h5 class='section'>Example:</h5> - * <p class='bcode'> - * WriterSerializer s = <jk>new</jk> RdfSerializer.XmlAbbrev().setLooseCollections(<jk>true</jk>); - * ReaderParser p = <jk>new</jk> RdfParser.Xml().setLooseCollections(<jk>true</jk>); - * - * List<MyBean> l = createListOfMyBeans(); - * - * <jc>// Serialize to RDF/XML as loose resources</jc> - * String rdfXml = s.serialize(l); - * - * <jc>// Parse back into a Java collection</jc> - * l = p.parse(rdfXml, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>); - * - * MyBean[] b = createArrayOfMyBeans(); - * - * <jc>// Serialize to RDF/XML as loose resources</jc> - * String rdfXml = s.serialize(b); - * - * <jc>// Parse back into a bean array</jc> - * b = p.parse(rdfXml, MyBean[].<jk>class</jk>); - * </p> - * <p> - * <h5 class='section'>Notes:</h5> - * <ul> - * <li>This is equivalent to calling <code>setProperty(<jsf>RDF_looseCollections</jsf>, value)</code>. - * </ul> - * - * @param value The new value for this property. - * @return This object (for method chaining). - * @throws LockedException If {@link #lock()} was called on this class. - * @see RdfCommonContext#RDF_looseCollections - */ - public RdfParser setLooseCollections(boolean value) throws LockedException { - return setProperty(RDF_looseCollections, value); - } - - @Override /* Parser */ - public RdfParser setTrimStrings(boolean value) throws LockedException { - super.setTrimStrings(value); - return this; - } - - @Override /* Parser */ - public RdfParser setStrict(boolean value) throws LockedException { - super.setStrict(value); - return this; - } - - @Override /* Parser */ - public RdfParser setInputStreamCharset(String value) throws LockedException { - super.setInputStreamCharset(value); - return this; - } - - @Override /* Parser */ - public RdfParser setFileCharset(String value) throws LockedException { - super.setFileCharset(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeansRequireDefaultConstructor(boolean value) throws LockedException { - super.setBeansRequireDefaultConstructor(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeansRequireSerializable(boolean value) throws LockedException { - super.setBeansRequireSerializable(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeansRequireSettersForGetters(boolean value) throws LockedException { - super.setBeansRequireSettersForGetters(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeansRequireSomeProperties(boolean value) throws LockedException { - super.setBeansRequireSomeProperties(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanMapPutReturnsOldValue(boolean value) throws LockedException { - super.setBeanMapPutReturnsOldValue(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanConstructorVisibility(Visibility value) throws LockedException { - super.setBeanConstructorVisibility(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanClassVisibility(Visibility value) throws LockedException { - super.setBeanClassVisibility(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanFieldVisibility(Visibility value) throws LockedException { - super.setBeanFieldVisibility(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setMethodVisibility(Visibility value) throws LockedException { - super.setMethodVisibility(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setUseJavaBeanIntrospector(boolean value) throws LockedException { - super.setUseJavaBeanIntrospector(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setUseInterfaceProxies(boolean value) throws LockedException { - super.setUseInterfaceProxies(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setIgnoreUnknownBeanProperties(boolean value) throws LockedException { - super.setIgnoreUnknownBeanProperties(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setIgnoreUnknownNullBeanProperties(boolean value) throws LockedException { - super.setIgnoreUnknownNullBeanProperties(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setIgnorePropertiesWithoutSetters(boolean value) throws LockedException { - super.setIgnorePropertiesWithoutSetters(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setIgnoreInvocationExceptionsOnGetters(boolean value) throws LockedException { - super.setIgnoreInvocationExceptionsOnGetters(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setIgnoreInvocationExceptionsOnSetters(boolean value) throws LockedException { - super.setIgnoreInvocationExceptionsOnSetters(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setSortProperties(boolean value) throws LockedException { - super.setSortProperties(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setNotBeanPackages(String...values) throws LockedException { - super.setNotBeanPackages(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setNotBeanPackages(Collection<String> values) throws LockedException { - super.setNotBeanPackages(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addNotBeanPackages(String...values) throws LockedException { - super.addNotBeanPackages(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addNotBeanPackages(Collection<String> values) throws LockedException { - super.addNotBeanPackages(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeNotBeanPackages(String...values) throws LockedException { - super.removeNotBeanPackages(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeNotBeanPackages(Collection<String> values) throws LockedException { - super.removeNotBeanPackages(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setNotBeanClasses(Class<?>...values) throws LockedException { - super.setNotBeanClasses(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setNotBeanClasses(Collection<Class<?>> values) throws LockedException { - super.setNotBeanClasses(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addNotBeanClasses(Class<?>...values) throws LockedException { - super.addNotBeanClasses(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addNotBeanClasses(Collection<Class<?>> values) throws LockedException { - super.addNotBeanClasses(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeNotBeanClasses(Class<?>...values) throws LockedException { - super.removeNotBeanClasses(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeNotBeanClasses(Collection<Class<?>> values) throws LockedException { - super.removeNotBeanClasses(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanFilters(Class<?>...values) throws LockedException { - super.setBeanFilters(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanFilters(Collection<Class<?>> values) throws LockedException { - super.setBeanFilters(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addBeanFilters(Class<?>...values) throws LockedException { - super.addBeanFilters(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addBeanFilters(Collection<Class<?>> values) throws LockedException { - super.addBeanFilters(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeBeanFilters(Class<?>...values) throws LockedException { - super.removeBeanFilters(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeBeanFilters(Collection<Class<?>> values) throws LockedException { - super.removeBeanFilters(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setPojoSwaps(Class<?>...values) throws LockedException { - super.setPojoSwaps(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setPojoSwaps(Collection<Class<?>> values) throws LockedException { - super.setPojoSwaps(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addPojoSwaps(Class<?>...values) throws LockedException { - super.addPojoSwaps(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addPojoSwaps(Collection<Class<?>> values) throws LockedException { - super.addPojoSwaps(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removePojoSwaps(Class<?>...values) throws LockedException { - super.removePojoSwaps(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removePojoSwaps(Collection<Class<?>> values) throws LockedException { - super.removePojoSwaps(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setImplClasses(Map<Class<?>,Class<?>> values) throws LockedException { - super.setImplClasses(values); - return this; - } - - @Override /* CoreApi */ - public <T> CoreApi addImplClass(Class<T> interfaceClass, Class<? extends T> implClass) throws LockedException { - super.addImplClass(interfaceClass, implClass); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanDictionary(Class<?>...values) throws LockedException { - super.setBeanDictionary(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanDictionary(Collection<Class<?>> values) throws LockedException { - super.setBeanDictionary(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addToBeanDictionary(Class<?>...values) throws LockedException { - super.addToBeanDictionary(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser addToBeanDictionary(Collection<Class<?>> values) throws LockedException { - super.addToBeanDictionary(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeFromBeanDictionary(Class<?>...values) throws LockedException { - super.removeFromBeanDictionary(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeFromBeanDictionary(Collection<Class<?>> values) throws LockedException { - super.removeFromBeanDictionary(values); - return this; - } - - @Override /* CoreApi */ - public RdfParser setBeanTypePropertyName(String value) throws LockedException { - super.setBeanTypePropertyName(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setDefaultParser(Class<?> value) throws LockedException { - super.setDefaultParser(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setLocale(Locale value) throws LockedException { - super.setLocale(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setTimeZone(TimeZone value) throws LockedException { - super.setTimeZone(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setMediaType(MediaType value) throws LockedException { - super.setMediaType(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setDebug(boolean value) throws LockedException { - super.setDebug(value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setProperty(String name, Object value) throws LockedException { - super.setProperty(name, value); - return this; - } - - @Override /* CoreApi */ - public RdfParser setProperties(ObjectMap properties) throws LockedException { - super.setProperties(properties); - return this; - } - - @Override /* CoreApi */ - public RdfParser addToProperty(String name, Object value) throws LockedException { - super.addToProperty(name, value); - return this; - } - - @Override /* CoreApi */ - public RdfParser putToProperty(String name, Object key, Object value) throws LockedException { - super.putToProperty(name, key, value); - return this; - } - - @Override /* CoreApi */ - public RdfParser putToProperty(String name, Object value) throws LockedException { - super.putToProperty(name, value); - return this; - } - - @Override /* CoreApi */ - public RdfParser removeFromProperty(String name, Object value) throws LockedException { - super.removeFromProperty(name, value); - return this; - } - - - //-------------------------------------------------------------------------------- - // Overridden methods - //-------------------------------------------------------------------------------- - - @Override /* CoreApi */ - public RdfParser setClassLoader(ClassLoader classLoader) throws LockedException { - super.setClassLoader(classLoader); - return this; - } - - @Override /* Lockable */ - public RdfParser lock() { - super.lock(); - return this; - } - - @Override /* Lockable */ - public RdfParser clone() { - try { - RdfParser c = (RdfParser)super.clone(); - return c; - } catch (CloneNotSupportedException e) { - throw new RuntimeException(e); // Shouldn't happen - } + return new RdfParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/95e832e1/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java new file mode 100644 index 0000000..1a71a2b --- /dev/null +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java @@ -0,0 +1,728 @@ +// *************************************************************************************************************************** +// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * +// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * +// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * +// * with the License. You may obtain a copy of the License at * +// * * +// * http://www.apache.org/licenses/LICENSE-2.0 * +// * * +// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * +// * specific language governing permissions and limitations under the License. * +// *************************************************************************************************************************** +package org.apache.juneau.jena; + +import static org.apache.juneau.jena.RdfCommonContext.*; +import static org.apache.juneau.jena.RdfParserContext.*; + +import java.util.*; + +import org.apache.juneau.*; +import org.apache.juneau.jena.annotation.*; +import org.apache.juneau.parser.*; +import org.apache.juneau.xml.*; +import org.apache.juneau.xml.annotation.*; + +/** + * Builder class for building instances of RDF parsers. + */ +public class RdfParserBuilder extends ParserBuilder { + + /** + * Constructor, default settings. + */ + public RdfParserBuilder() { + super(); + } + + /** + * Constructor. + * @param propertyStore The initial configuration settings for this builder. + */ + public RdfParserBuilder(PropertyStore propertyStore) { + super(propertyStore); + } + + @Override /* CoreObjectBuilder */ + public RdfParser build() { + return new RdfParser(propertyStore); + } + + + //-------------------------------------------------------------------------------- + // Properties + //-------------------------------------------------------------------------------- + + /** + * <b>Configuration property:</b> Trim whitespace from text elements. + * <p> + * <ul> + * <li><b>Name:</b> <js>"RdfParser.trimWhitespace"</js> + * <li><b>Data type:</b> <code>Boolean</code> + * <li><b>Default:</b> <jk>false</jk> + * <li><b>Session-overridable:</b> <jk>true</jk> + * </ul> + * <p> + * If <jk>true</jk>, whitespace in text elements will be automatically trimmed. + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>This is equivalent to calling <code>property(<jsf>RDF_trimWhitespace</jsf>, value)</code>. + * </ul> + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see RdfParserContext#RDF_trimWhitespace + */ + public RdfParserBuilder trimWhitespace(boolean value) { + return property(RDF_trimWhitespace, value); + } + + /** + * <b>Configuration property:</b> RDF language. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Rdf.language"</js> + * <li><b>Data type:</b> <code>String</code> + * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js> + * </ul> + * <p> + * Can be any of the following: + * <ul class='spaced-list'> + * <li><js>"RDF/XML"</js> + * <li><js>"RDF/XML-ABBREV"</js> + * <li><js>"N-TRIPLE"</js> + * <li><js>"N3"</js> - General name for the N3 writer. + * Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when created. + * Default is the pretty writer but can be overridden with system property <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>. + * <li><js>"N3-PP"</js> - Name of the N3 pretty writer. + * The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding one-referenced bNodes. + * <li><js>"N3-PLAIN"</js> - Name of the N3 plain writer. + * The plain writer writes records by subject. + * <li><js>"N3-TRIPLES"</js> - Name of the N3 triples writer. + * This writer writes one line per statement, like N-Triples, but does N3-style prefixing. + * <li><js>"TURTLE"</js> - Turtle writer. + * http://www.dajobe.org/2004/01/turtle/ + * </ul> + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>This is equivalent to calling <code>property(<jsf>RDF_language</jsf>, value)</code>. + * </ul> + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see RdfParserContext#RDF_language + */ + public RdfParserBuilder language(String value) { + return property(RDF_language, value); + } + + /** + * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code> + * @return This object (for method chaining). + */ + public RdfParserBuilder xml() { + return language(Constants.LANG_RDF_XML); + } + + /** + * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code> + * @return This object (for method chaining). + */ + public RdfParserBuilder xmlabbrev() { + return language(Constants.LANG_RDF_XML_ABBREV); + } + + /** + * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code> + * @return This object (for method chaining). + */ + public RdfParserBuilder ntriple() { + return language(Constants.LANG_NTRIPLE); + } + + /** + * Shortcut for calling <code>language(<jsf>LANG_N3</jsf>)</code> + * @return This object (for method chaining). + */ + public RdfParserBuilder n3() { + return language(Constants.LANG_N3); + } + + /** + * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code> + * @return This object (for method chaining). + */ + public RdfParserBuilder turtle() { + return language(Constants.LANG_TURTLE); + } + + /** + * <b>Configuration property:</b> XML namespace for Juneau properties. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Rdf.juneauNs"</js> + * <li><b>Data type:</b> {@link Namespace} + * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneau/'</js>}</code> + * </ul> + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauNs</jsf>, value)</code>. + * </ul> + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see RdfParserContext#RDF_juneauNs + */ + public RdfParserBuilder juneauNs(Namespace value) { + return property(RDF_juneauNs, value); + } + + /** + * <b>Configuration property:</b> Default XML namespace for bean properties. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Rdf.juneauBpNs"</js> + * <li><b>Data type:</b> {@link Namespace} + * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code> + * </ul> + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>This is equivalent to calling <code>property(<jsf>RDF_juneauBpNs</jsf>, value)</code>. + * </ul> + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see RdfParserContext#RDF_juneauBpNs + */ + public RdfParserBuilder juneauBpNs(Namespace value) { + return property(RDF_juneauBpNs, value); + } + + /** + * <b>Configuration property:</b> Reuse XML namespaces when RDF namespaces not specified. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Rdf.useXmlNamespaces"</js> + * <li><b>Data type:</b> <code>Boolean</code> + * <li><b>Default:</b> <jk>true</jk> + * </ul> + * <p> + * When specified, namespaces defined using {@link XmlNs} and {@link Xml} will be inherited by the RDF parsers. + * Otherwise, namespaces will be defined using {@link RdfNs} and {@link Rdf}. + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>This is equivalent to calling <code>property(<jsf>RDF_useXmlNamespaces</jsf>, value)</code>. + * </ul> + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see RdfParserContext#RDF_useXmlNamespaces + */ + public RdfParserBuilder useXmlNamespaces(boolean value) { + return property(RDF_useXmlNamespaces, value); + } + + /** + * <b>Configuration property:</b> RDF format for representing collections and arrays. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Rdf.collectionFormat"</js> + * <li><b>Data type:</b> <code>RdfCollectionFormat</code> + * <li><b>Default:</b> <js>"DEFAULT"</js> + * </ul> + * <p> + * Possible values: + * <ul class='spaced-list'> + * <li><js>"DEFAULT"</js> - Default format. The default is an RDF Sequence container. + * <li><js>"SEQ"</js> - RDF Sequence container. + * <li><js>"BAG"</js> - RDF Bag container. + * <li><js>"LIST"</js> - RDF List container. + * <li><js>"MULTI_VALUED"</js> - Multi-valued properties. + * </ul> + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements in the collection will get lost. + * </ul> + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>This is equivalent to calling <code>property(<jsf>RDF_collectionFormat</jsf>, value)</code>. + * <li>This introduces a slight performance penalty. + * </ul> + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see RdfCommonContext#RDF_collectionFormat + */ + public RdfParserBuilder collectionFormat(RdfCollectionFormat value) { + return property(RDF_collectionFormat, value); + } + + /** + * <b>Configuration property:</b> Collections should be serialized and parsed as loose collections. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Rdf.looseCollections"</js> + * <li><b>Data type:</b> <code>Boolean</code> + * <li><b>Default:</b> <jk>false</jk> + * </ul> + * <p> + * When specified, collections of resources are handled as loose collections of resources in RDF instead of + * resources that are children of an RDF collection (e.g. Sequence, Bag). + * <p> + * Note that this setting is specialized for RDF syntax, and is incompatible with the concept of + * losslessly representing POJO models, since the tree structure of these POJO models are lost + * when serialized as loose collections. + * <p> + * This setting is typically only useful if the beans being parsed into do not have a bean property + * annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}. + * + * <h5 class='section'>Example:</h5> + * <p class='bcode'> + * WriterSerializer s = <jk>new</jk> RdfSerializerBuilder().xmlabbrev().looseCollections(<jk>true</jk>).build(); + * ReaderParser p = <jk>new</jk> RdfParserBuilder().xml().looseCollections(<jk>true</jk>).build(); + * + * List<MyBean> l = createListOfMyBeans(); + * + * <jc>// Serialize to RDF/XML as loose resources</jc> + * String rdfXml = s.serialize(l); + * + * <jc>// Parse back into a Java collection</jc> + * l = p.parse(rdfXml, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>); + * + * MyBean[] b = createArrayOfMyBeans(); + * + * <jc>// Serialize to RDF/XML as loose resources</jc> + * String rdfXml = s.serialize(b); + * + * <jc>// Parse back into a bean array</jc> + * b = p.parse(rdfXml, MyBean[].<jk>class</jk>); + * </p> + * <p> + * <h5 class='section'>Notes:</h5> + * <ul> + * <li>This is equivalent to calling <code>property(<jsf>RDF_looseCollections</jsf>, value)</code>. + * </ul> + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see RdfCommonContext#RDF_looseCollections + */ + public RdfParserBuilder looseCollections(boolean value) { + return property(RDF_looseCollections, value); + } + + @Override /* ParserBuilder */ + public RdfParserBuilder trimStrings(boolean value) { + super.trimStrings(value); + return this; + } + + @Override /* ParserBuilder */ + public RdfParserBuilder strict(boolean value) { + super.strict(value); + return this; + } + + @Override /* ParserBuilder */ + public RdfParserBuilder strict() { + super.strict(); + return this; + } + + @Override /* ParserBuilder */ + public RdfParserBuilder inputStreamCharset(String value) { + super.inputStreamCharset(value); + return this; + } + + @Override /* ParserBuilder */ + public RdfParserBuilder fileCharset(String value) { + super.fileCharset(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beansRequireDefaultConstructor(boolean value) { + super.beansRequireDefaultConstructor(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beansRequireSerializable(boolean value) { + super.beansRequireSerializable(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beansRequireSettersForGetters(boolean value) { + super.beansRequireSettersForGetters(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beansRequireSomeProperties(boolean value) { + super.beansRequireSomeProperties(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanMapPutReturnsOldValue(boolean value) { + super.beanMapPutReturnsOldValue(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanConstructorVisibility(Visibility value) { + super.beanConstructorVisibility(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanClassVisibility(Visibility value) { + super.beanClassVisibility(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanFieldVisibility(Visibility value) { + super.beanFieldVisibility(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder methodVisibility(Visibility value) { + super.methodVisibility(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder useJavaBeanIntrospector(boolean value) { + super.useJavaBeanIntrospector(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder useInterfaceProxies(boolean value) { + super.useInterfaceProxies(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder ignoreUnknownBeanProperties(boolean value) { + super.ignoreUnknownBeanProperties(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder ignoreUnknownNullBeanProperties(boolean value) { + super.ignoreUnknownNullBeanProperties(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder ignorePropertiesWithoutSetters(boolean value) { + super.ignorePropertiesWithoutSetters(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder ignoreInvocationExceptionsOnGetters(boolean value) { + super.ignoreInvocationExceptionsOnGetters(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder ignoreInvocationExceptionsOnSetters(boolean value) { + super.ignoreInvocationExceptionsOnSetters(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder sortProperties(boolean value) { + super.sortProperties(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder notBeanPackages(String...values) { + super.notBeanPackages(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder notBeanPackages(Collection<String> values) { + super.notBeanPackages(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setNotBeanPackages(String...values) { + super.setNotBeanPackages(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setNotBeanPackages(Collection<String> values) { + super.setNotBeanPackages(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeNotBeanPackages(String...values) { + super.removeNotBeanPackages(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeNotBeanPackages(Collection<String> values) { + super.removeNotBeanPackages(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder notBeanClasses(Class<?>...values) { + super.notBeanClasses(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder notBeanClasses(Collection<Class<?>> values) { + super.notBeanClasses(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setNotBeanClasses(Class<?>...values) { + super.setNotBeanClasses(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setNotBeanClasses(Collection<Class<?>> values) { + super.setNotBeanClasses(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeNotBeanClasses(Class<?>...values) { + super.removeNotBeanClasses(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeNotBeanClasses(Collection<Class<?>> values) { + super.removeNotBeanClasses(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanFilters(Class<?>...values) { + super.beanFilters(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanFilters(Collection<Class<?>> values) { + super.beanFilters(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setBeanFilters(Class<?>...values) { + super.setBeanFilters(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setBeanFilters(Collection<Class<?>> values) { + super.setBeanFilters(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeBeanFilters(Class<?>...values) { + super.removeBeanFilters(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeBeanFilters(Collection<Class<?>> values) { + super.removeBeanFilters(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder pojoSwaps(Class<?>...values) { + super.pojoSwaps(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder pojoSwaps(Collection<Class<?>> values) { + super.pojoSwaps(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setPojoSwaps(Class<?>...values) { + super.setPojoSwaps(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setPojoSwaps(Collection<Class<?>> values) { + super.setPojoSwaps(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removePojoSwaps(Class<?>...values) { + super.removePojoSwaps(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removePojoSwaps(Collection<Class<?>> values) { + super.removePojoSwaps(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder implClasses(Map<Class<?>,Class<?>> values) { + super.implClasses(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public <T> RdfParserBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) { + super.implClass(interfaceClass, implClass); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanDictionary(Class<?>...values) { + super.beanDictionary(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanDictionary(Collection<Class<?>> values) { + super.beanDictionary(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setBeanDictionary(Class<?>...values) { + super.setBeanDictionary(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder setBeanDictionary(Collection<Class<?>> values) { + super.setBeanDictionary(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeFromBeanDictionary(Class<?>...values) { + super.removeFromBeanDictionary(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeFromBeanDictionary(Collection<Class<?>> values) { + super.removeFromBeanDictionary(values); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder beanTypePropertyName(String value) { + super.beanTypePropertyName(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder defaultParser(Class<?> value) { + super.defaultParser(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder locale(Locale value) { + super.locale(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder timeZone(TimeZone value) { + super.timeZone(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder mediaType(MediaType value) { + super.mediaType(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder debug(boolean value) { + super.debug(value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder property(String name, Object value) { + super.property(name, value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder properties(Map<String,Object> properties) { + super.properties(properties); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder addToProperty(String name, Object value) { + super.addToProperty(name, value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder putToProperty(String name, Object key, Object value) { + super.putToProperty(name, key, value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder putToProperty(String name, Object value) { + super.putToProperty(name, value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder removeFromProperty(String name, Object value) { + super.removeFromProperty(name, value); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder classLoader(ClassLoader classLoader) { + super.classLoader(classLoader); + return this; + } + + @Override /* CoreObjectBuilder */ + public RdfParserBuilder apply(PropertyStore copyFrom) { + super.apply(copyFrom); + return this; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/95e832e1/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java index 0161f11..708fd5b 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java @@ -21,10 +21,10 @@ import org.apache.juneau.xml.*; /** * Configurable properties on the {@link RdfParser} class. * <p> - * Context properties are set by calling {@link ContextFactory#setProperty(String, Object)} on the context factory - * returned {@link CoreApi#getContextFactory()}. + * Context properties are set by calling {@link PropertyStore#setProperty(String, Object)} on the property store + * passed into the constructor. * <p> - * See {@link ContextFactory} for more information about context properties. + * See {@link PropertyStore} for more information about context properties. * * <h6 class='topic' id='ConfigProperties'>Configurable properties inherited by the RDF parsers</h6> * <ul class='javahierarchy'> @@ -62,18 +62,18 @@ public final class RdfParserContext extends ParserContext implements RdfCommonCo /** * Constructor. * <p> - * Typically only called from {@link ContextFactory#getContext(Class)}. + * Typically only called from {@link PropertyStore#getContext(Class)}. * - * @param cf The factory that created this context. + * @param ps The property store that created this context. */ - public RdfParserContext(ContextFactory cf) { - super(cf); - trimWhitespace = cf.getProperty(RDF_trimWhitespace, boolean.class, false); - looseCollections = cf.getProperty(RDF_looseCollections, boolean.class, false); - rdfLanguage = cf.getProperty(RDF_language, String.class, "RDF/XML-ABBREV"); - juneauNs = cf.getProperty(RDF_juneauNs, Namespace.class, new Namespace("j", "http://www.apache.org/juneau/";)); - juneauBpNs = cf.getProperty(RDF_juneauBpNs, Namespace.class, new Namespace("j", "http://www.apache.org/juneaubp/";)); - collectionFormat = cf.getProperty(RDF_collectionFormat, RdfCollectionFormat.class, RdfCollectionFormat.DEFAULT); + public RdfParserContext(PropertyStore ps) { + super(ps); + trimWhitespace = ps.getProperty(RDF_trimWhitespace, boolean.class, false); + looseCollections = ps.getProperty(RDF_looseCollections, boolean.class, false); + rdfLanguage = ps.getProperty(RDF_language, String.class, "RDF/XML-ABBREV"); + juneauNs = ps.getProperty(RDF_juneauNs, Namespace.class, new Namespace("j", "http://www.apache.org/juneau/";)); + juneauBpNs = ps.getProperty(RDF_juneauBpNs, Namespace.class, new Namespace("j", "http://www.apache.org/juneaubp/";)); + collectionFormat = ps.getProperty(RDF_collectionFormat, RdfCollectionFormat.class, RdfCollectionFormat.DEFAULT); } @Override /* Context */
