Clean up javadocs Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/f400b0c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/f400b0c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/f400b0c0
Branch: refs/heads/master Commit: f400b0c0f0b7b050c793f428101f55d2b29eac2c Parents: 19c566d Author: JamesBognar <[email protected]> Authored: Wed Jun 28 19:37:00 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Wed Jun 28 19:37:00 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/juneau/jena/Constants.java | 6 + .../apache/juneau/jena/RdfBeanPropertyMeta.java | 1 + .../org/apache/juneau/jena/RdfClassMeta.java | 1 + .../apache/juneau/jena/RdfCollectionFormat.java | 2 + .../apache/juneau/jena/RdfCommonContext.java | 101 ++- .../java/org/apache/juneau/jena/RdfParser.java | 6 +- .../apache/juneau/jena/RdfParserBuilder.java | 29 +- .../apache/juneau/jena/RdfParserContext.java | 6 +- .../apache/juneau/jena/RdfParserSession.java | 41 +- .../org/apache/juneau/jena/RdfSerializer.java | 6 +- .../juneau/jena/RdfSerializerBuilder.java | 31 +- .../juneau/jena/RdfSerializerContext.java | 25 +- .../juneau/jena/RdfSerializerSession.java | 30 +- .../java/org/apache/juneau/jena/RdfUtils.java | 2 + .../org/apache/juneau/jena/annotation/Rdf.java | 14 +- .../apache/juneau/jena/annotation/RdfNs.java | 1 + .../juneau/jena/annotation/RdfSchema.java | 21 +- .../java/org/apache/juneau/BeanContext.java | 39 - .../main/java/org/apache/juneau/BeanMap.java | 6 +- .../main/java/org/apache/juneau/BeanMeta.java | 4 +- .../org/apache/juneau/CoreObjectBuilder.java | 32 - .../java/org/apache/juneau/PropertyStore.java | 8 +- .../org/apache/juneau/annotation/Consumes.java | 4 +- .../org/apache/juneau/annotation/Produces.java | 4 +- .../org/apache/juneau/dto/cognos/DataSet.java | 2 +- .../org/apache/juneau/encoders/Encoder.java | 1 - .../apache/juneau/encoders/EncoderGroup.java | 3 +- .../apache/juneau/html/HtmlDocSerializer.java | 8 +- .../juneau/html/HtmlDocSerializerContext.java | 13 - .../java/org/apache/juneau/html/HtmlParser.java | 6 +- .../juneau/html/HtmlSchemaDocSerializer.java | 4 +- .../org/apache/juneau/html/HtmlSerializer.java | 8 +- .../juneau/html/HtmlSerializerBuilder.java | 5 - .../juneau/html/HtmlSerializerContext.java | 6 - .../juneau/html/HtmlStrippedDocSerializer.java | 4 +- .../java/org/apache/juneau/http/MediaType.java | 1 - .../java/org/apache/juneau/ini/ConfigFile.java | 227 +++-- .../apache/juneau/ini/ConfigFileBuilder.java | 13 +- .../org/apache/juneau/ini/ConfigFileImpl.java | 36 +- .../apache/juneau/ini/ConfigFileListener.java | 1 + .../apache/juneau/ini/ConfigFileWrapped.java | 6 +- .../org/apache/juneau/ini/EntryListener.java | 1 + .../org/apache/juneau/ini/SectionListener.java | 1 + .../java/org/apache/juneau/ini/XorEncoder.java | 1 + .../org/apache/juneau/internal/ArrayUtils.java | 46 +- .../apache/juneau/internal/ByteArrayCache.java | 12 +- .../java/org/apache/juneau/internal/Cache.java | 6 +- .../org/apache/juneau/internal/ClassUtils.java | 49 +- .../apache/juneau/internal/CollectionUtils.java | 2 + .../org/apache/juneau/internal/DateUtils.java | 39 +- .../apache/juneau/internal/DelegateBeanMap.java | 2 + .../org/apache/juneau/internal/DelegateMap.java | 1 + .../org/apache/juneau/internal/FileUtils.java | 9 + .../org/apache/juneau/internal/HashCode.java | 11 +- .../org/apache/juneau/internal/IOUtils.java | 41 +- .../apache/juneau/internal/IdentityList.java | 2 + .../apache/juneau/internal/JuneauLogger.java | 33 +- .../org/apache/juneau/internal/KeywordSet.java | 1 + .../apache/juneau/internal/MultiIterable.java | 1 + .../org/apache/juneau/internal/ObjectUtils.java | 2 + .../apache/juneau/internal/ReflectionUtils.java | 9 +- .../org/apache/juneau/internal/SimpleMap.java | 3 + .../juneau/internal/StringBuilderWriter.java | 7 +- .../org/apache/juneau/internal/StringUtils.java | 96 ++- .../apache/juneau/internal/TeeOutputStream.java | 4 +- .../org/apache/juneau/internal/TeeWriter.java | 4 +- .../java/org/apache/juneau/internal/Utils.java | 7 +- .../org/apache/juneau/internal/Version.java | 23 +- .../apache/juneau/internal/VersionRange.java | 1 + .../java/org/apache/juneau/jso/JsoParser.java | 2 +- .../org/apache/juneau/jso/JsoSerializer.java | 3 +- .../java/org/apache/juneau/json/JsonParser.java | 12 +- .../apache/juneau/json/JsonParserContext.java | 3 + .../apache/juneau/json/JsonParserSession.java | 40 +- .../juneau/json/JsonSchemaSerializer.java | 4 +- .../org/apache/juneau/json/JsonSerializer.java | 27 +- .../juneau/json/JsonSerializerBuilder.java | 6 +- .../juneau/json/JsonSerializerContext.java | 17 +- .../juneau/json/JsonSerializerSession.java | 30 +- .../org/apache/juneau/json/annotation/Json.java | 8 +- .../juneau/msgpack/MsgPackInputStream.java | 4 + .../apache/juneau/msgpack/MsgPackParser.java | 4 +- .../juneau/msgpack/MsgPackParserContext.java | 3 + .../juneau/msgpack/MsgPackParserSession.java | 39 +- .../juneau/msgpack/MsgPackSerializer.java | 10 +- .../msgpack/MsgPackSerializerContext.java | 7 +- .../msgpack/MsgPackSerializerSession.java | 30 +- .../apache/juneau/parser/InputStreamParser.java | 5 +- .../apache/juneau/parser/ParseException.java | 2 + .../java/org/apache/juneau/parser/Parser.java | 192 +++-- .../org/apache/juneau/parser/ParserBuilder.java | 21 +- .../org/apache/juneau/parser/ParserContext.java | 21 +- .../org/apache/juneau/parser/ParserGroup.java | 21 +- .../juneau/parser/ParserGroupBuilder.java | 8 +- .../apache/juneau/parser/ParserListener.java | 20 +- .../org/apache/juneau/parser/ParserReader.java | 31 +- .../org/apache/juneau/parser/ParserSession.java | 80 +- .../org/apache/juneau/parser/PartParser.java | 9 +- .../org/apache/juneau/parser/ReaderParser.java | 5 +- .../juneau/plaintext/PlainTextParser.java | 12 +- .../juneau/plaintext/PlainTextSerializer.java | 8 +- .../java/org/apache/juneau/remoteable/Body.java | 5 +- .../org/apache/juneau/remoteable/FormData.java | 13 +- .../apache/juneau/remoteable/FormDataIfNE.java | 2 + .../org/apache/juneau/remoteable/Header.java | 10 +- .../apache/juneau/remoteable/HeaderIfNE.java | 2 + .../java/org/apache/juneau/remoteable/Path.java | 9 +- .../org/apache/juneau/remoteable/Query.java | 9 + .../org/apache/juneau/remoteable/QueryIfNE.java | 2 + .../apache/juneau/remoteable/RemoteMethod.java | 5 + .../juneau/remoteable/RemoteMethodArg.java | 6 +- .../apache/juneau/remoteable/Remoteable.java | 4 + .../juneau/remoteable/RemoteableMeta.java | 5 +- .../juneau/remoteable/RemoteableMethodMeta.java | 1 + .../apache/juneau/remoteable/RequestBean.java | 2 + .../serializer/OutputStreamSerializer.java | 5 +- .../juneau/serializer/PartSerializer.java | 3 + .../apache/juneau/serializer/Serializer.java | 148 ++-- .../juneau/serializer/SerializerBuilder.java | 71 +- .../juneau/serializer/SerializerContext.java | 82 +- .../juneau/serializer/SerializerGroup.java | 23 +- .../serializer/SerializerGroupBuilder.java | 4 + .../juneau/serializer/SerializerSession.java | 112 ++- .../juneau/serializer/SerializerWriter.java | 10 +- .../juneau/serializer/WriterSerializer.java | 10 +- .../apache/juneau/soap/SoapXmlSerializer.java | 7 +- .../juneau/soap/SoapXmlSerializerBuilder.java | 2 +- .../juneau/soap/SoapXmlSerializerContext.java | 2 +- .../org/apache/juneau/svl/DefaultingVar.java | 4 +- .../org/apache/juneau/svl/MultipartVar.java | 1 + .../java/org/apache/juneau/svl/SimpleVar.java | 2 + .../java/org/apache/juneau/svl/StreamedVar.java | 2 + .../main/java/org/apache/juneau/svl/Var.java | 15 +- .../java/org/apache/juneau/svl/VarResolver.java | 24 +- .../apache/juneau/svl/VarResolverBuilder.java | 8 +- .../apache/juneau/svl/VarResolverContext.java | 1 + .../apache/juneau/svl/VarResolverSession.java | 20 +- .../org/apache/juneau/svl/vars/ArgsVar.java | 3 + .../apache/juneau/svl/vars/ConfigFileVar.java | 3 + .../apache/juneau/svl/vars/EnvVariablesVar.java | 2 + .../java/org/apache/juneau/svl/vars/IfVar.java | 3 + .../apache/juneau/svl/vars/ManifestFileVar.java | 3 + .../org/apache/juneau/svl/vars/SwitchVar.java | 3 + .../juneau/svl/vars/SystemPropertiesVar.java | 2 + .../transform/AnnotationBeanFilterBuilder.java | 5 +- .../org/apache/juneau/transform/BeanFilter.java | 8 +- .../juneau/transform/BeanFilterBuilder.java | 9 + .../transform/InterfaceBeanFilterBuilder.java | 1 + .../org/apache/juneau/transform/PojoSwap.java | 53 +- .../apache/juneau/transform/SurrogateSwap.java | 8 + .../juneau/transforms/BeanStringSwap.java | 2 + .../apache/juneau/transforms/CalendarSwap.java | 38 +- .../org/apache/juneau/transforms/DateSwap.java | 32 +- .../juneau/transforms/EnumerationSwap.java | 1 + .../apache/juneau/transforms/IteratorSwap.java | 1 + .../apache/juneau/transforms/ReaderSwap.java | 6 +- .../transforms/XMLGregorianCalendarSwap.java | 2 + .../java/org/apache/juneau/uon/UonParser.java | 13 +- .../org/apache/juneau/uon/UonParserBuilder.java | 3 +- .../org/apache/juneau/uon/UonParserContext.java | 6 +- .../org/apache/juneau/uon/UonParserSession.java | 58 +- .../java/org/apache/juneau/uon/UonReader.java | 2 + .../org/apache/juneau/uon/UonSerializer.java | 19 +- .../apache/juneau/uon/UonSerializerBuilder.java | 4 +- .../apache/juneau/uon/UonSerializerContext.java | 15 +- .../apache/juneau/uon/UonSerializerSession.java | 26 +- .../java/org/apache/juneau/uon/UonUtils.java | 1 + .../juneau/urlencoding/UrlEncodingContext.java | 6 +- .../juneau/urlencoding/UrlEncodingParser.java | 9 +- .../urlencoding/UrlEncodingParserBuilder.java | 5 +- .../urlencoding/UrlEncodingParserContext.java | 3 + .../urlencoding/UrlEncodingParserSession.java | 25 +- .../urlencoding/UrlEncodingSerializer.java | 39 +- .../UrlEncodingSerializerBuilder.java | 9 +- .../UrlEncodingSerializerContext.java | 3 + .../UrlEncodingSerializerSession.java | 19 +- .../urlencoding/annotation/UrlEncoding.java | 1 + .../java/org/apache/juneau/utils/AList.java | 1 + .../main/java/org/apache/juneau/utils/AMap.java | 1 + .../main/java/org/apache/juneau/utils/ASet.java | 1 + .../main/java/org/apache/juneau/utils/Args.java | 9 + .../java/org/apache/juneau/utils/IOPipe.java | 4 + .../org/apache/juneau/utils/ManifestFile.java | 1 + .../org/apache/juneau/utils/MessageBundle.java | 42 +- .../org/apache/juneau/utils/MetadataMap.java | 2 + .../org/apache/juneau/utils/ObjectUtils.java | 8 +- .../apache/juneau/utils/PojoIntrospector.java | 74 +- .../java/org/apache/juneau/utils/PojoQuery.java | 37 +- .../java/org/apache/juneau/utils/PojoRest.java | 122 ++- .../apache/juneau/utils/PojoRestException.java | 3 + .../org/apache/juneau/utils/ProcBuilder.java | 23 + .../org/apache/juneau/utils/SearchArgs.java | 59 +- .../org/apache/juneau/utils/StringMessage.java | 1 + .../org/apache/juneau/utils/StringObject.java | 2 + .../org/apache/juneau/utils/ZipFileList.java | 1 + .../java/org/apache/juneau/xml/Namespace.java | 6 +- .../org/apache/juneau/xml/NamespaceFactory.java | 3 + .../java/org/apache/juneau/xml/XmlBeanMeta.java | 8 +- .../apache/juneau/xml/XmlBeanPropertyMeta.java | 1 + .../org/apache/juneau/xml/XmlClassMeta.java | 5 +- .../org/apache/juneau/xml/XmlDocSerializer.java | 5 +- .../java/org/apache/juneau/xml/XmlParser.java | 6 +- .../org/apache/juneau/xml/XmlParserBuilder.java | 23 +- .../org/apache/juneau/xml/XmlParserContext.java | 19 +- .../org/apache/juneau/xml/XmlParserSession.java | 57 +- .../juneau/xml/XmlSchemaDocSerializer.java | 5 +- .../apache/juneau/xml/XmlSchemaSerializer.java | 14 +- .../org/apache/juneau/xml/XmlSerializer.java | 18 +- .../apache/juneau/xml/XmlSerializerBuilder.java | 22 +- .../apache/juneau/xml/XmlSerializerContext.java | 29 +- .../apache/juneau/xml/XmlSerializerSession.java | 27 +- .../java/org/apache/juneau/xml/XmlUtils.java | 13 +- .../java/org/apache/juneau/xml/XmlWriter.java | 8 +- .../org/apache/juneau/xml/annotation/Xml.java | 14 +- .../apache/juneau/xml/annotation/XmlFormat.java | 35 +- .../org/apache/juneau/xml/annotation/XmlNs.java | 1 + .../apache/juneau/xml/annotation/XmlSchema.java | 5 + .../juneau/microservice/Microservice.java | 43 +- .../apache/juneau/microservice/Resource.java | 1 + .../juneau/microservice/ResourceGroup.java | 1 + .../juneau/microservice/RestMicroservice.java | 31 +- .../resources/DirectoryResource.java | 31 +- .../resources/LogEntryFormatter.java | 43 +- .../microservice/resources/LogParser.java | 8 +- .../eclipse-preferences/user-dictionary.txt | 828 +++++++++---------- .../apache/juneau/rest/client/DateHeader.java | 1 + .../juneau/rest/client/NameValuePairs.java | 3 + .../juneau/rest/client/ResponsePattern.java | 3 +- .../rest/client/SerializedNameValuePair.java | 4 +- .../apache/juneau/rest/jaxrs/BaseProvider.java | 4 +- .../juneau/rest/jaxrs/JuneauProvider.java | 14 +- .../java/org/apache/juneau/rest/CallRouter.java | 2 + .../juneau/rest/ClientVersionMatcher.java | 6 +- .../org/apache/juneau/rest/ReaderResource.java | 65 +- .../java/org/apache/juneau/rest/Redirect.java | 56 +- .../org/apache/juneau/rest/RequestBody.java | 45 +- .../org/apache/juneau/rest/RequestFormData.java | 36 +- .../org/apache/juneau/rest/RequestHeaders.java | 53 +- .../apache/juneau/rest/RequestPathMatch.java | 22 +- .../org/apache/juneau/rest/RequestQuery.java | 89 +- .../org/apache/juneau/rest/ResponseHandler.java | 15 +- .../org/apache/juneau/rest/RestCallHandler.java | 17 + .../java/org/apache/juneau/rest/RestConfig.java | 199 ++++- .../org/apache/juneau/rest/RestContext.java | 130 ++- .../org/apache/juneau/rest/RestConverter.java | 13 +- .../org/apache/juneau/rest/RestException.java | 15 +- .../java/org/apache/juneau/rest/RestGuard.java | 15 +- .../apache/juneau/rest/RestInfoProvider.java | 55 +- .../java/org/apache/juneau/rest/RestLogger.java | 20 +- .../org/apache/juneau/rest/RestMatcher.java | 4 + .../juneau/rest/RestMatcherReflecting.java | 1 + .../java/org/apache/juneau/rest/RestParam.java | 7 +- .../org/apache/juneau/rest/RestRequest.java | 47 +- .../juneau/rest/RestResourceResolver.java | 8 + .../org/apache/juneau/rest/RestResponse.java | 207 +++-- .../org/apache/juneau/rest/RestServlet.java | 17 + .../apache/juneau/rest/RestServletDefault.java | 10 +- .../juneau/rest/RestServletGroupDefault.java | 2 + .../java/org/apache/juneau/rest/RestUtils.java | 1 + .../org/apache/juneau/rest/StreamResource.java | 66 +- .../org/apache/juneau/rest/UrlPathPattern.java | 10 +- .../org/apache/juneau/rest/annotation/Body.java | 4 +- .../apache/juneau/rest/annotation/FormData.java | 20 +- .../juneau/rest/annotation/HasFormData.java | 8 +- .../apache/juneau/rest/annotation/HasQuery.java | 4 +- .../apache/juneau/rest/annotation/Header.java | 3 +- .../apache/juneau/rest/annotation/HtmlDoc.java | 66 +- .../apache/juneau/rest/annotation/Messages.java | 3 +- .../apache/juneau/rest/annotation/Method.java | 3 +- .../juneau/rest/annotation/MethodSwagger.java | 27 + .../juneau/rest/annotation/Parameter.java | 17 +- .../org/apache/juneau/rest/annotation/Path.java | 9 +- .../juneau/rest/annotation/PathRemainder.java | 2 +- .../juneau/rest/annotation/Properties.java | 3 + .../apache/juneau/rest/annotation/Property.java | 3 + .../apache/juneau/rest/annotation/Query.java | 8 +- .../juneau/rest/annotation/ResourceSwagger.java | 29 + .../apache/juneau/rest/annotation/Response.java | 5 + .../juneau/rest/annotation/RestMethod.java | 87 +- .../juneau/rest/annotation/RestResource.java | 103 ++- .../juneau/rest/converters/Introspectable.java | 4 + .../juneau/rest/converters/Queryable.java | 2 + .../juneau/rest/converters/Traversable.java | 2 + .../rest/jena/RestServletJenaDefault.java | 4 +- .../rest/jena/RestServletJenaGroupDefault.java | 2 + .../juneau/rest/labels/BeanDescription.java | 2 + .../rest/labels/ChildResourceDescriptions.java | 6 +- .../juneau/rest/labels/NameDescription.java | 1 + .../remoteable/RemoteableServiceProperties.java | 4 + .../rest/remoteable/RemoteableServlet.java | 3 + .../juneau/rest/response/DefaultHandler.java | 3 + .../rest/response/InputStreamHandler.java | 5 +- .../juneau/rest/response/ReaderHandler.java | 1 + .../juneau/rest/response/StreamableHandler.java | 1 + .../juneau/rest/response/WritableHandler.java | 4 +- .../response/ZipFileListResponseHandler.java | 2 + .../juneau/rest/vars/LocalizationVar.java | 4 + .../org/apache/juneau/rest/vars/RequestVar.java | 3 + .../rest/vars/SerializedRequestAttrVar.java | 5 +- .../juneau/rest/vars/ServletInitParamVar.java | 4 + .../apache/juneau/rest/vars/UrlEncodeVar.java | 3 + .../org/apache/juneau/rest/vars/UrlVar.java | 3 + .../org/apache/juneau/rest/vars/WidgetVar.java | 2 + .../widget/ContentTypeLinksColumnWidget.java | 1 + .../rest/widget/ContentTypeLinksRowWidget.java | 1 + .../rest/widget/PoweredByApacheWidget.java | 1 + .../rest/widget/PoweredByJuneauWidget.java | 1 + .../apache/juneau/rest/widget/QueryWidget.java | 9 +- .../org/apache/juneau/rest/widget/Widget.java | 6 +- pom.xml | 2 +- 310 files changed, 4252 insertions(+), 2150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/Constants.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/Constants.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/Constants.java index 47fcb73..2920b5d 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/Constants.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/Constants.java @@ -45,6 +45,7 @@ public final class Constants { /** * RDF property identifier <js>"items"</js>. + * * <p> * For resources that are collections, this property identifies the RDF Sequence container for the items in the * collection. @@ -53,8 +54,10 @@ public final class Constants { /** * RDF property identifier <js>"root"</js>. + * * <p> * Property added to root nodes to help identify them as root elements during parsing. + * * <p> * Added if {@link RdfSerializerContext#RDF_addRootProperty} setting is enabled. */ @@ -62,8 +65,10 @@ public final class Constants { /** * RDF property identifier <js>"class"</js>. + * * <p> * Property added to bean resources to identify the class type. + * * <p> * Added if {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting is enabled. */ @@ -71,6 +76,7 @@ public final class Constants { /** * RDF property identifier <js>"value"</js>. + * * <p> * Property added to nodes to identify a simple value. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java index 1bee6bd..b226607 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java @@ -63,6 +63,7 @@ public class RdfBeanPropertyMeta extends BeanPropertyMetaExtended { /** * Returns the RDF namespace associated with this bean property. + * * <p> * Namespace is determined in the following order: * <ol> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java index e8c2773..76d1e35 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java @@ -69,6 +69,7 @@ public class RdfClassMeta extends ClassMetaExtended { /** * Returns the RDF namespace associated with this class. + * * <p> * Namespace is determined in the following order: * <ol> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java index e1f64a9..2ff1370 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java @@ -22,6 +22,7 @@ public enum RdfCollectionFormat { /** * Default formatting (default). + * * <p> * Inherit formatting from parent class or parent package. * If no formatting specified at any level, default is {@link #SEQ}. @@ -45,6 +46,7 @@ public enum RdfCollectionFormat { /** * Causes collections and arrays to be rendered as multi-valued RDF properties instead of sequences. + * * <p> * Note that enabling this setting will cause order of elements in the collection to be lost. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/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 eeadd03..ae65e23 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 @@ -39,12 +39,13 @@ public interface RdfCommonContext { /** * <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'> @@ -79,7 +80,7 @@ public interface RdfCommonContext { /** * <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} @@ -90,7 +91,7 @@ public interface RdfCommonContext { /** * <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} @@ -101,12 +102,13 @@ public interface RdfCommonContext { /** * <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}. @@ -115,14 +117,16 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>iri_rules</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.iri-rules"</js> * <li><b>Data type:</b> <code>String</code> * <li><b>Default:</b> <js>"lax"</js> * </ul> + * * <p> * Set the engine for checking and resolving. + * * <p> * Possible values: * <ul class='spaced-list'> @@ -142,14 +146,16 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML ARP property: <code>error-mode</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.error-mode"</js> * <li><b>Data type:</b> <code>String</code> * <li><b>Default:</b> <js>"lax"</js> * </ul> + * * <p> * This allows a coarse-grained approach to control of error handling. + * * <p> * Possible values: * <ul> @@ -161,6 +167,7 @@ public interface RdfCommonContext { * <li><js>"strict-error"</js> * <li><js>"strict-fatal"</js> * </ul> + * * <p> * See also: * <ul class='spaced-list'> @@ -178,14 +185,16 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML ARP property: <code>embedding</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.embedding"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>false</jk> * </ul> + * * <p> * Sets ARP to look for RDF embedded within an enclosing XML document. + * * <p> * See also: * <ul class='spaced-list'> @@ -197,13 +206,15 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML ARP property: <code>ERR_xxx</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.ERR_"</js> * <li><b>Data type:</b> <code>String</code> * </ul> + * * <p> * Provides fine-grained control over detected error conditions. + * * <p> * Possible values: * <ul> @@ -212,6 +223,7 @@ public interface RdfCommonContext { * <li><js>"EM_ERROR"</js> * <li><js>"EM_FATAL"</js> * </ul> + * * <p> * See also: * <ul class='spaced-list'> @@ -225,11 +237,12 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML ARP property: <code>WARN_xxx</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.WARN_"</js> * <li><b>Data type:</b> <code>String</code> * </ul> + * * <p> * See {@link #RDF_arp_err_} for details. */ @@ -237,11 +250,12 @@ public interface RdfCommonContext { /** * RDF/XML ARP property: <code>IGN_xxx</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.IGN_"</js> * <li><b>Data type:</b> <code>String</code> * </ul> + * * <p> * See {@link #RDF_arp_err_} for details. */ @@ -249,12 +263,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>xmlbase</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.xmlbase"</js> * <li><b>Data type:</b> <code>String</code> * <li><b>Default:</b> <jk>null</jk> * </ul> + * * <p> * The value to be included for an <xa>xml:base</xa> attribute on the root element in the file. */ @@ -262,12 +277,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>longId</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.longId"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>false</jk> * </ul> + * * <p> * Whether to use long ID's for anon resources. * Short ID's are easier to read, but can run out of memory on very large models. @@ -276,12 +292,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>allowBadURIs</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.allowBadURIs"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>false</jk> * </ul> + * * <p> * URIs in the graph are, by default, checked prior to serialization. */ @@ -289,14 +306,16 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>relativeURIs</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.relativeURIs"</js> * <li><b>Data type:</b> <code>String</code> * <li><b>Default:</b> <js>"same-document, absolute, relative, parent"</js> * </ul> + * * <p> * What sort of relative URIs should be used. + * * <p> * A comma separate list of options: * <ul class='spaced-list'> @@ -313,6 +332,7 @@ public interface RdfCommonContext { * <li> * <js>"grandparent"</js> - Relative path beginning in <js>"../../"</js> * </ul> + * * <p> * The default value is <js>"same-document, absolute, relative, parent"</js>. * To switch off relative URIs use the value <js>""</js>. @@ -322,12 +342,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>showXmlDeclaration</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.showXmlDeclaration"</js> * <li><b>Data type:</b> <code>String</code> * <li><b>Default:</b> <js>"default"</js> * </ul> + * * <p> * Possible values: * <ul class='spaced-list'> @@ -345,12 +366,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>showDoctypeDeclaration</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.showDoctypeDeclaration"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * </ul> + * * <p> * If true, an XML doctype declaration is included in the output. * This declaration includes a <code>!ENTITY</code> declaration for each prefix mapping in the model, and any @@ -361,12 +383,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>tab</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.tab"</js> * <li><b>Data type:</b> <code>Integer</code> * <li><b>Default:</b> <code>2</code> * </ul> + * * <p> * The number of spaces with which to indent XML child elements. */ @@ -374,12 +397,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>attributeQuoteChar</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.attributeQuoteChar"</js> * <li><b>Data type:</b> <code>Character</code> * <li><b>Default:</b> <js>'"'</js> * </ul> + * * <p> * The XML attribute quote character. */ @@ -387,12 +411,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> RDF/XML property: <code>blockRules</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.rdfXml.blockRules"</js> * <li><b>Data type:</b> <code>String</code> * <li><b>Default:</b> <js>""</js> * </ul> + * * <p> * A list of <code>Resource</code> or a <code>String</code> being a comma separated list of fragment IDs from * <a class="doclink" href="http://www.w3.org/TR/rdf-syntax-grammar";>RDF Syntax Grammar</a> indicating grammar @@ -402,12 +427,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>minGap</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.minGap"</js> * <li><b>Data type:</b> <code>Integer</code> * <li><b>Default:</b> <code>1</code> * </ul> + * * <p> * Minimum gap between items on a line. */ @@ -415,12 +441,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>objectLists</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.objectLists"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * </ul> + * * <p> * Print object lists as comma separated lists. */ @@ -428,12 +455,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>subjectColumn</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.subjectColumn"</js> * <li><b>Data type:</b> <code>Integer</code> * <li><b>Default:</b> indentProperty * </ul> + * * <p> * If the subject is shorter than this value, the first property may go on the same line. */ @@ -441,12 +469,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>propertyColumn</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.propertyColumn"</js> * <li><b>Data type:</b> <code>Integer</code> * <li><b>Default:</b> <code>8</code> * </ul> + * * <p> * Width of the property column. */ @@ -454,12 +483,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>indentProperty</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.indentProperty"</js> * <li><b>Data type:</b> <code>Integer</code> * <li><b>Default:</b> <code>6</code> * </ul> + * * <p> * Width to indent properties. */ @@ -467,12 +497,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>widePropertyLen</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.widePropertyLen"</js> * <li><b>Data type:</b> <code>Integer</code> * <li><b>Default:</b> <code>20</code> * </ul> + * * <p> * Width of the property column. * Must be longer than <code>propertyColumn</code>. @@ -481,12 +512,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>abbrevBaseURI</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.abbrevBaseURI"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * </ul> + * * <p> * Control whether to use abbreviations <code><></code> or <code><#></code>. */ @@ -494,12 +526,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>usePropertySymbols</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.usePropertySymbols"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * </ul> + * * <p> * Control whether to use <code>a</code>, <code>=</code> and <code>=></code> in output */ @@ -507,12 +540,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>useTripleQuotedStrings</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.useTripleQuotedStrings"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * </ul> + * * <p> * Allow the use of <code>"""</code> to delimit long strings. */ @@ -520,12 +554,13 @@ public interface RdfCommonContext { /** * <b>Configuration property:</b> N3/Turtle property: <code>useDoubles</code>. - * <p> + * * <ul> * <li><b>Name:</b> <js>"Rdf.jena.n3.useDoubles"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * </ul> + * * <p> * Allow the use doubles as <code>123.456</code>. */ @@ -533,12 +568,13 @@ public interface RdfCommonContext { /** * <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>String</code> * <li><b>Default:</b> <js>"DEFAULT"</js> * </ul> + * * <p> * Possible values: * <ul class='spaced-list'> @@ -564,19 +600,22 @@ public interface RdfCommonContext { /** * <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)}. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/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 fe4f0ab..e2b58d5 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 @@ -32,12 +32,12 @@ import com.hp.hpl.jena.util.iterator.*; * Parses RDF into POJOs. * * <h5 class='section'>Configurable properties:</h5> - * <p> + * * Refer to <a class="doclink" href="package-summary.html#ParserConfigurableProperties">Configurable Properties</a> * for the entire list of configurable properties. * * <h6 class='topic'>Behavior-specific subclasses</h6> - * <p> + * * The following direct subclasses are provided for language-specific parsers: * <ul class='spaced-list'> * <li> @@ -51,7 +51,7 @@ import com.hp.hpl.jena.util.iterator.*; * </ul> * * <h5 class='section'>Additional information:</h5> - * <p> + * * See <a class="doclink" href="package-summary.html#TOC">RDF Overview</a> for an overview of RDF support in Juneau. */ @Consumes(value="text/xml+rdf") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/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 index 252fbd0..61b60ca 100644 --- 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 @@ -57,13 +57,14 @@ public class RdfParserBuilder extends ParserBuilder { /** * <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. * @@ -82,12 +83,13 @@ public class RdfParserBuilder extends ParserBuilder { /** * <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'> @@ -178,7 +180,7 @@ public class RdfParserBuilder extends ParserBuilder { /** * <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} @@ -200,7 +202,7 @@ public class RdfParserBuilder extends ParserBuilder { /** * <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} @@ -222,12 +224,13 @@ public class RdfParserBuilder extends ParserBuilder { /** * <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}. @@ -247,12 +250,13 @@ public class RdfParserBuilder extends ParserBuilder { /** * <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'> @@ -290,19 +294,22 @@ public class RdfParserBuilder extends ParserBuilder { /** * <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)}. @@ -316,16 +323,16 @@ public class RdfParserBuilder extends ParserBuilder { * * <jc>// Serialize to RDF/XML as loose resources</jc> * String rdfXml = s.serialize(l); - * - * <jc>// Parse back into a Java collection</jc> + * + * <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> + * + * <jc>// Parse back into a bean array</jc> * b = p.parse(rdfXml, MyBean[].<jk>class</jk>); * </p> * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/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 cadfa62..42833c4 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 @@ -20,9 +20,11 @@ import org.apache.juneau.xml.*; /** * Configurable properties on the {@link RdfParser} class. + * * <p> * Context properties are set by calling {@link PropertyStore#setProperty(String, Object)} on the property store * passed into the constructor. + * * <p> * See {@link PropertyStore} for more information about context properties. * @@ -49,13 +51,14 @@ public final class RdfParserContext extends ParserContext implements RdfCommonCo /** * <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. */ @@ -69,6 +72,7 @@ public final class RdfParserContext extends ParserContext implements RdfCommonCo /** * Constructor. + * * <p> * Typically only called from {@link PropertyStore#getContext(Class)}. * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java index 5bed276..63a5eca 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java @@ -28,6 +28,7 @@ import com.hp.hpl.jena.rdf.model.*; /** * Session object that lives for the duration of a single use of {@link RdfParser}. + * * <p> * This class is NOT thread safe. It is meant to be discarded after one-time use. */ @@ -45,24 +46,30 @@ public class RdfParserSession extends ParserSession { /** * Create a new session using properties specified in the context. * - * @param ctx The context creating this session object. - * The context contains all the configuration settings for this object. - * @param input The input. Can be any of the following types: - * <ul> - * <li><jk>null</jk> - * <li>{@link Reader} - * <li>{@link CharSequence} - * <li>{@link InputStream} containing UTF-8 encoded text. - * <li>{@link File} containing system encoded text. - * </ul> - * @param op The override properties. - * These override any context properties defined in the context. + * @param ctx + * The context creating this session object. + * The context contains all the configuration settings for this object. + * @param input + * The input. + * Can be any of the following types: + * <ul> + * <li><jk>null</jk> + * <li>{@link Reader} + * <li>{@link CharSequence} + * <li>{@link InputStream} containing UTF-8 encoded text. + * <li>{@link File} containing system encoded text. + * </ul> + * @param op + * The override properties. + * These override any context properties defined in the context. * @param javaMethod The java method that called this parser, usually the method in a REST servlet. * @param outer The outer object for instantiating top-level non-static inner classes. - * @param locale The session locale. - * If <jk>null</jk>, then the locale defined on the context is used. - * @param timeZone The session timezone. - * If <jk>null</jk>, then the timezone defined on the context is used. + * @param locale + * The session locale. + * If <jk>null</jk>, then the locale defined on the context is used. + * @param timeZone + * The session timezone. + * If <jk>null</jk>, then the timezone defined on the context is used. * @param mediaType The session media type (e.g. <js>"application/json"</js>). */ protected RdfParserSession(RdfParserContext ctx, ObjectMap op, Object input, Method javaMethod, Object outer, @@ -213,8 +220,10 @@ public class RdfParserSession extends ParserSession { /** * Decodes the specified string. + * * <p> * If {@link RdfParserContext#RDF_trimWhitespace} is <jk>true</jk>, the resulting string is trimmed before decoding. + * * <p> * If {@link #isTrimStrings()} is <jk>true</jk>, the resulting string is trimmed after decoding. * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java index fbaf525..82cd176 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java @@ -32,12 +32,12 @@ import com.hp.hpl.jena.rdf.model.*; * Serializes POJOs to RDF. * * <h5 class='section'>Configurable properties:</h5> - * <p> + * * Refer to <a class="doclink" href="package-summary.html#SerializerConfigurableProperties">Configurable Properties</a> * for the entire list of configurable properties. * * <h6 class='topic'>Behavior-specific subclasses</h6> - * <p> + * * The following direct subclasses are provided for language-specific serializers: * <ul> * <li>{@link RdfSerializer.Xml} - RDF/XML. @@ -48,7 +48,7 @@ import com.hp.hpl.jena.rdf.model.*; * </ul> * * <h5 class='section'>Additional information:</h5> - * <p> + * * See <a class="doclink" href="package-summary.html#TOC">RDF Overview</a> for an overview of RDF support in Juneau. */ @SuppressWarnings({ "rawtypes", "unchecked" }) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java index 879466b..196bdfa 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java @@ -57,12 +57,13 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <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'> @@ -154,7 +155,7 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <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} @@ -177,7 +178,7 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <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} @@ -200,12 +201,13 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <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}. @@ -226,7 +228,7 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <b>Configuration property:</b> Add XSI data types to non-<code>String</code> literals. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.addLiteralTypes"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -250,17 +252,19 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <b>Configuration property:</b> Add RDF root identifier property to root node. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.addRootProperty"</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> * When enabled an RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of * <js>"true"</js> to identify the root node in the graph. * This helps locate the root node during parsing. + * * <p> * If disabled, the parser has to search through the model to find any resources without incoming predicates to * identify root notes, which can introduce a considerable performance degradation. @@ -281,15 +285,17 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <b>Configuration property:</b> Auto-detect namespace usage. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.autoDetectNamespaces"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * <li><b>Session-overridable:</b> <jk>true</jk> * </ul> + * * <p> * Detect namespace usage before serialization. + * * <p> * If enabled, then the data structure will first be crawled looking for namespaces that will be encountered before * the root element is serialized. @@ -310,13 +316,14 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <b>Configuration property:</b> Default namespaces. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.namespaces.list"</js> * <li><b>Data type:</b> <code>List<{@link Namespace}></code> * <li><b>Default:</b> empty list * <li><b>Session-overridable:</b> <jk>true</jk> * </ul> + * * <p> * The default list of namespaces associated with this serializer. * @@ -336,12 +343,13 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <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'> @@ -379,19 +387,22 @@ public class RdfSerializerBuilder extends SerializerBuilder { /** * <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)}. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java index fb47c8f..2d5d6aa 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java @@ -20,9 +20,11 @@ import org.apache.juneau.xml.*; /** * Configurable properties on the {@link RdfSerializer} class. + * * <p> * Context properties are set by calling {@link PropertyStore#setProperty(String, Object)} on the property store * passed into the constructor. + * * <p> * See {@link PropertyStore} for more information about context properties. * @@ -49,7 +51,7 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf /** * <b>Configuration property:</b> Add XSI data types to non-<code>String</code> literals. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.addLiteralTypes"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -61,17 +63,19 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf /** * <b>Configuration property:</b> Add RDF root identifier property to root node. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.addRootProperty"</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> * When enabled an RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js> * to identify the root node in the graph. * This helps locate the root node during parsing. + * * <p> * If disabled, the parser has to search through the model to find any resources without incoming predicates to * identify root notes, which can introduce a considerable performance degradation. @@ -80,31 +84,33 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf /** * <b>Configuration property:</b> Auto-detect namespace usage. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.autoDetectNamespaces"</js> * <li><b>Data type:</b> <code>Boolean</code> * <li><b>Default:</b> <jk>true</jk> * <li><b>Session-overridable:</b> <jk>true</jk> * </ul> + * * <p> * Detect namespace usage before serialization. + * * <p> - * If enabled, then the data structure will first be crawled looking for - * namespaces that will be encountered before the root element is - * serialized. + * If enabled, then the data structure will first be crawled looking for namespaces that will be encountered before + * the root element is serialized. */ public static final String RDF_autoDetectNamespaces = "RdfSerializer.autoDetectNamespaces"; /** * <b>Configuration property:</b> Default namespaces. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.namespaces.list"</js> * <li><b>Data type:</b> <code>List<{@link Namespace}></code> * <li><b>Default:</b> empty list * <li><b>Session-overridable:</b> <jk>true</jk> * </ul> + * * <p> * The default list of namespaces associated with this serializer. */ @@ -112,19 +118,21 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf /** * <b>Configuration property:</b> Add <js>"_type"</js> properties when needed. - * <p> + * * <ul> * <li><b>Name:</b> <js>"RdfSerializer.addBeanTypeProperties"</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>, then <js>"_type"</js> properties will be added to beans if their type cannot be inferred * through reflection. * This is used to recreate the correct objects during parsing if the object types cannot be inferred. * For example, when serializing a {@code Map<String,Object>} field, where the bean class cannot be determined * from the value type. + * * <p> * When present, this value overrides the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting and is * provided to customize the behavior of specific serializers in a {@link SerializerGroup}. @@ -148,6 +156,7 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf /** * Constructor. + * * <p> * Typically only called from {@link PropertyStore#getContext(Class)}. * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java index 4b055b7..bf229c9 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java @@ -30,6 +30,7 @@ import com.hp.hpl.jena.rdf.model.*; /** * Session object that lives for the duration of a single use of {@link RdfSerializer}. + * * <p> * This class is NOT thread safe. It is meant to be discarded after one-time use. */ @@ -53,19 +54,26 @@ public final class RdfSerializerSession extends SerializerSession { /** * Create a new session using properties specified in the context. * - * @param ctx The context creating this session object. - * The context contains all the configuration settings for this object. - * @param output The output object. See {@link JsonSerializerSession#getWriter()} for valid class types. - * @param op The override properties. - * These override any context properties defined in the context. + * @param ctx + * The context creating this session object. + * The context contains all the configuration settings for this object. + * @param output + * The output object. + * See {@link JsonSerializerSession#getWriter()} for valid class types. + * @param op + * The override properties. + * These override any context properties defined in the context. * @param javaMethod The java method that called this serializer, usually the method in a REST servlet. - * @param locale The session locale. - * If <jk>null</jk>, then the locale defined on the context is used. - * @param timeZone The session timezone. - * If <jk>null</jk>, then the timezone defined on the context is used. + * @param locale + * The session locale. + * If <jk>null</jk>, then the locale defined on the context is used. + * @param timeZone + * The session timezone. + * If <jk>null</jk>, then the timezone defined on the context is used. * @param mediaType The session media type (e.g. <js>"application/json"</js>). - * @param uriContext The URI context. - * Identifies the current request URI used for resolution of URIs to absolute or root-relative form. + * @param uriContext + * The URI context. + * Identifies the current request URI used for resolution of URIs to absolute or root-relative form. */ protected RdfSerializerSession(RdfSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java index 518df2b..0432efb 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java @@ -25,6 +25,8 @@ public class RdfUtils { /** * Find the namespace given a list of <ja>@Rdf</ja> and <ja>@RdfSchema</ja> annotations. + * + * <p> * The annotations should be a child-to-parent ordering of annotations found on a class or method. * * @param rdfs The <code>@Rdf</code> annotations to search. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java index f4821a5..2812d71 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java @@ -21,8 +21,10 @@ import org.apache.juneau.jena.*; /** * Annotation for specifying options for RDF serializers. + * * <p> * Can be applied to Java packages, types, fields, and methods. + * * <p> * Can be used for the following: * <ul> @@ -37,28 +39,32 @@ public @interface Rdf { /** * Sets the XML prefix of this property or class. + * * <p> - * Must either be matched to a {@link #namespace()} annotation on the same object, parent object, or a {@link RdfNs} with the same name - * through the {@link RdfSchema#rdfNs()} annotation on the package. + * Must either be matched to a {@link #namespace()} annotation on the same object, parent object, or a {@link RdfNs} + * with the same name through the {@link RdfSchema#rdfNs()} annotation on the package. */ String prefix() default ""; /** * Sets the namespace URI of this property or class. + * * <p> - * Must be matched with a {@link #prefix()} annotation on this object, a parent object, or a {@link RdfNs} with the same name - * through the {@link RdfSchema#rdfNs()} annotation on the package. + * Must be matched with a {@link #prefix()} annotation on this object, a parent object, or a {@link RdfNs} with the + * same name through the {@link RdfSchema#rdfNs()} annotation on the package. */ String namespace() default ""; /** * The format for how collections (e.g. lists and arrays) are serialized in RDF. + * * @see RdfCollectionFormat */ RdfCollectionFormat collectionFormat() default RdfCollectionFormat.DEFAULT; /** * Marks a bean property as a resource URI identifier for the bean. + * * <p> * Has the following effects on the following serializers: * <ul class='spaced-list'> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java index b80fe5d..d8d9aff 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java @@ -18,6 +18,7 @@ import java.lang.annotation.*; /** * Namespace name/URL mapping pair. + * * <p> * Used to identify a namespace/URI pair on a {@link RdfSchema#rdfNs()} annotation. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java ---------------------------------------------------------------------- diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java index 901ee8f..c840dcd 100644 --- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java +++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java @@ -28,32 +28,35 @@ public @interface RdfSchema { /** * Sets the default RDF prefix for all classes in this and child packages. + * * <p> - * Must either be matched with a {@link #namespace()} annotation, or an {@link #rdfNs()} mapping with the - * same {@link RdfNs#prefix} value. + * Must either be matched with a {@link #namespace()} annotation, or an {@link #rdfNs()} mapping with the same + * {@link RdfNs#prefix} value. */ public String prefix() default ""; /** * Sets the default RDF namespace URL for all classes in this and child packages. + * * <p> - * Must either be matched with a {@link #prefix()} annotation, or an {@link #rdfNs()} mapping with the - * same {@link RdfNs#namespaceURI} value. + * Must either be matched with a {@link #prefix()} annotation, or an {@link #rdfNs()} mapping with the same + * {@link RdfNs#namespaceURI} value. */ public String namespace() default ""; /** * Lists all namespace mappings to be used on all classes within this package. + * * <p> - * The purpose of this annotation is to allow namespace mappings to be defined in a single location - * and referred to by name through just the {@link Rdf#prefix()} annotation. + * The purpose of this annotation is to allow namespace mappings to be defined in a single location and referred to + * by name through just the {@link Rdf#prefix()} annotation. + * * <p> * Inherited by child packages. * * <h5 class='section'>Example:</h5> - * <p> + * * Contents of <code>package-info.java</code>... - * </p> * <p class='bcode'> * <jc>// XML namespaces used within this package.</jc> * <ja>@RdfSchema</ja>(prefix=<js>"ab"</js>, @@ -67,9 +70,9 @@ public @interface RdfSchema { * <jk>package</jk> org.apache.juneau.examples.addressbook; * <jk>import</jk> org.apache.juneau.rdf.annotation.*; * </p> + * * <p> * Class in package using defined namespaces... - * </p> * <p class='bcode'> * <jk>package</jk> org.apache.juneau.examples.addressbook; * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core/src/main/java/org/apache/juneau/BeanContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java index 6a80dd7..1e705bd 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java @@ -51,7 +51,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>Bean Contexts</h5> * - * <p> * Bean contexts are created through the {@link PropertyStore#getContext(Class)} method. * These context objects are read-only, reusable, and thread-safe. * The {@link PropertyStore} class will typically cache copies of <code>Context</code> objects based on @@ -67,7 +66,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>Bean Sessions</h5> * - * <p> * Whereas <code>BeanContext</code> objects are permanent, unchangeable, cached, and thread-safe, * {@link BeanSession} objects are ephemeral and not thread-safe. * They are meant to be used as quickly-constructed scratchpads for creating bean maps. @@ -75,7 +73,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>BeanContext configuration properties</h5> * - * <p> * <code>BeanContexts</code> have several configuration properties that can be used to tweak behavior on how beans are * handled. These are denoted as the static <jsf>BEAN_*</jsf> fields on this class. * @@ -115,7 +112,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>Bean Maps</h5> * - * <p> * {@link BeanMap BeanMaps} are wrappers around Java beans that allow properties to be retrieved and * set using the common {@link Map#put(Object,Object)} and {@link Map#get(Object)} methods. * @@ -156,7 +152,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>Bean Annotations</h5> * - * <p> * This package contains annotations that can be applied to class definitions to override what properties are detected * on a bean. * @@ -178,7 +173,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>Beans with read-only properties</h5> * - * <p> * Bean maps can also be defined on top of beans with read-only properties by adding a * {@link BeanConstructor @BeanConstructor} annotation to one of the constructors on the * bean class. This will allow read-only properties to be set through constructor arguments. @@ -203,7 +197,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>BeanFilters and PojoSwaps</h5> * - * <p> * {@link BeanFilter BeanFilters} and {@link PojoSwap PojoSwaps} are used to tailor how beans and POJOs are handled. * <ol class='spaced-list'> * <li> @@ -222,7 +215,6 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>ClassMetas</h5> * - * <p> * The {@link ClassMeta} class is a wrapper around {@link Class} object that provides cached information about that * class (e.g. whether it's a {@link Map} or {@link Collection} or bean). * @@ -241,7 +233,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Beans require no-arg constructors. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beansRequireDefaultConstructor"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -260,7 +251,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Beans require {@link Serializable} interface. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beansRequireSerializable"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -279,7 +269,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Beans require setters for getters. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beansRequireSettersForGetters"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -296,7 +285,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Beans require at least one property. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beansRequireSomeProperties"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -316,7 +304,6 @@ public class BeanContext extends Context { * <b>Configuration property:</b> {@link BeanMap#put(String,Object) BeanMap.put()} method will return old property * value. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beanMapPutReturnsOldValue"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -336,7 +323,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Look for bean constructors with the specified minimum visibility. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beanConstructorVisibility"</js> * <li><b>Data type:</b> {@link Visibility} @@ -349,7 +335,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Look for bean classes with the specified minimum visibility. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beanClassVisibility"</js> * <li><b>Data type:</b> {@link Visibility} @@ -367,7 +352,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Look for bean fields with the specified minimum visibility. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beanFieldVisibility"</js> * <li><b>Data type:</b> {@link Visibility} @@ -388,7 +372,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Look for bean methods with the specified minimum visibility. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.methodVisibility"</js> * <li><b>Data type:</b> {@link Visibility} @@ -406,7 +389,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Use Java {@link Introspector} for determining bean properties. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.useJavaBeanIntrospector"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -423,7 +405,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Use interface proxies. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.useInterfaceProxies"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -440,7 +421,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Ignore unknown properties. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.ignoreUnknownBeanProperties"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -457,7 +437,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Ignore unknown properties with null values. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.ignoreUnknownNullBeanProperties"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -474,7 +453,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Ignore properties without setters. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.ignorePropertiesWithoutSetters"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -491,7 +469,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Ignore invocation errors on getters. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.ignoreInvocationExceptionsOnGetters"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -508,7 +485,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Ignore invocation errors on setters. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.ignoreInvocationExceptionsOnSetters"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -525,7 +501,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Sort bean properties in alphabetical order. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.sortProperties"</js> * <li><b>Data type:</b> <code>Boolean</code> @@ -549,7 +524,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Packages whose classes should not be considered beans. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.notBeanPackages.set"</js> * <li><b>Data type:</b> <code>Set<String></code> @@ -591,7 +565,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Classes to be excluded from consideration as being beans. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.notBeanClasses.set"</js> * <li><b>Data type:</b> <code>Set<Class></code> @@ -618,7 +591,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Bean filters to apply to beans. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beanFilters.list"</js> * <li><b>Data type:</b> <code>List<Class></code> @@ -659,7 +631,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> POJO swaps to apply to Java objects. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.pojoSwaps.list"</js> * <li><b>Data type:</b> <code>List<Class></code> @@ -689,7 +660,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Implementation classes for interfaces and abstract classes. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.implClasses.map"</js> * <li><b>Data type:</b> <code>Map<Class,Class></code> @@ -712,7 +682,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Explicitly specify visible bean properties. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.includeProperties"</js> * <li><b>Data type:</b> <code>Map<String,String></code> @@ -745,7 +714,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Exclude specified properties from beans. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.excludeProperties"</js> * <li><b>Data type:</b> <code>Map<String,String></code> @@ -778,7 +746,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Bean lookup dictionary. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beanDictionary.list"</js> * <li><b>Data type:</b> <code>List<Class></code> @@ -811,7 +778,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Name to use for the bean type properties used to represent a bean type. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.beanTypePropertyName"</js> * <li><b>Data type:</b> <code>String</code> @@ -824,7 +790,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Default parser to use when converting <code>Strings</code> to POJOs. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.defaultParser"</js> * <li><b>Data type:</b> <code>Class</code> @@ -840,7 +805,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Locale. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.locale"</js> * <li><b>Data type:</b> <code>Locale</code> @@ -856,7 +820,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> TimeZone. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.timeZone"</js> * <li><b>Data type:</b> <code>TimeZone</code> @@ -872,7 +835,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Media type. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.mediaType"</js> * <li><b>Data type:</b> <code>MediaType</code> @@ -888,7 +850,6 @@ public class BeanContext extends Context { /** * <b>Configuration property:</b> Debug mode. * - * <p> * <ul> * <li><b>Name:</b> <js>"BeanContext.debug"</js> * <li><b>Data type:</b> <code>Boolean</code> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core/src/main/java/org/apache/juneau/BeanMap.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/src/main/java/org/apache/juneau/BeanMap.java index fe97e09..c093c98 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanMap.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanMap.java @@ -27,7 +27,7 @@ import org.apache.juneau.xml.annotation.*; * Java bean wrapper class. * * <h5 class='section'>Description:</h5> - * <p> + * * A wrapper that wraps Java bean instances inside of a {@link Map} interface that allows properties on the wrapped * object can be accessed using the {@link Map#get(Object) get()} and {@link Map#put(Object,Object) put()} methods. * @@ -35,7 +35,7 @@ import org.apache.juneau.xml.annotation.*; * Use the {@link BeanContext} class to create instances of this class. * * <h6 class='topic'>Bean property order</h6> - * <p> + * * The order of the properties returned by the {@link Map#keySet() keySet()} and {@link Map#entrySet() entrySet()} * methods are as follows: * <ul class='spaced-list'> @@ -51,7 +51,7 @@ import org.apache.juneau.xml.annotation.*; * <br>The order can also be overridden through the use of a {@link BeanFilter}. * * <h6 class='topic'>POJO swaps</h6> - * <p> + * * If {@link PojoSwap PojoSwaps} are defined on the class types of the properties of this bean or the bean properties * themselves, the {@link #get(Object)} and {@link #put(String, Object)} methods will automatically transform the * property value to and from the serialized form. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f400b0c0/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java index 1f14abb..bd370ae 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java @@ -30,14 +30,14 @@ import org.apache.juneau.utils.*; * Encapsulates all access to the properties of a bean class (like a souped-up {@link java.beans.BeanInfo}). * * <h5 class='section'>Description:</h5> - * <p> + * * Uses introspection to find all the properties associated with this class. If the {@link Bean @Bean} annotation * is present on the class, or the class has a {@link BeanFilter} registered with it in the bean context, * then that information is used to determine the properties on the class. * Otherwise, the {@code BeanInfo} functionality in Java is used to determine the properties on the class. * * <h6 class='topic'>Bean property ordering</h6> - * <p> + * * The order of the properties are as follows: * <ul class='spaced-list'> * <li>
