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/ef1ead8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/ef1ead8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/ef1ead8e
Branch: refs/heads/master Commit: ef1ead8e404e7f3d87aaa7d5964d9050681e4205 Parents: bdb982d Author: JamesBognar <[email protected]> Authored: Fri Feb 24 17:15:14 2017 -0500 Committer: JamesBognar <[email protected]> Committed: Fri Feb 24 17:15:14 2017 -0500 ---------------------------------------------------------------------- .../apache/juneau/jena/RdfBeanPropertyMeta.java | 2 +- .../org/apache/juneau/jena/RdfClassMeta.java | 2 +- .../apache/juneau/jena/RdfCollectionFormat.java | 4 +- .../apache/juneau/jena/RdfCommonContext.java | 94 +++--- .../java/org/apache/juneau/jena/RdfParser.java | 26 +- .../apache/juneau/jena/RdfParserSession.java | 8 +- .../org/apache/juneau/jena/RdfSerializer.java | 26 +- .../juneau/jena/RdfSerializerSession.java | 8 +- .../org/apache/juneau/jena/annotation/Rdf.java | 9 +- .../apache/juneau/jena/annotation/RdfNs.java | 2 +- .../juneau/jena/annotation/RdfSchema.java | 14 +- .../java/org/apache/juneau/BeanContext.java | 126 +++---- .../org/apache/juneau/BeanDictionaryList.java | 4 +- .../main/java/org/apache/juneau/BeanMap.java | 52 +-- .../java/org/apache/juneau/BeanMapEntry.java | 2 +- .../main/java/org/apache/juneau/BeanMeta.java | 36 +- .../org/apache/juneau/BeanPropertyMeta.java | 6 +- .../juneau/BeanProxyInvocationHandler.java | 2 +- .../java/org/apache/juneau/BeanRegistry.java | 2 +- .../java/org/apache/juneau/BeanSession.java | 32 +- .../main/java/org/apache/juneau/ClassMeta.java | 22 +- .../main/java/org/apache/juneau/Context.java | 10 +- .../java/org/apache/juneau/ContextFactory.java | 220 ++++++------- .../main/java/org/apache/juneau/Delegate.java | 2 +- .../juneau/InvalidDataConversionException.java | 2 +- .../main/java/org/apache/juneau/MediaRange.java | 2 +- .../main/java/org/apache/juneau/ObjectList.java | 37 +-- .../main/java/org/apache/juneau/ObjectMap.java | 105 +++--- .../org/apache/juneau/PropertyNamerDefault.java | 2 +- .../main/java/org/apache/juneau/Session.java | 4 +- .../main/java/org/apache/juneau/Streamable.java | 3 +- .../main/java/org/apache/juneau/Writable.java | 3 +- .../java/org/apache/juneau/annotation/Bean.java | 76 ++--- .../juneau/annotation/BeanConstructor.java | 30 +- .../apache/juneau/annotation/BeanIgnore.java | 10 +- .../apache/juneau/annotation/BeanProperty.java | 14 +- .../org/apache/juneau/annotation/Consumes.java | 18 +- .../java/org/apache/juneau/annotation/Pojo.java | 4 +- .../org/apache/juneau/annotation/Produces.java | 28 +- .../java/org/apache/juneau/annotation/URI.java | 14 +- .../main/java/org/apache/juneau/dto/Link.java | 6 +- .../java/org/apache/juneau/dto/atom/Feed.java | 2 +- .../java/org/apache/juneau/dto/atom/Link.java | 2 +- .../java/org/apache/juneau/dto/atom/Text.java | 2 +- .../org/apache/juneau/dto/cognos/Column.java | 10 +- .../org/apache/juneau/dto/cognos/DataSet.java | 12 +- .../java/org/apache/juneau/dto/html5/A.java | 4 +- .../java/org/apache/juneau/dto/html5/Area.java | 4 +- .../java/org/apache/juneau/dto/html5/Audio.java | 10 +- .../java/org/apache/juneau/dto/html5/Base.java | 2 +- .../org/apache/juneau/dto/html5/Button.java | 6 +- .../org/apache/juneau/dto/html5/Canvas.java | 4 +- .../java/org/apache/juneau/dto/html5/Col.java | 2 +- .../org/apache/juneau/dto/html5/Colgroup.java | 2 +- .../java/org/apache/juneau/dto/html5/Data.java | 2 +- .../java/org/apache/juneau/dto/html5/Embed.java | 6 +- .../org/apache/juneau/dto/html5/Fieldset.java | 2 +- .../java/org/apache/juneau/dto/html5/Form.java | 2 +- .../apache/juneau/dto/html5/HtmlElement.java | 10 +- .../juneau/dto/html5/HtmlElementMixed.java | 4 +- .../org/apache/juneau/dto/html5/Iframe.java | 6 +- .../java/org/apache/juneau/dto/html5/Img.java | 8 +- .../java/org/apache/juneau/dto/html5/Input.java | 28 +- .../org/apache/juneau/dto/html5/Keygen.java | 4 +- .../java/org/apache/juneau/dto/html5/Link.java | 2 +- .../java/org/apache/juneau/dto/html5/Meter.java | 12 +- .../org/apache/juneau/dto/html5/Object2.java | 6 +- .../java/org/apache/juneau/dto/html5/Ol.java | 4 +- .../org/apache/juneau/dto/html5/Optgroup.java | 2 +- .../org/apache/juneau/dto/html5/Option.java | 6 +- .../java/org/apache/juneau/dto/html5/Param.java | 2 +- .../org/apache/juneau/dto/html5/Progress.java | 4 +- .../org/apache/juneau/dto/html5/Script.java | 6 +- .../org/apache/juneau/dto/html5/Select.java | 10 +- .../org/apache/juneau/dto/html5/Source.java | 2 +- .../java/org/apache/juneau/dto/html5/Table.java | 2 +- .../java/org/apache/juneau/dto/html5/Td.java | 4 +- .../org/apache/juneau/dto/html5/Textarea.java | 16 +- .../java/org/apache/juneau/dto/html5/Th.java | 4 +- .../java/org/apache/juneau/dto/html5/Track.java | 2 +- .../java/org/apache/juneau/dto/html5/Video.java | 14 +- .../apache/juneau/dto/jsonschema/JsonType.java | 8 +- .../apache/juneau/dto/jsonschema/Schema.java | 24 +- .../juneau/dto/jsonschema/SchemaArray.java | 2 +- .../apache/juneau/dto/jsonschema/SchemaMap.java | 2 +- .../juneau/dto/jsonschema/SchemaProperty.java | 2 +- .../jsonschema/SchemaPropertySimpleArray.java | 2 +- .../apache/juneau/dto/jsonschema/SchemaRef.java | 2 +- .../apache/juneau/dto/swagger/HeaderInfo.java | 2 +- .../org/apache/juneau/dto/swagger/Items.java | 4 +- .../apache/juneau/dto/swagger/Operation.java | 2 +- .../juneau/dto/swagger/ParameterInfo.java | 4 +- .../apache/juneau/dto/swagger/SchemaInfo.java | 8 +- .../org/apache/juneau/encoders/Encoder.java | 4 +- .../apache/juneau/encoders/EncoderGroup.java | 20 +- .../apache/juneau/html/HtmlDocSerializer.java | 8 +- .../juneau/html/HtmlDocSerializerContext.java | 37 +-- .../juneau/html/HtmlDocSerializerSession.java | 14 +- .../java/org/apache/juneau/html/HtmlLink.java | 6 +- .../java/org/apache/juneau/html/HtmlParser.java | 12 +- .../apache/juneau/html/HtmlParserSession.java | 8 +- .../juneau/html/HtmlSchemaDocSerializer.java | 14 +- .../org/apache/juneau/html/HtmlSerializer.java | 16 +- .../juneau/html/HtmlSerializerSession.java | 8 +- .../juneau/html/HtmlStrippedDocSerializer.java | 8 +- .../java/org/apache/juneau/ini/ConfigFile.java | 14 +- .../org/apache/juneau/ini/ConfigFileImpl.java | 18 +- .../org/apache/juneau/internal/ArrayUtils.java | 2 +- .../apache/juneau/internal/DelegateBeanMap.java | 4 +- .../org/apache/juneau/internal/HashCode.java | 2 +- .../org/apache/juneau/internal/IOUtils.java | 4 +- .../apache/juneau/internal/JuneauLogger.java | 12 +- .../apache/juneau/internal/ReflectionUtils.java | 2 +- .../org/apache/juneau/internal/SimpleMap.java | 6 +- .../org/apache/juneau/internal/StringUtils.java | 52 +-- .../java/org/apache/juneau/internal/Utils.java | 4 +- .../org/apache/juneau/internal/Version.java | 2 +- .../apache/juneau/internal/VersionRange.java | 2 +- .../juneau/jso/JavaSerializedObjectParser.java | 2 +- .../jso/JavaSerializedObjectSerializer.java | 4 +- .../java/org/apache/juneau/json/JsonParser.java | 42 +-- .../apache/juneau/json/JsonParserSession.java | 22 +- .../juneau/json/JsonSchemaSerializer.java | 6 +- .../org/apache/juneau/json/JsonSerializer.java | 40 +-- .../juneau/json/JsonSerializerSession.java | 8 +- .../java/org/apache/juneau/json/JsonWriter.java | 10 - .../org/apache/juneau/json/annotation/Json.java | 12 +- .../apache/juneau/msgpack/MsgPackParser.java | 4 +- .../juneau/msgpack/MsgPackParserSession.java | 22 +- .../juneau/msgpack/MsgPackSerializer.java | 6 +- .../msgpack/MsgPackSerializerSession.java | 8 +- .../apache/juneau/parser/InputStreamParser.java | 8 +- .../java/org/apache/juneau/parser/Parser.java | 62 ++-- .../org/apache/juneau/parser/ParserGroup.java | 12 +- .../apache/juneau/parser/ParserListener.java | 10 +- .../org/apache/juneau/parser/ParserReader.java | 6 +- .../org/apache/juneau/parser/ParserSession.java | 40 +-- .../org/apache/juneau/parser/ReaderParser.java | 8 +- .../juneau/plaintext/PlainTextParser.java | 10 +- .../juneau/plaintext/PlainTextSerializer.java | 10 +- .../serializer/OutputStreamSerializer.java | 10 +- .../apache/juneau/serializer/Serializer.java | 50 +-- .../juneau/serializer/SerializerContext.java | 6 +- .../juneau/serializer/SerializerGroup.java | 20 +- .../juneau/serializer/SerializerSession.java | 30 +- .../juneau/serializer/SerializerWriter.java | 2 +- .../juneau/serializer/WriterSerializer.java | 10 +- .../apache/juneau/soap/SoapXmlSerializer.java | 8 +- .../java/org/apache/juneau/svl/VarResolver.java | 4 +- .../apache/juneau/svl/VarResolverContext.java | 4 +- .../apache/juneau/svl/VarResolverSession.java | 2 +- .../org/apache/juneau/transform/BeanFilter.java | 12 +- .../juneau/transform/BeanFilterBuilder.java | 6 +- .../transform/InterfaceBeanFilterBuilder.java | 4 +- .../org/apache/juneau/transform/PojoSwap.java | 88 ++--- .../juneau/transforms/BeanStringSwap.java | 6 +- .../apache/juneau/transforms/CalendarSwap.java | 12 +- .../org/apache/juneau/transforms/DateSwap.java | 12 +- .../juneau/transforms/EnumerationSwap.java | 2 +- .../apache/juneau/transforms/IteratorSwap.java | 2 +- .../apache/juneau/transforms/ReaderSwap.java | 10 +- .../transforms/XMLGregorianCalendarSwap.java | 4 +- .../apache/juneau/urlencoding/UonParser.java | 6 +- .../juneau/urlencoding/UonParserSession.java | 22 +- .../juneau/urlencoding/UonSerializer.java | 16 +- .../urlencoding/UonSerializerSession.java | 8 +- .../juneau/urlencoding/UrlEncodingContext.java | 8 +- .../juneau/urlencoding/UrlEncodingParser.java | 16 +- .../urlencoding/UrlEncodingParserContext.java | 6 +- .../urlencoding/UrlEncodingParserSession.java | 8 +- .../urlencoding/UrlEncodingSerializer.java | 16 +- .../UrlEncodingSerializerSession.java | 8 +- .../main/java/org/apache/juneau/utils/Args.java | 2 +- .../java/org/apache/juneau/utils/IOPipe.java | 6 +- .../org/apache/juneau/utils/MessageBundle.java | 2 +- .../org/apache/juneau/utils/ObjectUtils.java | 6 +- .../apache/juneau/utils/PojoIntrospector.java | 16 +- .../java/org/apache/juneau/utils/PojoQuery.java | 34 +- .../java/org/apache/juneau/utils/PojoRest.java | 102 +++--- .../apache/juneau/utils/PojoRestException.java | 6 +- .../java/org/apache/juneau/xml/Namespace.java | 4 +- .../org/apache/juneau/xml/NamespaceFactory.java | 10 +- .../apache/juneau/xml/XmlBeanPropertyMeta.java | 2 +- .../org/apache/juneau/xml/XmlClassMeta.java | 2 +- .../org/apache/juneau/xml/XmlDocSerializer.java | 6 +- .../java/org/apache/juneau/xml/XmlParser.java | 30 +- .../org/apache/juneau/xml/XmlParserContext.java | 24 +- .../org/apache/juneau/xml/XmlParserSession.java | 10 +- .../juneau/xml/XmlSchemaDocSerializer.java | 6 +- .../apache/juneau/xml/XmlSchemaSerializer.java | 10 +- .../org/apache/juneau/xml/XmlSerializer.java | 20 +- .../apache/juneau/xml/XmlSerializerSession.java | 8 +- .../java/org/apache/juneau/xml/XmlUtils.java | 2 +- .../org/apache/juneau/xml/annotation/Xml.java | 18 +- .../org/apache/juneau/xml/annotation/XmlNs.java | 2 +- .../apache/juneau/xml/annotation/XmlSchema.java | 12 +- .../examples/addressbook/AddressBook.java | 2 +- .../juneau/examples/rest/TestMicroservice.java | 2 +- .../juneau/microservice/Microservice.java | 8 +- .../juneau/microservice/RestMicroservice.java | 2 +- .../resources/DirectoryResource.java | 21 +- .../resources/LogEntryFormatter.java | 38 +-- .../org/apache/juneau/rest/client/RestCall.java | 70 ++-- .../apache/juneau/rest/client/RestClient.java | 64 ++-- .../org/apache/juneau/rest/client/SSLOpts.java | 2 +- .../juneau/rest/jaxrs/JuneauProvider.java | 26 +- .../juneau/rest/test/TestMicroservice.java | 2 +- .../org/apache/juneau/rest/RestConverter.java | 18 +- .../org/apache/juneau/rest/RestException.java | 2 +- .../java/org/apache/juneau/rest/RestGuard.java | 26 +- .../juneau/rest/RestMatcherReflecting.java | 2 +- .../org/apache/juneau/rest/RestRequest.java | 18 +- .../org/apache/juneau/rest/RestResponse.java | 21 +- .../org/apache/juneau/rest/RestServlet.java | 325 ++++++++----------- .../apache/juneau/rest/RestServletContext.java | 116 +++---- .../apache/juneau/rest/RestServletDefault.java | 24 +- .../juneau/rest/RestServletGroupDefault.java | 6 +- .../org/apache/juneau/rest/annotation/Body.java | 6 +- .../apache/juneau/rest/annotation/FormData.java | 22 +- .../juneau/rest/annotation/HasFormData.java | 4 +- .../apache/juneau/rest/annotation/HasQuery.java | 2 +- .../apache/juneau/rest/annotation/Header.java | 2 +- .../apache/juneau/rest/annotation/Messages.java | 4 +- .../apache/juneau/rest/annotation/Method.java | 4 +- .../juneau/rest/annotation/Parameter.java | 4 +- .../org/apache/juneau/rest/annotation/Path.java | 8 +- .../juneau/rest/annotation/PathRemainder.java | 2 +- .../juneau/rest/annotation/Properties.java | 4 +- .../apache/juneau/rest/annotation/Property.java | 8 +- .../apache/juneau/rest/annotation/Query.java | 14 +- .../juneau/rest/annotation/RestMethod.java | 156 ++++----- .../juneau/rest/annotation/RestResource.java | 222 ++++++------- .../juneau/rest/converters/Introspectable.java | 8 +- .../juneau/rest/converters/Queryable.java | 8 +- .../juneau/rest/converters/Traversable.java | 4 +- .../rest/jena/RestServletJenaDefault.java | 11 +- .../rest/jena/RestServletJenaGroupDefault.java | 6 +- .../juneau/rest/labels/BeanDescription.java | 4 +- .../rest/labels/ChildResourceDescriptions.java | 2 +- .../juneau/rest/labels/NameDescription.java | 2 +- .../juneau/rest/labels/ResourceDescription.java | 6 +- .../rest/vars/SerializedRequestAttrVar.java | 8 +- 242 files changed, 1980 insertions(+), 2088 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 9dedfb4..dbf14da 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 @@ -62,7 +62,7 @@ public class RdfBeanPropertyMeta extends BeanPropertyMetaExtended { /** * Returns the RDF namespace associated with this bean property. * <p> - * Namespace is determined in the following order: + * Namespace is determined in the following order: * <ol> * <li>{@link Rdf#prefix()} annotation defined on bean property field. * <li>{@link Rdf#prefix()} annotation defined on bean getter. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 44331ad..4de7e2c 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 @@ -68,7 +68,7 @@ public class RdfClassMeta extends ClassMetaExtended { /** * Returns the RDF namespace associated with this class. * <p> - * Namespace is determined in the following order: + * Namespace is determined in the following order: * <ol> * <li>{@link Rdf#prefix()} annotation defined on class. * <li>{@link Rdf#prefix()} annotation defined on package. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 70984b2..c7de4e8 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 @@ -24,7 +24,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}. + * If no formatting specified at any level, default is {@link #SEQ}. */ DEFAULT, @@ -46,7 +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. + * Note that enabling this setting will cause order of elements in the collection to be lost. */ MULTI_VALUED; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 eb61785..4c7b5d6 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 @@ -47,7 +47,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js> * </ul> * <p> - * Can be any of the following: + * Can be any of the following: * <ul class='spaced-list'> * <li><js>"RDF/XML"</js> * <li><js>"RDF/XML-ABBREV"</js> @@ -98,8 +98,8 @@ public interface RdfCommonContext { * <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}. + * 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}. */ public static final String RDF_useXmlNamespaces = "Rdf.useXmlNamespaces"; @@ -112,9 +112,9 @@ public interface RdfCommonContext { * <li><b>Default:</b> <js>"lax"</js> * </ul> * <p> - * Set the engine for checking and resolving. + * Set the engine for checking and resolving. * <p> - * Possible values: + * Possible values: * <ul class='spaced-list'> * <li><js>"lax"</js> - The rules for RDF URI references only, which does permit spaces although the use of spaces is not good practice. * <li><js>"strict"</js> - Sets the IRI engine with rules for valid IRIs, XLink and RDF; it does not permit spaces in IRIs. @@ -132,9 +132,9 @@ public interface RdfCommonContext { * <li><b>Default:</b> <js>"lax"</js> * </ul> * <p> - * This allows a coarse-grained approach to control of error handling. + * This allows a coarse-grained approach to control of error handling. * <p> - * Possible values: + * Possible values: * <ul> * <li><js>"default"</js> * <li><js>"lax"</js> @@ -145,7 +145,7 @@ public interface RdfCommonContext { * <li><js>"strict-fatal"</js> * </ul> * <p> - * See also: + * See also: * <ul class='spaced-list'> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setDefaultErrorMode()">ARPOptions.setDefaultErrorMode()</a> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setLaxErrorMode()">ARPOptions.setLaxErrorMode()</a> @@ -164,9 +164,9 @@ public interface RdfCommonContext { * <li><b>Default:</b> <jk>false</jk> * </ul> * <p> - * Sets ARP to look for RDF embedded within an enclosing XML document. + * Sets ARP to look for RDF embedded within an enclosing XML document. * <p> - * See also: + * See also: * <ul class='spaced-list'> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setEmbedding(boolean)">ARPOptions.setEmbedding(boolean)</a> * </ul> @@ -181,9 +181,9 @@ public interface RdfCommonContext { * <li><b>Data type:</b> <code>String</code> * </ul> * <p> - * Provides fine-grained control over detected error conditions. + * Provides fine-grained control over detected error conditions. * <p> - * Possible values: + * Possible values: * <ul> * <li><js>"EM_IGNORE"</js> * <li><js>"EM_WARNING"</js> @@ -191,7 +191,7 @@ public interface RdfCommonContext { * <li><js>"EM_FATAL"</js> * </ul> * <p> - * See also: + * See also: * <ul class='spaced-list'> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html";>ARPErrorNumbers</a> * <li><a class="doclink" href="http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setErrorMode(int,%20int)">ARPOptions.setErrorMode(int, int)</a> @@ -207,7 +207,7 @@ public interface RdfCommonContext { * <li><b>Data type:</b> <code>String</code> * </ul> * <p> - * See {@link #RDF_arp_err_} for details. + * See {@link #RDF_arp_err_} for details. */ public static final String RDF_arp_warn_ = "Rdf.jena.rdfXml.WARN_"; @@ -219,7 +219,7 @@ public interface RdfCommonContext { * <li><b>Data type:</b> <code>String</code> * </ul> * <p> - * See {@link #RDF_arp_err_} for details. + * See {@link #RDF_arp_err_} for details. */ public static final String RDF_arp_ign_ = "Rdf.jena.rdfXml.IGN_"; @@ -232,7 +232,7 @@ public interface RdfCommonContext { * <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. + * The value to be included for an <xa>xml:base</xa> attribute on the root element in the file. */ public static final String RDF_rdfxml_xmlBase = "Rdf.jena.rdfXml.xmlbase"; @@ -245,8 +245,8 @@ public interface RdfCommonContext { * <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. + * 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. */ public static final String RDF_rdfxml_longId = "Rdf.jena.rdfXml.longId"; @@ -259,7 +259,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <jk>false</jk> * </ul> * <p> - * URIs in the graph are, by default, checked prior to serialization. + * URIs in the graph are, by default, checked prior to serialization. */ public static final String RDF_rdfxml_allowBadUris = "Rdf.jena.rdfXml.allowBadURIs"; @@ -272,9 +272,9 @@ public interface RdfCommonContext { * <li><b>Default:</b> <js>"same-document, absolute, relative, parent"</js> * </ul> * <p> - * What sort of relative URIs should be used. + * What sort of relative URIs should be used. * <p> - * A comma separate list of options: + * A comma separate list of options: * <ul class='spaced-list'> * <li><js>"same-document"</js> - Same-document references (e.g. <js>""</js> or <js>"#foo"</js>) * <li><js>"network"</js> - Network paths (e.g. <js>"//example.org/foo"</js> omitting the URI scheme) @@ -284,9 +284,9 @@ public interface RdfCommonContext { * <li><js>"grandparent"</js> - Relative path begining 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>. - * Relative URIs of any of these types are output where possible if and only if the option has been specified. + * The default value is <js>"same-document, absolute, relative, parent"</js>. + * To switch off relative URIs use the value <js>""</js>. + * Relative URIs of any of these types are output where possible if and only if the option has been specified. */ public static final String RDF_rdfxml_relativeUris = "Rdf.jena.rdfXml.relativeURIs"; @@ -299,7 +299,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <js>"default"</js> * </ul> * <p> - * Possible values: + * Possible values: * <ul class='spaced-list'> * <li><js>"true"</js> - Add XML Declaration to the output. * <li><js>"false"</js> - Don't add XML Declaration to the output. @@ -318,8 +318,8 @@ public interface RdfCommonContext { * <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 attribute value that starts with the URI of that mapping is written as starting with the corresponding entity invocation. + * 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 attribute value that starts with the URI of that mapping is written as starting with the corresponding entity invocation. */ public static final String RDF_rdfxml_showDoctypeDeclaration = "Rdf.jena.rdfXml.showDoctypeDeclaration"; @@ -332,7 +332,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <code>2</code> * </ul> * <p> - * The number of spaces with which to indent XML child elements. + * The number of spaces with which to indent XML child elements. */ public static final String RDF_rdfxml_tab = "Rdf.jena.rdfXml.tab"; @@ -345,7 +345,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <js>'"'</js> * </ul> * <p> - * The XML attribute quote character. + * The XML attribute quote character. */ public static final String RDF_rdfxml_attributeQuoteChar = "Rdf.jena.rdfXml.attributeQuoteChar"; @@ -358,7 +358,7 @@ public interface RdfCommonContext { * <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 rules that will not be used. + * 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 rules that will not be used. */ public static final String RDF_rdfxml_blockRules = "Rdf.jena.rdfXml.blockRules"; @@ -371,7 +371,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <code>1</code> * </ul> * <p> - * Minimum gap between items on a line. + * Minimum gap between items on a line. */ public static final String RDF_n3_minGap = "Rdf.jena.n3.minGap"; @@ -384,7 +384,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <jk>true</jk> * </ul> * <p> - * Print object lists as comma separated lists. + * Print object lists as comma separated lists. */ public static final String RDF_n3_objectLists = "Rdf.jena.n3.objectLists"; @@ -397,7 +397,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> indentProperty * </ul> * <p> - * If the subject is shorter than this value, the first property may go on the same line. + * If the subject is shorter than this value, the first property may go on the same line. */ public static final String RDF_n3_subjectColumn = "Rdf.jena.n3.subjectColumn"; @@ -410,7 +410,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <code>8</code> * </ul> * <p> - * Width of the property column. + * Width of the property column. */ public static final String RDF_n3_propertyColumn = "Rdf.jena.n3.propertyColumn"; @@ -423,7 +423,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <code>6</code> * </ul> * <p> - * Width to indent properties. + * Width to indent properties. */ public static final String RDF_n3_indentProperty = "Rdf.jena.n3.indentProperty"; @@ -436,8 +436,8 @@ public interface RdfCommonContext { * <li><b>Default:</b> <code>20</code> * </ul> * <p> - * Width of the property column. - * Must be longer than <code>propertyColumn</code>. + * Width of the property column. + * Must be longer than <code>propertyColumn</code>. */ public static final String RDF_n3_widePropertyLen = "Rdf.jena.n3.widePropertyLen"; @@ -450,7 +450,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <jk>true</jk> * </ul> * <p> - * Control whether to use abbreviations <code><></code> or <code><#></code>. + * Control whether to use abbreviations <code><></code> or <code><#></code>. */ public static final String RDF_n3_abbrevBaseUri = "Rdf.jena.n3.abbrevBaseURI"; @@ -463,7 +463,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <jk>true</jk> * </ul> * <p> - * Control whether to use <code>a</code>, <code>=</code> and <code>=></code> in output + * Control whether to use <code>a</code>, <code>=</code> and <code>=></code> in output */ public static final String RDF_n3_usePropertySymbols = "Rdf.jena.n3.usePropertySymbols"; @@ -476,7 +476,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <jk>true</jk> * </ul> * <p> - * Allow the use of <code>"""</code> to delimit long strings. + * Allow the use of <code>"""</code> to delimit long strings. */ public static final String RDF_n3_useTripleQuotedStrings = "Rdf.jena.n3.useTripleQuotedStrings"; @@ -489,7 +489,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <jk>true</jk> * </ul> * <p> - * Allow the use doubles as <code>123.456</code>. + * Allow the use doubles as <code>123.456</code>. */ public static final String RDF_n3_useDoubles = "Rdf.jena.n3.useDoubles"; @@ -502,7 +502,7 @@ public interface RdfCommonContext { * <li><b>Default:</b> <js>"DEFAULT"</js> * </ul> * <p> - * Possible values: + * 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. @@ -533,9 +533,9 @@ public interface RdfCommonContext { * 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)}. + * <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'> @@ -547,7 +547,7 @@ public interface RdfCommonContext { * <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(); @@ -555,7 +555,7 @@ public interface RdfCommonContext { * <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/ef1ead8e/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 413706f..c842505 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 @@ -36,12 +36,12 @@ import com.hp.hpl.jena.util.iterator.*; * * <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. + * 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: + * The following direct subclasses are provided for language-specific parsers: * <ul class='spaced-list'> * <li>{@link RdfParser.Xml} - RDF/XML and RDF/XML-ABBREV. * <li>{@link RdfParser.NTriple} - N-TRIPLE. @@ -51,7 +51,7 @@ import com.hp.hpl.jena.util.iterator.*; * * <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. + * 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") public class RdfParser extends ReaderParser { @@ -468,7 +468,7 @@ public class RdfParser extends ReaderParser { * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js> * </ul> * <p> - * Can be any of the following: + * Can be any of the following: * <ul class='spaced-list'> * <li><js>"RDF/XML"</js> * <li><js>"RDF/XML-ABBREV"</js> @@ -555,8 +555,8 @@ public class RdfParser extends ReaderParser { * <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}. + * 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> @@ -581,7 +581,7 @@ public class RdfParser extends ReaderParser { * <li><b>Default:</b> <js>"DEFAULT"</js> * </ul> * <p> - * Possible values: + * 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. @@ -625,9 +625,9 @@ public class RdfParser extends ReaderParser { * 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)}. + * <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'> @@ -639,7 +639,7 @@ public class RdfParser extends ReaderParser { * <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(); @@ -647,7 +647,7 @@ public class RdfParser extends ReaderParser { * <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> * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 87550b3..db1cbdc 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 @@ -45,7 +45,7 @@ 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. + * 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> @@ -55,13 +55,13 @@ public class RdfParserSession extends ParserSession { * <li>{@link File} containing system encoded text. * </ul> * @param op The override properties. - * These override any context properties defined in the context. + * 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. + * 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. + * 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, Locale locale, TimeZone timeZone, MediaType mediaType) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 211a9b2..c856512 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 @@ -35,12 +35,12 @@ import com.hp.hpl.jena.rdf.model.*; * * <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. + * 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: + * The following direct subclasses are provided for language-specific serializers: * <ul> * <li>{@link RdfSerializer.Xml} - RDF/XML. * <li>{@link RdfSerializer.XmlAbbrev} - RDF/XML-ABBREV. @@ -51,7 +51,7 @@ import com.hp.hpl.jena.rdf.model.*; * * <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. + * See <a class="doclink" href="package-summary.html#TOC">RDF Overview</a> for an overview of RDF support in Juneau. */ @SuppressWarnings({ "rawtypes", "unchecked" }) @Produces(value="text/xml+rdf+abbrev", contentType="text/xml+rdf") @@ -409,7 +409,7 @@ public class RdfSerializer extends WriterSerializer { * <li><b>Default:</b> <js>"RDF/XML-ABBREV"</js> * </ul> * <p> - * Can be any of the following: + * Can be any of the following: * <ul class='spaced-list'> * <li><js>"RDF/XML"</js> * <li><js>"RDF/XML-ABBREV"</js> @@ -499,8 +499,8 @@ public class RdfSerializer extends WriterSerializer { * <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}. + * 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> @@ -642,7 +642,7 @@ public class RdfSerializer extends WriterSerializer { * <li><b>Default:</b> <js>"DEFAULT"</js> * </ul> * <p> - * Possible values: + * 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. @@ -686,9 +686,9 @@ public class RdfSerializer extends WriterSerializer { * 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)}. + * <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'> @@ -700,7 +700,7 @@ public class RdfSerializer extends WriterSerializer { * <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(); @@ -708,7 +708,7 @@ public class RdfSerializer extends WriterSerializer { * <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> * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 ef9f347..c44951a 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 @@ -53,15 +53,15 @@ 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. + * 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. + * 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 locale The session locale. - * If <jk>null</jk>, then the locale defined on the context is used. + * 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. + * 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 RdfSerializerSession(RdfSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 275514b..e916bdb 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 @@ -22,9 +22,9 @@ import org.apache.juneau.jena.*; /** * Annotation for specifying options for RDF serializers. * <p> - * Can be applied to Java packages, types, fields, and methods. + * Can be applied to Java packages, types, fields, and methods. * <p> - * Can be used for the following: + * Can be used for the following: * <ul class='spaced-list'> * <li>Override the default behavior of how collections and arrays are serialized. * </ul> @@ -38,16 +38,15 @@ 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 + * 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. - * </p> */ 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 + * 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 ""; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 0bf66cf..b80fe5d 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 @@ -19,7 +19,7 @@ import java.lang.annotation.*; /** * Namespace name/URL mapping pair. * <p> - * Used to identify a namespace/URI pair on a {@link RdfSchema#rdfNs()} annotation. + * Used to identify a namespace/URI pair on a {@link RdfSchema#rdfNs()} annotation. */ @Documented @Target({}) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 3520f0e..901ee8f 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 @@ -29,32 +29,30 @@ 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 + * Must either be matched with a {@link #namespace()} annotation, or an {@link #rdfNs()} mapping with the * same {@link RdfNs#prefix} value. - * </p> */ 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 + * Must either be matched with a {@link #prefix()} annotation, or an {@link #rdfNs()} mapping with the * same {@link RdfNs#namespaceURI} value. - * </p> */ 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 + * 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. + * Inherited by child packages. * * <h5 class='section'>Example:</h5> * <p> - * Contents of <code>package-info.java</code>... + * Contents of <code>package-info.java</code>... * </p> * <p class='bcode'> * <jc>// XML namespaces used within this package.</jc> @@ -70,7 +68,7 @@ public @interface RdfSchema { * <jk>import</jk> org.apache.juneau.rdf.annotation.*; * </p> * <p> - * Class in package using defined namespaces... + * 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/ef1ead8e/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 9da4bcc..5c5d836 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java @@ -31,50 +31,50 @@ import org.apache.juneau.transform.*; /** * Core class of the Juneau architecture. * <p> - * This class servers multiple purposes: - * <ul class='spaced-list'> - * <li>Provides the ability to wrap beans inside {@link Map} interfaces. - * <li>Serves as a repository for metadata on POJOs, such as associated {@link BeanFilter beanFilters}, {@link PropertyNamer property namers}, etc... - * which are used to tailor how POJOs are serialized and parsed. - * <li>Serves as a common utility class for all {@link Serializer Serializers} and {@link Parser Parsers} - * for serializing and parsing Java beans. - * </ul> + * This class servers multiple purposes: + * <ul class='spaced-list'> + * <li>Provides the ability to wrap beans inside {@link Map} interfaces. + * <li>Serves as a repository for metadata on POJOs, such as associated {@link BeanFilter beanFilters}, {@link PropertyNamer property namers}, etc... + * which are used to tailor how POJOs are serialized and parsed. + * <li>Serves as a common utility class for all {@link Serializer Serializers} and {@link Parser Parsers} + * for serializing and parsing Java beans. + * </ul> * <p> - * All serializer and parser contexts extend from this context. + * All serializer and parser contexts extend from this context. * * <h5 class='topic'>Bean Contexts</h5> - * Bean contexts are created through the {@link ContextFactory#getContext(Class)} method. - * These context objects are read-only, reusable, and thread-safe. - * The {@link ContextFactory} class will typically cache copies of <code>Context</code> objects based on - * the current settings on the factory. + * Bean contexts are created through the {@link ContextFactory#getContext(Class)} method. + * These context objects are read-only, reusable, and thread-safe. + * The {@link ContextFactory} class will typically cache copies of <code>Context</code> objects based on + * the current settings on the factory. * <p> - * Each bean context maintains a cache of {@link ClassMeta} objects that describe information about classes encountered. - * These <code>ClassMeta</code> objects are time-consuming to construct. - * Therefore, instances of {@link BeanContext} that share the same <js>"BeanContext.*"</js> property values share - * the same cache. This allows for efficient reuse of <code>ClassMeta</code> objects so that the information about - * classes only needs to be calculated once. - * Because of this, many of the properties defined on the {@link BeanContext} class cannot be overridden on the session. + * Each bean context maintains a cache of {@link ClassMeta} objects that describe information about classes encountered. + * These <code>ClassMeta</code> objects are time-consuming to construct. + * Therefore, instances of {@link BeanContext} that share the same <js>"BeanContext.*"</js> property values share + * the same cache. This allows for efficient reuse of <code>ClassMeta</code> objects so that the information about + * classes only needs to be calculated once. + * Because of this, many of the properties defined on the {@link BeanContext} class cannot be overridden on the session. * * <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. - * {@link BeanMap} objects can only be created through the session. + * 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. + * {@link BeanMap} objects can only be created through the session. * * <h5 class='topic'>BeanContext configuration properties</h5> - * <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. + * <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. * <p> - * Some settings (e.g. {@link BeanContext#BEAN_beansRequireDefaultConstructor}) are used to differentiate between bean and non-bean classes. - * Attempting to create a bean map around one of these objects will throw a {@link BeanRuntimeException}. - * The purpose for this behavior is so that the serializers can identify these non-bean classes and convert them to plain strings using the {@link Object#toString()} method. + * Some settings (e.g. {@link BeanContext#BEAN_beansRequireDefaultConstructor}) are used to differentiate between bean and non-bean classes. + * Attempting to create a bean map around one of these objects will throw a {@link BeanRuntimeException}. + * The purpose for this behavior is so that the serializers can identify these non-bean classes and convert them to plain strings using the {@link Object#toString()} method. * <p> - * Some settings (e.g. {@link BeanContext#BEAN_beanFieldVisibility}) are used to determine what kinds of properties are detected on beans. + * Some settings (e.g. {@link BeanContext#BEAN_beanFieldVisibility}) are used to determine what kinds of properties are detected on beans. * <p> - * Some settings (e.g. {@link BeanContext#BEAN_beanMapPutReturnsOldValue}) change the runtime behavior of bean maps. + * Some settings (e.g. {@link BeanContext#BEAN_beanMapPutReturnsOldValue}) change the runtime behavior of bean maps. * <p> - * Settings are specified using the {@link ContextFactory#setProperty(String, Object)} method and related convenience methods. + * Settings are specified using the {@link ContextFactory#setProperty(String, Object)} method and related convenience methods. * * <h5 class='section'>Example:</h5> * <p class='bcode'> @@ -93,14 +93,14 @@ 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 + * {@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.<br> - * <br> - * Bean maps are created in two ways... - * <ol> - * <li> {@link BeanSession#toBeanMap(Object) BeanSession.toBeanMap()} - Wraps an existing bean inside a {@code Map} wrapper. - * <li> {@link BeanSession#newBeanMap(Class) BeanSession.newBeanMap()} - Create a new bean instance wrapped in a {@code Map} wrapper. - * </ol> + * <br> + * Bean maps are created in two ways... + * <ol> + * <li> {@link BeanSession#toBeanMap(Object) BeanSession.toBeanMap()} - Wraps an existing bean inside a {@code Map} wrapper. + * <li> {@link BeanSession#newBeanMap(Class) BeanSession.newBeanMap()} - Create a new bean instance wrapped in a {@code Map} wrapper. + * </ol> * * <h5 class='section'>Example:</h5> * <p class='bcode'> @@ -113,7 +113,7 @@ import org.apache.juneau.transform.*; * } * * <jc>// Create a new bean session</jc> - * BeanSession session = BeanContext.<jsf>DEFAULT</jsf>.createSession(); + * BeanSession session = BeanContext.<jsf>DEFAULT</jsf>.createSession(); * * <jc>// Wrap an existing bean in a new bean map</jc> * BeanMap<Person> m1 = session.toBeanMap(<jk>new</jk> Person()); @@ -129,7 +129,7 @@ import org.apache.juneau.transform.*; * * <h5 class='topic'>Bean Annotations</h5> * <p> - * This package contains annotations that can be applied to + * This package contains annotations that can be applied to * class definitions to override what properties are detected on a bean. * <h5 class='section'>Example:</h5> * <p class='bcode'> @@ -142,26 +142,26 @@ import org.apache.juneau.transform.*; * <jk>public void</jk> setAge(<jk>int</jk> age); * } * <p> - * See {@link Bean @Bean} and {@link BeanProperty @BeanProperty} for more information. + * See {@link Bean @Bean} and {@link BeanProperty @BeanProperty} for more information. * * <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 + * 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. * <p> - * When the <code>@BeanConstructor</code> annotation is present, bean instantiation is delayed until the call to {@link BeanMap#getBean()}. - * Until then, bean property values are stored in a local cache until <code>getBean()</code> is called. - * Because of this additional caching step, parsing into read-only beans tends to be slower and use + * When the <code>@BeanConstructor</code> annotation is present, bean instantiation is delayed until the call to {@link BeanMap#getBean()}. + * Until then, bean property values are stored in a local cache until <code>getBean()</code> is called. + * Because of this additional caching step, parsing into read-only beans tends to be slower and use * more memory than parsing into beans with writable properties. * <p> - * Attempting to call {@link BeanMap#put(String,Object)} on a read-only property after calling {@link BeanMap#getBean()} + * Attempting to call {@link BeanMap#put(String,Object)} on a read-only property after calling {@link BeanMap#getBean()} * will result in a {@link BeanRuntimeException} being thrown. - * Multiple calls to {@link BeanMap#getBean()} will return the same bean instance. + * Multiple calls to {@link BeanMap#getBean()} will return the same bean instance. * <p> - * Beans can be defined with a combination of read-only and read-write properties. + * Beans can be defined with a combination of read-only and read-write properties. * <p> - * See {@link BeanConstructor @BeanConstructor} for more information. + * See {@link BeanConstructor @BeanConstructor} for more information. * * <h5 class='topic'>BeanFilters and PojoSwaps</h5> * <p> @@ -174,19 +174,19 @@ import org.apache.juneau.transform.*; * <li>{@link PojoSwap} - Allows you to swap out non-serializable objects with serializable replacements. * </ol> * <p> - * See <a class='doclink' href='transform/package-summary.html#TOC'>org.apache.juneau.transform</a> for more information. + * See <a class='doclink' href='transform/package-summary.html#TOC'>org.apache.juneau.transform</a> for more information. * * <h5 class='topic'>ClassMetas</h5> * <p> - * The {@link ClassMeta} class is a wrapper around {@link Class} object that provides cached information + * 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). * <p> - * As a general rule, it's best to reuse bean contexts (and therefore serializers and parsers too) + * As a general rule, it's best to reuse bean contexts (and therefore serializers and parsers too) * whenever possible since it takes some time to populate the internal {@code ClassMeta} object cache. - * By reusing bean contexts, the class type metadata only needs to be calculated once which significantly + * By reusing bean contexts, the class type metadata only needs to be calculated once which significantly * improves performance. * <p> - * See {@link ClassMeta} for more information. + * See {@link ClassMeta} for more information. */ @SuppressWarnings({"unchecked","rawtypes","hiding"}) public class BeanContext extends Context { @@ -934,15 +934,15 @@ public class BeanContext extends Context { * Create a new bean session based on the properties defined on this context. * * @param op The override properties. - * This map can contain values to override properties defined on this context. - * Note that only session-overridable settings can be overridden. + * This map can contain values to override properties defined on this context. + * Note that only session-overridable settings can be overridden. * @param locale The bean session locale. - * Typically used by {@link PojoSwap PojoSwaps} to provide locale-specific output. - * If <jk>null</jk>, the system default locale is assumed. + * Typically used by {@link PojoSwap PojoSwaps} to provide locale-specific output. + * If <jk>null</jk>, the system default locale is assumed. * @param timeZone The bean session timezone. - * Typically used by time-sensitive {@link PojoSwap PojoSwaps} to provide timezone-specific output. - * If <jk>null</jk> the system default timezone is assumed on {@link Date} objects, or the - * locale specified on {@link Calendar} objects are used. + * Typically used by time-sensitive {@link PojoSwap PojoSwaps} to provide timezone-specific output. + * If <jk>null</jk> the system default timezone is assumed on {@link Date} objects, or the + * locale specified on {@link Calendar} objects are used. * @param mediaType The session media type (e.g. <js>"application/json"</js>). * @return A new session object. */ @@ -1032,7 +1032,7 @@ public class BeanContext extends Context { * @param <T> The class type being wrapped. * @param type The class to resolve. * @return If the class is not an array, returns a cached {@link ClassMeta} object. - * Otherwise, returns a new {@link ClassMeta} object every time.<br> + * Otherwise, returns a new {@link ClassMeta} object every time.<br> */ public final <T> ClassMeta<T> getClassMeta(Class<T> type) { @@ -1265,7 +1265,7 @@ public class BeanContext extends Context { * @param t The type. * @param typeVarImpls Contains known resolved type parameters on the specified class so * that we can result {@code ParameterizedTypes} and {@code TypeVariables}.<br> - * Can be <jk>null</jk> if the information is not known. + * Can be <jk>null</jk> if the information is not known. * @return The new {@code ClassMeta} object wrapped around the {@code Type} object. */ protected final <T> ClassMeta<T> resolveClassMeta(BeanProperty p, Type t, Map<Class<?>,Class<?>[]> typeVarImpls) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/BeanDictionaryList.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanDictionaryList.java b/juneau-core/src/main/java/org/apache/juneau/BeanDictionaryList.java index 58a4435..901f2e3 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanDictionaryList.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanDictionaryList.java @@ -35,7 +35,7 @@ public class BeanDictionaryList extends ArrayList<Class<?>> { * Constructor. * * @param c The list of bean classes to add to this dictionary. - * Classes must either specify a {@link Bean#typeName()} value or be another subclass of <code>BeanDictionaryList</code>. + * Classes must either specify a {@link Bean#typeName()} value or be another subclass of <code>BeanDictionaryList</code>. */ public BeanDictionaryList(Class<?>...c) { append(c); @@ -45,7 +45,7 @@ public class BeanDictionaryList extends ArrayList<Class<?>> { * Append one or more bean classes to this bean dictionary. * * @param c The list of bean classes to add to this dictionary. - * Classes must either specify a {@link Bean#typeName()} value or be another subclass of <code>BeanDictionaryList</code>. + * Classes must either specify a {@link Bean#typeName()} value or be another subclass of <code>BeanDictionaryList</code>. * @return This object (for method chaining). */ protected BeanDictionaryList append(Class<?>...c) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 48fbd40..009ce2f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanMap.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanMap.java @@ -26,25 +26,25 @@ import org.apache.juneau.xml.annotation.*; * * <h5 class='section'>Description:</h5> * <p> - * A wrapper that wraps Java bean instances inside of a {@link Map} interface that allows + * 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. * <p> - * Use the {@link BeanContext} class to create instances of this class. + * 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'> - * <li>If {@link Bean @Bean} annotation is specified on class, then the order is the same as the list of properties in the annotation. - * <li>If {@link Bean @Bean} annotation is not specified on the class, then the order is the same as that returned - * by the {@link java.beans.BeanInfo} class (i.e. ordered by definition in the class). - * </ul> - * <br> - * The order can also be overridden through the use of a {@link BeanFilter}. + * 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'> + * <li>If {@link Bean @Bean} annotation is specified on class, then the order is the same as the list of properties in the annotation. + * <li>If {@link Bean @Bean} annotation is not specified on the class, then the order is the same as that returned + * by the {@link java.beans.BeanInfo} class (i.e. ordered by definition in the class). + * </ul> + * <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 + * 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. * @@ -134,7 +134,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T * defined by the {@link BeanConstructor} annotation. * <p> * This method does NOT always return the bean in it's final state. - * Array properties temporary stored as ArrayLists are not finalized + * Array properties temporary stored as ArrayLists are not finalized * until the {@link #getBean()} method is called. * * @param create If bean hasn't been instantiated yet, then instantiate it. @@ -188,13 +188,13 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T * @param property The name of the property to set. * @param value The value to set the property to. * @return If the bean context setting {@code beanMapPutReturnsOldValue} is <jk>true</jk>, then the old value of the property is returned. - * Otherwise, this method always returns <jk>null</jk>. + * Otherwise, this method always returns <jk>null</jk>. * @throws RuntimeException if any of the following occur. - * <ul class='spaced-list'> - * <li>BeanMapEntry does not exist on the underlying object. - * <li>Security settings prevent access to the underlying object setter method. - * <li>An exception occurred inside the setter method. - * </ul> + * <ul class='spaced-list'> + * <li>BeanMapEntry does not exist on the underlying object. + * <li>Security settings prevent access to the underlying object setter method. + * <li>An exception occurred inside the setter method. + * </ul> */ @Override /* Map */ public Object put(String property, Object value) { @@ -217,7 +217,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T /** * Add a value to a collection or array property. * <p> - * As a general rule, adding to arrays is not recommended since the array must be recreate each time + * As a general rule, adding to arrays is not recommended since the array must be recreate each time * this method is called. * * @param property Property name or child-element name (if {@link Xml#childName()} is specified). @@ -281,7 +281,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T /** * Convenience method for setting multiple property values by passing in JSON (or other) text. * <p> - * Typically the input is going to be JSON, although the actual data type + * Typically the input is going to be JSON, although the actual data type * depends on the default parser specified by the {@link BeanContext#BEAN_defaultParser} property * value on the config that created the context that created this map. * @@ -330,7 +330,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T /** * Returns the names of all properties associated with the bean. * <p> - * The returned set is unmodifiable. + * The returned set is unmodifiable. */ @Override /* Map */ public Set<String> keySet() { @@ -340,11 +340,11 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T /** * Returns the specified property on this bean map. * <p> - * Allows you to get and set an individual property on a bean without having a + * Allows you to get and set an individual property on a bean without having a * handle to the bean itself by using the {@link BeanMapEntry#getValue()} * and {@link BeanMapEntry#setValue(Object)} methods. * <p> - * This method can also be used to get metadata on a property by + * This method can also be used to get metadata on a property by * calling the {@link BeanMapEntry#getMeta()} method. * * @param propertyName The name of the property to look up. @@ -383,10 +383,10 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T * This allows a snapshot of all values to be grabbed from a bean in one call. * * @param ignoreNulls - * Don't return properties whose values are null. + * Don't return properties whose values are null. * @param prependVals - * Additional bean property values to prepended to this list. - * Any <jk>null</jk> values in this list will be ignored. + * Additional bean property values to prepended to this list. + * Any <jk>null</jk> values in this list will be ignored. * @return The list of all bean property values. */ public List<BeanPropertyValue> getValues(final boolean ignoreNulls, BeanPropertyValue...prependVals) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/BeanMapEntry.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanMapEntry.java b/juneau-core/src/main/java/org/apache/juneau/BeanMapEntry.java index b7a2758..9871930 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanMapEntry.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanMapEntry.java @@ -20,7 +20,7 @@ import org.apache.juneau.transform.*; /** * Represents a single entry in a bean map. * <p> - * This class can be used to get and set property values on a bean, or to get metadata on a property. + * This class can be used to get and set property values on a bean, or to get metadata on a property. * * <h5 class='section'>Example:</h5> * <p class='bcode'> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/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 a98677c..e327a75 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java @@ -30,25 +30,25 @@ import org.apache.juneau.utils.*; * * <h5 class='section'>Description:</h5> * <p> - * Uses introspection to find all the properties associated with this class. If the {@link Bean @Bean} annotation + * 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. + * 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>If {@link Bean @Bean} annotation is specified on class, then the order is the same as the list of properties in the annotation. - * <li>If {@link Bean @Bean} annotation is not specified on the class, then the order is based on the following. - * <ul> - * <li>Public fields (same order as {@code Class.getFields()}). - * <li>Properties returned by {@code BeanInfo.getPropertyDescriptors()}. - * <li>Non-standard getters/setters with {@link BeanProperty @BeanProperty} annotation defined on them. - * </ul> - * </ul> - * <br> - * The order can also be overridden through the use of an {@link BeanFilter}. + * The order of the properties are as follows: + * <ul class='spaced-list'> + * <li>If {@link Bean @Bean} annotation is specified on class, then the order is the same as the list of properties in the annotation. + * <li>If {@link Bean @Bean} annotation is not specified on the class, then the order is based on the following. + * <ul> + * <li>Public fields (same order as {@code Class.getFields()}). + * <li>Properties returned by {@code BeanInfo.getPropertyDescriptors()}. + * <li>Non-standard getters/setters with {@link BeanProperty @BeanProperty} annotation defined on them. + * </ul> + * </ul> + * <br> + * The order can also be overridden through the use of an {@link BeanFilter}. * * @param <T> The class type that this metadata applies to. */ @@ -680,7 +680,7 @@ public class BeanMeta<T> { * Recursively determines the classes represented by parameterized types in the class hierarchy of * the specified type, and puts the results in the specified map.<br> * <p> - * For example, given the following classes... + * For example, given the following classes... * <p class='bcode'> * public static class BeanA<T> { * public T x; @@ -692,13 +692,13 @@ public class BeanMeta<T> { * <p class='bcode'> * {BeanA.class:[Integer.class]} * <p> - * TODO: This code doesn't currently properly handle the following situation: + * TODO: This code doesn't currently properly handle the following situation: * <p class='bcode'> * public static class BeanB<T extends Number> extends BeanA<T>; * public static class BeanC extends BeanB<Integer>; * <p> - * When called on {@code BeanC}, the variable will be detected as a {@code Number}, not an {@code Integer}.<br> - * If anyone can figure out a better way of doing this, please do so! + * When called on {@code BeanC}, the variable will be detected as a {@code Number}, not an {@code Integer}.<br> + * If anyone can figure out a better way of doing this, please do so! * * @param t The type we're recursing. * @param m Where the results are loaded. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java index ba6f2df..d14e3d3 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java @@ -33,10 +33,10 @@ import org.apache.juneau.utils.*; /** * Contains metadata about a bean property. * <p> - * Contains information such as type of property (e.g. field/getter/setter), class type of property value, + * Contains information such as type of property (e.g. field/getter/setter), class type of property value, * and whether any transforms are associated with this property. * <p> - * Developers will typically not need access to this class. The information provided by it is already + * Developers will typically not need access to this class. The information provided by it is already * exposed through several methods on the {@link BeanMap} API. */ @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -339,7 +339,7 @@ public class BeanPropertyMeta { /** * Returns the override list of properties defined through a {@link BeanProperty#properties()} annotation - * on this property. + * on this property. * * @return The list of override properties, or <jk>null</jk> if annotation not specified. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java b/juneau-core/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java index 9e40344..4965e1e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java @@ -18,7 +18,7 @@ import java.util.*; /** * Provides an {@link InvocationHandler} for creating beans from bean interfaces. * <p> - * If the {@code useInterfaceProxies} setting is enabled in {@link BeanContext}, this + * If the {@code useInterfaceProxies} setting is enabled in {@link BeanContext}, this * is the class that creates instances of beans from interfaces. * * @param <T> The interface class http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/BeanRegistry.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanRegistry.java b/juneau-core/src/main/java/org/apache/juneau/BeanRegistry.java index 090fd91..f966565 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanRegistry.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanRegistry.java @@ -114,7 +114,7 @@ public class BeanRegistry { * Gets the class metadata for the specified bean type name. * * @param typeName The bean type name as defined by {@link Bean#typeName()}. - * Can include multi-dimensional array type names (e.g. <js>"X^^"</js>). + * Can include multi-dimensional array type names (e.g. <js>"X^^"</js>). * @return The class metadata for the bean. */ public ClassMeta<?> getClassMeta(String typeName) {
