You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/02/24 22:15:24 UTC
[1/9] incubator-juneau git commit: Clean up javadocs
Repository: incubator-juneau
Updated Branches:
refs/heads/master bdb982d45 -> ef1ead8e4
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
index 014d838..1061f9f 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
@@ -44,17 +44,17 @@ public @interface RestResource {
/**
* Identifies the location of the resource bundle for this class.
* <p>
- * This annotation is used to provide localized messages for the following methods:
+ * This annotation is used to provide localized messages for the following methods:
* <ul>
* <li>{@link RestServlet#getMessage(java.util.Locale, String, Object...)}
* <li>{@link RestServlet#getTitle(RestRequest)}
* <li>{@link RestServlet#getDescription(RestRequest)}
* </ul>
* <p>
- * Refer to the {@link MessageBundle} class for a description of the message key formats
+ * Refer to the {@link MessageBundle} class for a description of the message key formats
* used in the properties file.
* <p>
- * The value can be a relative path like <js>"nls/Messages"</js>, indicating to look for the
+ * The value can be a relative path like <js>"nls/Messages"</js>, indicating to look for the
* resource bundle <js>"com.foo.sample.nls.Messages"</js> if the resource class
* is in <js>"com.foo.sample"</js>, or it can be an absolute path, like <js>"com.foo.sample.nls.Messages"</js>
*/
@@ -63,11 +63,11 @@ public @interface RestResource {
/**
* Class-level guards.
* <p>
- * Associates one or more {@link RestGuard RestGuards} with all REST methods defined
+ * Associates one or more {@link RestGuard RestGuards} with all REST methods defined
* in this class.
- * These guards get called immediately before execution of any REST method in this class.
+ * These guards get called immediately before execution of any REST method in this class.
* <p>
- * Typically, guards will be used for permissions checking on the user making the request,
+ * Typically, guards will be used for permissions checking on the user making the request,
* but it can also be used for other purposes like pre-call validation of a request.
*/
Class<? extends RestGuard>[] guards() default {};
@@ -75,28 +75,28 @@ public @interface RestResource {
/**
* Class-level converters.
* <p>
- * Associates one or more {@link RestConverter converters} with a resource class.
- * These converters get called immediately after execution of the REST method in the same
+ * Associates one or more {@link RestConverter converters} with a resource class.
+ * These converters get called immediately after execution of the REST method in the same
* order specified in the annotation.
* <p>
- * Can be used for performing post-processing on the response object before serialization.
+ * Can be used for performing post-processing on the response object before serialization.
* <p>
- * Default converter implementations are provided in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.
+ * Default converter implementations are provided in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.
*/
Class<? extends RestConverter>[] converters() default {};
/**
* Class-level bean filters.
* <p>
- * Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:
+ * Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:
* <ul>
* <li>{@link RestServlet#getBeanContext()}
* <li>{@link RestServlet#getSerializers()}
* <li>{@link RestServlet#getParsers()}
* </ul>
* <p>
- * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.
- * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should
+ * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.
+ * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should
* be treated as the specified class type.
*/
Class<?>[] beanFilters() default {};
@@ -104,29 +104,29 @@ public @interface RestResource {
/**
* Class-level POJO swaps.
* <p>
- * Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:
+ * Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:
* <ul>
* <li>{@link RestServlet#getBeanContext()}
* <li>{@link RestServlet#getSerializers()}
* <li>{@link RestServlet#getParsers()}
* </ul>
* <p>
- * If the specified class is an instance of {@link PojoSwap}, then that swap is added.
- * Any other classes are wrapped in a {@link SurrogateSwap}.
+ * If the specified class is an instance of {@link PojoSwap}, then that swap is added.
+ * Any other classes are wrapped in a {@link SurrogateSwap}.
*/
Class<?>[] pojoSwaps() default {};
/**
* Class-level properties.
* <p>
- * Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:
+ * Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:
* <ul>
* <li>{@link RestServlet#getBeanContext()}
* <li>{@link RestServlet#getSerializers()}
* <li>{@link RestServlet#getParsers()}
* </ul>
* <p>
- * Any of the following property names can be specified:
+ * Any of the following property names can be specified:
* <ul>
* <li>{@link RestServletContext}
* <li>{@link BeanContext}
@@ -140,9 +140,9 @@ public @interface RestResource {
* <li>{@link XmlParserContext}
* </ul>
* <p>
- * Property values will be converted to the appropriate type.
+ * Property values will be converted to the appropriate type.
* <p>
- * In some cases, properties can be overridden at runtime through the {@link RestResponse#setProperty(String, Object)} method
+ * In some cases, properties can be overridden at runtime through the {@link RestResponse#setProperty(String, Object)} method
* or through a {@link Properties @Properties} annotated method parameter.
*/
Property[] properties() default {};
@@ -150,14 +150,14 @@ public @interface RestResource {
/**
* Specifies a list of {@link Serializer} classes to add to the list of serializers available for this servlet.
* <p>
- * This annotation can only be used on {@link Serializer} classes that have no-arg constructors.
+ * This annotation can only be used on {@link Serializer} classes that have no-arg constructors.
*/
Class<? extends Serializer>[] serializers() default {};
/**
* Specifies a list of {@link Parser} classes to add to the list of parsers available for this servlet.
* <p>
- * This annotation can only be used on {@link Parser} classes that have no-arg constructors.
+ * This annotation can only be used on {@link Parser} classes that have no-arg constructors.
*/
Class<? extends Parser>[] parsers() default {};
@@ -166,16 +166,16 @@ public @interface RestResource {
* by REST methods or set via {@link RestResponse#setOutput(Object)} into appropriate
* HTTP responses.
* <p>
- * See {@link ResponseHandler} for details.
+ * See {@link ResponseHandler} for details.
*/
Class<? extends ResponseHandler>[] responseHandlers() default {};
/**
* Specifies a list of {@link Encoder} to associate with this servlet.
* <p>
- * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.
+ * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.
* <p>
- * This annotation can only be used on {@link Encoder} classes that have no-arg constructors.
+ * This annotation can only be used on {@link Encoder} classes that have no-arg constructors.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -191,14 +191,14 @@ public @interface RestResource {
/**
* Specifies default values for request headers.
* <p>
- * Strings are of the format <js>"Header-Name: header-value"</js>.
+ * Strings are of the format <js>"Header-Name: header-value"</js>.
* <p>
- * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.
+ * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.
* <p>
- * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not specified
+ * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not specified
* so that a particular default {@link Serializer} is picked.
* <p>
- * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).
+ * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -214,13 +214,13 @@ public @interface RestResource {
/**
* Specifies default values for response headers.
* <p>
- * Strings are of the format <js>"Header-Name: header-value"</js>.
+ * Strings are of the format <js>"Header-Name: header-value"</js>.
* <p>
- * This is equivalent to calling {@link RestResponse#setHeader(String, String)} programmatically in each of the Java methods.
+ * This is equivalent to calling {@link RestResponse#setHeader(String, String)} programmatically in each of the Java methods.
* <p>
- * The header value will not be set if the header value has already been specified (hence the 'default' in the name).
+ * The header value will not be set if the header value has already been specified (hence the 'default' in the name).
* <p>
- * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).
+ * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -236,17 +236,17 @@ public @interface RestResource {
/**
* Defines children of this resource.
* <p>
- * A REST child resource is simply another servlet that is initialized as part of the parent
+ * A REST child resource is simply another servlet that is initialized as part of the parent
* resource and has a servlet path directly under the parent servlet path.
- * The main advantage to defining servlets as REST children is that you do not need
+ * The main advantage to defining servlets as REST children is that you do not need
* to define them in the <code>web.xml</code> file of the web application.
- * This can cut down on the number of entries that show up in the <code>web.xml</code> file
+ * This can cut down on the number of entries that show up in the <code>web.xml</code> file
* if you are defining large numbers of servlets.
* <p>
- * Child resources must specify a value for {@link #path()} that identifies the subpath of the
+ * Child resources must specify a value for {@link #path()} that identifies the subpath of the
* child resource relative to the parent path.
* <p>
- * It should be noted that servlets can be nested arbitrarily deep using this technique (i.e. children can also have children).
+ * It should be noted that servlets can be nested arbitrarily deep using this technique (i.e. children can also have children).
*
* <dl>
* <dt>Servlet initialization:</dt>
@@ -276,66 +276,66 @@ public @interface RestResource {
/**
* Identifies the URL subpath relative to the parent resource.
* <p>
- * Typically, this annotation is only applicable to resources defined as children through the {@link #children()}
+ * Typically, this annotation is only applicable to resources defined as children through the {@link #children()}
* annotation. However, it may be used in other ways (e.g. defining paths for top-level resources in microservices).
* <p>
- * This annotation is ignored on top-level servlets (i.e. servlets defined in <code>web.xml</code> files).
- * Therefore, implementers can optionally specify a path value for documentation purposes.
+ * This annotation is ignored on top-level servlets (i.e. servlets defined in <code>web.xml</code> files).
+ * Therefore, implementers can optionally specify a path value for documentation purposes.
*/
String path() default "";
/**
* Optional servlet title.
* <p>
- * It is used to populate the Swagger title field and to display on HTML pages.
- * This value can be retrieved programmatically through the {@link RestServlet#getTitle(RestRequest)} method.
+ * It is used to populate the Swagger title field and to display on HTML pages.
+ * This value can be retrieved programmatically through the {@link RestServlet#getTitle(RestRequest)} method.
* <p>
- * The default value pulls the label from the <code>label</code> entry in the servlet resource bundle.
+ * The default value pulls the label from the <code>label</code> entry in the servlet resource bundle.
* (e.g. <js>"title = foo"</js> or <js>"MyServlet.title = foo"</js>).
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/info/title</code>.
+ * Corresponds to the swagger field <code>/info/title</code>.
*/
String title() default "";
/**
* Optional servlet description.
* <p>
- * It is used to populate the Swagger description field and to display on HTML pages.
- * This value can be retrieved programmatically through the {@link RestServlet#getDescription(RestRequest)} method.
+ * It is used to populate the Swagger description field and to display on HTML pages.
+ * This value can be retrieved programmatically through the {@link RestServlet#getDescription(RestRequest)} method.
* <p>
- * The default value pulls the description from the <code>description</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>description</code> entry in the servlet resource bundle.
* (e.g. <js>"description = foo"</js> or <js>"MyServlet.description = foo"</js>).
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/info/description</code>.
+ * Corresponds to the swagger field <code>/info/description</code>.
*/
String description() default "";
/**
* Optional servlet terms-of-service for this API.
* <p>
- * It is used to populate the Swagger terms-of-service field.
- * This value can be retrieved programmatically through the {@link RestServlet#getTermsOfService(RestRequest)} method.
+ * It is used to populate the Swagger terms-of-service field.
+ * This value can be retrieved programmatically through the {@link RestServlet#getTermsOfService(RestRequest)} method.
* <p>
- * The default value pulls the description from the <code>termsOfService</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>termsOfService</code> entry in the servlet resource bundle.
* (e.g. <js>"termsOfService = foo"</js> or <js>"MyServlet.termsOfService = foo"</js>).
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/info/termsOfService</code>.
+ * Corresponds to the swagger field <code>/info/termsOfService</code>.
*/
String termsOfService() default "";
/**
* Optional contact information for the exposed API.
* <p>
- * It is used to populate the Swagger contact field and to display on HTML pages.
- * This value can be retrieved programmatically through the {@link RestServlet#getContact(RestRequest)} method.
+ * It is used to populate the Swagger contact field and to display on HTML pages.
+ * This value can be retrieved programmatically through the {@link RestServlet#getContact(RestRequest)} method.
* <p>
- * A simplified JSON string with the following fields:
+ * A simplified JSON string with the following fields:
* <p class='bcode'>
* {
* name: string,
@@ -344,7 +344,7 @@ public @interface RestResource {
* }
* </p>
* <p>
- * The default value pulls the description from the <code>contact</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>contact</code> entry in the servlet resource bundle.
* (e.g. <js>"contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js> or <js>"MyServlet.contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js>).
*
* <h5 class='section'>Example:</h5>
@@ -352,19 +352,19 @@ public @interface RestResource {
* <ja>@RestResource</ja>(contact=<js>"{name:'John Smith',email:'john.smith@foo.bar'}"</js>)
* </p>
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/info/contact</code>.
+ * Corresponds to the swagger field <code>/info/contact</code>.
*/
String contact() default "";
/**
* Optional license information for the exposed API.
* <p>
- * It is used to populate the Swagger license field and to display on HTML pages.
- * This value can be retrieved programmatically through the {@link RestServlet#getLicense(RestRequest)} method.
+ * It is used to populate the Swagger license field and to display on HTML pages.
+ * This value can be retrieved programmatically through the {@link RestServlet#getLicense(RestRequest)} method.
* <p>
- * A simplified JSON string with the following fields:
+ * A simplified JSON string with the following fields:
* <p class='bcode'>
* {
* name: string,
@@ -372,7 +372,7 @@ public @interface RestResource {
* }
* </p>
* <p>
- * The default value pulls the description from the <code>license</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>license</code> entry in the servlet resource bundle.
* (e.g. <js>"license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js> or <js>"MyServlet.license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>).
*
* <h5 class='section'>Example:</h5>
@@ -380,34 +380,34 @@ public @interface RestResource {
* <ja>@RestResource</ja>(license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>)
* </p>
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/info/license</code>.
+ * Corresponds to the swagger field <code>/info/license</code>.
*/
String license() default "";
/**
* Provides the version of the application API (not to be confused with the specification version).
* <p>
- * It is used to populate the Swagger version field and to display on HTML pages.
- * This value can be retrieved programmatically through the {@link RestServlet#getVersion(RestRequest)} method.
+ * It is used to populate the Swagger version field and to display on HTML pages.
+ * This value can be retrieved programmatically through the {@link RestServlet#getVersion(RestRequest)} method.
* <p>
- * The default value pulls the description from the <code>version</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>version</code> entry in the servlet resource bundle.
* (e.g. <js>"version = 2.0"</js> or <js>"MyServlet.version = 2.0"</js>).
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/info/version</code>.
+ * Corresponds to the swagger field <code>/info/version</code>.
*/
String version() default "";
/**
* Optional tagging information for the exposed API.
* <p>
- * It is used to populate the Swagger tags field and to display on HTML pages.
- * This value can be retrieved programmatically through the {@link RestServlet#getTags(RestRequest)} method.
+ * It is used to populate the Swagger tags field and to display on HTML pages.
+ * This value can be retrieved programmatically through the {@link RestServlet#getTags(RestRequest)} method.
* <p>
- * A simplified JSON string with the following fields:
+ * A simplified JSON string with the following fields:
* <p class='bcode'>
* [
* {
@@ -421,7 +421,7 @@ public @interface RestResource {
* ]
* </p>
* <p>
- * The default value pulls the description from the <code>tags</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>tags</code> entry in the servlet resource bundle.
* (e.g. <js>"tags = [{name:'Foo',description:'Foobar'}]"</js> or <js>"MyServlet.tags = [{name:'Foo',description:'Foobar'}]"</js>).
*
* <h5 class='section'>Example:</h5>
@@ -429,19 +429,19 @@ public @interface RestResource {
* <ja>@RestResource</ja>(tags=<js>"[{name:'Foo',description:'Foobar'}]"</js>)
* </p>
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/tags</code>.
+ * Corresponds to the swagger field <code>/tags</code>.
*/
String tags() default "";
/**
* Optional external documentation information for the exposed API.
* <p>
- * It is used to populate the Swagger external documentation field and to display on HTML pages.
- * This value can be retrieved programmatically through the {@link RestServlet#getExternalDocs(RestRequest)} method.
+ * It is used to populate the Swagger external documentation field and to display on HTML pages.
+ * This value can be retrieved programmatically through the {@link RestServlet#getExternalDocs(RestRequest)} method.
* <p>
- * A simplified JSON string with the following fields:
+ * A simplified JSON string with the following fields:
* <p class='bcode'>
* {
* description: string,
@@ -449,7 +449,7 @@ public @interface RestResource {
* }
* </p>
* <p>
- * The default value pulls the description from the <code>externalDocs</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>externalDocs</code> entry in the servlet resource bundle.
* (e.g. <js>"externalDocs = {url:'http://juneau.apache.org'}"</js> or <js>"MyServlet.externalDocs = {url:'http://juneau.apache.org'}"</js>).
*
* <h5 class='section'>Example:</h5>
@@ -457,43 +457,43 @@ public @interface RestResource {
* <ja>@RestResource</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>)
* </p>
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/tags</code>.
+ * Corresponds to the swagger field <code>/tags</code>.
*/
String externalDocs() default "";
/**
* Optional location of configuration file for this servlet.
* <p>
- * The configuration file .
+ * The configuration file .
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
*/
String config() default "";
/**
* The stylesheet to use for HTML views.
* <p>
- * The name is a path to a stylesheet located in either the classpath or working directory.
- * The resulting stylesheet becomes available through the servlet via the URL <js>"[servletpath]/style.css"</js>.
+ * The name is a path to a stylesheet located in either the classpath or working directory.
+ * The resulting stylesheet becomes available through the servlet via the URL <js>"[servletpath]/style.css"</js>.
* <p>
- * The default set of styles located in the <code>org.apache.juneau.rest.styles</code> package are:
- * <ul class='spaced-list'>
- * <li><js>"styles/juneau.css"</js> - Theme based on Jazz look-and-feel.
- * <li><js>"styles/devops.css"</js> - Theme based on IBM DevOps look-and-feel.
- * </ul>
+ * The default set of styles located in the <code>org.apache.juneau.rest.styles</code> package are:
+ * <ul class='spaced-list'>
+ * <li><js>"styles/juneau.css"</js> - Theme based on Jazz look-and-feel.
+ * <li><js>"styles/devops.css"</js> - Theme based on IBM DevOps look-and-feel.
+ * </ul>
* <p>
- * The classpath search starts with the child servlet class and proceeds up the class hierarchy
+ * The classpath search starts with the child servlet class and proceeds up the class hierarchy
* chain. Since the {@link RestServlet} class is in the <code>org.apache.juneau.rest</code> package
* and the predefined styles are in the <code>org.apache.juneau.rest.styles</code> package, the paths to
* the predefined styles are prefixed with <js>"styles/"</js>.
* <p>
- * If the stylesheet cannot be found on the classpath, an attempt to look in the working directory
+ * If the stylesheet cannot be found on the classpath, an attempt to look in the working directory
* for it will be made. This allows for stylesheets to be placed on the file system in the working
* directory.
* <p>
- * If the file cannot be located, the request to <js>"[servletpath]/style.css"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}.
+ * If the file cannot be located, the request to <js>"[servletpath]/style.css"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -506,24 +506,24 @@ public @interface RestResource {
* }
* </p>
* <p>
- * In this example, the servlet will attempt to find the <code>mycss.css</code> file in the following ordered locations:
+ * In this example, the servlet will attempt to find the <code>mycss.css</code> file in the following ordered locations:
* </p>
* <ol>
* <li><code>com.foo.mypackage.mystyles</code> package.
* <li><code>org.apache.juneau.rest.mystyles</code> package (since <code>RestServletDefault</code> is in <code>org.apache.juneau.rest</code>).
- * <li><code>[working-dir]/mystyles</code> directory.
- * </ol>
+ * <li><code>[working-dir]/mystyles</code> directory.
+ * </ol>
*/
String stylesheet() default "";
/**
* The favicon to use for HTML views.
* <p>
- * The name is a path to an icon file located in either the classpath or working directory in a similar way
+ * The name is a path to an icon file located in either the classpath or working directory in a similar way
* to how the {@link #stylesheet()} stylesheet is resolved.
- * The resulting favicon becomes available in the servlet via the URL <js>"[servletpath]/favicon.ico"</js>.
+ * The resulting favicon becomes available in the servlet via the URL <js>"[servletpath]/favicon.ico"</js>.
* <p>
- * If the file cannot be located, the request to <js>"[servletpath]/favicon.ico"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}.
+ * If the file cannot be located, the request to <js>"[servletpath]/favicon.ico"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -536,7 +536,7 @@ public @interface RestResource {
* }
* </p>
* <p>
- * In this example, the servlet will attempt to find the <code>myicon.ico</code> file in the following ordered locations:
+ * In this example, the servlet will attempt to find the <code>myicon.ico</code> file in the following ordered locations:
* </p>
* <ol>
* <li><code>com.foo.mypackage.mydocs</code> package.
@@ -549,13 +549,13 @@ public @interface RestResource {
/**
* Defines paths and locations of statically served files.
* <p>
- * This is a JSON map of paths to packages/directories located on either the classpath or working directory.
+ * This is a JSON map of paths to packages/directories located on either the classpath or working directory.
* <p>
- * Mappings are cumulative from parent to child. Child resources can override mappings made on parent resources.
+ * Mappings are cumulative from parent to child. Child resources can override mappings made on parent resources.
* <p>
- * If the file cannot be located, the request will return {@link HttpServletResponse#SC_NOT_FOUND}.
+ * If the file cannot be located, the request will return {@link HttpServletResponse#SC_NOT_FOUND}.
* <p>
- * The media type on the response is determined by the {@link RestServlet#getMimetypesFileTypeMap()} method.
+ * The media type on the response is determined by the {@link RestServlet#getMimetypesFileTypeMap()} method.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -569,7 +569,7 @@ public @interface RestResource {
* }
* </p>
* <p>
- * In this example, given a GET request to <code>/myresource/htdocs/foobar.html</code>, the servlet will attempt to find the <code>foobar.html</code> file
+ * In this example, given a GET request to <code>/myresource/htdocs/foobar.html</code>, the servlet will attempt to find the <code>foobar.html</code> file
* in the following ordered locations:
* </p>
* <ol>
@@ -583,10 +583,10 @@ public @interface RestResource {
/**
* Specifies the HTTP header name used to identify the client version.
* <p>
- * The client version is used to support backwards compatibility for breaking REST interface
+ * The client version is used to support backwards compatibility for breaking REST interface
* changes. Used in conjunction with {@link RestMethod#clientVersion()} annotation.
* <p>
- * If not specified, uses <js>"X-Client-Version"</js>.
+ * If not specified, uses <js>"X-Client-Version"</js>.
*/
String clientVersionHeader() default "";
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Introspectable.java b/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
index daa556e..b4bb393 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
@@ -22,18 +22,18 @@ import org.apache.juneau.utils.*;
/**
* Converter for enablement of {@link PojoIntrospector} support on response objects returned by a <code>@RestMethod</code> method.
* <p>
- * When enabled, public methods can be called on objects returned through the {@link RestResponse#setOutput(Object)} method.
+ * When enabled, public methods can be called on objects returned through the {@link RestResponse#setOutput(Object)} method.
* <p>
- * Note that opening up public methods for calling through a REST interface can be dangerous, and should
+ * Note that opening up public methods for calling through a REST interface can be dangerous, and should
* be done with caution.
* <p>
- * Java methods are invoked by passing in the following URL parameters:
+ * Java methods are invoked by passing in the following URL parameters:
* <ul class='spaced-list'>
* <li><code>&invokeMethod</code> - The Java method name, optionally with arguments if necessary to differentiate between methods.
* <li><code>&invokeArgs</code> - The arguments as a JSON array.
* </ul>
* <p>
- * See {@link PojoIntrospector} for additional information on introspecting POJO methods.
+ * See {@link PojoIntrospector} for additional information on introspecting POJO methods.
*/
public final class Introspectable implements RestConverter {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Queryable.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Queryable.java b/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Queryable.java
index 911b0b4..fee4939 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Queryable.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Queryable.java
@@ -25,10 +25,10 @@ import org.apache.juneau.utils.*;
/**
* Converter for enablement of {@link PojoQuery} support on response objects returned by a <code>@RestMethod</code> method.
* <p>
- * When enabled, objects in a POJO tree can be filtered using the functionality described in the {@link PojoQuery}
+ * When enabled, objects in a POJO tree can be filtered using the functionality described in the {@link PojoQuery}
* class.
* <p>
- * The following HTTP request parameters are available for tabular data (e.g. {@code Collections} of {@code Maps}, arrays of beans, etc...):
+ * The following HTTP request parameters are available for tabular data (e.g. {@code Collections} of {@code Maps}, arrays of beans, etc...):
* <ul class='spaced-list'>
* <li><b>&q=<i>JSON-object</i></b> - Query parameter. Only return rows that match the specified search string. <br>
* The JSON object keys are column names, and the values are search parameter strings.<br>
@@ -44,10 +44,10 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <p>
- * The <b>&v</b> parameter can also be used on {@code Maps} and beans.
+ * The <b>&v</b> parameter can also be used on {@code Maps} and beans.
*
* <p>
- * See {@link PojoQuery} for additional information on filtering POJO models.
+ * See {@link PojoQuery} for additional information on filtering POJO models.
*/
public final class Queryable implements RestConverter {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Traversable.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Traversable.java b/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Traversable.java
index 9dfe411..f56bf15 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Traversable.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/converters/Traversable.java
@@ -22,7 +22,7 @@ import org.apache.juneau.utils.*;
/**
* Converter for enablement of {@link PojoRest} support on response objects returned by a <code>@RestMethod</code> method.
* <p>
- * When enabled, objects in a POJO tree returned by the REST method can be addressed through additional URL path information.
+ * When enabled, objects in a POJO tree returned by the REST method can be addressed through additional URL path information.
*
* <p class='bcode'>
* <jc>// Resource method on resource "http://localhost:8080/sample/addressBook"</jc>
@@ -39,7 +39,7 @@ import org.apache.juneau.utils.*;
* }
* </p>
* <p>
- * See {@link PojoRest} for additional information on addressing elements in a POJO tree using URL notation.
+ * See {@link PojoRest} for additional information on addressing elements in a POJO tree using URL notation.
*/
public final class Traversable implements RestConverter {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java b/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java
index f2d7ae5..76c7a66 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaDefault.java
@@ -31,10 +31,10 @@ import org.apache.juneau.xml.*;
/**
* Subclass of {@link RestServlet} with default sets of serializers and parsers that include RDF support.
* <p>
- * Extends the {@link org.apache.juneau.rest.RestServletDefault} class with additional RDF support.
+ * Extends the {@link org.apache.juneau.rest.RestServletDefault} class with additional RDF support.
* <p>
* <p>
- * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:
+ * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:
* </p>
* <table class='styled'>
* <tr>
@@ -134,7 +134,7 @@ import org.apache.juneau.xml.*;
* </tr>
* </table>
* <p>
- * Supports the following request <code>Content-Type</code> header values:
+ * Supports the following request <code>Content-Type</code> header values:
* </p>
* <table class='styled'>
* <tr>
@@ -183,9 +183,8 @@ import org.apache.juneau.xml.*;
* </tr>
* </table>
* <p>
- * Note that the list of serializers and parsers can be appended to using the {@link RestResource#serializers() @RestResource.serializers()}
- * and {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.
- * </p>
+ * Note that the list of serializers and parsers can be appended to using the {@link RestResource#serializers() @RestResource.serializers()}
+ * and {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.
*/
@RestResource(
serializers={
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.java b/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.java
index 5ef37be..8c6e635 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.java
@@ -19,10 +19,10 @@ import org.apache.juneau.rest.labels.*;
/**
* Specialized subclass of {@link RestServletJenaDefault} for showing "group" pages.
* <p>
- * Group pages consist of simple lists of child resource URLs and their labels.
- * They're meant to be used as jumping-off points for child resources.
+ * Group pages consist of simple lists of child resource URLs and their labels.
+ * They're meant to be used as jumping-off points for child resources.
* <p>
- * Child resources are specified using the {@link RestResource#children()} annotation.
+ * Child resources are specified using the {@link RestResource#children()} annotation.
*/
@RestResource()
public abstract class RestServletJenaGroupDefault extends RestServletJenaDefault {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java
index 08565eb..9375fc9 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java
@@ -18,10 +18,10 @@ import org.apache.juneau.annotation.*;
/**
* Simple serializable bean description.
* <p>
- * Given a particular class type, this serializes the class into
+ * Given a particular class type, this serializes the class into
* the fully-qualified class name and the properties associated with the class.
* <p>
- * Useful for rendering simple information about a bean during REST OPTIONS requests.
+ * Useful for rendering simple information about a bean during REST OPTIONS requests.
*/
@Bean(properties="type,properties")
public final class BeanDescription {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java
index 63ba284..216b34d 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java
@@ -42,7 +42,7 @@ public class ChildResourceDescriptions extends LinkedList<ResourceDescription> {
* @param servlet The servlet that this bean describes.
* @param req The HTTP servlet request.
* @param sort If <jk>true</jk>, list will be ordered by name alphabetically.
- * Default is to maintain the order as specified in the annotation.
+ * Default is to maintain the order as specified in the annotation.
*/
public ChildResourceDescriptions(RestServlet servlet, RestRequest req, boolean sort) {
String uri = req.getTrimmedRequestURI();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/labels/NameDescription.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/NameDescription.java b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/NameDescription.java
index ab4f598..8a6af9d 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/NameDescription.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/NameDescription.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* Simple bean with {@code name} and {@code description} properties.
* <p>
- * Primarily used for constructing tables with name/description columns on REST OPTIONS requests.
+ * Primarily used for constructing tables with name/description columns on REST OPTIONS requests.
*/
@Bean(properties="name,description")
public class NameDescription {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java
index 29ea2e9..bbdf8cf 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java
@@ -33,10 +33,10 @@ public final class ResourceDescription extends NameDescription implements Compar
* Constructor.
*
* @param rootUrl The root URI of the child resource (e.g. the URI of the parent resource).
- * Must not end with <js>'/'</js>.
- * Must be URL-Encoded.
+ * Must not end with <js>'/'</js>.
+ * Must be URL-Encoded.
* @param name The name of the child resource.
- * This will be URL-encoded and appended onto the root URL to create the hyperlink for the resource.
+ * This will be URL-encoded and appended onto the root URL to create the hyperlink for the resource.
* @param description The description of the child resource.
*/
public ResourceDescription(String rootUrl, String name, String description) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java b/juneau-rest/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java
index f1b750d..d4c24fa 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java
@@ -22,13 +22,13 @@ import org.apache.juneau.svl.*;
/**
* Serialized request attribute variable resolver.
* <p>
- * The format for this var is <js>"$SA{contentType,key}"</js> or <js>"$SA{contentType,key,defaultValue}"</js>.
+ * The format for this var is <js>"$SA{contentType,key}"</js> or <js>"$SA{contentType,key,defaultValue}"</js>.
* <p>
- * This variable resolver requires that a {@link RestRequest} object be set as a context object on the resolver or a
+ * This variable resolver requires that a {@link RestRequest} object be set as a context object on the resolver or a
* session object on the resolver session.
* <p>
- * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.
- * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.
+ * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* @see org.apache.juneau.svl
*/
[9/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
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 <ja...@apache.org>
Authored: Fri Feb 24 17:15:14 2017 -0500
Committer: JamesBognar <ja...@apache.org>
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) {
[4/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
index 9fae479..d5ca9e7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
@@ -27,24 +27,24 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/uon</code>
+ * Handles <code>Accept</code> types: <code>text/uon</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/uon</code>
+ * Produces <code>Content-Type</code> types: <code>text/uon</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * This serializer provides several serialization options. Typically, one of the predefined DEFAULT serializers will be sufficient.
- * However, custom serializers can be constructed to fine-tune behavior.
+ * This serializer provides several serialization options. Typically, one of the predefined DEFAULT serializers will be sufficient.
+ * However, custom serializers can be constructed to fine-tune behavior.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link UonSerializerContext}
* <li>{@link BeanContext}
* </ul>
* <p>
- * The following shows a sample object defined in Javascript:
+ * The following shows a sample object defined in Javascript:
* </p>
* <p class='bcode'>
* {
@@ -69,8 +69,8 @@ import org.apache.juneau.transform.*;
* }
* </p>
* <p>
- * Using the "strict" syntax defined in this document, the equivalent
- * UON notation would be as follows:
+ * Using the "strict" syntax defined in this document, the equivalent
+ * UON notation would be as follows:
* </p>
* <p class='bcode'>
* (
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializerSession.java
index e0beaf3..27aeb38 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializerSession.java
@@ -37,15 +37,15 @@ public class UonSerializerSession 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 UonSerializerSession(UonSerializerContext 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/src/main/java/org/apache/juneau/urlencoding/UrlEncodingContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingContext.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingContext.java
index 0a0fd5d..d412eeb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingContext.java
@@ -15,7 +15,7 @@ package org.apache.juneau.urlencoding;
/**
* Configurable properties on the {@link UrlEncodingSerializer} and {@link UrlEncodingParser} classes.
* <p>
- * Use the {@link UrlEncodingSerializer#setProperty(String, Object)} and
+ * Use the {@link UrlEncodingSerializer#setProperty(String, Object)} and
* {@link UrlEncodingParser#setProperty(String, Object)} methods to set property values.
*/
public final class UrlEncodingContext implements Cloneable {
@@ -23,10 +23,10 @@ public final class UrlEncodingContext implements Cloneable {
/**
* Serialize bean property collections/arrays as separate key/value pairs ({@link Boolean}, default=<jk>false</jk>).
* <p>
- * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
- * If <jk>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>.
+ * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
+ * If <jk>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>.
* <p>
- * Example:
+ * Example:
* <p class='bcode'>
* <jk>public class</jk> A {
* <jk>public</jk> String[] f1 = {<js>"a"</js>,<js>"b"</js>};
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 99e28d1..1a76fd6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -28,19 +28,19 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Content-Type</code> types: <code>application/x-www-form-urlencoded</code>
+ * Handles <code>Content-Type</code> types: <code>application/x-www-form-urlencoded</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Parses URL-Encoded text (e.g. <js>"foo=bar&baz=bing"</js>) into POJOs.
+ * Parses URL-Encoded text (e.g. <js>"foo=bar&baz=bing"</js>) into POJOs.
* <p>
- * Expects parameter values to be in UON notation.
+ * Expects parameter values to be in UON notation.
* <p>
- * This parser uses a state machine, which makes it very fast and efficient.
+ * This parser uses a state machine, which makes it very fast and efficient.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link UonParserContext}
* <li>{@link BeanContext}
@@ -539,8 +539,8 @@ public class UrlEncodingParser extends UonParser {
* <li><b>Session-overridable:</b> <jk>true</jk>
* </ul>
* <p>
- * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
- * If <jk>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>.
+ * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
+ * If <jk>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -556,7 +556,7 @@ public class UrlEncodingParser extends UonParser {
* String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc>
* </p>
* <p>
- * This option only applies to beans.
+ * This option only applies to beans.
* <p>
* <h5 class='section'>Notes:</h5>
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserContext.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserContext.java
index 20b33e3..a9829c1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserContext.java
@@ -34,8 +34,8 @@ public class UrlEncodingParserContext extends UonParserContext {
* <li><b>Session-overridable:</b> <jk>true</jk>
* </ul>
* <p>
- * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
- * If <jk>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>.
+ * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
+ * If <jk>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -51,7 +51,7 @@ public class UrlEncodingParserContext extends UonParserContext {
* String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc>
* </p>
* <p>
- * This option only applies to beans.
+ * This option only applies to beans.
* <p>
* <h5 class='section'>Notes:</h5>
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index 62234b9..2d2ba44 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -33,7 +33,7 @@ public class UrlEncodingParserSession extends UonParserSession {
* 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>
@@ -43,13 +43,13 @@ public class UrlEncodingParserSession extends UonParserSession {
* <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>).
*/
public UrlEncodingParserSession(UrlEncodingParserContext 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/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 04b64d6..94c8f97 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -30,24 +30,24 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>application/x-www-form-urlencoded</code>
+ * Handles <code>Accept</code> types: <code>application/x-www-form-urlencoded</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>application/x-www-form-urlencoded</code>
+ * Produces <code>Content-Type</code> types: <code>application/x-www-form-urlencoded</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * This serializer provides several serialization options. Typically, one of the predefined DEFAULT serializers will be sufficient.
- * However, custom serializers can be constructed to fine-tune behavior.
+ * This serializer provides several serialization options. Typically, one of the predefined DEFAULT serializers will be sufficient.
+ * However, custom serializers can be constructed to fine-tune behavior.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link UonSerializerContext}
* <li>{@link BeanContext}
* </ul>
* <p>
- * The following shows a sample object defined in Javascript:
+ * The following shows a sample object defined in Javascript:
* </p>
* <p class='bcode'>
* {
@@ -72,8 +72,8 @@ import org.apache.juneau.transform.*;
* }
* </p>
* <p>
- * Using the "strict" syntax defined in this document, the equivalent
- * URL-encoded notation would be as follows:
+ * Using the "strict" syntax defined in this document, the equivalent
+ * URL-encoded notation would be as follows:
* </p>
* <p class='bcode'>
* <ua>id</ua>=<un>1</un>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index a09d9b0..9f89a7f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -33,15 +33,15 @@ public class UrlEncodingSerializerSession extends UonSerializerSession {
* 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>).
*/
public UrlEncodingSerializerSession(UrlEncodingSerializerContext 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/src/main/java/org/apache/juneau/utils/Args.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/Args.java b/juneau-core/src/main/java/org/apache/juneau/utils/Args.java
index 4d4d01d..0399c39 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/Args.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/Args.java
@@ -194,7 +194,7 @@ public final class Args extends ObjectMap {
* If the optional arg has multiple values, returns only the first converted value.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode'>
+ * <p class='bcode'>
* <jc>// Command: java com.sample.MyClass -verbose true -debug 5</jc>
* <jk>boolean</jk> b = args.getArg(<jk>boolean</jk>.<jk>class</jk>, <js>"verbose"</js>);
* <jk>int</jk> i = args.getArg(<jk>int</jk>.<jk>class</jk>, <js>"debug"</js>);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/utils/IOPipe.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/IOPipe.java b/juneau-core/src/main/java/org/apache/juneau/utils/IOPipe.java
index 48829c3..743f7ae 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/IOPipe.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/IOPipe.java
@@ -22,15 +22,15 @@ import org.apache.juneau.internal.*;
/**
* A utility class for piping input streams and readers to output streams and writers.
* <p>
- * A typical usage is as follows...
+ * A typical usage is as follows...
* <p class='bcode'>
* InputStream in = getInputStream();
* Writer out = getWriter();
* IOPipe.create(in, out).closeOut().run();
* </p>
* <p>
- * By default, the input stream is closed and the output stream is not.
- * This can be changed by calling {@link #closeOut()} and {@link #close(boolean, boolean)}.
+ * By default, the input stream is closed and the output stream is not.
+ * This can be changed by calling {@link #closeOut()} and {@link #close(boolean, boolean)}.
*/
@SuppressWarnings("hiding")
public class IOPipe {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java b/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java
index 190e68c..cb6dd18 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java
@@ -76,7 +76,7 @@ public class MessageBundle extends ResourceBundle {
*
* @param forClass The class using this resource bundle.
* @param bundlePath The path of the resource bundle to wrap.
- * This can be an absolute path (e.g. <js>"com.foo.MyMessages"</js>) or a path
+ * This can be an absolute path (e.g. <js>"com.foo.MyMessages"</js>) or a path
* relative to the package of the <l>forClass</l> (e.g. <js>"MyMessages"</js> if <l>forClass</l> is <js>"com.foo.MyClass"</js>).
*/
public MessageBundle(Class<?> forClass, String bundlePath) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java b/juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java
index 1e55ec7..a48c3fc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/ObjectUtils.java
@@ -18,10 +18,10 @@ import org.apache.juneau.transform.*;
/**
* Utility class for efficiently converting objects between types.
* <p>
- * If the value isn't an instance of the specified type, then converts
+ * If the value isn't an instance of the specified type, then converts
* the value if possible.<br>
* <p>
- * The following conversions are valid:
+ * The following conversions are valid:
* <table class='styled'>
* <tr><th>Convert to type</th><th>Valid input value types</th><th>Notes</th></tr>
* <tr>
@@ -166,7 +166,7 @@ public class ObjectUtils {
*
* @param <T> The class type to convert the value to.
* @param outer If class is a member class, this is the instance of the containing class.
- * Should be <jk>null</jk> if not a member class.
+ * Should be <jk>null</jk> if not a member class.
* @param value The value to convert.
* @param type The class type to convert the value to.
* @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/PojoIntrospector.java b/juneau-core/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
index 908fc5d..415e203 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
@@ -24,10 +24,10 @@ import org.apache.juneau.parser.*;
* Used to invoke methods on {@code Objects} using arguments in serialized form.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode'>
- * String s = <js>"foobar"</js>;
- * String s2 = (String)<jk>new</jk> PojoIntrospector(s).invoke(<js>"substring(int,int)"</js>, <js>"[3,6]"</js>); <jc>// "bar"</jc>
- * </p>
+ * <p class='bcode'>
+ * String s = <js>"foobar"</js>;
+ * String s2 = (String)<jk>new</jk> PojoIntrospector(s).invoke(<js>"substring(int,int)"</js>, <js>"[3,6]"</js>); <jc>// "bar"</jc>
+ * </p>
*/
public final class PojoIntrospector {
@@ -61,8 +61,8 @@ public final class PojoIntrospector {
*
* @param method The method being invoked.
* @param args The arguments to pass as parameters to the method.<br>
- * These will automatically be converted to the appropriate object type if possible.<br>
- * Can be <jk>null</jk> if method has no arguments.
+ * These will automatically be converted to the appropriate object type if possible.<br>
+ * Can be <jk>null</jk> if method has no arguments.
* @return The object returned by the call to the method, or <jk>null</jk> if target object is <jk>null</jk>.
* @throws IllegalAccessException If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is inaccessible.
* @throws IllegalArgumentException If one of the following occurs:
@@ -89,8 +89,8 @@ public final class PojoIntrospector {
*
* @param method The method being invoked.
* @param args The arguments to pass as parameters to the method.<br>
- * These will automatically be converted to the appropriate object type if possible.<br>
- * Can be <jk>null</jk> if method has no arguments.
+ * These will automatically be converted to the appropriate object type if possible.<br>
+ * Can be <jk>null</jk> if method has no arguments.
* @return The object returned by the call to the method, or <jk>null</jk> if target object is <jk>null</jk>.
* @throws NoSuchMethodException If method does not exist.
* @throws IllegalAccessException If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is inaccessible.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java b/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
index 1f2ff64..e42ec1b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
@@ -24,9 +24,9 @@ import org.apache.juneau.internal.*;
/**
* Designed to provide query/view/sort/paging filtering on tabular in-memory POJO models.
* <p>
- * It can also perform just view filtering on beans/maps.
+ * It can also perform just view filtering on beans/maps.
* <p>
- * Examples of tabular POJO models:
+ * Examples of tabular POJO models:
* <ul>
* <li><tt>Collection{@code <Map>}</tt>
* <li><tt>Collection{@code <Bean>}</tt>
@@ -34,7 +34,7 @@ import org.apache.juneau.internal.*;
* <li><tt>Bean[]</tt>
* </ul>
* <p>
- * Tabular POJO models can be thought of as tables of data. For example, a list of the following beans...
+ * Tabular POJO models can be thought of as tables of data. For example, a list of the following beans...
* <p class='bcode'>
* <jk>public</jk> MyBean {
* <jk>public int</jk> fi;
@@ -50,7 +50,7 @@ import org.apache.juneau.internal.*;
* <tr><td colspan=3>...</td></tr>
* </table>
* <p>
- * From this table, you can perform the following functions:
+ * From this table, you can perform the following functions:
* <ul class='spaced-list'>
* <li>Query - Return only rows where a search pattern matches.
* <li>View - Return only the specified subset of columns in the specified order.
@@ -60,11 +60,11 @@ import org.apache.juneau.internal.*;
*
* <h5 class='topic'>Query</h5>
* <p>
- * The query capabilites allow you to filter based on query patterns against
+ * The query capabilites allow you to filter based on query patterns against
* strings, dates, and numbers. Queries take the form of a Map with column names
* as keys, and search patterns as values. <br>
- * Search patterns can be either {@code Strings} or {@code Maps}.<br>
- * Multiple search patterns are ANDed (i.e. all patterns must match for the row to be returned).
+ * Search patterns can be either {@code Strings} or {@code Maps}.<br>
+ * Multiple search patterns are ANDed (i.e. all patterns must match for the row to be returned).
*
* <h5 class='section'>Example:</h5>
* <ul class='spaced-list'>
@@ -75,13 +75,13 @@ import org.apache.juneau.internal.*;
* and the <tt>fs</tt> column starts with <tt>"foo"</tt>.
* </ul>
* <p>
- * Search patterns can also be applied to lower level fields. For example, the search term
+ * Search patterns can also be applied to lower level fields. For example, the search term
* <tt>{f1:{f2:{f3{'foobar'}}}</tt> means only return top level rows where the <tt>f1.getF2().getF3()</tt>
* property is <tt>'foobar'</tt>.
*
* <h5 class='topic'>String Patterns</h5>
* <p>
- * Any objects can be queried against using string patterns. If the objects being
+ * Any objects can be queried against using string patterns. If the objects being
* searched are not strings, then the patterns are matched against whatever is
* return by the {@code Object#toString()} method.
*
@@ -104,7 +104,7 @@ import org.apache.juneau.internal.*;
*
* <h5 class='topic'>Numeric Patterns</h5>
* <p>
- * Any object of type {@link Number} (or numeric primitives) can be searched using numeric patterns.
+ * Any object of type {@link Number} (or numeric primitives) can be searched using numeric patterns.
*
* <h6 class='topic'>Example numeric query patterns:</h6>
* <ul>
@@ -126,9 +126,9 @@ import org.apache.juneau.internal.*;
*
* <h5 class='topic'>Date Patterns</h5>
* <p>
- * Any object of type {@link Date} or {@link Calendar} can be searched using date patterns.
+ * Any object of type {@link Date} or {@link Calendar} can be searched using date patterns.
* <p>
- * The default valid input timestamp formats (which can be overridden via the {@link #setValidTimestampFormats(String...)} method are...
+ * The default valid input timestamp formats (which can be overridden via the {@link #setValidTimestampFormats(String...)} method are...
*
* <ul>
* <li><tt>yyyy.MM.dd.HH.mm.ss</tt>
@@ -156,9 +156,9 @@ import org.apache.juneau.internal.*;
*
* <h5 class='topic'>View</h5>
* <p>
- * The view capability allows you to return only the specified subset of columns in the
+ * The view capability allows you to return only the specified subset of columns in the
* specified order.<br>
- * The view parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.
+ * The view parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.
*
* <h6 class='topic'>Example view parameters:</h6>
* <ul>
@@ -170,8 +170,8 @@ import org.apache.juneau.internal.*;
*
* <h5 class='topic'>Sort</h5>
* <p>
- * The sort capability allows you to sort values by the specified rows.<br>
- * The sort parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.<br>
+ * The sort capability allows you to sort values by the specified rows.<br>
+ * The sort parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.<br>
* <tt>Strings</tt> represent column names to sort ascending. If you want
* to sort descending, you need to specify a <tt>Map</tt> of the form <tt>{colname:'d'}</tt>
*
@@ -185,7 +185,7 @@ import org.apache.juneau.internal.*;
*
* <h5 class='topic'>Paging</h5>
* <p>
- * Use the <tt>pos</tt> and <tt>limit</tt> parameters to specify a subset of rows to
+ * Use the <tt>pos</tt> and <tt>limit</tt> parameters to specify a subset of rows to
* return.
*
* <h5 class='topic'>Other Notes</h5>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java b/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
index 851bc9b..12de791 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
@@ -26,21 +26,21 @@ import org.apache.juneau.parser.*;
* Provides the ability to perform standard REST operations (GET, PUT, POST, DELETE) against
* nodes in a POJO model. Nodes in the POJO model are addressed using URLs.
* <p>
- * A POJO model is defined as a tree model where nodes consist of consisting of the following:
- * <ul class='spaced-list'>
- * <li>{@link Map Maps} and Java beans representing JSON objects.
- * <li>{@link Collection Collections} and arrays representing JSON arrays.
- * <li>Java beans.
- * </ul>
+ * A POJO model is defined as a tree model where nodes consist of consisting of the following:
+ * <ul class='spaced-list'>
+ * <li>{@link Map Maps} and Java beans representing JSON objects.
+ * <li>{@link Collection Collections} and arrays representing JSON arrays.
+ * <li>Java beans.
+ * </ul>
* <p>
- * Leaves of the tree can be any type of object.
+ * Leaves of the tree can be any type of object.
* <p>
- * Use {@link #get(String) get()} to retrieve an element from a JSON tree.<br>
- * Use {@link #put(String,Object) put()} to create (or overwrite) an element in a JSON tree.<br>
- * Use {@link #post(String,Object) post()} to add an element to a list in a JSON tree.<br>
- * Use {@link #delete(String) delete()} to remove an element from a JSON tree.<br>
+ * Use {@link #get(String) get()} to retrieve an element from a JSON tree.<br>
+ * Use {@link #put(String,Object) put()} to create (or overwrite) an element in a JSON tree.<br>
+ * Use {@link #post(String,Object) post()} to add an element to a list in a JSON tree.<br>
+ * Use {@link #delete(String) delete()} to remove an element from a JSON tree.<br>
* <p>
- * Leading slashes in URLs are ignored. So <js>"/xxx/yyy/zzz"</js> and <js>"xxx/yyy/zzz"</js> are considered identical.
+ * Leading slashes in URLs are ignored. So <js>"/xxx/yyy/zzz"</js> and <js>"xxx/yyy/zzz"</js> are considered identical.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -102,9 +102,9 @@ import org.apache.juneau.parser.*;
* );
* johnSmith.put(<js>"additionalInfo/medicalInfo"</js>, medicalInfo);
* <p>
- * In the special case of collections/arrays of maps/beans, a special XPath-like selector notation
+ * In the special case of collections/arrays of maps/beans, a special XPath-like selector notation
* can be used in lieu of index numbers on GET requests to return a map/bean with a specified attribute value.<br>
- * The syntax is {@code @attr=val}, where attr is the attribute name on the child map, and val is the matching value.
+ * The syntax is {@code @attr=val}, where attr is the attribute name on the child map, and val is the matching value.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -130,7 +130,7 @@ public final class PojoRest {
/**
* Create a new instance of a REST interface over the specified object.
* <p>
- * Uses {@link BeanContext#DEFAULT} for working with Java beans.
+ * Uses {@link BeanContext#DEFAULT} for working with Java beans.
*
* @param o The object to be wrapped.
*/
@@ -141,7 +141,7 @@ public final class PojoRest {
/**
* Create a new instance of a REST interface over the specified object.
* <p>
- * The parser is used as the bean context.
+ * The parser is used as the bean context.
*
* @param o The object to be wrapped.
* @param parser The parser to use for parsing arguments and converting objects to the correct data type.
@@ -177,7 +177,7 @@ public final class PojoRest {
* Retrieves the element addressed by the URL.
*
* @param url The URL of the element to retrieve.
- * If null or blank, returns the root.
+ * If null or blank, returns the root.
* @return The addressed element, or null if that element does not exist in the tree.
*/
public Object get(String url) {
@@ -188,7 +188,7 @@ public final class PojoRest {
* Retrieves the element addressed by the URL.
*
* @param url The URL of the element to retrieve.
- * If null or blank, returns the root.
+ * If null or blank, returns the root.
* @param defVal The default value if the map doesn't contain the specified mapping.
* @return The addressed element, or null if that element does not exist in the tree.
*/
@@ -204,7 +204,7 @@ public final class PojoRest {
*
* @param type The specified object type.
* @param url The URL of the element to retrieve.
- * If null or blank, returns the root.
+ * If null or blank, returns the root.
* @param <T> The specified object type.
*
* @return The addressed element, or null if that element does not exist in the tree.
@@ -220,7 +220,7 @@ public final class PojoRest {
*
* @param type The specified object type.
* @param url The URL of the element to retrieve.
- * If null or blank, returns the root.
+ * If null or blank, returns the root.
* @param def The default value if addressed item does not exist.
* @param <T> The specified object type.
*
@@ -236,7 +236,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link String}.
* <p>
- * Shortcut for <code>get(String.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(String.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -248,7 +248,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link String}.
* <p>
- * Shortcut for <code>get(String.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(String.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -261,7 +261,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to an {@link Integer}.
* <p>
- * Shortcut for <code>get(Integer.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Integer.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -274,7 +274,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to an {@link Integer}.
* <p>
- * Shortcut for <code>get(Integer.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Integer.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -288,7 +288,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link Long}.
* <p>
- * Shortcut for <code>get(Long.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Long.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -301,7 +301,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link Long}.
* <p>
- * Shortcut for <code>get(Long.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Long.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -315,7 +315,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link Boolean}.
* <p>
- * Shortcut for <code>get(Boolean.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Boolean.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -328,7 +328,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link Boolean}.
* <p>
- * Shortcut for <code>get(Boolean.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Boolean.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -342,7 +342,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link Map}.
* <p>
- * Shortcut for <code>get(Map.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Map.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -355,7 +355,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link Map}.
* <p>
- * Shortcut for <code>get(Map.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Map.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -369,7 +369,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link List}.
* <p>
- * Shortcut for <code>get(List.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(List.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -382,7 +382,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link List}.
* <p>
- * Shortcut for <code>get(List.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(List.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -396,7 +396,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link Map}.
* <p>
- * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -409,7 +409,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link ObjectMap}.
* <p>
- * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -423,7 +423,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link ObjectList}.
* <p>
- * Shortcut for <code>get(ObjectList.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(ObjectList.<jk>class</jk>, key)</code>.
*
* @param url The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -436,7 +436,7 @@ public final class PojoRest {
/**
* Returns the specified entry value converted to a {@link ObjectList}.
* <p>
- * Shortcut for <code>get(ObjectList.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(ObjectList.<jk>class</jk>, key, defVal)</code>.
*
* @param url The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -452,20 +452,18 @@ public final class PojoRest {
*
* @param url The URL of the element to retrieve.
* @param method The method signature.
- * <p>
- * Can be any of the following formats:
- * </p>
- * <ul class='spaced-list'>
- * <li>Method name only. e.g. <js>"myMethod"</js>.
- * <li>Method name with class names. e.g. <js>"myMethod(String,int)"</js>.
- * <li>Method name with fully-qualified class names. e.g. <js>"myMethod(java.util.String,int)"</js>.
- * </ul>
- * <p>
- * As a rule, use the simplest format needed to uniquely resolve a method.
- * </p>
+ * <p>
+ * Can be any of the following formats:
+ * <ul class='spaced-list'>
+ * <li>Method name only. e.g. <js>"myMethod"</js>.
+ * <li>Method name with class names. e.g. <js>"myMethod(String,int)"</js>.
+ * <li>Method name with fully-qualified class names. e.g. <js>"myMethod(java.util.String,int)"</js>.
+ * </ul>
+ * <p>
+ * As a rule, use the simplest format needed to uniquely resolve a method.
* @param args The arguments to pass as parameters to the method.<br>
- * These will automatically be converted to the appropriate object type if possible.<br>
- * This must be an array, like a JSON array.
+ * These will automatically be converted to the appropriate object type if possible.<br>
+ * This must be an array, like a JSON array.
* @return The returned object from the method call.
* @throws IllegalAccessException If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is inaccessible.
* @throws IllegalArgumentException If one of the following occurs:
@@ -514,10 +512,10 @@ public final class PojoRest {
/**
* Sets/replaces the element addressed by the URL.
* <p>
- * This method expands the POJO model as necessary to create the new element.
+ * This method expands the POJO model as necessary to create the new element.
*
* @param url The URL of the element to create.
- * If <jk>null</jk> or blank, the root itself is replaced with the specified value.
+ * If <jk>null</jk> or blank, the root itself is replaced with the specified value.
* @param val The value being set. Value can be of any type.
* @return The previously addressed element, or <jk>null</jk> the element did not previously exist.
*/
@@ -559,7 +557,7 @@ public final class PojoRest {
* qIf the element does not exist, no action is taken.
*
* @param url The URL of the element being deleted.
- * If <jk>null</jk> or blank, the root itself is deleted.
+ * If <jk>null</jk> or blank, the root itself is deleted.
* @return The removed element, or null if that element does not exist.
*/
public Object delete(String url) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/utils/PojoRestException.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/PojoRestException.java b/juneau-core/src/main/java/org/apache/juneau/utils/PojoRestException.java
index ad74cef..451878c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/PojoRestException.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/PojoRestException.java
@@ -18,9 +18,9 @@ import java.text.*;
/**
* Generic exception thrown from the {@link PojoRest} class.
* <p>
- * Typically, this is a user-error, such as trying to address a non-existent node in the tree.
+ * Typically, this is a user-error, such as trying to address a non-existent node in the tree.
* <p>
- * The status code is an HTTP-equivalent code. It will be one of the following:
+ * The status code is an HTTP-equivalent code. It will be one of the following:
* <ul class='spaced-list'>
* <li>{@link HttpURLConnection#HTTP_BAD_REQUEST HTTP_BAD_REQUEST} - Attempting to do something impossible.
* <li>{@link HttpURLConnection#HTTP_NOT_FOUND HTTP_NOT_FOUND} - Attempting to access a non-existent node in the tree.
@@ -48,7 +48,7 @@ public final class PojoRestException extends RuntimeException {
/**
* The HTTP-equivalent status code.
* <p>
- * See above for details.
+ * See above for details.
*
* @return The HTTP-equivalent status code.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/Namespace.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/Namespace.java b/juneau-core/src/main/java/org/apache/juneau/xml/Namespace.java
index b78bd30..d8f4a76 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/Namespace.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/Namespace.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* Represents a simple namespace mapping between a simple name and URI.
* <p>
- * In general, the simple name will be used as the XML prefix mapping unless
+ * In general, the simple name will be used as the XML prefix mapping unless
* there are conflicts or prefix remappings in the serializer.
*/
@Bean(sort=true)
@@ -28,7 +28,7 @@ public final class Namespace implements Comparable<Namespace> {
/**
* Constructor.
* <p>
- * Use this constructor when the long name and short name are the same value.
+ * Use this constructor when the long name and short name are the same value.
*
* @param name The long and short name of this schema.
* @param uri The URI of this schema.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/NamespaceFactory.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/NamespaceFactory.java b/juneau-core/src/main/java/org/apache/juneau/xml/NamespaceFactory.java
index 75c0d67..52fe1ea 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/NamespaceFactory.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/NamespaceFactory.java
@@ -22,10 +22,10 @@ import org.apache.juneau.parser.*;
/**
* Factory class for getting unique instances of {@link Namespace} objects.
* <p>
- * For performance reasons, {@link Namespace} objects are stored in {@link IdentityList IdentityLists}.
- * For this to work property, namespaces with the same name and URI must only be represented by a single
+ * For performance reasons, {@link Namespace} objects are stored in {@link IdentityList IdentityLists}.
+ * For this to work property, namespaces with the same name and URI must only be represented by a single
* {@link Namespace} instance.
- * This factory class ensures this identity uniqueness.
+ * This factory class ensures this identity uniqueness.
*/
public final class NamespaceFactory {
@@ -53,7 +53,7 @@ public final class NamespaceFactory {
/**
* Converts the specified object into a {@link Namespace} object.
* <p>
- * Can be any of following types:
+ * Can be any of following types:
* <ul class='spaced-list'>
* <li>A {@link Namespace} object
* <li>A JSON string containing a single key/value pair indicating the name/URI mapping.
@@ -85,7 +85,7 @@ public final class NamespaceFactory {
/**
* Converts the specified object into an array of {@link Namespace} object.
* <p>
- * Can be any of following types:
+ * Can be any of following types:
* <ul class='spaced-list'>
* <li>A {@link Namespace} array
* <li>A JSON string with key/value pairs indicating name/URI pairs.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
index 86333c0..5e869cf 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
@@ -48,7 +48,7 @@ public class XmlBeanPropertyMeta extends BeanPropertyMetaExtended {
/**
* Returns the XML namespace associated with this bean property.
* <p>
- * Namespace is determined in the following order:
+ * Namespace is determined in the following order:
* <ol>
* <li>{@link Xml#prefix()} annotation defined on bean property field.
* <li>{@link Xml#prefix()} annotation defined on bean getter.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
index 931f379..c32cfa9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
@@ -78,7 +78,7 @@ public class XmlClassMeta extends ClassMetaExtended {
/**
* Returns the XML namespace associated with this class.
* <p>
- * Namespace is determined in the following order:
+ * Namespace is determined in the following order:
* <ol>
* <li>{@link Xml#prefix()} annotation defined on class.
* <li>{@link Xml#prefix()} annotation defined on package.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
index d521717..c62d18f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
@@ -20,13 +20,13 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/xml</code>
+ * Handles <code>Accept</code> types: <code>text/xml</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/xml</code>
+ * Produces <code>Content-Type</code> types: <code>text/xml</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Same as {@link XmlSerializer}, except prepends <code><xt><?xml</xt> <xa>version</xa>=<xs>'1.0'</xs> <xa>encoding</xa>=<xs>'UTF-8'</xs><xt>?></xt></code> to the response
+ * Same as {@link XmlSerializer}, except prepends <code><xt><?xml</xt> <xa>version</xa>=<xs>'1.0'</xs> <xa>encoding</xa>=<xs>'UTF-8'</xs><xt>?></xt></code> to the response
* to make it a valid XML document.
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
index a13c1d9..a6a0212 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -34,15 +34,15 @@ import org.apache.juneau.xml.annotation.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Content-Type</code> types: <code>text/xml</code>
+ * Handles <code>Content-Type</code> types: <code>text/xml</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * See the {@link XmlSerializer} class for a description of Juneau-generated XML.
+ * See the {@link XmlSerializer} class for a description of Juneau-generated XML.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link XmlParserContext}
* <li>{@link BeanContext}
@@ -663,18 +663,18 @@ public class XmlParser extends ReaderParser {
* contain a single entry whose key is the root element name.
*
* Example:
- * <table class='styled'>
- * <tr>
- * <td>XML</td>
- * <td>ObjectMap.toString(), preserveRootElement==false</td>
- * <td>ObjectMap.toString(), preserveRootElement==true</td>
- * </tr>
- * <tr>
- * <td><code><xt><root><a></xt>foobar<xt></a></root></xt></code></td>
- * <td><code>{ a:<js>'foobar'</js> }</code></td>
- * <td><code>{ root: { a:<js>'foobar'</js> }}</code></td>
- * </tr>
- * </table>
+ * <table class='styled'>
+ * <tr>
+ * <td>XML</td>
+ * <td>ObjectMap.toString(), preserveRootElement==false</td>
+ * <td>ObjectMap.toString(), preserveRootElement==true</td>
+ * </tr>
+ * <tr>
+ * <td><code><xt><root><a></xt>foobar<xt></a></root></xt></code></td>
+ * <td><code>{ a:<js>'foobar'</js> }</code></td>
+ * <td><code>{ root: { a:<js>'foobar'</js> }}</code></td>
+ * </tr>
+ * </table>
* <p>
* <h5 class='section'>Notes:</h5>
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserContext.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserContext.java
index 25df977..095410d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserContext.java
@@ -112,18 +112,18 @@ public class XmlParserContext extends ParserContext {
* contain a single entry whose key is the root element name.
*
* Example:
- * <table class='styled'>
- * <tr>
- * <td>XML</td>
- * <td>ObjectMap.toString(), preserveRootElement==false</td>
- * <td>ObjectMap.toString(), preserveRootElement==true</td>
- * </tr>
- * <tr>
- * <td><code><xt><root><a></xt>foobar<xt></a></root></xt></code></td>
- * <td><code>{ a:<js>'foobar'</js> }</code></td>
- * <td><code>{ root: { a:<js>'foobar'</js> }}</code></td>
- * </tr>
- * </table>
+ * <table class='styled'>
+ * <tr>
+ * <td>XML</td>
+ * <td>ObjectMap.toString(), preserveRootElement==false</td>
+ * <td>ObjectMap.toString(), preserveRootElement==true</td>
+ * </tr>
+ * <tr>
+ * <td><code><xt><root><a></xt>foobar<xt></a></root></xt></code></td>
+ * <td><code>{ a:<js>'foobar'</js> }</code></td>
+ * <td><code>{ root: { a:<js>'foobar'</js> }}</code></td>
+ * </tr>
+ * </table>
*/
public static final String XML_preserveRootElement = "XmlParser.preserveRootElement";
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserSession.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index ebf5d5d..6a52ed7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -47,7 +47,7 @@ public class XmlParserSession 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>
@@ -57,13 +57,13 @@ public class XmlParserSession 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>).
*/
public XmlParserSession(XmlParserContext ctx, ObjectMap op, Object input, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {
@@ -208,7 +208,7 @@ public class XmlParserSession extends ParserSession {
*
* @param r The reader to read the element text from.
* @param trim If <jk>true</jk>, trim the contents of the text node BEFORE decoding escape sequences.
- * Typically <jk>true</jk> for {@link XmlFormat#MIXED_PWS} and {@link XmlFormat#TEXT_PWS}.
+ * Typically <jk>true</jk> for {@link XmlFormat#MIXED_PWS} and {@link XmlFormat#TEXT_PWS}.
* @return The decoded text. <jk>null</jk> if the text consists of the sequence <js>'_x0000_'</js>.
* @throws XMLStreamException
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaDocSerializer.java
index 195abf1..6dd2841 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaDocSerializer.java
@@ -20,13 +20,13 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/xml+schema</code>
+ * Handles <code>Accept</code> types: <code>text/xml+schema</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/xml</code>
+ * Produces <code>Content-Type</code> types: <code>text/xml</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Same as {@link XmlSchemaSerializer}, except prepends <code><xt><?xml</xt> <xa>version</xa>=<xs>'1.0'</xs> <xa>encoding</xa>=<xs>'UTF-8'</xs><xt>?></xt></code> to the response
+ * Same as {@link XmlSchemaSerializer}, except prepends <code><xt><?xml</xt> <xa>version</xa>=<xs>'1.0'</xs> <xa>encoding</xa>=<xs>'UTF-8'</xs><xt>?></xt></code> to the response
* to make it a valid XML document.
*/
public class XmlSchemaDocSerializer extends XmlSchemaSerializer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
index 397c513..ec9bc52 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
@@ -37,17 +37,17 @@ import org.w3c.dom.ls.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/xml+schema</code>
+ * Handles <code>Accept</code> types: <code>text/xml+schema</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/xml</code>
+ * Produces <code>Content-Type</code> types: <code>text/xml</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Produces the XML-schema representation of the XML produced by the {@link XmlSerializer} class with the same properties.
+ * Produces the XML-schema representation of the XML produced by the {@link XmlSerializer} class with the same properties.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link XmlSerializerContext}
* <li>{@link BeanContext}
@@ -91,7 +91,7 @@ public class XmlSchemaSerializer extends XmlSerializer {
* Returns an XML-Schema validator based on the output returned by {@link #doSerialize(SerializerSession, Object)};
*
* @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}.<br>
- * Can be <jk>null</jk>.
+ * Can be <jk>null</jk>.
* @param o The object to serialize.
* @return The new validator.
* @throws Exception If a problem was detected in the XML-Schema output produced by this serializer.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index bb4f6bc..3091056 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -32,15 +32,15 @@ import org.apache.juneau.xml.annotation.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/xml</code>
+ * Handles <code>Accept</code> types: <code>text/xml</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/xml</code>
+ * Produces <code>Content-Type</code> types: <code>text/xml</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * See the {@link JsonSerializer} class for details on how Java models map to JSON.
+ * See the {@link JsonSerializer} class for details on how Java models map to JSON.
* <p>
- * For example, the following JSON...
+ * For example, the following JSON...
* <p class='bcode'>
* {
* name:<js>'John Smith'</js>,
@@ -80,7 +80,7 @@ import org.apache.juneau.xml.annotation.*;
* <xt><fico_x0020_score></xt> &gt; 640<xt></fico_x0020_score></xt>
* <xt></object></xt>
* <p>
- * An additional "add-json-properties" mode is also provided to prevent loss of JSON data types...
+ * An additional "add-json-properties" mode is also provided to prevent loss of JSON data types...
* <p class='bcode'>
* <xt><name</xt> <xa>_type</xa>=<xs>'string'</xs><xt>></xt>John Smith<xt></name></xt>
* <xt><address</xt> <xa>_type</xa>=<xs>'object'</xs><xt>></xt>
@@ -99,14 +99,14 @@ import org.apache.juneau.xml.annotation.*;
* <xt><fico_x0020_score</xt> <xa>_type</xa>=<xs>'string'</xs><xt>></xt> &gt; 640<xt></fico_x0020_score></xt>
* <xt></object></xt>
* <p>
- * This serializer provides several serialization options. Typically, one of the predefined <jsf>DEFAULT</jsf> serializers will be sufficient.
- * However, custom serializers can be constructed to fine-tune behavior.
+ * This serializer provides several serialization options. Typically, one of the predefined <jsf>DEFAULT</jsf> serializers will be sufficient.
+ * However, custom serializers can be constructed to fine-tune behavior.
* <p>
- * If an attribute name contains any non-valid XML element characters, they will be escaped using standard {@code _x####_} notation.
+ * If an attribute name contains any non-valid XML element characters, they will be escaped using standard {@code _x####_} notation.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link XmlSerializerContext}
* <li>{@link BeanContext}
@@ -114,7 +114,7 @@ import org.apache.juneau.xml.annotation.*;
*
* <h6 class='topic'>Behavior-specific subclasses</h6>
* <p>
- * The following direct subclasses are provided for convenience:
+ * The following direct subclasses are provided for convenience:
* <ul class='spaced-list'>
* <li>{@link Sq} - Default serializer, single quotes.
* <li>{@link SqReadable} - Default serializer, single quotes, whitespace added.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 223f75b..36c8a03 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -49,15 +49,15 @@ public class XmlSerializerSession 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>).
*/
public XmlSerializerSession(XmlSerializerContext 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/src/main/java/org/apache/juneau/xml/XmlUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlUtils.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlUtils.java
index fe92575..0567d73 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -76,7 +76,7 @@ public final class XmlUtils {
* @param trim Trim the text before serializing it.
* @param preserveWhitespace Specifies whether we're in preserve-whitespace mode.
* (e.g. {@link XmlFormat#MIXED_PWS} or {@link XmlFormat#TEXT_PWS}.
- * If <jk>true</jk>, leading and trailing whitespace characters will be encoded.
+ * If <jk>true</jk>, leading and trailing whitespace characters will be encoded.
* @return The same writer passed in.
* @throws IOException Thrown from the writer.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/annotation/Xml.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/Xml.java b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/Xml.java
index 5d53451..13f7613 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/Xml.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/Xml.java
@@ -20,9 +20,9 @@ import java.lang.annotation.*;
/**
* Annotation for specifying various XML options for the XML and RDF/XML 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 child element name on the XML representation of collection or array properties.
* <li>Specify the XML namespace on a package, class, or method.
@@ -38,7 +38,7 @@ public @interface Xml {
/**
* Sets the name of the XML child elements for bean properties of type collection and array.
* <p>
- * Applies only to collection and array bean properties.
+ * Applies only to collection and array bean properties.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -48,7 +48,7 @@ public @interface Xml {
* }
* </p>
* <p>
- * Without the <ja>@Xml</ja> annotation, serializing this bean as XML would have produced the following...
+ * Without the <ja>@Xml</ja> annotation, serializing this bean as XML would have produced the following...
* </p>
* <p class='bcode'>
* <xt><object></xt>
@@ -59,7 +59,7 @@ public @interface Xml {
* <xt></object></xt>
* </p>
* <p>
- * With the annotations, serializing this bean as XML produces the following...
+ * With the annotations, serializing this bean as XML produces the following...
* </p>
* <p class='bcode'>
* <xt><object></xt>
@@ -81,7 +81,7 @@ public @interface Xml {
* to the bean property.
* </ul>
* <p>
- * Must either be matched to a {@link #namespace()} annotation on the same object, parent object, or a {@link XmlNs} with the same name
+ * Must either be matched to a {@link #namespace()} annotation on the same object, parent object, or a {@link XmlNs} with the same name
* through the {@link XmlSchema#xmlNs()} annotation on the package.
* </p>
*/
@@ -90,7 +90,7 @@ public @interface Xml {
/**
* 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 XmlNs} with the same name
+ * Must be matched with a {@link #prefix()} annotation on this object, a parent object, or a {@link XmlNs} with the same name
* through the {@link XmlSchema#xmlNs()} annotation on the package.
*/
String namespace() default "";
@@ -120,7 +120,7 @@ public @interface Xml {
* }
* </p>
* <p>
- * Without the <ja>@Xml</ja> annotations, serializing this bean as XML would have produced the following...
+ * Without the <ja>@Xml</ja> annotations, serializing this bean as XML would have produced the following...
* </p>
* <p class='bcode'>
* <xt><object</xt> <xa>href</xa>=<js>'http://foo'</js><xt>></xt>
@@ -132,7 +132,7 @@ public @interface Xml {
* <xt></object></xt>
* </p>
* <p>
- * With the annotations, serializing this bean as XML produces the following...
+ * With the annotations, serializing this bean as XML produces the following...
* </p>
* <p class='bcode'>
* <xt><object</xt> <xa>f1</xa>=<js>'123'</js><xt>></xt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlNs.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlNs.java b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlNs.java
index 61c79d5..d42412c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlNs.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlNs.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 XmlSchema#xmlNs()} annotation.
+ * Used to identify a namespace/URI pair on a {@link XmlSchema#xmlNs()} annotation.
*/
@Documented
@Target({})
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java
index 1bd5945..8d67da8 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java
@@ -29,7 +29,7 @@ public @interface XmlSchema {
/**
* Sets the default XML prefix for all classes in this and child packages.
* <p>
- * Must either be matched with a {@link #namespace()} annotation, or an {@link #xmlNs()} mapping with the
+ * Must either be matched with a {@link #namespace()} annotation, or an {@link #xmlNs()} mapping with the
* same {@link XmlNs#prefix} value.
* </p>
*/
@@ -38,7 +38,7 @@ public @interface XmlSchema {
/**
* Sets the default XML namespace URL for all classes in this and child packages.
* <p>
- * Must either be matched with a {@link #prefix()} annotation, or an {@link #xmlNs()} mapping with the
+ * Must either be matched with a {@link #prefix()} annotation, or an {@link #xmlNs()} mapping with the
* same {@link XmlNs#namespaceURI} value.
* </p>
*/
@@ -47,14 +47,14 @@ public @interface XmlSchema {
/**
* 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 Xml#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 +70,7 @@ public @interface XmlSchema {
* <jk>import</jk> org.apache.juneau.xml.annotation.*;
* </p>
* <p>
- * Class in package using defined namespaces...
+ * Class in package using defined namespaces...
* </p>
* <p class='bcode'>
* <jk>package</jk> corg.apache.juneau.examples.addressbook;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
index 3064809..28935df 100755
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
@@ -19,7 +19,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
/**
- * Address book bean
+ * Address book bean
*/
@Bean(typeName="addressBook")
public class AddressBook extends LinkedList<Person> implements IAddressBook {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestMicroservice.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestMicroservice.java b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestMicroservice.java
index 303b1ca..8cedc99 100644
--- a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestMicroservice.java
+++ b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestMicroservice.java
@@ -26,7 +26,7 @@ public class TestMicroservice {
/**
* Starts the microservice.
* @return <jk>true</jk> if the service started, <jk>false</jk> if it's already started.
- * If this returns <jk>false</jk> then don't call stopMicroservice()!.
+ * If this returns <jk>false</jk> then don't call stopMicroservice()!.
*/
public static boolean startMicroservice() {
if (microservice != null)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
index b65354b..66a9c7d 100755
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -244,8 +244,8 @@ public abstract class Microservice {
* <cc># Example config file</cc>
* <cs>[MySection]</cs>
* <ck>myEntry</ck> = $B{foo}
- * </p>
- * <p class='bcode'>
+ * </p>
+ * <p class='bcode'>
* <jc>// Example java code</jc>
* String myentry = getConfig().getString(<js>"MySection/myEntry"</js>); <jc>// == "[foo]"</js>
* </p>
@@ -337,8 +337,8 @@ public abstract class Microservice {
* <cc># A POJO with embedded variables</cc>
* <ck>aBean2</ck> = {foo:'$ARG{0}',baz:$C{MySection/anInt}}
*
- * </p>
- * <p class='bcode'>
+ * </p>
+ * <p class='bcode'>
* <jc>// Java code for accessing config entries above.</jc>
* ConfigFile cf = getConfig();
*
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
index fe46dca..36cef4e 100755
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
@@ -402,7 +402,7 @@ public class RestMicroservice extends Microservice {
* <ck>resources</ck> =
* </p>
* <p>
- * In most cases, the rest resources will be specified in the manifest file since
+ * In most cases, the rest resources will be specified in the manifest file since
* it's not likely to be a configurable property:
* <p>
* <p class='bcode'>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 19e1757..da1cae9 100755
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -36,14 +36,14 @@ import org.apache.juneau.utils.*;
/**
* REST resource that allows access to a file system directory.
* <p>
- * The root directory is specified in one of two ways:
+ * The root directory is specified in one of two ways:
* </p>
* <ul class='spaced-list'>
* <li>Specifying the location via a <l>DirectoryResource.rootDir</l> property.
* <li>Overriding the {@link #getRootDir()} method.
* </ul>
* <p>
- * Read/write access control is handled through the following properties:
+ * Read/write access control is handled through the following properties:
* </p>
* <ul class='spaced-list'>
* <li><l>DirectoryResource.allowViews</l> - If <jk>true</jk>, allows view and download access to files.
@@ -51,8 +51,7 @@ import org.apache.juneau.utils.*;
* <li><l>DirectoryResource.allowDeletes</l> - If <jk>true</jk>, allows files to be deleted.
* </ul>
* <p>
- * Access can also be controlled by overriding the {@link #checkAccess(RestRequest)} method.
- * </p>
+ * Access can also be controlled by overriding the {@link #checkAccess(RestRequest)} method.
*/
@RestResource(
title="File System Explorer",
@@ -104,8 +103,8 @@ public class DirectoryResource extends Resource {
/**
* [GET /*]
- * On directories, returns a directory listing.
- * On files, returns information about the file.
+ * On directories, returns a directory listing.
+ * On files, returns information about the file.
*
* @param req The HTTP request.
* @return Either a FileResource or list of FileResources depending on whether it's a
@@ -144,7 +143,7 @@ public class DirectoryResource extends Resource {
/**
* [DELETE /*]
- * Delete a file on the file system.
+ * Delete a file on the file system.
*
* @param req The HTTP request.
* @return The message <js>"File deleted"</js> if successful.
@@ -189,8 +188,8 @@ public class DirectoryResource extends Resource {
/**
* [VIEW /*]
- * View the contents of a file.
- * Applies to files only.
+ * View the contents of a file.
+ * Applies to files only.
*
* @param req The HTTP request.
* @param res The HTTP response.
@@ -217,8 +216,8 @@ public class DirectoryResource extends Resource {
/**
* [DOWNLOAD /*]
- * Download the contents of a file.
- * Applies to files only.
+ * Download the contents of a file.
+ * Applies to files only.
*
* @param req The HTTP request.
* @param res The HTTP response.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index 08ec6bc..05d3a31 100644
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -25,14 +25,14 @@ import org.apache.juneau.internal.*;
/**
* Log entry formatter.
* <p>
- * Uses three simple parameter for configuring log entry formats:
- * <ul class='spaced-list'>
- * <li><code>dateFormat</code> - A {@link SimpleDateFormat} string describing the format for dates.
- * <li><code>format</code> - A string with <code>{...}</code> replacement variables representing predefined fields.
- * <li><code>useStackTraceHashes</code> - A setting that causes duplicate stack traces to be replaced with 8-character hash strings.
- * </ul>
+ * Uses three simple parameter for configuring log entry formats:
+ * <ul class='spaced-list'>
+ * <li><code>dateFormat</code> - A {@link SimpleDateFormat} string describing the format for dates.
+ * <li><code>format</code> - A string with <code>{...}</code> replacement variables representing predefined fields.
+ * <li><code>useStackTraceHashes</code> - A setting that causes duplicate stack traces to be replaced with 8-character hash strings.
+ * </ul>
* <p>
- * This class converts the format strings into a regular expression that can be used to parse the resulting log file.
+ * This class converts the format strings into a regular expression that can be used to parse the resulting log file.
*/
public class LogEntryFormatter extends Formatter {
@@ -46,17 +46,17 @@ public class LogEntryFormatter extends Formatter {
* Create a new formatter.
*
* @param format The log entry format. e.g. <js>"[{date} {level}] {msg}%n"</js>
- * The string can contain any of the following variables:
- * <ol>
- * <li><js>"{date}"</js> - The date, formatted per <js>"Logging/dateFormat"</js>.
- * <li><js>"{class}"</js> - The class name.
- * <li><js>"{method}"</js> - The method name.
- * <li><js>"{logger}"</js> - The logger name.
- * <li><js>"{level}"</js> - The log level name.
- * <li><js>"{msg}"</js> - The log message.
- * <li><js>"{threadid}"</js> - The thread ID.
- * <li><js>"{exception}"</js> - The localized exception message.
- * </ol>
+ * The string can contain any of the following variables:
+ * <ol>
+ * <li><js>"{date}"</js> - The date, formatted per <js>"Logging/dateFormat"</js>.
+ * <li><js>"{class}"</js> - The class name.
+ * <li><js>"{method}"</js> - The method name.
+ * <li><js>"{logger}"</js> - The logger name.
+ * <li><js>"{level}"</js> - The log level name.
+ * <li><js>"{msg}"</js> - The log message.
+ * <li><js>"{threadid}"</js> - The thread ID.
+ * <li><js>"{exception}"</js> - The localized exception message.
+ * </ol>
* @param dateFormat The {@link SimpleDateFormat} format to use for dates. e.g. <js>"yyyy.MM.dd hh:mm:ss"</js>.
* @param useStackTraceHashes If <jk>true</jk>, only print unique stack traces once and then refer to them by a
* simple 8 character hash identifier.
@@ -202,7 +202,7 @@ public class LogEntryFormatter extends Formatter {
* <li><js>"msg"</js>
* <li><js>"threadid"</js>
* <li><js>"exception"</js>
- * </ul>
+ * </ul>
* @param m The matcher.
* @return The field value, or <jk>null</jk> if the specified field does not exist.
*/
[8/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/BeanSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/src/main/java/org/apache/juneau/BeanSession.java
index abc9959..b033324 100644
--- a/juneau-core/src/main/java/org/apache/juneau/BeanSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/BeanSession.java
@@ -45,13 +45,13 @@ public class BeanSession extends Session {
* Create a new session using properties specified in the context.
*
* @param op The override properties.
- * These override any context properties defined in the context.
+ * 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.
+ * The context contains all the configuration settings for this object.
* @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 BeanSession(BeanContext ctx, ObjectMap op, Locale locale, TimeZone timeZone, MediaType mediaType) {
@@ -124,7 +124,7 @@ public class BeanSession extends Session {
/**
* Converts the specified value to the specified class type.
* <p>
- * See {@link #convertToType(Object, ClassMeta)} for the list of valid conversions.
+ * See {@link #convertToType(Object, ClassMeta)} for the list of valid conversions.
*
* @param <T> The class type to convert the value to.
* @param value The value to convert.
@@ -145,7 +145,7 @@ public class BeanSession extends Session {
*
* @param <T> The class type to convert the value to.
* @param outer If class is a member class, this is the instance of the containing class.
- * Should be <jk>null</jk> if not a member class.
+ * Should be <jk>null</jk> if not a member class.
* @param value The value to convert.
* @param type The class type to convert the value to.
* @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.
@@ -158,10 +158,10 @@ public class BeanSession extends Session {
/**
* Casts the specified value into the specified type.
* <p>
- * If the value isn't an instance of the specified type, then converts
+ * If the value isn't an instance of the specified type, then converts
* the value if possible.<br>
* <p>
- * The following conversions are valid:
+ * The following conversions are valid:
* <table class='styled'>
* <tr><th>Convert to type</th><th>Valid input value types</th><th>Notes</th></tr>
* <tr>
@@ -298,7 +298,7 @@ public class BeanSession extends Session {
*
* @param <T> The class type to convert the value to.
* @param outer If class is a member class, this is the instance of the containing class.
- * Should be <jk>null</jk> if not a member class.
+ * Should be <jk>null</jk> if not a member class.
* @param value The value to convert.
* @param type The class type to convert the value to.
* @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.
@@ -583,9 +583,9 @@ public class BeanSession extends Session {
/**
* Converts the contents of the specified list into an array.
* <p>
- * Works on both object and primitive arrays.
+ * Works on both object and primitive arrays.
* <p>
- * In the case of multi-dimensional arrays, the incoming list must
+ * In the case of multi-dimensional arrays, the incoming list must
* contain elements of type n-1 dimension. i.e. if {@code type} is <code><jk>int</jk>[][]</code>
* then {@code list} must have entries of type <code><jk>int</jk>[]</code>.
*
@@ -621,7 +621,7 @@ public class BeanSession extends Session {
/**
* Wraps an object inside a {@link BeanMap} object (i.e. a modifiable {@link Map}).
* <p>
- * If object is not a true bean, then throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.
+ * If object is not a true bean, then throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -663,7 +663,7 @@ public class BeanSession extends Session {
* Wraps an object inside a {@link BeanMap} object (i.e.: a modifiable {@link Map})
* defined as a bean for one of its class, a super class, or an implemented interface.
* <p>
- * If object is not a true bean, throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.
+ * If object is not a true bean, throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -701,7 +701,7 @@ public class BeanSession extends Session {
/**
* Creates a new {@link BeanMap} object (i.e. a modifiable {@link Map}) of the given class with uninitialized property values.
* <p>
- * If object is not a true bean, then throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.
+ * If object is not a true bean, then throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -724,7 +724,7 @@ public class BeanSession extends Session {
* @param <T> The class of the object being wrapped.
* @param c The name of the class to create a new instance of.
* @param outer If class is a member class, this is the instance of the containing class.
- * Should be <jk>null</jk> if not a member class.
+ * Should be <jk>null</jk> if not a member class.
* @return A new instance of the class.
*/
public final <T> BeanMap<T> newBeanMap(Object outer, Class<T> c) {
@@ -763,7 +763,7 @@ public class BeanSession extends Session {
* @param <T> The class type of the bean being created.
* @param c The class type of the bean being created.
* @param outer If class is a member class, this is the instance of the containing class.
- * Should be <jk>null</jk> if not a member class.
+ * Should be <jk>null</jk> if not a member class.
* @return A new bean object.
* @throws BeanRuntimeException If the specified class is not a valid bean.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
index c1c2e72..7cf4180 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
@@ -35,16 +35,16 @@ import org.apache.juneau.utils.*;
* about that class.
*
* <p>
- * Instances of this class can be created through the {@link BeanContext#getClassMeta(Class)} method.
+ * Instances of this class can be created through the {@link BeanContext#getClassMeta(Class)} method.
* <p>
- * The {@link BeanContext} class will cache and reuse instances of this class except for the following class types:
+ * The {@link BeanContext} class will cache and reuse instances of this class except for the following class types:
* <ul>
* <li>Arrays
* <li>Maps with non-Object key/values.
* <li>Collections with non-Object key/values.
* </ul>
* <p>
- * This class is tied to the {@link BeanContext} class because it's that class that makes the determination
+ * This class is tied to the {@link BeanContext} class because it's that class that makes the determination
* of what is a bean.
*
* @param <T> The class type of the wrapped class.
@@ -121,16 +121,16 @@ public final class ClassMeta<T> implements Type {
* @param innerClass The class being wrapped.
* @param beanContext The bean context that created this object.
* @param implClass For interfaces and abstract classes, this represents the "real" class to instantiate.
- * Can be <jk>null</jk>.
+ * Can be <jk>null</jk>.
* @param beanFilter The {@link BeanFilter} programmatically associated with this class.
- * Can be <jk>null</jk>.
+ * Can be <jk>null</jk>.
* @param pojoSwap The {@link PojoSwap} programmatically associated with this class.
- * Can be <jk>null</jk>.
+ * Can be <jk>null</jk>.
* @param childPojoSwap The child {@link PojoSwap PojoSwaps} programmatically associated with this class.
- * These are the <code>PojoSwaps</code> that have normal classes that are subclasses of this class.
- * Can be <jk>null</jk>.
+ * These are the <code>PojoSwaps</code> that have normal classes that are subclasses of this class.
+ * Can be <jk>null</jk>.
* @param delayedInit Don't call init() in constructor.
- * Used for delayed initialization when the possibility of class reference loops exist.
+ * Used for delayed initialization when the possibility of class reference loops exist.
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
ClassMeta(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {
@@ -629,7 +629,7 @@ public final class ClassMeta<T> implements Type {
* Returns the resolved bean dictionary name associated with this class.
* <p>
* Unlike {@link #getDictionaryName()}, this method automatically resolves multidimensional arrays
- * (e.g. <js>"X^^"</js> and returns array class metas accordingly if the base class has a type name.
+ * (e.g. <js>"X^^"</js> and returns array class metas accordingly if the base class has a type name.
*
* @return The type name associated with this bean class, or <jk>null</jk> if there is no type name defined or this isn't a bean.
*/
@@ -1026,7 +1026,7 @@ public final class ClassMeta<T> implements Type {
/**
* Returns <jk>true</jk> if instance of this object can be <jk>null</jk>.
* <p>
- * Objects can be <jk>null</jk>, but primitives cannot, except for chars which can be represented
+ * Objects can be <jk>null</jk>, but primitives cannot, except for chars which can be represented
* by <code>(<jk>char</jk>)0</code>.
*
* @return <jk>true</jk> if instance of this class can be null.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/Context.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/Context.java b/juneau-core/src/main/java/org/apache/juneau/Context.java
index fe151cb..6005ee9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/src/main/java/org/apache/juneau/Context.java
@@ -19,12 +19,12 @@ import org.apache.juneau.serializer.*;
/**
* A reusable stateless thread-safe read-only configuration, typically used for creating one-time use {@link Session} objects.
* <p>
- * Contexts are created through the {@link ContextFactory#getContext(Class)} method.
+ * Contexts are created through the {@link ContextFactory#getContext(Class)} method.
* <p>
- * Subclasses MUST implement a constructor method that takes in a {@link ContextFactory} parameter.
- * Besides that restriction, a context object can do anything you desire. However, it MUST
- * be thread-safe and all fields should be declared final to prevent modification.
- * It should NOT be used for storing temporary or state information.
+ * Subclasses MUST implement a constructor method that takes in a {@link ContextFactory} parameter.
+ * Besides that restriction, a context object can do anything you desire. However, it MUST
+ * be thread-safe and all fields should be declared final to prevent modification.
+ * It should NOT be used for storing temporary or state information.
*
* @see ContextFactory
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/ContextFactory.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ContextFactory.java b/juneau-core/src/main/java/org/apache/juneau/ContextFactory.java
index fff9e21..6dcde7b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ContextFactory.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ContextFactory.java
@@ -26,94 +26,94 @@ import org.apache.juneau.parser.*;
/**
* A factory for instantiating {@link Context} objects.
* <p>
- * The hierarchy of these objects are...
- * <ul class='spaced-list'>
- * <li>{@link ContextFactory} - A thread-safe, modifiable context property store.<br>
- * Used to create {@link Context} objects.
- * <li>{@link Context} - A reusable, cachable, thread-safe, read-only context with configuration properties copied from the factory.<br>
- * Often used to create {@link Session} objects.
- * <li>{@link Session} - A one-time-use non-thread-safe object.<br>
- * Used by serializers and parsers to retrieve context properties and to be used as scratchpads.
- * </ul>
+ * The hierarchy of these objects are...
+ * <ul class='spaced-list'>
+ * <li>{@link ContextFactory} - A thread-safe, modifiable context property store.<br>
+ * Used to create {@link Context} objects.
+ * <li>{@link Context} - A reusable, cachable, thread-safe, read-only context with configuration properties copied from the factory.<br>
+ * Often used to create {@link Session} objects.
+ * <li>{@link Session} - A one-time-use non-thread-safe object.<br>
+ * Used by serializers and parsers to retrieve context properties and to be used as scratchpads.
+ * </ul>
*
* <h6 class='topic'>ContextFactory objects</h6>
* <p>
- * Context factories can be thought of as consisting of the following:
- * <ul class='spaced-list'>
- * <li>A <code>Map<String,Object></code> of context properties.
- * <li>A <code>Map<Class,Context></code> of context instances.
- * </ul>
+ * Context factories can be thought of as consisting of the following:
+ * <ul class='spaced-list'>
+ * <li>A <code>Map<String,Object></code> of context properties.
+ * <li>A <code>Map<Class,Context></code> of context instances.
+ * </ul>
* <p>
- * Context factories are used to create and cache {@link Context} objects using the {@link #getContext(Class)} method.
+ * Context factories are used to create and cache {@link Context} objects using the {@link #getContext(Class)} method.
* <p>
- * As a general rule, {@link ContextFactory} objects are 'slow'.<br>
- * Setting and retrieving properties on a factory can involve relatively slow data conversion and synchronization.<br>
- * However, the {@link #getContext(Class)} method is fast, and will return cached context objects if the context properties have not changed.
+ * As a general rule, {@link ContextFactory} objects are 'slow'.<br>
+ * Setting and retrieving properties on a factory can involve relatively slow data conversion and synchronization.<br>
+ * However, the {@link #getContext(Class)} method is fast, and will return cached context objects if the context properties have not changed.
* <p>
- * Context factories can be used to store context properties for a variety of contexts.<br>
- * For example, a single factory can store context properties for the JSON serializer, XML serializer, HTML serializer
+ * Context factories can be used to store context properties for a variety of contexts.<br>
+ * For example, a single factory can store context properties for the JSON serializer, XML serializer, HTML serializer
* etc... and can thus be used to retrieve context objects for those serializers.<br>
* <p>
- * Other notes:
- * <ul class='spaced-list'>
- * <li>Context factories can be locked using the {@link #lock()} method.<br>
- * This prevents the context properties from being further modified.
- * <li>Context factories can be cloned using the {@link #clone} method.<br>
- * This will return a new unlocked factory with the same context properties.
- * </ul>
+ * Other notes:
+ * <ul class='spaced-list'>
+ * <li>Context factories can be locked using the {@link #lock()} method.<br>
+ * This prevents the context properties from being further modified.
+ * <li>Context factories can be cloned using the {@link #clone} method.<br>
+ * This will return a new unlocked factory with the same context properties.
+ * </ul>
*
* <h6 class='topic'>Context properties</h6>
* <p>
- * Context properties are 'settings' for serializers and parsers.<br>
- * For example, the {@link BeanContext#BEAN_sortProperties} context property defines whether
+ * Context properties are 'settings' for serializers and parsers.<br>
+ * For example, the {@link BeanContext#BEAN_sortProperties} context property defines whether
* bean properties should be serialized in alphabetical order.
* <p>
- * Each {@link Context} object should contain the context properties that apply to it as static
+ * Each {@link Context} object should contain the context properties that apply to it as static
* fields (e.g {@link BeanContext#BEAN_sortProperties}).
* <p>
- * Context properties can be of the following types:
- * <ul class='spaced-list'>
- * <li><l>SIMPLE</l> - A simple property.<br>
- * Examples include: booleans, integers, Strings, Classes, etc...<br>
- * <br>
- * An example of this would be the {@link BeanContext#BEAN_sortProperties} property.<br>
- * It's name is simply <js>"BeanContext.sortProperties"</js>.
+ * Context properties can be of the following types:
+ * <ul class='spaced-list'>
+ * <li><l>SIMPLE</l> - A simple property.<br>
+ * Examples include: booleans, integers, Strings, Classes, etc...<br>
+ * <br>
+ * An example of this would be the {@link BeanContext#BEAN_sortProperties} property.<br>
+ * It's name is simply <js>"BeanContext.sortProperties"</js>.
+ *
+ * <li><l>SET</l> - A sorted set of objects.<br>
+ * These are denoted by appending <js>".set"</js> to the property name.<br>
+ * Objects can be of any type, even complex types.<br>
+ * Sorted sets use tree sets to maintain the value in alphabetical order.<br>
+ * <br>
+ * For example, the {@link BeanContext#BEAN_notBeanClasses} property is used to store classes that should not be treated like beans.<br>
+ * It's name is <js>"BeanContext.notBeanClasses.set"</js>.
*
- * <li><l>SET</l> - A sorted set of objects.<br>
- * These are denoted by appending <js>".set"</js> to the property name.<br>
- * Objects can be of any type, even complex types.<br>
- * Sorted sets use tree sets to maintain the value in alphabetical order.<br>
- * <br>
- * For example, the {@link BeanContext#BEAN_notBeanClasses} property is used to store classes that should not be treated like beans.<br>
- * It's name is <js>"BeanContext.notBeanClasses.set"</js>.
+ * <li><l>LIST</l> - A list of unique objects.<br>
+ * These are denoted by appending <js>".list"</js> to the property name.<br>
+ * Objects can be of any type, even complex types.<br>
+ * Use lists if the ordering of the values in the set is important (similar to how the order of entries in a classpath is important).<br>
+ * <br>
+ * For example, the {@link BeanContext#BEAN_beanFilters} property is used to store bean filters.<br>
+ * It's name is <js>"BeanContext.transforms.list"</js>.
*
- * <li><l>LIST</l> - A list of unique objects.<br>
- * These are denoted by appending <js>".list"</js> to the property name.<br>
- * Objects can be of any type, even complex types.<br>
- * Use lists if the ordering of the values in the set is important (similar to how the order of entries in a classpath is important).<br>
- * <br>
- * For example, the {@link BeanContext#BEAN_beanFilters} property is used to store bean filters.<br>
- * It's name is <js>"BeanContext.transforms.list"</js>.
- *
- * <li><l>MAP</l> - A sorted map of key-value pairs.<br>
- * These are denoted by appending <js>".map"</js> to the property name.<br>
- * Keys can be any type directly convertable to and from Strings.
- * Values can be of any type, even complex types.<br>
- * <br>
- * For example, the {@link BeanContext#BEAN_implClasses} property is used to specify the names of implementation classes for interfaces.<br>
- * It's name is <js>"BeanContext.implClasses.map"</js>.<br>
- * </ul>
+ * <li><l>MAP</l> - A sorted map of key-value pairs.<br>
+ * These are denoted by appending <js>".map"</js> to the property name.<br>
+ * Keys can be any type directly convertable to and from Strings.
+ * Values can be of any type, even complex types.<br>
+ * <br>
+ * For example, the {@link BeanContext#BEAN_implClasses} property is used to specify the names of implementation classes for interfaces.<br>
+ * It's name is <js>"BeanContext.implClasses.map"</js>.<br>
+ * </ul>
* <p>
- * All context properties are set using the {@link #setProperty(String, Object)} method.
+ * All context properties are set using the {@link #setProperty(String, Object)} method.
* <p>
- * Default values for context properties can be specified globally as system properties.<br>
- * Example: <code>System.<jsm>setProperty</jsm>(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>);</code>
+ * Default values for context properties can be specified globally as system properties.<br>
+ * Example: <code>System.<jsm>setProperty</jsm>(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>);</code>
* <p>
- * SET and LIST properties can be added to using the {@link #addToProperty(String, Object)} method and removed from using the {@link #removeFromProperty(String, Object)} method.
+ * SET and LIST properties can be added to using the {@link #addToProperty(String, Object)} method and removed from using the {@link #removeFromProperty(String, Object)} method.
* <p>
- * SET and LIST properties can also be added to and removed from by appending <js>".add"</js> or <js>".remove"</js> to the property name and using the {@link #setProperty(String, Object)} method.
+ * SET and LIST properties can also be added to and removed from by appending <js>".add"</js> or <js>".remove"</js> to the property name and using the {@link #setProperty(String, Object)} method.
* <p>
- * The following shows the two different ways to append to a set or list property:
+ * The following shows the two different ways to append to a set or list property:
* <p class='bcode'>
* Config config = <jk>new</jk> Config().set(<js>"BeanContext.notBeanClasses.set"</js>, Collections.<jsm>emptySet</jsm>());
*
@@ -124,10 +124,10 @@ import org.apache.juneau.parser.*;
* config.set(<js>"BeanContext.notBeanClasses.set.add"</js>, MyNotBeanClass.<jk>class</jk>);
* </p>
* <p>
- * Lists are appended to the beginning of the set so that behavior can be overridden.<br>
+ * Lists are appended to the beginning of the set so that behavior can be overridden.<br>
* <p>
- * For sample, the following code shows the order in which POJO swaps are applied.<br>
- * In this case, we want F3 and F4 to appear at the beginning of the set so that they
+ * For sample, the following code shows the order in which POJO swaps are applied.<br>
+ * In this case, we want F3 and F4 to appear at the beginning of the set so that they
* take precedence over F1 and F2....
* <p class='bcode'>
* <jc>// Result will be F3,F4,F1,F2</jc>
@@ -135,7 +135,7 @@ import org.apache.juneau.parser.*;
* config.addTo(<js>"BeanContext.transforms.list"</js>, Arrays.<jsm>asList</jsm>(F3.<jk>class</jk>,F4.<jk>class</jk>));
* </p>
* <p>
- * SET and LIST properties can also be set and manipulated using JSON strings.
+ * SET and LIST properties can also be set and manipulated using JSON strings.
* <p class='bcode'>
* ContextFactory f = ContextFactory.<jsm>create</jsm>();
*
@@ -152,11 +152,11 @@ import org.apache.juneau.parser.*;
* f.removeFrom(<js>"BeanContext.notBeanClasses.set"</js>, <js>"['com.my.MyNotBeanClass3']"</js>);
* </p>
* <p>
- * MAP properties can be added to using the {@link #putToProperty(String, Object, Object)} and {@link #putToProperty(String, Object)} methods.<br>
- * MAP property entries can be removed by setting the value to <jk>null</jk> (e.g. <code>config.putTo(<js>"BEAN_implClasses"</js>, MyNotBeanClass.<jk>class</jk>, <jk>null</jk>);</code>.<br>
- * MAP properties can also be added to by appending <js>".put"</js> to the property name and using the {@link #setProperty(String, Object)} method.<br>
+ * MAP properties can be added to using the {@link #putToProperty(String, Object, Object)} and {@link #putToProperty(String, Object)} methods.<br>
+ * MAP property entries can be removed by setting the value to <jk>null</jk> (e.g. <code>config.putTo(<js>"BEAN_implClasses"</js>, MyNotBeanClass.<jk>class</jk>, <jk>null</jk>);</code>.<br>
+ * MAP properties can also be added to by appending <js>".put"</js> to the property name and using the {@link #setProperty(String, Object)} method.<br>
* <p>
- * The following shows the two different ways to append to a set property:
+ * The following shows the two different ways to append to a set property:
* <p class='bcode'>
* ContextFactory f = ContextFactory.<jsm>create</jsm>().set(<js>"BeanContext.implClasses.map"</js>, Collections.<jsm>emptyMap</jsm>());
*
@@ -168,7 +168,7 @@ import org.apache.juneau.parser.*;
* f.set(<js>"BeanContext.implClasses.map.put"</js>, m);
* </p>
* <p>
- * MAP properties can also be set and manipulated using JSON strings.
+ * MAP properties can also be set and manipulated using JSON strings.
* <p class='bcode'>
* ContextFactory f = ContextFactory.<jsm>create</jsm>();
*
@@ -182,23 +182,23 @@ import org.apache.juneau.parser.*;
* f.putTo(<js>"BeanContext.implClasses.map"</js>, <js>"{'com.my.MyInterface2':null}"</js>);
* </p>
* <p>
- * Context properties are retrieved from this factory using the following 3 methods:
- * <ul class='spaced-list'>
- * <li>{@link #getProperty(String, Class, Object)} - Retrieve a SIMPLE or SET property converted to the specified class type.
- * <li>{@link #getMap(String, Class, Class, Map)} - Retrieve a MAP property with keys/values converted to the specified class types.
- * <li>{@link #getPropertyMap(String)} - Retrieve a map of all context properties with the specified prefix (e.g. <js>"BeanContext"</js> for {@link BeanContext} properties).
- * </ul>
+ * Context properties are retrieved from this factory using the following 3 methods:
+ * <ul class='spaced-list'>
+ * <li>{@link #getProperty(String, Class, Object)} - Retrieve a SIMPLE or SET property converted to the specified class type.
+ * <li>{@link #getMap(String, Class, Class, Map)} - Retrieve a MAP property with keys/values converted to the specified class types.
+ * <li>{@link #getPropertyMap(String)} - Retrieve a map of all context properties with the specified prefix (e.g. <js>"BeanContext"</js> for {@link BeanContext} properties).
+ * </ul>
* <p>
- * As a general rule, only {@link Context} objects will use these read methods.
+ * As a general rule, only {@link Context} objects will use these read methods.
*
* <h6 class='topic'>Context objects</h6>
* <p>
- * A Context object can be thought of as unmodifiable snapshot of a factory.<br>
- * They should be 'fast' by avoiding synchronization by using final fields whenever possible.<br>
- * However, they MUST be thread safe.
+ * A Context object can be thought of as unmodifiable snapshot of a factory.<br>
+ * They should be 'fast' by avoiding synchronization by using final fields whenever possible.<br>
+ * However, they MUST be thread safe.
* <p>
- * Context objects are created using the {@link #getContext(Class)} method.<br>
- * As long as the properties on a factory have not been modified, the factory will return a cached copy
+ * Context objects are created using the {@link #getContext(Class)} method.<br>
+ * As long as the properties on a factory have not been modified, the factory will return a cached copy
* of a context.
* <p class='bcode'>
* ContextFactory f = ContextFactory.<jsm>create</jsm>();
@@ -220,12 +220,12 @@ import org.apache.juneau.parser.*;
*
* <h6 class='topic'>Session objects</h6>
* <p>
- * Session objects are created through {@link Context} objects, typically through a <code>createContext()</code> method.<br>
- * Unlike context objects, they are NOT reusable and NOT thread safe.<br>
- * They are meant to be used one time and then thrown away.<br>
- * They should NEVER need to use synchronization.
+ * Session objects are created through {@link Context} objects, typically through a <code>createContext()</code> method.<br>
+ * Unlike context objects, they are NOT reusable and NOT thread safe.<br>
+ * They are meant to be used one time and then thrown away.<br>
+ * They should NEVER need to use synchronization.
* <p>
- * Session objects are also often used as scratchpads for information such as keeping track of call stack
+ * Session objects are also often used as scratchpads for information such as keeping track of call stack
* information to detect recursive loops when serializing beans.
*/
public final class ContextFactory extends Lockable {
@@ -315,13 +315,13 @@ public final class ContextFactory extends Lockable {
/**
* Sets a configuration property value on this object.
* <p>
- * A typical usage is to set or overwrite configuration values like so...
+ * A typical usage is to set or overwrite configuration values like so...
* <p class='bcode'>
* ContextFactory g = ContextFactory.<jsm>create</jsm>();
* f.setProperty(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>);
* </p>
* <p>
- * The possible class types of the value depend on the property type:
+ * The possible class types of the value depend on the property type:
* <p>
* <table class='styled'>
* <tr>
@@ -357,16 +357,16 @@ public final class ContextFactory extends Lockable {
* </table>
*
* @param name The configuration property name.<br>
- * If name ends with <l>.add</l>, then the specified value is added to the
- * existing property value as an entry in a SET or LIST property.<br>
- * If name ends with <l>.put</l>, then the specified value is added to the
- * existing property value as a key/value pair in a MAP property.<br>
- * If name ends with <l>.remove</l>, then the specified value is removed from the
- * existing property property value in a SET or LIST property.<br>
+ * If name ends with <l>.add</l>, then the specified value is added to the
+ * existing property value as an entry in a SET or LIST property.<br>
+ * If name ends with <l>.put</l>, then the specified value is added to the
+ * existing property value as a key/value pair in a MAP property.<br>
+ * If name ends with <l>.remove</l>, then the specified value is removed from the
+ * existing property property value in a SET or LIST property.<br>
*
* @param value The new value.
- * If <jk>null</jk>, the property value is deleted.<br>
- * In general, the value type can be anything.<br>
+ * If <jk>null</jk>, the property value is deleted.<br>
+ * In general, the value type can be anything.<br>
*
* @return This object (for method chaining).
*/
@@ -526,10 +526,10 @@ public final class ContextFactory extends Lockable {
* Returns an instance of the specified context initialized with the properties
* in this config.
* <p>
- * Multiple calls to this method for the same config class will return the same
+ * Multiple calls to this method for the same config class will return the same
* cached value as long as the config properties on this config are not touched.
* <p>
- * As soon as any properties are modified on this config, all cached entries
+ * As soon as any properties are modified on this config, all cached entries
* are discarded and recreated as needed.
*
* @param c The context class to instantiate.
@@ -565,7 +565,7 @@ public final class ContextFactory extends Lockable {
/**
* Returns the configuration properties with the specified prefix.
* <p>
- * For example, if <l>prefix</l> is <js>"BeanContext"</js>, then retrieves
+ * For example, if <l>prefix</l> is <js>"BeanContext"</js>, then retrieves
* all configuration properties that are prefixed with <js>"BeanContext."</js>.
*
* @param prefix The prefix of properties to retrieve.
@@ -584,10 +584,10 @@ public final class ContextFactory extends Lockable {
/**
* Specifies the classloader to use when resolving classes from strings.
* <p>
- * Can be used for resolving class names when the classes being created are in a different
+ * Can be used for resolving class names when the classes being created are in a different
* classloader from the Juneau code.
* <p>
- * If <jk>null</jk>, the system classloader will be used to resolve classes.
+ * If <jk>null</jk>, the system classloader will be used to resolve classes.
*
* @param classLoader The new classloader.
* @throws LockedException If {@link #lock()} was called on this object.
@@ -602,7 +602,7 @@ public final class ContextFactory extends Lockable {
/**
* Specifies the parser to use to convert Strings to POJOs.
* <p>
- * If <jk>null</jk>, {@link JsonParser#DEFAULT} will be used.
+ * If <jk>null</jk>, {@link JsonParser#DEFAULT} will be used.
*
* @param defaultParser The new defaultParser.
* @throws LockedException If {@link #lock()} was called on this object.
@@ -787,9 +787,9 @@ public final class ContextFactory extends Lockable {
/**
* Contains all the properties for a particular property prefix (e.g. <js>'BeanContext'</js>)
* <p>
- * Instances of this map are immutable from outside this class.
+ * Instances of this map are immutable from outside this class.
* <p>
- * The {@link PropertyMap#hashCode()} and {@link PropertyMap#equals(Object)} methods
+ * The {@link PropertyMap#hashCode()} and {@link PropertyMap#equals(Object)} methods
* can be used to compare with other property maps.
*/
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/Delegate.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/Delegate.java b/juneau-core/src/main/java/org/apache/juneau/Delegate.java
index a648ad8..717f556 100644
--- a/juneau-core/src/main/java/org/apache/juneau/Delegate.java
+++ b/juneau-core/src/main/java/org/apache/juneau/Delegate.java
@@ -17,7 +17,7 @@ package org.apache.juneau;
* <p>
* <b>*** Internal Interface - Not intended for external use ***</b>
* <p>
- * For example, {@link BeanMap} is a map representation of a bean.
+ * For example, {@link BeanMap} is a map representation of a bean.
*
* @param <T> The represented class type.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/InvalidDataConversionException.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/InvalidDataConversionException.java b/juneau-core/src/main/java/org/apache/juneau/InvalidDataConversionException.java
index c97fc34..1336fb0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/InvalidDataConversionException.java
+++ b/juneau-core/src/main/java/org/apache/juneau/InvalidDataConversionException.java
@@ -20,7 +20,7 @@ import org.apache.juneau.json.*;
/**
* General invalid conversion exception.
* <p>
- * Exception that gets thrown if you try to perform an invalid conversion, such as when calling {@code ObjectMap.getInt(...)} on a non-numeric <code>String</code>.
+ * Exception that gets thrown if you try to perform an invalid conversion, such as when calling {@code ObjectMap.getInt(...)} on a non-numeric <code>String</code>.
*/
public final class InvalidDataConversionException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/MediaRange.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/MediaRange.java b/juneau-core/src/main/java/org/apache/juneau/MediaRange.java
index 376fdee..c9295f0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/MediaRange.java
+++ b/juneau-core/src/main/java/org/apache/juneau/MediaRange.java
@@ -255,7 +255,7 @@ public final class MediaRange implements Comparable<MediaRange> {
*
* @param value The value to parse. If <jk>null</jk> or empty, returns a single <code>MediaRange</code> is returned that represents all types.
* @return The media ranges described by the string.
- * The ranges are sorted such that the most acceptable media is available at ordinal position <js>'0'</js>, and the least acceptable at position n-1.
+ * The ranges are sorted such that the most acceptable media is available at ordinal position <js>'0'</js>, and the least acceptable at position n-1.
*/
public static MediaRange[] parse(String value) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/ObjectList.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ObjectList.java b/juneau-core/src/main/java/org/apache/juneau/ObjectList.java
index d8526e8..a5d6148 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ObjectList.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ObjectList.java
@@ -23,10 +23,10 @@ import org.apache.juneau.utils.*;
/**
* Java implementation of a JSON array.
* <p>
- * An extension of {@link LinkedList}, so all methods available to in that class are also available
+ * An extension of {@link LinkedList}, so all methods available to in that class are also available
* to this class.
* <p>
- * Note that the use of this class is optional. The serializers will accept any objects that implement
+ * Note that the use of this class is optional. The serializers will accept any objects that implement
* the {@link Collection} interface. But this class provides some useful additional functionality
* when working with JSON models constructed from Java Collections Framework objects. For example, a
* constructor is provided for converting a JSON array string directly into a {@link List}. It also contains
@@ -88,8 +88,7 @@ import org.apache.juneau.utils.*;
* }
* </p>
* <p>
- * This class is not thread safe.
- * </p>
+ * This class is not thread safe.
*/
public class ObjectList extends LinkedList<Object> {
private static final long serialVersionUID = 1L;
@@ -236,7 +235,7 @@ public class ObjectList extends LinkedList<Object> {
/**
* Get the entry at the specified index, converted to the specified type (if possible).
* <p>
- * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
+ * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
*
* @param type The type of object to convert the entry to.
* @param index The index into this list.
@@ -338,7 +337,7 @@ public class ObjectList extends LinkedList<Object> {
* Same as {@link #get(Class,int) get(Class,int)}, but the key is a slash-delimited
* path used to traverse entries in this POJO.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -350,9 +349,8 @@ public class ObjectList extends LinkedList<Object> {
* <jk>long</jk> l = m.getAt(<jk>long</jk>.<jk>class</jk>, <js>"foo/bar/0/baz"</js>);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param <T> The class type.
* @param type The class type.
@@ -367,7 +365,7 @@ public class ObjectList extends LinkedList<Object> {
* Same as {@link #set(int,Object) set(int,Object)}, but the key is a slash-delimited
* path used to traverse entries in this POJO.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -379,9 +377,8 @@ public class ObjectList extends LinkedList<Object> {
* m.putAt(<js>"foo/bar/0/baz"</js>, 123);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param path The path to the entry.
* @param o The new value.
@@ -395,7 +392,7 @@ public class ObjectList extends LinkedList<Object> {
* Similar to {@link #putAt(String,Object) putAt(String,Object)}, but used to append
* to collections and arrays.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -407,9 +404,8 @@ public class ObjectList extends LinkedList<Object> {
* m.postAt(<js>"foo/bar"</js>, 123);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param path The path to the entry.
* @param o The new value.
@@ -423,7 +419,7 @@ public class ObjectList extends LinkedList<Object> {
* Similar to {@link #remove(int) remove(int)},but the key is a slash-delimited
* path used to traverse entries in this POJO.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -435,9 +431,8 @@ public class ObjectList extends LinkedList<Object> {
* m.deleteAt(<js>"foo/bar/0/baz"</js>);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param path The path to the entry.
* @return The previous value, or <jk>null</jk> if the entry doesn't exist.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
index 502189a..08069a5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
@@ -27,10 +27,10 @@ import org.apache.juneau.utils.*;
/**
* Java implementation of a JSON object.
* <p>
- * An extension of {@link LinkedHashMap}, so all methods available in that class are also available
+ * An extension of {@link LinkedHashMap}, so all methods available in that class are also available
* to this class.
* <p>
- * Note that the use of this class is optional. The serializers will accept any objects that implement
+ * Note that the use of this class is optional. The serializers will accept any objects that implement
* the {@link java.util.Map} interface. But this class provides some useful additional functionality
* when working with JSON models constructed from Java Collections Framework objects. For example, a
* constructor is provided for converting a JSON object string directly into a {@link Map}. It also contains
@@ -94,8 +94,7 @@ import org.apache.juneau.utils.*;
* <jk>int</jk> a = m2.getInt(<js>"a"</js>); <jc>// a == 1 </jc>
* </p>
* <p>
- * This class is not thread safe.
- * </p>
+ * This class is not thread safe.
*/
public class ObjectMap extends LinkedHashMap<String,Object> {
private static final long serialVersionUID = 1L;
@@ -238,7 +237,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* </p>
*
* @param inner The inner map.
- * Can be <jk>null</jk> to remove the inner map from an existing map.
+ * Can be <jk>null</jk> to remove the inner map from an existing map.
* @return This object (for method chaining).
*/
public ObjectMap setInner(ObjectMap inner) {
@@ -296,7 +295,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Convenience method for adding multiple objects to this map.
* <p>
- * Equivalent to calling {@code put(key, value)}, but returns
+ * Equivalent to calling {@code put(key, value)}, but returns
* this map so that the method can be chained.
*
* @param key The key.
@@ -311,7 +310,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Convenience method for adding a contents of another map to this map.
* <p>
- * Equivalent to calling {@code putAll(m)}, but returns
+ * Equivalent to calling {@code putAll(m)}, but returns
* this map so that the method can be chained.
*
* @param m The map whose contents should be added to this map.
@@ -346,7 +345,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Same as {@link Map#get(Object) get()}, but casts or converts the value to the specified class type.
* <p>
- * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
+ * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
*
* @param <T> The class type.
* @param type The class type.
@@ -378,7 +377,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Same as {@link Map#get(Object) get()}, but casts or converts the value to the specified class type.
* <p>
- * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
+ * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
*
* @param <T> The class type.
* @param type The class type.
@@ -399,7 +398,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Same as {@link Map#get(Object) get()}, but casts or converts the value to the specified class type.
* <p>
- * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
+ * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
*
* @param <T> The class type.
* @param type The class type.
@@ -413,7 +412,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Same as {@link Map#get(Object) get()}, but casts or converts the value to the specified class type.
* <p>
- * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
+ * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
*
* @param <T> The class type.
* @param type The class type.
@@ -444,9 +443,9 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the value for the first key in the list that has an entry in this map.
* <p>
- * Casts or converts the value to the specified class type.
+ * Casts or converts the value to the specified class type.
* <p>
- * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
+ * See {@link BeanSession#convertToType(Object, ClassMeta)} for the list of valid data conversions.
*
* @param type The class type to convert the value to.
* @param <T> The class type to convert the value to.
@@ -464,7 +463,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* Same as {@link #get(Class,String) get(Class,String)}, but the key is a slash-delimited
* path used to traverse entries in this POJO.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -476,9 +475,8 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* <jk>long</jk> l = m.getAt(<jk>long</jk>.<jk>class</jk>, <js>"foo/bar/0/baz"</js>);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param <T> The class type.
* @param type The class type.
@@ -493,7 +491,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* Same as <code>put(String,Object)</code>, but the key is a slash-delimited
* path used to traverse entries in this POJO.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -505,9 +503,8 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* m.putAt(<js>"foo/bar/0/baz"</js>, 123);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param path The path to the entry.
* @param o The new value.
@@ -521,7 +518,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* Similar to {@link #putAt(String,Object) putAt(String,Object)}, but used to append
* to collections and arrays.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -533,9 +530,8 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* m.postAt(<js>"foo/bar"</js>, 123);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param path The path to the entry.
* @param o The new value.
@@ -549,7 +545,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* Similar to {@link #remove(Object) remove(Object)},but the key is a slash-delimited
* path used to traverse entries in this POJO.
* <p>
- * For example, the following code is equivalent:
+ * For example, the following code is equivalent:
* </p>
* <p class='bcode'>
* ObjectMap m = getObjectMap();
@@ -561,9 +557,8 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* m.deleteAt(<js>"foo/bar/0/baz"</js>);
* </p>
* <p>
- * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
- * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
- * </p>
+ * This method uses the {@link PojoRest} class to perform the lookup, so the map can contain
+ * any of the various class types that the {@link PojoRest} class supports (e.g. beans, collections, arrays).
*
* @param path The path to the entry.
* @return The previous value, or <jk>null</jk> if the entry doesn't exist.
@@ -575,7 +570,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Convenience method for inserting JSON directly into an attribute on this object.
* <p>
- * The JSON text can be an object (i.e. <js>"{...}"</js>) or an array (i.e. <js>"[...]"</js>).
+ * The JSON text can be an object (i.e. <js>"{...}"</js>) or an array (i.e. <js>"[...]"</js>).
*
* @param key The key.
* @param json The JSON text that will be parsed into an Object and then inserted into this map.
@@ -588,7 +583,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link String}.
* <p>
- * Shortcut for <code>get(String.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(String.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -625,7 +620,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link String}.
* <p>
- * Shortcut for <code>get(String.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(String.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -638,7 +633,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to an {@link Integer}.
* <p>
- * Shortcut for <code>get(Integer.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Integer.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -651,7 +646,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to an {@link Integer}.
* <p>
- * Shortcut for <code>get(Integer.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Integer.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -665,7 +660,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link Long}.
* <p>
- * Shortcut for <code>get(Long.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Long.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -678,7 +673,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link Long}.
* <p>
- * Shortcut for <code>get(Long.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Long.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -692,7 +687,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link Boolean}.
* <p>
- * Shortcut for <code>get(Boolean.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Boolean.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -705,7 +700,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link Boolean}.
* <p>
- * Shortcut for <code>get(Boolean.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Boolean.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -719,7 +714,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link Map}.
* <p>
- * Shortcut for <code>get(Map.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(Map.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -732,7 +727,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link Map}.
* <p>
- * Shortcut for <code>get(Map.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(Map.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -746,7 +741,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link List}.
* <p>
- * Shortcut for <code>get(List.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(List.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -759,7 +754,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link List}.
* <p>
- * Shortcut for <code>get(List.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(List.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -773,7 +768,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link Map}.
* <p>
- * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -786,7 +781,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link ObjectMap}.
* <p>
- * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(ObjectMap.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -800,7 +795,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link ObjectList}.
* <p>
- * Shortcut for <code>get(ObjectList.<jk>class</jk>, key)</code>.
+ * Shortcut for <code>get(ObjectList.<jk>class</jk>, key)</code>.
*
* @param key The key.
* @return The converted value, or <jk>null</jk> if the map contains no mapping for this key.
@@ -813,7 +808,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the specified entry value converted to a {@link ObjectList}.
* <p>
- * Shortcut for <code>get(ObjectList.<jk>class</jk>, key, defVal)</code>.
+ * Shortcut for <code>get(ObjectList.<jk>class</jk>, key, defVal)</code>.
*
* @param key The key.
* @param defVal The default value if the map doesn't contain the specified mapping.
@@ -827,7 +822,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to a {@link String}.
* <p>
- * Shortcut for <code>find(String.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(String.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -840,7 +835,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to an {@link Integer}.
* <p>
- * Shortcut for <code>find(Integer.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(Integer.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -854,7 +849,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to a {@link Long}.
* <p>
- * Shortcut for <code>find(Long.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(Long.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -868,7 +863,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to a {@link Boolean}.
* <p>
- * Shortcut for <code>find(Boolean.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(Boolean.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -882,7 +877,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to a {@link Map}.
* <p>
- * Shortcut for <code>find(Map.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(Map.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -896,7 +891,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to a {@link List}.
* <p>
- * Shortcut for <code>find(List.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(List.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -910,7 +905,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to a {@link ObjectMap}.
* <p>
- * Shortcut for <code>find(ObjectMap.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(ObjectMap.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -924,7 +919,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
/**
* Returns the first entry that exists converted to a {@link ObjectList}.
* <p>
- * Shortcut for <code>find(ObjectList.<jk>class</jk>, keys)</code>.
+ * Shortcut for <code>find(ObjectList.<jk>class</jk>, keys)</code>.
*
* @param keys The list of keys to look for.
* @return The converted value of the first key in the list that has an entry in this map,
@@ -1088,7 +1083,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* Same as {@link #cast()}, but first do a lookup for the name in the specified dictionary.
*
* @param beanRegistry
- * The class lexicon to resolve the name. Can be <jk>null</jk>.
+ * The class lexicon to resolve the name. Can be <jk>null</jk>.
* @return The new Java object of type specified by the <js>"_type"</js> entry value, or this
* same object if entry does not exist.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/PropertyNamerDefault.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/PropertyNamerDefault.java b/juneau-core/src/main/java/org/apache/juneau/PropertyNamerDefault.java
index 1a64676..19dcda3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/PropertyNamerDefault.java
+++ b/juneau-core/src/main/java/org/apache/juneau/PropertyNamerDefault.java
@@ -25,7 +25,7 @@ import java.beans.*;
* <li><js>"URL"</js> -> <js>"URL"</js>
* </ul>
* <p>
- * See {@link Introspector#decapitalize(String)} for exact rules.
+ * See {@link Introspector#decapitalize(String)} for exact rules.
*/
public final class PropertyNamerDefault implements PropertyNamer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/Session.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/Session.java b/juneau-core/src/main/java/org/apache/juneau/Session.java
index fe33eb2..b870421 100644
--- a/juneau-core/src/main/java/org/apache/juneau/Session.java
+++ b/juneau-core/src/main/java/org/apache/juneau/Session.java
@@ -41,7 +41,7 @@ public abstract class Session {
* Default constructor.
*
* @param ctx The context creating this session object.
- * The context contains all the configuration settings for the session.
+ * The context contains all the configuration settings for the session.
* @param op Properties associated with this session.
*/
protected Session(Context ctx, ObjectMap op) {
@@ -75,7 +75,7 @@ public abstract class Session {
* Can be used to store objects for reuse during a session.
*
* @param cacheObjects The objects to add to this session's cache.
- * No-op if <jk>null</jk>.
+ * No-op if <jk>null</jk>.
*/
public void addToCache(Map<String,Object> cacheObjects) {
if (cacheObjects != null) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/Streamable.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/Streamable.java b/juneau-core/src/main/java/org/apache/juneau/Streamable.java
index 3a2b9e0..9dc9b44 100644
--- a/juneau-core/src/main/java/org/apache/juneau/Streamable.java
+++ b/juneau-core/src/main/java/org/apache/juneau/Streamable.java
@@ -17,9 +17,8 @@ import java.io.*;
/**
* Interface that identifies that an object can be serialized directly to an output stream.
* <p>
- * Instances must identify the media type of the content by implementing the
+ * Instances must identify the media type of the content by implementing the
* {@link #getMediaType()} method.
- * </p>
*/
public interface Streamable {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/Writable.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/Writable.java b/juneau-core/src/main/java/org/apache/juneau/Writable.java
index 747990f..20dd7e0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/Writable.java
+++ b/juneau-core/src/main/java/org/apache/juneau/Writable.java
@@ -17,9 +17,8 @@ import java.io.*;
/**
* Interface that identifies that an object can be serialized directly to a writer.
* <p>
- * Instances must identify the media type of the content by implementing the
+ * Instances must identify the media type of the content by implementing the
* {@link #getMediaType()} method.
- * </p>
*/
public interface Writable {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
index 983588d..d4abba2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -24,14 +24,14 @@ import org.apache.juneau.transform.*;
/**
* Used to tailor how beans get interpreted by the framework.
* <p>
- * Can be used to do the following:
+ * Can be used to do the following:
* <ul class='spaced-list'>
* <li>Explicitly specify the set and order of properties on a bean.
* <li>Associate a {@link PropertyNamer} with a class.
* <li>Specify subtypes of a bean differentiated by a sub type property.
* </ul>
* <p>
- * This annotation can be applied to classes and interfaces.
+ * This annotation can be applied to classes and interfaces.
*/
@Documented
@Target(TYPE)
@@ -56,8 +56,8 @@ public @interface Bean {
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {
* <jc>// A bean property where the object types cannot be inferred since it's an Object[].</jc>
- * <ja>@BeanProperty</ja>(typeDictionary={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
- * <jk>public</jk> Object[] x = <jk>new</jk> Object[]{<jk>new</jk> Bar(), <jk>new</jk> Baz()};
+ * <ja>@BeanProperty</ja>(typeDictionary={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
+ * <jk>public</jk> Object[] x = <jk>new</jk> Object[]{<jk>new</jk> Bar(), <jk>new</jk> Baz()};
* }
*
* <ja>@Bean</ja>(typeName=<js>"bar"</js>)
@@ -67,26 +67,26 @@ public @interface Bean {
* <jk>public class</jk> Baz {}
* </p>
* <p>
- * When serialized as XML, the bean is rendered as:
+ * When serialized as XML, the bean is rendered as:
* </p>
* <p class='bcode'>
* <xt><foo></xt>
- * <xt><x></xt>
- * <xt><bar/>v
- * <xt><baz/></xt>
- * <xt></x></xt>
+ * <xt><x></xt>
+ * <xt><bar/>v
+ * <xt><baz/></xt>
+ * <xt></x></xt>
* <xt></foo></xt>
* </p>
* <p>
- * When serialized as JSON, <js>'n'</js> attributes would be added when needed to infer the type during parsing:
+ * When serialized as JSON, <js>'n'</js> attributes would be added when needed to infer the type during parsing:
* </p>
* <p class='bcode'>
* {
- * x: [
- * {_type:<js>'bar'</js>},
- * {_type>:<js>'baz'</js>}
- * ]
- * } *
+ * x: [
+ * {_type:<js>'bar'</js>},
+ * {_type>:<js>'baz'</js>}
+ * ]
+ * }
* </p>
*/
String typeName() default "";
@@ -94,9 +94,9 @@ public @interface Bean {
/**
* The set and order of names of properties associated with a bean class.
* <p>
- * The order specified is the same order that the entries will be returned by the {@link BeanMap#entrySet()} and related methods.
+ * The order specified is the same order that the entries will be returned by the {@link BeanMap#entrySet()} and related methods.
* <p>
- * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getProperties()} method.
+ * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getProperties()} method.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -104,7 +104,7 @@ public @interface Bean {
* <jc>// All other properties are ignored.</jc>
* <ja>@Bean</ja>(properties=<js>"street,city,state"</js>)
* <jk>public class</jk> Address {
- * ...
+ * ...
* </p>
*/
String properties() default "";
@@ -112,17 +112,17 @@ public @interface Bean {
/**
* Sort bean properties in alphabetical order.
* <p>
- * When <jk>true</jk>, all bean properties will be serialized and access in alphabetical order.
- * Otherwise, the natural order of the bean properties is used which is dependent on the
- * JVM vendor.
- * On IBM JVMs, the bean properties are ordered based on their ordering in the Java file.
- * On Oracle JVMs, the bean properties are not ordered (which follows the offical JVM specs).
+ * When <jk>true</jk>, all bean properties will be serialized and access in alphabetical order.
+ * Otherwise, the natural order of the bean properties is used which is dependent on the
+ * JVM vendor.
+ * On IBM JVMs, the bean properties are ordered based on their ordering in the Java file.
+ * On Oracle JVMs, the bean properties are not ordered (which follows the offical JVM specs).
* <p>
- * This property is disabled by default so that IBM JVM users don't have to use {@link Bean @Bean} annotations
- * to force bean properties to be in a particular order and can just alter the order of the fields/methods
- * in the Java file.
+ * This property is disabled by default so that IBM JVM users don't have to use {@link Bean @Bean} annotations
+ * to force bean properties to be in a particular order and can just alter the order of the fields/methods
+ * in the Java file.
* <p>
- * This annotation is equivalent to using the {@link BeanContext#BEAN_sortProperties} property, but
+ * This annotation is equivalent to using the {@link BeanContext#BEAN_sortProperties} property, but
* applied to individual classes instead of globally at the serializer or parser level.
*/
boolean sort() default false;
@@ -130,7 +130,7 @@ public @interface Bean {
/**
* Specifies a list of properties that should be excluded from {@link BeanMap#entrySet()}.
* <p>
- * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getExcludeProperties()} method.
+ * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getExcludeProperties()} method.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -146,11 +146,11 @@ public @interface Bean {
/**
* Associates a {@link PropertyNamer} with this bean to tailor the names of the bean properties.
* <p>
- * Property namers are used to transform bean property names from standard form to some other form.
- * For example, the {@link PropertyNamerDashedLC} will convert property names to dashed-lowercase, and
- * these will be used as attribute names in JSON, and element names in XML.
+ * Property namers are used to transform bean property names from standard form to some other form.
+ * For example, the {@link PropertyNamerDashedLC} will convert property names to dashed-lowercase, and
+ * these will be used as attribute names in JSON, and element names in XML.
* <p>
- * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getPropertyNamer()} method.
+ * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getPropertyNamer()} method.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -159,15 +159,15 @@ public @interface Bean {
* <jk>public class</jk> MyClass {
* ...
* }
- * </p>
+ * </p>
*/
Class<? extends PropertyNamer> propertyNamer() default PropertyNamerDefault.class;
/**
* Identifies a class to be used as the interface class for this and all subclasses.
* <p>
- * When specified, only the list of properties defined on the interface class will be used during serialization.
- * Additional properties on subclasses will be ignored.
+ * When specified, only the list of properties defined on the interface class will be used during serialization.
+ * Additional properties on subclasses will be ignored.
* <p class='bcode'>
* <jc>// Parent class</jc>
* <ja>@Bean</ja>(interfaceClass=A.<jk>class</jk>)
@@ -186,10 +186,10 @@ public @interface Bean {
* <jsm>assertEquals</jsm>(<js>"{f0:'f0'}"</js>, r); // Note f1 is not serialized.
* </p>
* <p>
- * Note that this annotation can be used on the parent class so that it filters to all child classes,
- * or can be set individually on the child classes.
+ * Note that this annotation can be used on the parent class so that it filters to all child classes,
+ * or can be set individually on the child classes.
* <p>
- * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getInterfaceClass()} method.
+ * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getInterfaceClass()} method.
*/
Class<?> interfaceClass() default Object.class;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
index 168c73b..68a4c63 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
@@ -22,12 +22,12 @@ import org.apache.juneau.*;
/**
* Maps constructor arguments to property names on beans with read-only properties.
* <p>
- * This annotation can be used in the case of beans with properties whose values can only be set by passing
- * them in through a constructor on the class.<br>
- * Since method parameter names are lost during compilation, this annotation essentially redefines them
- * so that they are available at runtime.
+ * This annotation can be used in the case of beans with properties whose values can only be set by passing
+ * them in through a constructor on the class.<br>
+ * Since method parameter names are lost during compilation, this annotation essentially redefines them
+ * so that they are available at runtime.
* <p>
- * The definition of a read-only bean is a bean with properties with only getters, like shown below...
+ * The definition of a read-only bean is a bean with properties with only getters, like shown below...
* <p class='bcode'>
* <jk>public class</jk> Person {
* <jk>private final</jk> String <jf>name</jf>;
@@ -56,18 +56,18 @@ import org.apache.juneau.*;
* <jk>int</jk> age = p.getAge(); <jc>// 45</jc>
* </p>
* <p>
- * This annotation can only be applied to constructors and can only be applied to one constructor per class.
+ * This annotation can only be applied to constructors and can only be applied to one constructor per class.
* <p>
- * When 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.
+ * When 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()}
- * will result in a {@link BeanRuntimeException} being thrown.
- * Multiple calls to {@link BeanMap#getBean()} will return the same bean instance.
+ * 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.
* <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.
*/
@Documented
@Target(CONSTRUCTOR)
@@ -78,7 +78,7 @@ public @interface BeanConstructor {
/**
* The names of the properties of the constructor arguments.
* <p>
- * The number of properties listed must match the number of arguments in the constructor.
+ * The number of properties listed must match the number of arguments in the constructor.
*/
String properties() default "";
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanIgnore.java b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
index bed8fec..5f8dc70 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
@@ -20,13 +20,13 @@ import java.lang.annotation.*;
/**
* Ignore classes, fields, and methods from being interpreted as bean or bean components.
* <p>
- * Applied to classes that may look like beans, but you want to be treated as non-beans.
- * For example, if you want to force a bean to be converted to a string using the <code>toString()</code>
- * method, use this annoation on the class.
+ * Applied to classes that may look like beans, but you want to be treated as non-beans.
+ * For example, if you want to force a bean to be converted to a string using the <code>toString()</code>
+ * method, use this annoation on the class.
* <p>
- * Applies to fields that should not be interpreted as bean property fields.
+ * Applies to fields that should not be interpreted as bean property fields.
* <p>
- * Applies to getters or setters that should not be interpreted as bean property getters or setters.
+ * Applies to getters or setters that should not be interpreted as bean property getters or setters.
*/
@Documented
@Target({FIELD,METHOD,TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
index 10e4919..f934c9e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
@@ -24,7 +24,7 @@ import org.apache.juneau.transform.*;
/**
* Used tailor how bean properties get interpreted by the framework.
* <p>
- * Can be used to do the following:
+ * Can be used to do the following:
* <ul class='spaced-list'>
* <li>Override the name of a property.
* <li>Identify a getter or setter with a non-standard naming convention.
@@ -37,7 +37,7 @@ import org.apache.juneau.transform.*;
* <li>Identify a property as the ID for a bean.
* </ul>
* <p>
- * This annotation is applied to public fields and public getter/setter methods of beans.
+ * This annotation is applied to public fields and public getter/setter methods of beans.
*/
@Documented
@Target({FIELD,METHOD})
@@ -48,11 +48,11 @@ public @interface BeanProperty {
/**
* Identifies the name of the property.
* <p>
- * Normally, this is automatically inferred from the field name or getter method name
+ * Normally, this is automatically inferred from the field name or getter method name
* of the property. However, this property can be used to assign a different
* property name from the automatically inferred value.
* <p>
- * If the {@link BeanContext#BEAN_beanFieldVisibility} setting on the bean context excludes this field (e.g. the visibility
+ * If the {@link BeanContext#BEAN_beanFieldVisibility} setting on the bean context excludes this field (e.g. the visibility
* is set to PUBLIC, but the field is PROTECTED), this annotation can be used to force the field to be identified as a property.
*/
String name() default "";
@@ -60,12 +60,12 @@ public @interface BeanProperty {
/**
* Identifies a specialized class type for the property.
* <p>
- * Normally this can be inferred through reflection of the field type or getter return type.
- * However, you'll want to specify this value if you're parsing beans where the bean property class
+ * Normally this can be inferred through reflection of the field type or getter return type.
+ * However, you'll want to specify this value if you're parsing beans where the bean property class
* is an interface or abstract class to identify the bean type to instantiate. Otherwise, you may
* cause an {@link InstantiationException} when trying to set these fields.
* <p>
- * This property must denote a concrete bean class with a no-arg constructor.
+ * This property must denote a concrete bean class with a no-arg constructor.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
[6/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
index 638ae24..81f58e7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
@@ -24,7 +24,7 @@ import org.apache.juneau.transform.*;
/**
* Represents a top-level schema object bean in the JSON-Schema core specification.
* <p>
- * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
@SuppressWarnings("hiding")
@Bean(typeName="schema",
@@ -131,7 +131,7 @@ public class Schema {
* Bean property setter: <property>id</property>.
*
* @param id The new value for the <property>id</property> property on this bean.
- * The parameter must be a valid URI. It can be <jk>null</jk>.
+ * The parameter must be a valid URI. It can be <jk>null</jk>.
* @return This object (for method chaining).
*/
public Schema setId(String id) {
@@ -164,7 +164,7 @@ public class Schema {
* Bean property setter: <property>schemaVersion</property>.
*
* @param schemaVersion The new value for the <property>schemaVersion</property> property on this bean.
- * The parameter must be a valid URI. It can be <jk>null</jk>.
+ * The parameter must be a valid URI. It can be <jk>null</jk>.
* @return This object (for method chaining).
*/
public Schema setSchemaVersionUri(String schemaVersion) {
@@ -215,7 +215,7 @@ public class Schema {
* Bean property getter: <property>type</property>.
*
* @return The value of the <property>type</property> property on this bean, or <jk>null</jk> if it is not set.
- * Can be either a {@link JsonType} or {@link JsonTypeArray} depending on what value was used to set it.
+ * Can be either a {@link JsonType} or {@link JsonTypeArray} depending on what value was used to set it.
*/
@BeanProperty(swap=JsonTypeOrJsonTypeArraySwap.class)
public Object getType() {
@@ -252,7 +252,7 @@ public class Schema {
* Bean property setter: <property>type</property>.
*
* @param type The new value for the <property>type</property> property on this bean.
- * This object must be of type {@link JsonType} or {@link JsonTypeArray}.
+ * This object must be of type {@link JsonType} or {@link JsonTypeArray}.
* @return This object (for method chaining).
* @throws BeanRuntimeException If invalid object type passed in.
*/
@@ -510,7 +510,7 @@ public class Schema {
* Bean property getter: <property>items</property>.
*
* @return The value of the <property>items</property> property on this bean, or <jk>null</jk> if it is not set.
- * Can be either a {@link Schema} or {@link SchemaArray} depending on what value was used to set it.
+ * Can be either a {@link Schema} or {@link SchemaArray} depending on what value was used to set it.
*/
@BeanProperty(swap=SchemaOrSchemaArraySwap.class)
public Object getItems() {
@@ -569,7 +569,7 @@ public class Schema {
* Bean property setter: <property>items</property>.
*
* @param items The new value for the <property>items</property> property on this bean.
- * This object must be of type {@link Schema} or {@link SchemaArray}.
+ * This object must be of type {@link Schema} or {@link SchemaArray}.
* @return This object (for method chaining).
* @throws BeanRuntimeException If invalid object type passed in.
*/
@@ -767,7 +767,7 @@ public class Schema {
* Bean property getter: <property>additionalItems</property>.
*
* @return The value of the <property>additionalItems</property> property on this bean, or <jk>null</jk> if it is not set.
- * Can be either a {@link Boolean} or {@link SchemaArray} depending on what value was used to set it.
+ * Can be either a {@link Boolean} or {@link SchemaArray} depending on what value was used to set it.
*/
@BeanProperty(swap=BooleanOrSchemaArraySwap.class)
public Object getAdditionalItems() {
@@ -804,7 +804,7 @@ public class Schema {
* Bean property setter: <property>additionalItems</property>.
*
* @param additionalItems The new value for the <property>additionalItems</property> property on this bean.
- * This object must be of type {@link Boolean} or {@link SchemaArray}.
+ * This object must be of type {@link Boolean} or {@link SchemaArray}.
* @return This object (for method chaining).
* @throws BeanRuntimeException If invalid object type passed in.
*/
@@ -1025,7 +1025,7 @@ public class Schema {
* Bean property getter: <property>additionalProperties</property>.
*
* @return The value of the <property>additionalProperties</property> property on this bean, or <jk>null</jk> if it is not set.
- * Can be either a {@link Boolean} or {@link SchemaArray} depending on what value was used to set it.
+ * Can be either a {@link Boolean} or {@link SchemaArray} depending on what value was used to set it.
*/
@BeanProperty(swap=BooleanOrSchemaSwap.class)
public Object getAdditionalProperties() {
@@ -1062,7 +1062,7 @@ public class Schema {
* Bean property setter: <property>additionalProperties</property>.
*
* @param additionalProperties The new value for the <property>additionalProperties</property> property on this bean.
- * This object must be of type {@link Boolean} or {@link Schema}.
+ * This object must be of type {@link Boolean} or {@link Schema}.
* @return This object (for method chaining).
* @throws BeanRuntimeException If invalid object type passed in.
*/
@@ -1362,7 +1362,7 @@ public class Schema {
* Bean property setter: <property>$ref</property>.
*
* @param ref The new value for the <property>$ref</property> property on this bean.
- * The parameter must be a valid URI. It can be <jk>null</jk>.
+ * The parameter must be a valid URI. It can be <jk>null</jk>.
* @return This object (for method chaining).
*/
public Schema setRef(String ref) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
index 2a06e10..caa81b3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
@@ -17,7 +17,7 @@ import java.util.*;
/**
* Represents a list of {@link Schema} objects.
* <p>
- * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
public class SchemaArray extends LinkedList<Schema> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
index cdccebe..85998f3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
@@ -21,7 +21,7 @@ import org.apache.juneau.json.*;
/**
* A container for retrieving JSON {@link Schema} objects by URI.
* <p>
- * Subclasses must implement one of the following methods to load schemas from external sources:
+ * Subclasses must implement one of the following methods to load schemas from external sources:
* <ul class='spaced-list'>
* <li>{@link #getReader(URI)} - If schemas should be loaded from readers and automatically parsed.
* <li>{@link #load(URI)} - If you want control over construction of {@link Schema} objects.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
index 365d09f..124022b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
@@ -15,7 +15,7 @@ package org.apache.juneau.dto.jsonschema;
/**
* Represents a JSON property in the JSON-Schema core specification.
* <p>
- * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
public class SchemaProperty extends Schema {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java
index 42e1af5..d869a3c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java
@@ -15,7 +15,7 @@ package org.apache.juneau.dto.jsonschema;
/**
* Convenience class for representing a property that's an array of simple types.
* <p>
- * An instance of this object is equivalent to calling...
+ * An instance of this object is equivalent to calling...
*
* <p class='bcode'>
* SchemaProperty p = <jk>new</jk> SchemaProperty(name)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java
index 0daaa59..3f91548 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java
@@ -17,7 +17,7 @@ import java.net.*;
/**
* Convenience class for representing a schema reference such as <js>"{'$ref':'/url/to/ref'}"</js>.
* <p>
- * An instance of this object is equivalent to calling...
+ * An instance of this object is equivalent to calling...
*
* <p class='bcode'>
* Schema s = <jk>new</jk> Schema().setRef(uri);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index 8b36f83..7f1456f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -670,7 +670,7 @@ public class HeaderInfo extends SwaggerElement {
* See <a class="doclink" href="http://json-schema.org/latest/json-schema-validation.html#anchor76">http://json-schema.org/latest/json-schema-validation.html#anchor76</a>.
*
* @param _enum The new values to add to the <property>enum</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public HeaderInfo addEnum(Object..._enum) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
index a3d9633..82283fc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -636,7 +636,7 @@ public class Items extends SwaggerElement {
* See <a class="doclink" href="http://json-schema.org/latest/json-schema-validation.html#anchor76">http://json-schema.org/latest/json-schema-validation.html#anchor76</a>.
*
* @param _enum The new values to add to the <property>enum</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public Items addEnum(Object..._enum) {
@@ -658,7 +658,7 @@ public class Items extends SwaggerElement {
* Synonym for {@link #addEnum(Object...)}.
*
* @param _enum The new values to add to the <property>enum</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public Items _enum(Object..._enum) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index 0c1472e..8dc3e50 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -143,7 +143,7 @@ public class Operation extends SwaggerElement {
* Tags can be used for logical grouping of operations by resources or any other qualifier.
*
* @param tags The values to add for the <property>tags</property> property on this bean.
- * Ignored if <jk>null</jk>.
+ * Ignored if <jk>null</jk>.
* @return This object (for method chaining).
*/
public Operation addTags(Collection<String> tags) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 5b90235..98674b2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -905,7 +905,7 @@ public class ParameterInfo extends SwaggerElement {
* See <a class="doclink" href="http://json-schema.org/latest/json-schema-validation.html#anchor76">http://json-schema.org/latest/json-schema-validation.html#anchor76</a>.
*
* @param _enum The new values to add to the <property>enum</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
@SuppressWarnings("unchecked")
@@ -928,7 +928,7 @@ public class ParameterInfo extends SwaggerElement {
* Synonym for {@link #addEnum(Object...)}.
*
* @param _enum The new values to add to the <property>enum</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public ParameterInfo _enum(Object..._enum) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
index 0aec92f..8d84b30 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -637,7 +637,7 @@ public class SchemaInfo extends SwaggerElement {
* Bean property adder: <property>enum</property>.
*
* @param _enum The new values to add to the <property>enum</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public SchemaInfo addEnum(Object..._enum) {
@@ -659,7 +659,7 @@ public class SchemaInfo extends SwaggerElement {
* Synonym for {@link #addEnum(Object...)}.
*
* @param _enum The new values to add to the <property>enum</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public SchemaInfo _enum(Object..._enum) {
@@ -750,7 +750,7 @@ public class SchemaInfo extends SwaggerElement {
* Bean property adder: <property>enum</property>.
*
* @param allOf The new values to add to the <property>allOf</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public SchemaInfo addAllOf(Object...allOf) {
@@ -772,7 +772,7 @@ public class SchemaInfo extends SwaggerElement {
* Synonym for {@link #addAllOf(Object...)}.
*
* @param allOf The new values to add to the <property>allOf</property> property on this bean.
- * These can either be individual objects or {@link Collection Collections} of objects.
+ * These can either be individual objects or {@link Collection Collections} of objects.
* @return This object (for method chaining).
*/
public SchemaInfo allOf(Object...allOf) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/encoders/Encoder.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/encoders/Encoder.java b/juneau-core/src/main/java/org/apache/juneau/encoders/Encoder.java
index 6f7c488..933bc07 100644
--- a/juneau-core/src/main/java/org/apache/juneau/encoders/Encoder.java
+++ b/juneau-core/src/main/java/org/apache/juneau/encoders/Encoder.java
@@ -19,9 +19,9 @@ import java.io.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Used to wrap input and output streams withing compression/decompression streams.
+ * Used to wrap input and output streams withing compression/decompression streams.
* <p>
- * Encoders are registered with <code>RestServlets</code> through the <ja>@RestResource.encoders()</ja> annotation.
+ * Encoders are registered with <code>RestServlets</code> through the <ja>@RestResource.encoders()</ja> annotation.
*/
public abstract class Encoder {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/encoders/EncoderGroup.java b/juneau-core/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
index 4f437c4..4bf4e03 100644
--- a/juneau-core/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
@@ -26,20 +26,20 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Maintains a set of encoders and the codings that they can handle.
+ * Maintains a set of encoders and the codings that they can handle.
* <p>
- * The {@link #getEncoderMatch(String)} and {@link #getEncoder(String)} methods are then
- * used to find appropriate encoders for specific <code>Accept-Encoding</code>
- * and <code>Content-Encoding</code> header values.
+ * The {@link #getEncoderMatch(String)} and {@link #getEncoder(String)} methods are then
+ * used to find appropriate encoders for specific <code>Accept-Encoding</code>
+ * and <code>Content-Encoding</code> header values.
*
* <h6 class='topic'>Match ordering</h6>
* <p>
- * Encoders are matched against <code>Accept-Encoding</code> strings in the order they exist in this group.
+ * Encoders are matched against <code>Accept-Encoding</code> strings in the order they exist in this group.
* <p>
- * Adding new entries will cause the entries to be prepended to the group.
- * This allows for previous encoders to be overridden through subsequent calls.
+ * Adding new entries will cause the entries to be prepended to the group.
+ * This allows for previous encoders to be overridden through subsequent calls.
* <p>
- * For example, calling <code>g.append(E1.<jk>class</jk>,E2.<jk>class</jk>).append(E3.<jk>class</jk>,E4.<jk>class</jk>)</code>
+ * For example, calling <code>g.append(E1.<jk>class</jk>,E2.<jk>class</jk>).append(E3.<jk>class</jk>,E4.<jk>class</jk>)</code>
* will result in the order <code>E3, E4, E1, E2</code>.
*
* <h5 class='section'>Example:</h5>
@@ -122,9 +122,9 @@ public final class EncoderGroup extends Lockable {
* Returns the coding string for the matching encoder that can handle the specified <code>Accept-Encoding</code>
* or <code>Content-Encoding</code> header value.
* <p>
- * Returns <jk>null</jk> if no encoders can handle it.
+ * Returns <jk>null</jk> if no encoders can handle it.
* <p>
- * This method is fully compliant with the RFC2616/14.3 and 14.11 specifications.
+ * This method is fully compliant with the RFC2616/14.3 and 14.11 specifications.
*
* @param acceptEncoding The <code>Accept-Encoding</code> or <code>Content-Encoding</code> value.
* @return The coding value (e.g. <js>"gzip"</js>).
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index ac79d08..6428d8a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -26,18 +26,18 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/html</code>
+ * Handles <code>Accept</code> types: <code>text/html</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/html</code>
+ * Produces <code>Content-Type</code> types: <code>text/html</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Same as {@link HtmlSerializer}, except wraps the response in <code><xt><html></code>, <code><xt><head></code>,
+ * Same as {@link HtmlSerializer}, except wraps the response in <code><xt><html></code>, <code><xt><head></code>,
* and <code><xt><body></code> tags so that it can be rendered in a browser.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link HtmlDocSerializerContext}
* <li>{@link BeanContext}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java
index 57f10db..56f6fb6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java
@@ -19,8 +19,8 @@ import org.apache.juneau.*;
/**
* Properties associated with the {@link HtmlDocSerializer} class.
* <p>
- * These are typically specified via <ja>@RestResource.properties()</ja> and <ja>@RestMethod.properties()</ja> annotations,
- * although they can also be set programmatically via the <code>RestResponse.setProperty()</code> method.
+ * These are typically specified via <ja>@RestResource.properties()</ja> and <ja>@RestMethod.properties()</ja> annotations,
+ * although they can also be set programmatically via the <code>RestResponse.setProperty()</code> method.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -35,10 +35,9 @@ import org.apache.juneau.*;
* <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault {
* </p>
* <p>
- * The <code>$L{...}</code> variable represent localized strings pulled from the resource bundle identified by the <code>messages</code> annotation.
- * These variables are replaced at runtime based on the HTTP request locale.
- * Several built-in runtime variable types are defined, and the API can be extended to include user-defined variables.
- * </p>
+ * The <code>$L{...}</code> variable represent localized strings pulled from the resource bundle identified by the <code>messages</code> annotation.
+ * These variables are replaced at runtime based on the HTTP request locale.
+ * Several built-in runtime variable types are defined, and the API can be extended to include user-defined variables.
*
* <h5 class='section'>Inherited configurable properties:</h5>
* <ul class='javahierarchy'>
@@ -66,7 +65,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext {
*
* <h5 class='section'>Example:</h5>
* <p>
- * The <code>AddressBookResource</code> sample class uses this property...
+ * The <code>AddressBookResource</code> sample class uses this property...
* </p>
* <p class='bcode'>
* <ja>@RestResource</ja>(
@@ -103,7 +102,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext {
*
* <h5 class='section'>Example:</h5>
* <p>
- * The <code>AddressBookResource</code> sample class uses this property...
+ * The <code>AddressBookResource</code> sample class uses this property...
* </p>
* <p class='bcode'>
* <ja>@RestResource</ja>(
@@ -123,7 +122,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext {
* <p>
* ...to produce this description on the HTML page...
* </p>
- * <img class='bordered' src='doc-files/HTML_DESCRIPTION.png'>
+ * <img class='bordered' src='doc-files/HTML_DESCRIPTION.png'>
*/
public static final String HTMLDOC_description = "HtmlSerializer.description";
@@ -139,19 +138,19 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext {
* <p>
* Adds a list of hyperlinks immediately under the title and description but above the content of the page.
* <p>
- * This can be used to provide convenient hyperlinks when viewing the REST interface from a browser.
+ * This can be used to provide convenient hyperlinks when viewing the REST interface from a browser.
* <p>
- * The value is a JSON object string where the keys are anchor text and the values are URLs.
+ * The value is a JSON object string where the keys are anchor text and the values are URLs.
* <p>
- * Relative URLs are considered relative to the servlet path.
- * For example, if the servlet path is <js>"http://localhost/myContext/myServlet"</js>, and the
- * URL is <js>"foo"</js>, the link becomes <js>"http://localhost/myContext/myServlet/foo"</js>.
- * Absolute (<js>"/myOtherContext/foo"</js>) and fully-qualified (<js>"http://localhost2/foo"</js>) URLs
- * can also be used.
+ * Relative URLs are considered relative to the servlet path.
+ * For example, if the servlet path is <js>"http://localhost/myContext/myServlet"</js>, and the
+ * URL is <js>"foo"</js>, the link becomes <js>"http://localhost/myContext/myServlet/foo"</js>.
+ * Absolute (<js>"/myOtherContext/foo"</js>) and fully-qualified (<js>"http://localhost2/foo"</js>) URLs
+ * can also be used.
*
* <h5 class='section'>Example:</h5>
* <p>
- * The <code>AddressBookResource</code> sample class uses this property...
+ * The <code>AddressBookResource</code> sample class uses this property...
* </p>
* <p class='bcode'>
* <ja>@RestResource</ja>(
@@ -186,8 +185,8 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext {
* <p>
* Adds a link to the specified stylesheet URL.
* <p>
- * If not specified, defaults to the built-in stylesheet located at <js>"style.css"</js>.
- * Note that this stylesheet is controlled by the <code><ja>@RestResource</ja>.stylesheet()</code> annotation.
+ * If not specified, defaults to the built-in stylesheet located at <js>"style.css"</js>.
+ * Note that this stylesheet is controlled by the <code><ja>@RestResource</ja>.stylesheet()</code> annotation.
*/
public static final String HTMLDOC_cssUrl = "HtmlDocSerializer.cssUrl";
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index f270030..b4745cd 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -25,11 +25,9 @@ import org.apache.juneau.serializer.*;
/**
* Context object that lives for the duration of a single serialization of {@link HtmlSerializer} and its subclasses.
* <p>
- * See {@link SerializerContext} for details.
- * </p>
+ * See {@link SerializerContext} for details.
* <p>
- * This class is NOT thread safe. It is meant to be discarded after one-time use.
- * </p>
+ * This class is NOT thread safe. It is meant to be discarded after one-time use.
*/
public final class HtmlDocSerializerSession extends HtmlSerializerSession {
@@ -42,15 +40,15 @@ public final class HtmlDocSerializerSession extends HtmlSerializerSession {
* 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>).
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlLink.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlLink.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlLink.java
index e26e135..08c1808 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlLink.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlLink.java
@@ -20,11 +20,11 @@ import java.lang.annotation.*;
/**
* Used in conjunction with the {@link HtmlSerializer} class to define hyperlinks.
* <p>
- * This annotation is applied to classes.
+ * This annotation is applied to classes.
* <p>
- * Annotation that can be used to specify that a class has a URL associated with it.
+ * Annotation that can be used to specify that a class has a URL associated with it.
* <p>
- * When rendered using the {@link org.apache.juneau.html.HtmlSerializer HtmlSerializer} class, this class will get rendered as a hyperlink like so...
+ * When rendered using the {@link org.apache.juneau.html.HtmlSerializer HtmlSerializer} class, this class will get rendered as a hyperlink like so...
* <p class='code'>
* <xt><a</xt> <xa>href</xa>=<xs>'hrefProperty'</xs><xt>></xt>nameProperty<xt></a></xt>
* </p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
index 39705ca..92eb48f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -34,17 +34,17 @@ import org.apache.juneau.xml.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Content-Type</code> types: <code>text/html</code>
+ * Handles <code>Content-Type</code> types: <code>text/html</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * See the {@link HtmlSerializer} class for a description of the HTML generated.
+ * See the {@link HtmlSerializer} class for a description of the HTML generated.
* <p>
- * This class is used primarily for automated testing of the {@link HtmlSerializer} class.
+ * This class is used primarily for automated testing of the {@link HtmlSerializer} class.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link HtmlSerializerContext}
* </ul>
@@ -59,8 +59,8 @@ public final class HtmlParser extends XmlParser {
/*
* Reads anything starting at the current event.
* <p>
- * Precondition: Must be pointing at outer START_ELEMENT.
- * Postcondition: Pointing at outer END_ELEMENT.
+ * Precondition: Must be pointing at outer START_ELEMENT.
+ * Postcondition: Pointing at outer END_ELEMENT.
*/
private <T> T parseAnything(HtmlParserSession session, ClassMeta<T> eType, XMLStreamReader r, Object outer, boolean isRoot, BeanPropertyMeta pMeta) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParserSession.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index f885578..5ebef14 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -42,7 +42,7 @@ public final class HtmlParserSession extends XmlParserSession {
* 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>
@@ -52,13 +52,13 @@ public final class HtmlParserSession extends XmlParserSession {
* <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>).
*/
public HtmlParserSession(HtmlParserContext 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/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index f5b2fa4..0223623 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -27,19 +27,19 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/html+schema</code>
+ * Handles <code>Accept</code> types: <code>text/html+schema</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/html</code>
+ * Produces <code>Content-Type</code> types: <code>text/html</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Essentially the same as {@link HtmlSerializer}, except serializes the POJO metamodel
- * instead of the model itself.
+ * Essentially the same as {@link HtmlSerializer}, except serializes the POJO metamodel
+ * instead of the model itself.
* <p>
- * Produces output that describes the POJO metamodel similar to an XML schema document.
+ * Produces output that describes the POJO metamodel similar to an XML schema document.
* <p>
- * The easiest way to create instances of this class is through the {@link HtmlSerializer#getSchemaSerializer()},
- * which will create a schema serializer with the same settings as the originating serializer.
+ * The easiest way to create instances of this class is through the {@link HtmlSerializer#getSchemaSerializer()},
+ * which will create a schema serializer with the same settings as the originating serializer.
*/
@Produces(value="text/html+schema", contentType="text/html")
public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index e5d4589..f66d57f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -31,13 +31,13 @@ import org.apache.juneau.xml.annotation.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/html</code>
+ * Handles <code>Accept</code> types: <code>text/html</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/html</code>
+ * Produces <code>Content-Type</code> types: <code>text/html</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * The conversion is as follows...
+ * The conversion is as follows...
* <ul class='spaced-list'>
* <li>{@link Map Maps} (e.g. {@link HashMap}, {@link TreeMap}) and beans are converted to HTML tables with 'key' and 'value' columns.
* <li>{@link Collection Collections} (e.g. {@link HashSet}, {@link LinkedList}) and Java arrays are converted to HTML ordered lists.
@@ -45,21 +45,21 @@ import org.apache.juneau.xml.annotation.*;
* <li>Everything else is converted to text.
* </ul>
* <p>
- * This serializer provides several serialization options. Typically, one of the predefined <jsf>DEFAULT</jsf> serializers will be sufficient.
- * However, custom serializers can be constructed to fine-tune behavior.
+ * This serializer provides several serialization options. Typically, one of the predefined <jsf>DEFAULT</jsf> serializers will be sufficient.
+ * However, custom serializers can be constructed to fine-tune behavior.
* <p>
- * The {@link HtmlLink} annotation can be used on beans to add hyperlinks to the output.
+ * The {@link HtmlLink} annotation can be used on beans to add hyperlinks to the output.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul class='spaced-list'>
* <li>{@link HtmlSerializerContext}
* </ul>
*
* <h6 class='topic'>Behavior-specific subclasses</h6>
* <p>
- * The following direct subclasses are provided for convenience:
+ * The following direct subclasses are provided for convenience:
* <ul class='spaced-list'>
* <li>{@link Sq} - Default serializer, single quotes.
* <li>{@link SqReadable} - Default serializer, single quotes, whitespace added.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 992067e..1ce2efc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -51,15 +51,15 @@ public class HtmlSerializerSession extends XmlSerializerSession {
* 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 HtmlSerializerSession(HtmlSerializerContext 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/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index 168b648..7efdfa0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -23,14 +23,14 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/html+stripped</code>
+ * Handles <code>Accept</code> types: <code>text/html+stripped</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/html</code>
+ * Produces <code>Content-Type</code> types: <code>text/html</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Produces the same output as {@link HtmlDocSerializer}, but without the header and body tags and page title and description.
- * Used primarily for JUnit testing the {@link HtmlDocSerializer} class.
+ * Produces the same output as {@link HtmlDocSerializer}, but without the header and body tags and page title and description.
+ * Used primarily for JUnit testing the {@link HtmlDocSerializer} class.
*/
@Produces(value="text/html+stripped",contentType="text/html")
public class HtmlStrippedDocSerializer extends HtmlSerializer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
index b55a2ab..d8f18c1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
@@ -396,8 +396,8 @@ public abstract class ConfigFile implements Map<String,Section> {
/**
* Adds or replaces an entry with the specified key with a POJO serialized to a string using the registered serializer.
- * <p>
- * Equivalent to calling <code>put(key, value, isEncoded(key))</code>.
+ * <p>
+ * Equivalent to calling <code>put(key, value, isEncoded(key))</code>.
*
* @param key The key. See {@link #getString(String)} for a description of the key.
* @param value The new value POJO.
@@ -423,7 +423,7 @@ public abstract class ConfigFile implements Map<String,Section> {
*
* @param key The key. See {@link #getString(String)} for a description of the key.
* @param value The new value.
- * @param encoded If <jk>true</jk>, value is encoded by the registered encoder when the config file is persisted to disk.
+ * @param encoded If <jk>true</jk>, value is encoded by the registered encoder when the config file is persisted to disk.
* @return The previous value, or <jk>null</jk> if the section or key did not previously exist.
* @throws SerializeException If serializer could not serialize the value or if a serializer is not registered with this config file.
* @throws UnsupportedOperationException If config file is read only.
@@ -483,7 +483,7 @@ public abstract class ConfigFile implements Map<String,Section> {
/**
* Copies the entries in a section to the specified bean by calling the public setters on that bean.
*
- * @param sectionName The section name to write from.
+ * @param sectionName The section name to write from.
* @param bean The bean to set the properties on.
* @param ignoreUnknownProperties If <jk>true</jk>, don't throw an {@link IllegalArgumentException} if this section
* contains a key that doesn't correspond to a setter method.
@@ -542,7 +542,7 @@ public abstract class ConfigFile implements Map<String,Section> {
/**
* Converts this config file section to the specified bean instance.
*
- * @param sectionName The section name to write from.
+ * @param sectionName The section name to write from.
* @param c The bean class to create.
* @param ignoreUnknownProperties If <jk>false</jk>, throws a {@link ParseException} if
* the section contains an entry that isn't a bean property name.
@@ -716,9 +716,9 @@ public abstract class ConfigFile implements Map<String,Section> {
/**
* Returns a wrapped instance of this config file where calls to getters have their values
- * first resolved by a default {@link VarResolver}.
+ * first resolved by a default {@link VarResolver}.
*
- * The default {@link VarResolver} is registered with the following {@link Var StringVars}:
+ * The default {@link VarResolver} is registered with the following {@link Var StringVars}:
* <ul class='spaced-list'>
* <li><code>$S{key}</code>,<code>$S{key,default}</code> - System properties.
* <li><code>$E{key}</code>,<code>$E{key,default}</code> - Environment variables.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
index 8982b81..a4b2f89 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
@@ -59,17 +59,17 @@ public final class ConfigFileImpl extends ConfigFile {
* If file does not initially exist, this object will start off empty.
*
* @param file The INI file on disk.
- * If <jk>null</jk>, create an in-memory config file.
+ * If <jk>null</jk>, create an in-memory config file.
* @param readOnly Make this configuration file read-only.
- * Attempting to set any values on this config file will cause {@link UnsupportedOperationException} to be thrown.
- * @param encoder The encoder to use for encoding sensitive values in this configuration file.
- * If <jk>null</jk>, defaults to {@link XorEncoder#INSTANCE}.
- * @param serializer The serializer to use for serializing POJOs in the {@link #put(String, Object)} method.
- * If <jk>null</jk>, defaults to {@link JsonSerializer#DEFAULT}.
- * @param parser The parser to use for parsing POJOs in the {@link #getObject(Class,String)} method.
- * If <jk>null</jk>, defaults to {@link JsonParser#DEFAULT}.
+ * Attempting to set any values on this config file will cause {@link UnsupportedOperationException} to be thrown.
+ * @param encoder The encoder to use for encoding sensitive values in this configuration file.
+ * If <jk>null</jk>, defaults to {@link XorEncoder#INSTANCE}.
+ * @param serializer The serializer to use for serializing POJOs in the {@link #put(String, Object)} method.
+ * If <jk>null</jk>, defaults to {@link JsonSerializer#DEFAULT}.
+ * @param parser The parser to use for parsing POJOs in the {@link #getObject(Class,String)} method.
+ * If <jk>null</jk>, defaults to {@link JsonParser#DEFAULT}.
* @param charset The charset on the files.
- * If <jk>null</jk>, defaults to {@link Charset#defaultCharset()}.
+ * If <jk>null</jk>, defaults to {@link Charset#defaultCharset()}.
* @throws IOException
*/
public ConfigFileImpl(File file, boolean readOnly, Encoder encoder, WriterSerializer serializer, ReaderParser parser, Charset charset) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/ArrayUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/ArrayUtils.java b/juneau-core/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index 0bd765a..12c7614 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -113,7 +113,7 @@ public final class ArrayUtils {
/**
* Converts the specified array to a <code>Set</code>.
* <p>
- * The order of the entries in the set are the same as the array.
+ * The order of the entries in the set are the same as the array.
*
* @param <T> The entry type of the array.
* @param array The array being wrapped in a <code>Set</code> interface.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java b/juneau-core/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
index 940eda3..e490535 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
@@ -20,8 +20,8 @@ import org.apache.juneau.*;
* Represents a wrapped {@link BeanMap} where property values can be overridden, removed, or reordered
* without affecting the underlying bean.
* <p>
- * Provides the {@link #filterKeys(List)} method for specifying the keys to keep in the bean map
- * and in what order they should appear.
+ * Provides the {@link #filterKeys(List)} method for specifying the keys to keep in the bean map
+ * and in what order they should appear.
*
* @param <T> The class type of the wrapped bean.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java b/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java
index c8b8f7a..0cc048c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/HashCode.java
@@ -15,7 +15,7 @@ package org.apache.juneau.internal;
/**
* Utility class for generating integer hash codes.
* <p>
- * General usage:
+ * General usage:
* <p class='bcode'>
* int hashCode = new HashCode().add("foobar").add(myobject).add(123).get();
* </p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java b/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java
index 6821892..254fac9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/IOUtils.java
@@ -177,9 +177,9 @@ public final class IOUtils {
/**
* Reads the specified input into a {@link String} until the end of the input is reached.
* <p>
- * The {@code Reader} is automatically closed.
+ * The {@code Reader} is automatically closed.
* <p>
- * If the {@code Reader} is not an instance of a {@code BufferedReader}, then it gets wrapped in a {@code BufferedReader}.
+ * If the {@code Reader} is not an instance of a {@code BufferedReader}, then it gets wrapped in a {@code BufferedReader}.
*
* @param in The input reader.
* @param length Specify a positive number if the length of the input is known.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java b/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
index b2a1e29..021e4c3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
@@ -56,12 +56,12 @@ public class JuneauLogger extends java.util.logging.Logger {
*
* @param forClass The class to create a logger for.
* @param resourceBundleName The name of the resource bundle.
- * Can be any of the following formats:
- * <ol>
- * <li>An absolute path. E.g. <js>"com/foo/nls/Messages"</js>.
- * <li>A path relative to the package of the class. E.g. <js>"nls/Messages"</js>.
- * </ol>
- * Both <js>'.'</js> and <js>'/'</js> can be used as path delimiters.
+ * Can be any of the following formats:
+ * <ol>
+ * <li>An absolute path. E.g. <js>"com/foo/nls/Messages"</js>.
+ * <li>A path relative to the package of the class. E.g. <js>"nls/Messages"</js>.
+ * </ol>
+ * Both <js>'.'</js> and <js>'/'</js> can be used as path delimiters.
* @return A new <l>Logger</l>.
*/
public static JuneauLogger getLogger(Class<?> forClass, String resourceBundleName) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/ReflectionUtils.java b/juneau-core/src/main/java/org/apache/juneau/internal/ReflectionUtils.java
index 06f6c33..0a0c602 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/ReflectionUtils.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/ReflectionUtils.java
@@ -54,7 +54,7 @@ public final class ReflectionUtils {
/**
* Returns the specified annotation only if it's been declared on the specified class.
* <p>
- * More efficient than calling {@link Class#getAnnotation(Class)} since it doesn't
+ * More efficient than calling {@link Class#getAnnotation(Class)} since it doesn't
* recursively look for the class up the parent chain.
*
* @param <T> The annotation class type.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/SimpleMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/SimpleMap.java b/juneau-core/src/main/java/org/apache/juneau/internal/SimpleMap.java
index 287c2df..93d9b74 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/SimpleMap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/SimpleMap.java
@@ -22,11 +22,11 @@ import java.util.*;
* An instance of a <code>Map</code> where the keys and values
* are simple <code>String[]</code> and <code>Object[]</code> arrays.
* <p>
- * Typically more efficient than <code>HashMaps</code> for small maps (e.g. <10 entries).
+ * Typically more efficient than <code>HashMaps</code> for small maps (e.g. <10 entries).
* <p>
- * Does not support adding or removing entries.
+ * Does not support adding or removing entries.
* <p>
- * Setting values overwrites the value on the underlying value array.
+ * Setting values overwrites the value on the underlying value array.
*/
public final class SimpleMap extends AbstractMap<String,Object> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java b/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java
index 0831df4..8d8fe73 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -52,18 +52,18 @@ public final class StringUtils {
*
* @param r The reader to parse the string from.
* @param type The number type to created. <br>
- * Can be any of the following:
- * <ul>
- * <li> Integer
- * <li> Double
- * <li> Float
- * <li> Long
- * <li> Short
- * <li> Byte
- * <li> BigInteger
- * <li> BigDecimal
- * </ul>
- * If <jk>null</jk>, uses the best guess.
+ * Can be any of the following:
+ * <ul>
+ * <li> Integer
+ * <li> Double
+ * <li> Float
+ * <li> Long
+ * <li> Short
+ * <li> Byte
+ * <li> BigInteger
+ * <li> BigDecimal
+ * </ul>
+ * If <jk>null</jk>, uses the best guess.
* @throws IOException If a problem occurred trying to read from the reader.
* @return The parsed number.
* @throws Exception
@@ -99,18 +99,18 @@ public final class StringUtils {
*
* @param s The string to parse the number from.
* @param type The number type to created. <br>
- * Can be any of the following:
- * <ul>
- * <li> Integer
- * <li> Double
- * <li> Float
- * <li> Long
- * <li> Short
- * <li> Byte
- * <li> BigInteger
- * <li> BigDecimal
- * </ul>
- * If <jk>null</jk>, uses the best guess.
+ * Can be any of the following:
+ * <ul>
+ * <li> Integer
+ * <li> Double
+ * <li> Float
+ * <li> Long
+ * <li> Short
+ * <li> Byte
+ * <li> BigInteger
+ * <li> BigDecimal
+ * </ul>
+ * If <jk>null</jk>, uses the best guess.
* @return The parsed number.
* @throws ParseException
*/
@@ -854,8 +854,8 @@ public final class StringUtils {
* Nested variables are supported in both the input string and map values.
* <p>
* If the map does not contain the specified value, the variable is not replaced.
- * <p>
- * <jk>null</jk> values in the map are treated as blank strings.
+ * <p>
+ * <jk>null</jk> values in the map are treated as blank strings.
*
* @param s The string containing variables to replace.
* @param m The map containing the variable values.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java b/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java
index d97e76e..7e15972 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/Utils.java
@@ -27,8 +27,8 @@ public class Utils {
* <code>0</code> if Integer #1 numerically less
* than Integer #2; and a value greater
* than <code>0</code> if Integer #1 is numerically
- * greater than Integer #2 (signed
- * comparison).
+ * greater than Integer #2 (signed
+ * comparison).
*/
public static final int compare(int i1, int i2) {
return (i1<i2 ? -1 : (i1==i2 ? 0 : 1));
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/Version.java b/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
index 33530c7..942043e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/Version.java
@@ -34,7 +34,7 @@ public class Version {
* <li><js>"0.1"</js>
* <li><js>".1"</js>
* </ul>
- * Any parts that are not numeric are interpreted as {@link Integer#MAX_VALUE}
+ * Any parts that are not numeric are interpreted as {@link Integer#MAX_VALUE}
*/
public Version(String versionString) {
if (isEmpty(versionString))
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/internal/VersionRange.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/VersionRange.java b/juneau-core/src/main/java/org/apache/juneau/internal/VersionRange.java
index 4c61e88..3321f2d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/VersionRange.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/VersionRange.java
@@ -15,7 +15,7 @@ package org.apache.juneau.internal;
/**
* Represents an OSGi-style version range like <js>"1.2"</js> or <js>"[1.0,2.0)"</js>.
* <p>
- * The range can be any of the following formats:
+ * The range can be any of the following formats:
* <ul>
* <li><js>"[0,1.0)"</js> = Less than 1.0. 1.0 and 1.0.0 does not match.
* <li><js>"[0,1.0]"</js> = Less than or equal to 1.0. Note that 1.0.1 will match.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectParser.java b/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectParser.java
index 88cc42b..92181bc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectParser.java
@@ -23,7 +23,7 @@ import org.apache.juneau.parser.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Consumes <code>Content-Type</code> types: <code>application/x-java-serialized-object</code>
+ * Consumes <code>Content-Type</code> types: <code>application/x-java-serialized-object</code>
*/
@Consumes("application/x-java-serialized-object")
public final class JavaSerializedObjectParser extends InputStreamParser {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectSerializer.java b/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectSerializer.java
index 1e1e8e8..4cfde6a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/jso/JavaSerializedObjectSerializer.java
@@ -22,9 +22,9 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>application/x-java-serialized-object</code>
+ * Handles <code>Accept</code> types: <code>application/x-java-serialized-object</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>application/x-java-serialized-object</code>
+ * Produces <code>Content-Type</code> types: <code>application/x-java-serialized-object</code>
*/
@Produces("application/x-java-serialized-object")
public final class JavaSerializedObjectSerializer extends OutputStreamSerializer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
index ac4a096..d8197fc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -27,24 +27,24 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Content-Type</code> types: <code>application/json, text/json</code>
+ * Handles <code>Content-Type</code> types: <code>application/json, text/json</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * This parser uses a state machine, which makes it very fast and efficient. It parses JSON in about 70% of the
+ * This parser uses a state machine, which makes it very fast and efficient. It parses JSON in about 70% of the
* time that it takes the built-in Java DOM parsers to parse equivalent XML.
* <p>
- * This parser handles all valid JSON syntax.
- * In addition, when strict mode is disable, the parser also handles the following:
+ * This parser handles all valid JSON syntax.
+ * In addition, when strict mode is disable, the parser also handles the following:
* <ul class='spaced-list'>
* <li> Javascript comments (both {@code /*} and {@code //}) are ignored.
* <li> Both single and double quoted strings.
* <li> Automatically joins concatenated strings (e.g. <code><js>"aaa"</js> + <js>'bbb'</js></code>).
* <li> Unquoted attributes.
* </ul>
- * Also handles negative, decimal, hexadecimal, octal, and double numbers, including exponential notation.
+ * Also handles negative, decimal, hexadecimal, octal, and double numbers, including exponential notation.
* <p>
- * This parser handles the following input, and automatically returns the corresponding Java class.
+ * This parser handles the following input, and automatically returns the corresponding Java class.
* <ul class='spaced-list'>
* <li> JSON objects (<js>"{...}"</js>) are converted to {@link ObjectMap ObjectMaps}. <br>
* <b>Note:</b> If a <code><xa>_type</xa>=<xs>'xxx'</xs></code> attribute is specified on the object, then an attempt is made to convert the object
@@ -59,24 +59,24 @@ import org.apache.juneau.transform.*;
* <li> Input consisting of only whitespace or JSON comments are converted to <jk>null</jk>.
* </ul>
* <p>
- * Input can be any of the following:<br>
- * <ul class='spaced-list'>
- * <li> <js>"{...}"</js> - Converted to a {@link ObjectMap} or an instance of a Java bean if a <xa>_type</xa> attribute is present.
- * <li> <js>"[...]"</js> - Converted to a {@link ObjectList}.
- * <li> <js>"123..."</js> - Converted to a {@link Number} (either {@link Integer}, {@link Long}, {@link Float}, or {@link Double}).
- * <li> <js>"true"</js>/<js>"false"</js> - Converted to a {@link Boolean}.
- * <li> <js>"null"</js> - Returns <jk>null</jk>.
- * <li> <js>"'xxx'"</js> - Converted to a {@link String}.
- * <li> <js>"\"xxx\""</js> - Converted to a {@link String}.
- * <li> <js>"'xxx' + \"yyy\""</js> - Converted to a concatenated {@link String}.
- * </ul>
- * <p>
- * TIP: If you know you're parsing a JSON object or array, it can be easier to parse it using the {@link ObjectMap#ObjectMap(CharSequence) ObjectMap(CharSequence)}
- * or {@link ObjectList#ObjectList(CharSequence) ObjectList(CharSequence)} constructors instead of using this class. The end result should be the same.
+ * Input can be any of the following:<br>
+ * <ul class='spaced-list'>
+ * <li> <js>"{...}"</js> - Converted to a {@link ObjectMap} or an instance of a Java bean if a <xa>_type</xa> attribute is present.
+ * <li> <js>"[...]"</js> - Converted to a {@link ObjectList}.
+ * <li> <js>"123..."</js> - Converted to a {@link Number} (either {@link Integer}, {@link Long}, {@link Float}, or {@link Double}).
+ * <li> <js>"true"</js>/<js>"false"</js> - Converted to a {@link Boolean}.
+ * <li> <js>"null"</js> - Returns <jk>null</jk>.
+ * <li> <js>"'xxx'"</js> - Converted to a {@link String}.
+ * <li> <js>"\"xxx\""</js> - Converted to a {@link String}.
+ * <li> <js>"'xxx' + \"yyy\""</js> - Converted to a concatenated {@link String}.
+ * </ul>
+ * <p>
+ * TIP: If you know you're parsing a JSON object or array, it can be easier to parse it using the {@link ObjectMap#ObjectMap(CharSequence) ObjectMap(CharSequence)}
+ * or {@link ObjectList#ObjectList(CharSequence) ObjectList(CharSequence)} constructors instead of using this class. The end result should be the same.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link JsonParserContext}
* </ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/json/JsonParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 11acf28..6ce9d20 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -33,23 +33,23 @@ public final class JsonParserSession 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>
- * <li>{@link Reader}
- * <li>{@link CharSequence}
- * <li>{@link InputStream} containing UTF-8 encoded text.
- * <li>{@link File} containing system encoded text.
- * </ul>
+ * <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.
+ * 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>).
*/
public JsonParserSession(JsonParserContext 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/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 54aa643..91c4d72 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -26,13 +26,13 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>application/json+schema, text/json+schema</code>
+ * Handles <code>Accept</code> types: <code>application/json+schema, text/json+schema</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>application/json</code>
+ * Produces <code>Content-Type</code> types: <code>application/json</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Produces the JSON-schema for the JSON produced by the {@link JsonSerializer} class with the same properties.
+ * Produces the JSON-schema for the JSON produced by the {@link JsonSerializer} class with the same properties.
*/
@Produces(value="application/json+schema,text/json+schema",contentType="application/json")
public final class JsonSchemaSerializer extends JsonSerializer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
index cf74e06..35c2b05 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -27,34 +27,34 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>application/json, text/json</code>
+ * Handles <code>Accept</code> types: <code>application/json, text/json</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>application/json</code>
+ * Produces <code>Content-Type</code> types: <code>application/json</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * The conversion is as follows...
- * <ul class='spaced-list'>
- * <li>Maps (e.g. {@link HashMap HashMaps}, {@link TreeMap TreeMaps}) are converted to JSON objects.
- * <li>Collections (e.g. {@link HashSet HashSets}, {@link LinkedList LinkedLists}) and Java arrays are converted to JSON arrays.
- * <li>{@link String Strings} are converted to JSON strings.
- * <li>{@link Number Numbers} (e.g. {@link Integer}, {@link Long}, {@link Double}) are converted to JSON numbers.
- * <li>{@link Boolean Booleans} are converted to JSON booleans.
- * <li>{@code nulls} are converted to JSON nulls.
- * <li>{@code arrays} are converted to JSON arrays.
- * <li>{@code beans} are converted to JSON objects.
- * </ul>
+ * The conversion is as follows...
+ * <ul class='spaced-list'>
+ * <li>Maps (e.g. {@link HashMap HashMaps}, {@link TreeMap TreeMaps}) are converted to JSON objects.
+ * <li>Collections (e.g. {@link HashSet HashSets}, {@link LinkedList LinkedLists}) and Java arrays are converted to JSON arrays.
+ * <li>{@link String Strings} are converted to JSON strings.
+ * <li>{@link Number Numbers} (e.g. {@link Integer}, {@link Long}, {@link Double}) are converted to JSON numbers.
+ * <li>{@link Boolean Booleans} are converted to JSON booleans.
+ * <li>{@code nulls} are converted to JSON nulls.
+ * <li>{@code arrays} are converted to JSON arrays.
+ * <li>{@code beans} are converted to JSON objects.
+ * </ul>
* <p>
- * The types above are considered "JSON-primitive" object types. Any non-JSON-primitive object types are transformed
- * into JSON-primitive object types through {@link org.apache.juneau.transform.PojoSwap PojoSwaps} associated through the {@link CoreApi#addPojoSwaps(Class...)}
- * method. Several default transforms are provided for transforming Dates, Enums, Iterators, etc...
+ * The types above are considered "JSON-primitive" object types. Any non-JSON-primitive object types are transformed
+ * into JSON-primitive object types through {@link org.apache.juneau.transform.PojoSwap PojoSwaps} associated through the {@link CoreApi#addPojoSwaps(Class...)}
+ * method. Several default transforms are provided for transforming Dates, Enums, Iterators, etc...
* <p>
- * This serializer provides several serialization options. Typically, one of the predefined DEFAULT serializers will be sufficient.
- * However, custom serializers can be constructed to fine-tune behavior.
+ * This serializer provides several serialization options. Typically, one of the predefined DEFAULT serializers will be sufficient.
+ * However, custom serializers can be constructed to fine-tune behavior.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link JsonSerializerContext}
* <li>{@link SerializerContext}
@@ -63,7 +63,7 @@ import org.apache.juneau.transform.*;
*
* <h6 class='topic'>Behavior-specific subclasses</h6>
* <p>
- * The following direct subclasses are provided for convenience:
+ * The following direct subclasses are provided for convenience:
* <ul class='spaced-list'>
* <li>{@link Simple} - Default serializer, single quotes, simple mode.
* <li>{@link SimpleReadable} - Default serializer, single quotes, simple mode, with whitespace.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index ebe569a..ec5498f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -36,15 +36,15 @@ public final class JsonSerializerSession 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 JsonSerializerSession(JsonSerializerContext 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/src/main/java/org/apache/juneau/json/JsonWriter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonWriter.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonWriter.java
index 093a4f0..38b923a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonWriter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonWriter.java
@@ -77,16 +77,6 @@ public final class JsonWriter extends SerializerWriter {
* @throws IOException Should never happen.
*/
public JsonWriter stringValue(String s) throws IOException {
- /*
- * Fixes up a Java string so that it can be used as a JSON string.<br>
- * Does the following:<br>
- * <ul>
- * <li> Replaces {@code \r?\n} with {@code \\n}<br>
- * <li> Replaces {@code \t} with {@code \\t}<br>
- * <li> Replaces {@code '} with {@code \\'}<br>
- * <li> Replaces {@code "} with {@code \\"}<br>
- * </ul>
- */
if (s == null)
return this;
boolean doConvert = false;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/json/annotation/Json.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/annotation/Json.java b/juneau-core/src/main/java/org/apache/juneau/json/annotation/Json.java
index f8ee5d0..3a361ce 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/annotation/Json.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/annotation/Json.java
@@ -20,9 +20,9 @@ import java.lang.annotation.*;
/**
* Annotation for specifying various JSON options for the JSON serializers and parsers.
* <p>
- * Can be applied to Java types.
+ * Can be applied to Java types.
* <p>
- * Can be used for the following:
+ * Can be used for the following:
* <ul class='spaced-list'>
* <li>Wrap bean instances inside wrapper object (e.g. <code>{'wrapperAttr':bean}</code>).
* </ul>
@@ -36,9 +36,9 @@ public @interface Json {
/**
* Wraps beans in a JSON object with the specified attribute name.
* <p>
- * Applies only to {@link ElementType#TYPE}.
+ * Applies only to {@link ElementType#TYPE}.
* <p>
- * This annotation can be applied to beans as well as other objects serialized to other types (e.g. strings).
+ * This annotation can be applied to beans as well as other objects serialized to other types (e.g. strings).
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -48,7 +48,7 @@ public @interface Json {
* }
* </p>
* <p>
- * Without the <ja>@Xml</ja> annotations, serializing this bean as JSON would have produced the following...
+ * Without the <ja>@Xml</ja> annotations, serializing this bean as JSON would have produced the following...
* </p>
* <p class='bcode'>
* {
@@ -56,7 +56,7 @@ public @interface Json {
* }
* </p>
* <p>
- * With the annotations, serializing this bean as XML produces the following...
+ * With the annotations, serializing this bean as XML produces the following...
* </p>
* <p class='bcode'>
* {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index 08b80e4..358f3d2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -27,11 +27,11 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Content-Type</code> types: <code>octal/msgpack</code>
+ * Handles <code>Content-Type</code> types: <code>octal/msgpack</code>
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link MsgPackParserContext}
* </ul>
[3/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
----------------------------------------------------------------------
diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
index 5fbf663..b3c33a5 100644
--- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
+++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
@@ -36,9 +36,9 @@ import org.apache.juneau.utils.*;
/**
* Represents a connection to a remote REST resource.
* <p>
- * Instances of this class are created by the various {@code doX()} methods on the {@link RestClient} class.
+ * Instances of this class are created by the various {@code doX()} methods on the {@link RestClient} class.
* <p>
- * This class uses only Java standard APIs. Requests can be built up using a fluent interface with method chaining, like so...
+ * This class uses only Java standard APIs. Requests can be built up using a fluent interface with method chaining, like so...
*
* <p class='bcode'>
* RestClient client = <jk>new</jk> RestClient();
@@ -46,7 +46,7 @@ import org.apache.juneau.utils.*;
* MyBean b = c.getResponse(MyBean.<jk>class</jk>);
* </p>
* <p>
- * The actual connection and request/response transaction occurs when calling one of the <code>getResponseXXX()</code> methods.
+ * The actual connection and request/response transaction occurs when calling one of the <code>getResponseXXX()</code> methods.
*
* <h5 class='section'>Additional information:</h5>
* <ul>
@@ -93,13 +93,13 @@ public final class RestCall {
* Sets the input for this REST call.
*
* @param input The input to be sent to the REST resource (only valid for PUT and POST) requests. <br>
- * Can be of the following types:
- * <ul class='spaced-list'>
- * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
- * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
- * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
- * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
- * </ul>
+ * Can be of the following types:
+ * <ul class='spaced-list'>
+ * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
+ * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
+ * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
+ * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
+ * </ul>
* @return This object (for method chaining).
* @throws RestCallException If a retry was attempted, but the entity was not repeatable.
*/
@@ -133,7 +133,7 @@ public final class RestCall {
* @param retries The number of retries to attempt.
* @param interval The time in milliseconds between attempts.
* @param retryOn Optional object used for determining whether a retry should be attempted.
- * If <jk>null</jk>, uses {@link RetryOn#DEFAULT}.
+ * If <jk>null</jk>, uses {@link RetryOn#DEFAULT}.
* @return This object (for method chaining).
* @throws RestCallException If current entity is not repeatable.
*/
@@ -485,10 +485,10 @@ public final class RestCall {
/**
* Connects to the REST resource.
* <p>
- * If this is a <code>PUT</code> or <code>POST</code>, also sends the input to the remote resource.<br>
+ * If this is a <code>PUT</code> or <code>POST</code>, also sends the input to the remote resource.<br>
* <p>
- * Typically, you would only call this method if you're not interested in retrieving the body of the HTTP response.
- * Otherwise, you're better off just calling one of the {@link #getReader()}/{@link #getResponse(Class)}/{@link #pipeTo(Writer)}
+ * Typically, you would only call this method if you're not interested in retrieving the body of the HTTP response.
+ * Otherwise, you're better off just calling one of the {@link #getReader()}/{@link #getResponse(Class)}/{@link #pipeTo(Writer)}
* methods directly which automatically call this method already.
*
* @return This object (for method chaining).
@@ -578,12 +578,12 @@ public final class RestCall {
/**
* Connects to the remote resource (if <code>connect()</code> hasn't already been called) and returns the HTTP response message body as a reader.
* <p>
- * If an {@link Encoder} has been registered with the {@link RestClient}, then the underlying input stream
- * will be wrapped in the encoded stream (e.g. a <code>GZIPInputStream</code>).
+ * If an {@link Encoder} has been registered with the {@link RestClient}, then the underlying input stream
+ * will be wrapped in the encoded stream (e.g. a <code>GZIPInputStream</code>).
* <p>
- * If present, automatically handles the <code>charset</code> value in the <code>Content-Type</code> response header.
+ * If present, automatically handles the <code>charset</code> value in the <code>Content-Type</code> response header.
* <p>
- * <b>IMPORTANT:</b> It is your responsibility to close this reader once you have finished with it.
+ * <b>IMPORTANT:</b> It is your responsibility to close this reader once you have finished with it.
*
* @return The HTTP response message body reader. <jk>null</jk> if response was successful but didn't contain a body (e.g. HTTP 204).
* @throws IOException If an exception occurred while streaming was already occurring.
@@ -681,10 +681,10 @@ public final class RestCall {
/**
* Connects to the remote resource (if <code>connect()</code> hasn't already been called) and returns the HTTP response message body as an input stream.
* <p>
- * If an {@link Encoder} has been registered with the {@link RestClient}, then the underlying input stream
- * will be wrapped in the encoded stream (e.g. a <code>GZIPInputStream</code>).
+ * If an {@link Encoder} has been registered with the {@link RestClient}, then the underlying input stream
+ * will be wrapped in the encoded stream (e.g. a <code>GZIPInputStream</code>).
* <p>
- * <b>IMPORTANT:</b> It is your responsibility to close this reader once you have finished with it.
+ * <b>IMPORTANT:</b> It is your responsibility to close this reader once you have finished with it.
*
* @return The HTTP response message body input stream. <jk>null</jk> if response was successful but didn't contain a body (e.g. HTTP 204).
* @throws IOException If an exception occurred while streaming was already occurring.
@@ -749,21 +749,21 @@ public final class RestCall {
* Same as {@link #getResponse(Class)}, but useful for parsing into maps and collections of specific types.
*
* @param type The class to resolve.
- * Can be any of the following:
- * <ul>
- * <li>{@link ClassMeta}
- * <li>{@link Class}
- * <li>{@link ParameterizedType}
- * <li>{@link GenericArrayType}
- * </ul>
+ * Can be any of the following:
+ * <ul>
+ * <li>{@link ClassMeta}
+ * <li>{@link Class}
+ * <li>{@link ParameterizedType}
+ * <li>{@link GenericArrayType}
+ * </ul>
* @param args The type arguments of the class if it's a collection or map.
- * Can be any of the following:
- * <ul>
- * <li>{@link ClassMeta}
- * <li>{@link Class}
- * <li>{@link ParameterizedType}
- * <li>{@link GenericArrayType}
- * </ul>
+ * Can be any of the following:
+ * <ul>
+ * <li>{@link ClassMeta}
+ * <li>{@link Class}
+ * <li>{@link ParameterizedType}
+ * <li>{@link GenericArrayType}
+ * </ul>
* @param <T> The class to convert the input to.
* @return The parsed output.
* @throws IOException If a connection error occurred.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
----------------------------------------------------------------------
diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 6041d6d..de99eb0 100644
--- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -224,11 +224,9 @@ public class RestClient extends CoreApi {
* Creates an instance of an {@link HttpClientBuilder} to be used to create
* the {@link HttpClient}.
* <p>
- * Subclasses can override this method to provide their own client builder.
- * </p>
+ * Subclasses can override this method to provide their own client builder.
* <p>
- * The predefined method returns an {@link HttpClientBuilder} with the following settings:
- * </p>
+ * The predefined method returns an {@link HttpClientBuilder} with the following settings:
* <ul>
* <li>Lax redirect strategy.
* <li>The connection manager returned by {@link #createConnectionManager()}.
@@ -245,11 +243,9 @@ public class RestClient extends CoreApi {
/**
* Creates the {@link HttpClientConnectionManager} returned by {@link #createConnectionManager()}.
* <p>
- * Subclasses can override this method to provide their own connection manager.
- * </p>
+ * Subclasses can override this method to provide their own connection manager.
* <p>
- * The default implementation returns an instance of a {@link PoolingHttpClientConnectionManager}.
- * </p>
+ * The default implementation returns an instance of a {@link PoolingHttpClientConnectionManager}.
*
* @return The HTTP client builder to use to create the HTTP client.
*/
@@ -493,7 +489,7 @@ public class RestClient extends CoreApi {
/**
* Sets the value for the <code>Accept</code> request header.
* <p>
- * This overrides the media type specified on the parser, but is overridden by calling <code>setHeader(<js>"Accept"</js>, newvalue);</code>
+ * This overrides the media type specified on the parser, but is overridden by calling <code>setHeader(<js>"Accept"</js>, newvalue);</code>
*
* @param accept The new header value.
* @return This object (for method chaining).
@@ -506,7 +502,7 @@ public class RestClient extends CoreApi {
/**
* Sets the value for the <code>Content-Type</code> request header.
* <p>
- * This overrides the media type specified on the serializer, but is overridden by calling <code>setHeader(<js>"Content-Type"</js>, newvalue);</code>
+ * This overrides the media type specified on the serializer, but is overridden by calling <code>setHeader(<js>"Content-Type"</js>, newvalue);</code>
*
* @param contentType The new header value.
* @return This object (for method chaining).
@@ -520,7 +516,7 @@ public class RestClient extends CoreApi {
* Sets the URI of the remoteable services REST servlet for invoking remoteable services.
*
* @param remoteableServletUri The URI of the REST resource implementing a remoteable services servlet.
- * (typically an instance of <code>RemoteableServlet</code>).
+ * (typically an instance of <code>RemoteableServlet</code>).
* @return This object (for method chaining).
*/
public RestClient setRemoteableServletUri(String remoteableServletUri) {
@@ -549,7 +545,7 @@ public class RestClient extends CoreApi {
* Enable SSL support on this client.
*
* @param opts The SSL configuration options. See {@link SSLOpts} for details.
- * This method is a no-op if <code>sslConfig</code> is <jk>null</jk>.
+ * This method is a no-op if <code>sslConfig</code> is <jk>null</jk>.
* @return This object (for method chaining).
* @throws KeyStoreException
* @throws NoSuchAlgorithmException
@@ -589,13 +585,13 @@ public class RestClient extends CoreApi {
*
* @param url The URL of the remote REST resource. Can be any of the following: {@link String}, {@link URI}, {@link URL}.
* @param o The object to serialize and transmit to the URL as the body of the request.
- * Can be of the following types:
- * <ul class='spaced-list'>
- * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
- * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
- * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
- * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
- * </ul>
+ * Can be of the following types:
+ * <ul class='spaced-list'>
+ * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
+ * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
+ * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
+ * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
+ * </ul>
* @return A {@link RestCall} object that can be further tailored before executing the request
* and getting the response as a parsed object.
* @throws RestCallException If any authentication errors occurred.
@@ -609,13 +605,13 @@ public class RestClient extends CoreApi {
*
* @param url The URL of the remote REST resource. Can be any of the following: {@link String}, {@link URI}, {@link URL}.
* @param o The object to serialize and transmit to the URL as the body of the request.
- * Can be of the following types:
- * <ul class='spaced-list'>
- * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
- * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
- * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
- * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
- * </ul>
+ * Can be of the following types:
+ * <ul class='spaced-list'>
+ * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
+ * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
+ * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
+ * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
+ * </ul>
* @return A {@link RestCall} object that can be further tailored before executing the request
* and getting the response as a parsed object.
* @throws RestCallException If any authentication errors occurred.
@@ -736,14 +732,14 @@ public class RestClient extends CoreApi {
* @param method The HTTP method.
* @param url The URL of the remote REST resource. Can be any of the following: {@link String}, {@link URI}, {@link URL}.
* @param content The HTTP body content.
- * Can be of the following types:
- * <ul class='spaced-list'>
- * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
- * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
- * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
- * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
- * </ul>
- * This parameter is IGNORED if {@link HttpMethod#hasContent()} is <jk>false</jk>.
+ * Can be of the following types:
+ * <ul class='spaced-list'>
+ * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
+ * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
+ * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.
+ * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
+ * </ul>
+ * This parameter is IGNORED if {@link HttpMethod#hasContent()} is <jk>false</jk>.
* @return A {@link RestCall} object that can be further tailored before executing the request
* and getting the response as a parsed object.
* @throws RestCallException If any authentication errors occurred.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SSLOpts.java
----------------------------------------------------------------------
diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SSLOpts.java b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SSLOpts.java
index 444ad19..52f5766 100644
--- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SSLOpts.java
+++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/SSLOpts.java
@@ -42,7 +42,7 @@ public class SSLOpts {
* Constructor.
*
* @param protocols A comma-delimited list of supported SSL protocols.
- * If <jk>null</jk>, uses the value returned by {@link #getDefaultProtocols()}.
+ * If <jk>null</jk>, uses the value returned by {@link #getDefaultProtocols()}.
* @param certValidate Certificate validation setting.
* @param hostVerify Host verification setting.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
----------------------------------------------------------------------
diff --git a/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java b/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
index bbca603..6ded12d 100644
--- a/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
+++ b/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
@@ -31,7 +31,7 @@ import org.apache.juneau.xml.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Used to associate serializers, parsers, filters, and properties with instances of {@link BaseProvider}.
+ * Used to associate serializers, parsers, filters, and properties with instances of {@link BaseProvider}.
*/
@Documented
@Target(TYPE)
@@ -42,28 +42,28 @@ public @interface JuneauProvider {
/**
* Provider-level bean filters.
* <p>
- * These filters are applied to all serializers and parsers being used by the provider.
+ * These filters are applied to all serializers and parsers being used by the provider.
* <p>
- * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.
- * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should
- * be treated as the specified class type.
+ * If the specified class is an instance of {@link BeanFilterBuilder}, then a filter built from that builder is added.
+ * Any other classes are wrapped in a {@link InterfaceBeanFilterBuilder} to indicate that subclasses should
+ * be treated as the specified class type.
*/
Class<?>[] beanFilters() default {};
/**
* Provider-level POJO swaps.
* <p>
- * These POJO swaps are applied to all serializers and parsers being used by the provider.
+ * These POJO swaps are applied to all serializers and parsers being used by the provider.
* <p>
- * If the specified class is an instance of {@link PojoSwap}, then that swap is added.
- * Any other classes are wrapped in a {@link SurrogateSwap}.
+ * If the specified class is an instance of {@link PojoSwap}, then that swap is added.
+ * Any other classes are wrapped in a {@link SurrogateSwap}.
*/
Class<?>[] pojoSwaps() default {};
/**
* Provider-level properties.
* <p>
- * Any of the following property names can be specified:
+ * Any of the following property names can be specified:
* <ul>
* <li>{@link RestServletContext}
* <li>{@link BeanContext}
@@ -74,23 +74,23 @@ public @interface JuneauProvider {
* <li>{@link XmlParserContext}
* </ul>
* <p>
- * Property values will be converted to the appropriate type.
+ * Property values will be converted to the appropriate type.
* <p>
- * These properties can be augmented/overridden through the {@link RestMethod#properties()} annotation on the REST method.
+ * These properties can be augmented/overridden through the {@link RestMethod#properties()} annotation on the REST method.
*/
Property[] properties() default {};
/**
* Specifies a list of {@link Serializer} classes to add to the list of serializers available for this provider.
* <p>
- * This annotation can only be used on {@link Serializer} classes that have no-arg constructors.
+ * This annotation can only be used on {@link Serializer} classes that have no-arg constructors.
*/
Class<? extends Serializer>[] serializers() default {};
/**
* Specifies a list of {@link Parser} classes to add to the list of parsers available for this provider.
* <p>
- * This annotation can only be used on {@link Parser} classes that have no-arg constructors.
+ * This annotation can only be used on {@link Parser} classes that have no-arg constructors.
*/
Class<? extends Parser>[] parsers() default {};
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
----------------------------------------------------------------------
diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
index 8c5300f..d7d45d9 100644
--- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
+++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/TestMicroservice.java
@@ -26,7 +26,7 @@ public class TestMicroservice {
/**
* Starts the microservice.
* @return <jk>true</jk> if the service started, <jk>false</jk> if it's already started.
- * If this returns <jk>false</jk> then don't call stopMicroservice()!.
+ * If this returns <jk>false</jk> then don't call stopMicroservice()!.
*/
public static boolean startMicroservice() {
if (microservice != null)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestConverter.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestConverter.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestConverter.java
index cc401ec..2d668d3 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestConverter.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestConverter.java
@@ -20,10 +20,10 @@ import org.apache.juneau.serializer.*;
/**
* REST method response converter.
* <p>
- * Implements a filter mechanism for REST method calls that allows response objects to be
+ * Implements a filter mechanism for REST method calls that allows response objects to be
* converted to some other POJO after invocation of the REST method.
* <p>
- * Converters are associated with REST methods through the {@link RestMethod#converters()} annotation.
+ * Converters are associated with REST methods through the {@link RestMethod#converters()} annotation.
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* <jk>public class</jk> RequestEchoResource <jk>extends</jk> RestServlet {
@@ -37,20 +37,20 @@ import org.apache.juneau.serializer.*;
* }
* </p>
* <p>
- * Converters can also be associated at the servlet level using the {@link RestResource#converters()} annotation.
- * Applying converters at the resource level is equivalent to applying converters to each resource method individually.
+ * Converters can also be associated at the servlet level using the {@link RestResource#converters()} annotation.
+ * Applying converters at the resource level is equivalent to applying converters to each resource method individually.
*
* <h6 class='topic'>How to implement</h6>
* <p>
- * Implementers should simply implement the {@link #convert(RestRequest, Object, ClassMeta)} and
+ * Implementers should simply implement the {@link #convert(RestRequest, Object, ClassMeta)} and
* return back a 'converted' object.
- * It's up to the implementer to decide what this means.
+ * It's up to the implementer to decide what this means.
* <p>
- * Converters must implement a no-args constructor.
+ * Converters must implement a no-args constructor.
*
* <h6 class='topic'>Predefined converters</h6>
* <p>
- * The following converters are available by default.
+ * The following converters are available by default.
* <ul class='spaced-list'>
* <li>{@link Traversable} - Allows URL additional path info to address individual elements in a POJO tree.
* <li>{@link Queryable} - Allows query/view/sort functions to be performed on POJOs.
@@ -65,7 +65,7 @@ public interface RestConverter {
* @param req The servlet request.
* @param res The response object set by the REST method through the {@link RestResponse#setOutput(Object)} method.
* @param cm The {@link ClassMeta} on the object from the bean context of the servlet.
- * Can be used to check if the object has any filters.
+ * Can be used to check if the object has any filters.
* @return The converted object.
* @throws RestException Thrown if any errors occur during conversion.
* @throws SerializeException
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestException.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestException.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestException.java
index 4ad7fd1..5fd3d2c 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestException.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestException.java
@@ -17,7 +17,7 @@ import java.text.*;
/**
* Exception thrown to trigger an error HTTP status.
* <p>
- * REST methods on subclasses of {@link RestServlet} can throw
+ * REST methods on subclasses of {@link RestServlet} can throw
* this exception to trigger an HTTP status other than the automatically-generated
* <code>404</code>, <code>405</code>, and <code>500</code> statuses.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestGuard.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestGuard.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestGuard.java
index 6b406ca..7848bb2 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestGuard.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestGuard.java
@@ -21,23 +21,23 @@ import org.apache.juneau.rest.annotation.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Implements a guard mechanism for REST method calls that allows requests to be
- * rejected before invocation of the REST method.
- * For example, guards can be used to ensure that only administrators can call certain methods.
+ * Implements a guard mechanism for REST method calls that allows requests to be
+ * rejected before invocation of the REST method.
+ * For example, guards can be used to ensure that only administrators can call certain methods.
* <p>
- * Guards are applied to REST methods declaratively through the {@link RestResource#guards()} or {@link RestMethod#guards()} annotations.
+ * Guards are applied to REST methods declaratively through the {@link RestResource#guards()} or {@link RestMethod#guards()} annotations.
* <p>
- * If multiple guards are specified, ALL guards must pass in order for the request to proceed.
+ * If multiple guards are specified, ALL guards must pass in order for the request to proceed.
*
* <h6 class='topic'>How to implement</h6>
* <p>
- * Typically, guards will be used for permissions checking on the user making the request,
- * but it can also be used for other purposes like pre-call validation of a request.
+ * Typically, guards will be used for permissions checking on the user making the request,
+ * but it can also be used for other purposes like pre-call validation of a request.
* <p>
- * Implementers should simply throw a {@link RestException} from the {@link #guard(RestRequest, RestResponse)}
- * method to abort processing on the current request.
+ * Implementers should simply throw a {@link RestException} from the {@link #guard(RestRequest, RestResponse)}
+ * method to abort processing on the current request.
* <p>
- * Guards must implement a no-args constructor.
+ * Guards must implement a no-args constructor.
*
* <h6 class='topic'>Example usage:</h6>
* <p class='bcode'>
@@ -67,17 +67,17 @@ public abstract class RestGuard {
* Checks the current HTTP request and throws a {@link RestException} if the guard
* does not permit the request.
* <p>
- * By default, throws an <jsf>SC_FORBIDDEN</jsf> exception if {@link #isRequestAllowed(RestRequest)}
+ * By default, throws an <jsf>SC_FORBIDDEN</jsf> exception if {@link #isRequestAllowed(RestRequest)}
* returns <jk>false</jk>.
* <p>
- * Subclasses are free to override this method to tailor the behavior of how to handle unauthorized
+ * Subclasses are free to override this method to tailor the behavior of how to handle unauthorized
* requests.
*
* @param req The servlet request.
* @param res The servlet response.
* @throws RestException Thrown to abort processing on current request.
* @return <jk>true</jk> if request can proceed.
- * Specify <jk>false</jk> if you're doing something like a redirection to a login page.
+ * Specify <jk>false</jk> if you're doing something like a redirection to a login page.
*/
public boolean guard(RestRequest req, RestResponse res) throws RestException {
if (! isRequestAllowed(req))
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestMatcherReflecting.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestMatcherReflecting.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestMatcherReflecting.java
index f40e14b..4a2619d 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestMatcherReflecting.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestMatcherReflecting.java
@@ -17,7 +17,7 @@ import java.lang.reflect.*;
/**
* Subclass of {@link RestMatcher} that gives access to the servlet and Java method it's applied to.
* <p>
- * Essentially the same as {@link RestMatcher} except has a constructor where the
+ * Essentially the same as {@link RestMatcher} except has a constructor where the
* Java method is passed in so that you can access annotations defined on it to tailor
* the behavior of the matcher.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
index 64a5a2a..5682f24 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -874,10 +874,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
* <h5 class='section'>Examples:</h5>
* <p class='bcode'>
* <jc>// Parse into a linked-list of strings.</jc>
- * Listt<String> myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<String> myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of linked-lists of strings.</jc>
- * Listt<List<String>> myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<List<String>> myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a map of string keys/values.</jc>
* Map<String,String> myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
@@ -1047,10 +1047,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
* <h5 class='section'>Examples:</h5>
* <p class='bcode'>
* <jc>// Parse into a linked-list of strings.</jc>
- * Listt<String> myparam = req.getPathParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<String> myparam = req.getPathParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of linked-lists of strings.</jc>
- * Listt<List<String>> myparam = req.getPathParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<List<String>> myparam = req.getPathParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a map of string keys/values.</jc>
* Map<String,String> myparam = req.getPathParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
@@ -1120,8 +1120,8 @@ public final class RestRequest extends HttpServletRequestWrapper {
* <td><code>123</code></td>
* <td><code><xt><number></xt>123<xt></number></xt></code><br><code><xt><x</xt> <xa>type</xa>=<xs>'number'</xs><xt>></xt>...<xt></x></xt></code></td>
* <td>{@link Number}</td>
- * </tr>
- * <tr>
+ * </tr>
+ * <tr>
* <td>boolean</td>
* <td><jk>true</jk></td>
* <td><code><xt><boolean></xt>true<xt></boolean></xt></code><br><code><xt><x</xt> <xa>type</xa>=<xs>'boolean'</xs><xt>></xt>...<xt></x></xt></code></td>
@@ -1171,10 +1171,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
* <h5 class='section'>Examples:</h5>
* <p class='bcode'>
* <jc>// Parse into a linked-list of strings.</jc>
- * Listt<String> body = req.getBody(LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<String> body = req.getBody(LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of linked-lists of strings.</jc>
- * Listt<List<String>> body = req.getBody(LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<List<String>> body = req.getBody(LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a map of string keys/values.</jc>
* Map<String,String> body = req.getBody(TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
@@ -1637,7 +1637,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
*
* @return The parser matching the request <code>Content-Type</code> header, or <jk>null</jk>
* if no matching parser was found.
- * Includes the matching media type.
+ * Includes the matching media type.
*/
public ParserMatch getParserMatch() {
MediaType mediaType = getMediaType();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java
index 0318f59..d4fbd50 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -31,11 +31,9 @@ import org.apache.juneau.xml.*;
* <p>
* Essentially an extended {@link HttpServletResponse} with some special convenience methods
* that allow you to easily output POJOs as responses.
- * </p>
* <p>
* Since this class extends {@link HttpServletResponse}, developers are free to use these
* convenience methods, or revert to using lower level methods like any other servlet response.
- * </p>
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -46,8 +44,7 @@ import org.apache.juneau.xml.*;
* }
* </p>
* <p>
- * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.
- * </p>
+ * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.
*/
public final class RestResponse extends HttpServletResponseWrapper {
@@ -147,16 +144,16 @@ public final class RestResponse extends HttpServletResponseWrapper {
/**
* Sets the HTTP output on the response.
* <p>
- * Calling this method is functionally equivalent to returning the object in the REST Java method.
+ * Calling this method is functionally equivalent to returning the object in the REST Java method.
* <p>
- * Can be of any of the following types:
- * <ul>
- * <li> {@link InputStream}
- * <li> {@link Reader}
- * <li> Any serializable type defined in <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a>
- * </ul>
+ * Can be of any of the following types:
+ * <ul>
+ * <li> {@link InputStream}
+ * <li> {@link Reader}
+ * <li> Any serializable type defined in <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a>
+ * </ul>
* <p>
- * If it's an {@link InputStream} or {@link Reader}, you must also specify the <code>Content-Type</code> using the {@link #setContentType(String)} method.
+ * If it's an {@link InputStream} or {@link Reader}, you must also specify the <code>Content-Type</code> using the {@link #setContentType(String)} method.
*
* @param output The output to serialize to the connection.
* @return This object (for method chaining).
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
index 9ffb83b..b7ce3a7 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -59,8 +59,7 @@ import org.apache.juneau.utils.*;
/**
* Servlet implementation of a REST resource.
* <p>
- * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.
- * </p>
+ * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.
*/
@SuppressWarnings({"rawtypes","hiding"})
public abstract class RestServlet extends HttpServlet {
@@ -295,16 +294,14 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates the child resources of this resource.
* <p>
- * Default implementation calls {@link #createChildren()} and uses the {@link RestResource#path() @RestResource.path()} annotation
- * on each child to identify the subpath for the resource which become the keys in this map.
- * It then calls the {@link #setParent(RestServlet)} method on the child resource.
- * </p>
+ * Default implementation calls {@link #createChildren()} and uses the {@link RestResource#path() @RestResource.path()} annotation
+ * on each child to identify the subpath for the resource which become the keys in this map.
+ * It then calls the {@link #setParent(RestServlet)} method on the child resource.
* <p>
- * Subclasses can override this method to programatically create child resources
- * without using the {@link RestResource#children() @RestResource.children()} annotation.
- * When overridding this method, you are responsible for calling {@link #setParent(RestServlet)} on the
- * child resources.
- * </p>
+ * Subclasses can override this method to programatically create child resources
+ * without using the {@link RestResource#children() @RestResource.children()} annotation.
+ * When overridding this method, you are responsible for calling {@link #setParent(RestServlet)} on the
+ * child resources.
*
* @return The new mutable list of child resource instances.
* @throws Exception If an error occurred during servlet instantiation.
@@ -324,13 +321,11 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates instances of child resources for this servlet.
* <p>
- * Default implementation uses the {@link RestResource#children() @RestResource.children()} annotation to identify and
- * instantiate children.
- * </p>
+ * Default implementation uses the {@link RestResource#children() @RestResource.children()} annotation to identify and
+ * instantiate children.
* <p>
- * Subclasses can override this method to programatically create child resources
- * without using the {@link RestResource#children() @RestResource.children()} annotation.
- * </p>
+ * Subclasses can override this method to programatically create child resources
+ * without using the {@link RestResource#children() @RestResource.children()} annotation.
*
* @return The new mutable list of child resource instances.
* @throws Exception If an error occurred during servlet instantiation.
@@ -349,12 +344,10 @@ public abstract class RestServlet extends HttpServlet {
/**
* Programmatic equivalent to the {@link RestResource#children() @RestResource.children()} annotation.
* <p>
- * Subclasses can override this method to provide customized list of child resources.
- * (e.g. different children based on values specified in the config file).
- * </p>
+ * Subclasses can override this method to provide customized list of child resources.
+ * (e.g. different children based on values specified in the config file).
* <p>
- * Default implementation simply returns the value from the {@link RestResource#children() @RestResource.children()} annotation.
- * </p>
+ * Default implementation simply returns the value from the {@link RestResource#children() @RestResource.children()} annotation.
*
* @return The new mutable list of child resource instances.
* @throws Exception If an error occurred during servlet instantiation.
@@ -370,13 +363,12 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates the class-level properties associated with this servlet.
* <p>
- * Subclasses can override this method to provide their own class-level properties for this servlet, typically
- * by calling <code><jk>super</jk>.createProperties()</code> and appending to the map.
- * However, in most cases, the existing set of properties can be added to by overridding {@link #getProperties()}
- * and appending to the map returned by <code><jk>super</jk>.getProperties()</code>
- * </p>
+ * Subclasses can override this method to provide their own class-level properties for this servlet, typically
+ * by calling <code><jk>super</jk>.createProperties()</code> and appending to the map.
+ * However, in most cases, the existing set of properties can be added to by overridding {@link #getProperties()}
+ * and appending to the map returned by <code><jk>super</jk>.getProperties()</code>
* <p>
- * By default, the map returned by this method contains the following:
+ * By default, the map returned by this method contains the following:
* </p>
* <ul class='spaced-list'>
* <li>Servlet-init parameters.
@@ -877,8 +869,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates a {@link RestRequest} object based on the specified incoming {@link HttpServletRequest} object.
* <p>
- * Subclasses may choose to override this method to provide a specialized request object.
- * </p>
+ * Subclasses may choose to override this method to provide a specialized request object.
*
* @param req The request object from the {@link #service(HttpServletRequest, HttpServletResponse)} method.
* @return The wrapped request object.
@@ -890,10 +881,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates a {@link RestResponse} object based on the specified incoming {@link HttpServletResponse} object
- * and the request returned by {@link #createRequest(HttpServletRequest)}.
+ * and the request returned by {@link #createRequest(HttpServletRequest)}.
* <p>
- * Subclasses may choose to override this method to provide a specialized response object.
- * </p>
+ * Subclasses may choose to override this method to provide a specialized response object.
*
* @param req The request object returned by {@link #createRequest(HttpServletRequest)}.
* @param res The response object from the {@link #service(HttpServletRequest, HttpServletResponse)} method.
@@ -907,11 +897,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns whether this resource class can provide an OPTIONS page.
* <p>
- * By default, returns <jk>false</jk>.
- * </p>
+ * By default, returns <jk>false</jk>.
* <p>
- * Subclasses can override this method to cause the <code>options</code> link to show up in the HTML serialized output.
- * </p>
+ * Subclasses can override this method to cause the <code>options</code> link to show up in the HTML serialized output.
*
* @return <jk>true</jk> if this resource has implemented a {@code getOptions()} method.
*/
@@ -922,8 +910,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* Specify a class-level property.
* <p>
- * Typically, properties in {@link RestServletContext} can be set in the {@link Servlet#init(ServletConfig)} method.
- * </p>
+ * Typically, properties in {@link RestServletContext} can be set in the {@link Servlet#init(ServletConfig)} method.
*
* @param key The property name.
* @param value The property value.
@@ -937,8 +924,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* The main service method.
* <p>
- * Subclasses can optionally override this method if they want to tailor the behavior of requests.
- * </p>
+ * Subclasses can optionally override this method if they want to tailor the behavior of requests.
*/
@Override /* Servlet */
public void service(HttpServletRequest r1, HttpServletResponse r2) throws ServletException, IOException {
@@ -1042,9 +1028,8 @@ public abstract class RestServlet extends HttpServlet {
/**
* Handle the case where a matching method was not found.
* <p>
- * Subclasses can override this method to provide a 2nd-chance for specifying a response.
- * The default implementation will simply throw an exception with an appropriate message.
- * </p>
+ * Subclasses can override this method to provide a 2nd-chance for specifying a response.
+ * The default implementation will simply throw an exception with an appropriate message.
*
* @param rc The HTTP response code.
* @param req The HTTP request.
@@ -1084,12 +1069,10 @@ public abstract class RestServlet extends HttpServlet {
/**
* Method for rendering response errors.
* <p>
- * The default implementation renders a plain text English message, optionally with a stack trace
- * if {@link RestServletContext#REST_renderResponseStackTraces} is enabled.
- * </p>
+ * The default implementation renders a plain text English message, optionally with a stack trace
+ * if {@link RestServletContext#REST_renderResponseStackTraces} is enabled.
* <p>
- * Subclasses can override this method to provide their own custom error response handling.
- * </p>
+ * Subclasses can override this method to provide their own custom error response handling.
*
* @param req The servlet request.
* @param res The servlet response.
@@ -1122,13 +1105,11 @@ public abstract class RestServlet extends HttpServlet {
/**
* Callback method for logging errors during HTTP requests.
* <p>
- * Typically, subclasses will override this method and log errors themselves.
- * </p>
+ * ypically, subclasses will override this method and log errors themselves.
* <p>
- * The default implementation simply logs errors to the <code>RestServlet</code> logger.
- * </p>
+ * The default implementation simply logs errors to the <code>RestServlet</code> logger.
* <p>
- * Here's a typical implementation showing how stack trace hashing can be used to reduce log file sizes...
+ * Here's a typical implementation showing how stack trace hashing can be used to reduce log file sizes...
* </p>
* <p class='bcode'>
* <jk>protected void</jk> onError(HttpServletRequest req, HttpServletResponse res, RestException e, <jk>boolean</jk> noTrace) {
@@ -1174,11 +1155,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns <jk>true</jk> if the specified exception should be logged.
* <p>
- * Subclasses can override this method to provide their own logic for determining when exceptions are logged.
- * </p>
+ * Subclasses can override this method to provide their own logic for determining when exceptions are logged.
* <p>
- * The default implementation will return <jk>false</jk> if <js>"noTrace=true"</js> is passed in the query string.
- * </p>
+ * The default implementation will return <jk>false</jk> if <js>"noTrace=true"</js> is passed in the query string.
*
* @param req The HTTP request.
* @param res The HTTP response.
@@ -1193,11 +1172,10 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns <jk>true</jk> if a stack trace should be logged for this exception.
* <p>
- * Subclasses can override this method to provide their own logic for determining when stack traces are logged.
- * </p>
+ * Subclasses can override this method to provide their own logic for determining when stack traces are logged.
* <p>
- * The default implementation will only log a stack trace if {@link RestException#getOccurrence()} returns <code>1</code>
- * and the exception is not one of the following:
+ * The default implementation will only log a stack trace if {@link RestException#getOccurrence()} returns <code>1</code>
+ * and the exception is not one of the following:
* </p>
* <ul>
* <li>{@link HttpServletResponse#SC_UNAUTHORIZED}
@@ -1225,8 +1203,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* Log a message.
* <p>
- * Equivalent to calling <code>log(level, <jk>null</jk>, msg, args);</code>
- * </p>
+ * Equivalent to calling <code>log(level, <jk>null</jk>, msg, args);</code>
*
* @param level The log level.
* @param msg The message to log.
@@ -1238,11 +1215,10 @@ public abstract class RestServlet extends HttpServlet {
/**
* Same as {@link #log(Level, String, Object...)} excepts runs the
- * arguments through {@link JsonSerializer#DEFAULT_LAX_READABLE}.
+ * arguments through {@link JsonSerializer#DEFAULT_LAX_READABLE}.
* <p>
- * Serialization of arguments do not occur if message is not logged, so
- * it's safe to use this method from within debug log statements.
- * </p>
+ * Serialization of arguments do not occur if message is not logged, so
+ * it's safe to use this method from within debug log statements.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -1262,9 +1238,8 @@ public abstract class RestServlet extends HttpServlet {
/**
* Log a message to the logger returned by {@link #getLogger()}.
* <p>
- * Subclasses can override this method if they wish to log messages using a library other than
- * Java Logging (e.g. Apache Commons Logging).
- * </p>
+ * Subclasses can override this method if they wish to log messages using a library other than
+ * Java Logging (e.g. Apache Commons Logging).
*
* @param level The log level.
* @param cause The cause.
@@ -1281,11 +1256,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Callback method for listening for successful completion of requests.
* <p>
- * Subclasses can override this method for gathering performance statistics.
- * </p>
+ * Subclasses can override this method for gathering performance statistics.
* <p>
- * The default implementation does nothing.
- * </p>
+ * The default implementation does nothing.
*
* @param req The HTTP request.
* @param res The HTTP response.
@@ -1296,9 +1269,8 @@ public abstract class RestServlet extends HttpServlet {
/**
* Callback method that gets invoked right before the REST Java method is invoked.
* <p>
- * Subclasses can override this method to override request headers or set request-duration properties
- * before the Java method is invoked.
- * </p>
+ * Subclasses can override this method to override request headers or set request-duration properties
+ * before the Java method is invoked.
*
* @param req The HTTP servlet request object.
* @throws RestException If any error occurs.
@@ -1309,9 +1281,8 @@ public abstract class RestServlet extends HttpServlet {
* Callback method that gets invoked right after the REST Java method is invoked, but before
* the serializer is invoked.
* <p>
- * Subclasses can override this method to override request and response headers, or
- * set/override properties used by the serializer.
- * </p>
+ * Subclasses can override this method to override request and response headers, or
+ * set/override properties used by the serializer.
*
* @param req The HTTP servlet request object.
* @param res The HTTP servlet response object.
@@ -1322,9 +1293,8 @@ public abstract class RestServlet extends HttpServlet {
/**
* The main method for serializing POJOs passed in through the {@link RestResponse#setOutput(Object)} method.
* <p>
- * Subclasses may override this method if they wish to modify the way the output is rendered, or support
+ * Subclasses may override this method if they wish to modify the way the output is rendered, or support
* other output formats.
- * </p>
*
* @param req The HTTP request.
* @param res The HTTP response.
@@ -1355,8 +1325,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* Resolve a static resource file.
* <p>
- * Subclasses can override this method to provide their own way to resolve files.
- * </p>
+ * Subclasses can override this method to provide their own way to resolve files.
*
* @param pathInfo The unencoded path info.
* @return The resource, or <jk>null</jk> if the resource could not be resolved.
@@ -1395,15 +1364,12 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns a list of valid {@code Accept} content types for this resource.
* <p>
- * Typically used by subclasses during {@code OPTIONS} requests.
- * </p>
+ * Typically used by subclasses during {@code OPTIONS} requests.
* <p>
- * The default implementation resturns the list from {@link ParserGroup#getSupportedMediaTypes()}
- * from the parser group returned by {@link #getParsers()}.
- * </p>
+ * The default implementation resturns the list from {@link ParserGroup#getSupportedMediaTypes()}
+ * from the parser group returned by {@link #getParsers()}.
* <p>
- * Subclasses can override or expand this list as they see fit.
- * </p>
+ * Subclasses can override or expand this list as they see fit.
*
* @return The list of valid {@code Accept} content types for this resource.
* @throws RestServletException
@@ -1415,15 +1381,12 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns a list of valid {@code Content-Types} for input for this resource.
* <p>
- * Typically used by subclasses during {@code OPTIONS} requests.
- * </p>
+ * Typically used by subclasses during {@code OPTIONS} requests.
* <p>
- * The default implementation resturns the list from {@link SerializerGroup#getSupportedMediaTypes()}
- * from the parser group returned by {@link #getSerializers()}.
- * </p>
+ * The default implementation resturns the list from {@link SerializerGroup#getSupportedMediaTypes()}
+ * from the parser group returned by {@link #getSerializers()}.
* <p>
- * Subclasses can override or expand this list as they see fit.
- * </p>
+ * Subclasses can override or expand this list as they see fit.
*
* @return The list of valid {@code Content-Type} header values for this resource.
* @throws RestServletException
@@ -1435,10 +1398,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the localized summary of the specified java method on this servlet.
* <p>
- * Subclasses can override this method to provide their own summary.
- * </p>
+ * Subclasses can override this method to provide their own summary.
* <p>
- * The default implementation returns the summary from the following locations (whichever matches first):
+ * The default implementation returns the summary from the following locations (whichever matches first):
* </p>
* <ol>
* <li>{@link RestMethod#summary() @RestMethod.summary()} annotation on the method.
@@ -1462,10 +1424,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the localized description of the specified java method on this servlet.
* <p>
- * Subclasses can override this method to provide their own description.
- * </p>
+ * Subclasses can override this method to provide their own description.
* <p>
- * The default implementation returns the description from the following locations (whichever matches first):
+ * The default implementation returns the description from the following locations (whichever matches first):
* </p>
* <ol>
* <li>{@link RestMethod#description() @RestMethod.description()} annotation on the method.
@@ -1489,9 +1450,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the localized title of this REST resource.
* <p>
- * Subclasses can override this method to provide their own title.
+ * Subclasses can override this method to provide their own title.
* <p>
- * The default implementation returns the description from the following locations (whichever matches first):
+ * The default implementation returns the description from the following locations (whichever matches first):
* <p>
* <ol>
* <li>{@link RestResource#title() @RestResourcel.title()} annotation on this class, and then any parent classes.
@@ -1521,9 +1482,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the localized description of this REST resource.
* <p>
- * Subclasses can override this method to provide their own description.
+ * Subclasses can override this method to provide their own description.
* <p>
- * The default implementation returns the description from the following locations (whichever matches first):
+ * The default implementation returns the description from the following locations (whichever matches first):
* <ol>
* <li>{@link RestResource#description() @RestResource.description()} annotation on this class, and then any parent classes.
* <li><ck>[ClassName].description</ck> property in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
@@ -1552,9 +1513,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the localized contact information of this REST resource.
* <p>
- * Subclasses can override this method to provide their own contact information.
+ * Subclasses can override this method to provide their own contact information.
* <p>
- * The default implementation returns the contact information from the following locations (whichever matches first):
+ * The default implementation returns the contact information from the following locations (whichever matches first):
* <ol>
* <li>{@link RestResource#contact() @RestResource.contact()} annotation on this class, and then any parent classes.
* <li><ck>[ClassName].contact</ck> property in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
@@ -1588,9 +1549,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the localized license information of this REST resource.
* <p>
- * Subclasses can override this method to provide their own license information.
+ * Subclasses can override this method to provide their own license information.
* <p>
- * The default implementation returns the license information from the following locations (whichever matches first):
+ * The default implementation returns the license information from the following locations (whichever matches first):
* <ol>
* <li>{@link RestResource#license() @RestResource.license()} annotation on this class, and then any parent classes.
* <li><ck>[ClassName].license</ck> property in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
@@ -1624,9 +1585,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the terms-of-service information of this REST resource.
* <p>
- * Subclasses can override this method to provide their own terms-of-service information.
+ * Subclasses can override this method to provide their own terms-of-service information.
* <p>
- * The default implementation returns the terms-of-service information from the following locations (whichever matches first):
+ * The default implementation returns the terms-of-service information from the following locations (whichever matches first):
* <ol>
* <li>{@link RestResource#termsOfService() @RestResource.termsOfService()} annotation on this class, and then any parent classes.
* <li><ck>[ClassName].termsOfService</ck> property in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
@@ -1655,9 +1616,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the version information of this REST resource.
* <p>
- * Subclasses can override this method to provide their own version information.
+ * Subclasses can override this method to provide their own version information.
* <p>
- * The default implementation returns the version information from the following locations (whichever matches first):
+ * The default implementation returns the version information from the following locations (whichever matches first):
* <ol>
* <li>{@link RestResource#version() @RestResource.version()} annotation on this class, and then any parent classes.
* <li><ck>[ClassName].version</ck> property in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
@@ -1686,9 +1647,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the version information of this REST resource.
* <p>
- * Subclasses can override this method to provide their own version information.
+ * Subclasses can override this method to provide their own version information.
* <p>
- * The default implementation returns the version information from the following locations (whichever matches first):
+ * The default implementation returns the version information from the following locations (whichever matches first):
* <ol>
* <li>{@link RestResource#version() @RestResource.version()} annotation on this class, and then any parent classes.
* <li><ck>[ClassName].version</ck> property in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
@@ -1722,9 +1683,9 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the version information of this REST resource.
* <p>
- * Subclasses can override this method to provide their own version information.
+ * Subclasses can override this method to provide their own version information.
* <p>
- * The default implementation returns the version information from the following locations (whichever matches first):
+ * The default implementation returns the version information from the following locations (whichever matches first):
* <ol>
* <li>{@link RestResource#version() @RestResource.version()} annotation on this class, and then any parent classes.
* <li><ck>[ClassName].version</ck> property in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
@@ -1777,12 +1738,10 @@ public abstract class RestServlet extends HttpServlet {
/**
* Gets a localized message from the resource bundle identified by the {@link RestResource#messages() @RestResource.messages()} annotation.
* <p>
- * If resource bundle location was not specified, or the resource bundle was not found,
+ * If resource bundle location was not specified, or the resource bundle was not found,
* returns the string <js>"{!!key}"</js>.
- * </p>
* <p>
- * If message was not found in the resource bundle, returns the string <js>"{!key}"</js>.
- * </p>
+ * If message was not found in the resource bundle, returns the string <js>"{!key}"</js>.
*
* @param locale The client locale.
* @param key The resource bundle key.
@@ -1796,16 +1755,14 @@ public abstract class RestServlet extends HttpServlet {
/**
* Programmatically adds the specified resource as a child to this resource.
* <p>
- * This method can be used in a resources {@link #init()} method to define child resources
+ * This method can be used in a resources {@link #init()} method to define child resources
* accessible through a child URL.
- * </p>
* <p>
- * Typically, child methods are defined via {@link RestResource#children() @RestResource.children()}. However, this
+ * Typically, child methods are defined via {@link RestResource#children() @RestResource.children()}. However, this
* method is provided to handle child resources determined at runtime.
- * </p>
*
* @param name The sub-URL under which this resource is accessible.<br>
- * For example, if the parent resource URL is <js>"/foo"</js>, and this name is <js>"bar"</js>, then
+ * For example, if the parent resource URL is <js>"/foo"</js>, and this name is <js>"bar"</js>, then
* the child resource will be accessible via the URL <js>"/foo/bar"</js>.
* @param resource The child resource.
* @throws ServletException Thrown by the child init() method.
@@ -1819,7 +1776,7 @@ public abstract class RestServlet extends HttpServlet {
* Returns the child resources associated with this servlet.
*
* @return An unmodifiable map of child resources.
- * Keys are the {@link RestResource#path() @RestResource.path()} annotation defined on the child resource.
+ * Keys are the {@link RestResource#path() @RestResource.path()} annotation defined on the child resource.
*/
public Map<String,RestServlet> getChildResources() {
return Collections.unmodifiableMap(childResources);
@@ -1829,11 +1786,9 @@ public abstract class RestServlet extends HttpServlet {
* Returns the path for this servlet as defined by the {@link RestResource#path()} annotation
* on this class concatenated with those on all parent classes.
* <p>
- * If path is not specified, returns <js>"/"</js>.
- * </p>
+ * If path is not specified, returns <js>"/"</js>.
* <p>
- * Path always starts with <js>"/"</js>.
- * </p>
+ * Path always starts with <js>"/"</js>.
*
* @return The servlet path.
*/
@@ -1871,12 +1826,10 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the config file for this servlet.
* <p>
- * Subclasses can override this method to provide their own config file.
- * </p>
+ * Subclasses can override this method to provide their own config file.
* <p>
- * The default implementation uses the path defined by the {@link RestResource#config() @RestResource.config()} property resolved
- * by {@link ConfigMgr#DEFAULT}.
- * </p>
+ * The default implementation uses the path defined by the {@link RestResource#config() @RestResource.config()} property resolved
+ * by {@link ConfigMgr#DEFAULT}.
*
* @return The config file for this servlet.
* @throws IOException
@@ -1891,16 +1844,13 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates the stylesheet for this servlet.
* <p>
- * The stylesheet is made available on the path <js>"/servlet-path/style.css"</js>.
- * </p>
+ * The stylesheet is made available on the path <js>"/servlet-path/style.css"</js>.
* <p>
- * Subclasses can override this method to provide their own stylesheet.
- * </p>
+ * Subclasses can override this method to provide their own stylesheet.
* <p>
- * The default implementation uses the {@link RestResource#stylesheet() @RestResource.stylesheet()} annotation
- * to determine the stylesheet name and then searches the classpath then working directory
- * for that stylesheet.
- * </p>
+ * The default implementation uses the {@link RestResource#stylesheet() @RestResource.stylesheet()} annotation
+ * to determine the stylesheet name and then searches the classpath then working directory
+ * for that stylesheet.
*
* @return The stylesheet to use for this servlet, or <jk>null</jk> if the stylesheet could not be found.
* @throws IOException If stylesheet could not be loaded.
@@ -1925,16 +1875,13 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates the favicon for this servlet.
* <p>
- * The favicon is made available on the path <js>"/servlet-path/favicon.ico"</js>.
- * </p>
+ * The favicon is made available on the path <js>"/servlet-path/favicon.ico"</js>.
* <p>
- * Subclasses can override this method to provide their own favorites icon.
- * </p>
+ * Subclasses can override this method to provide their own favorites icon.
* <p>
- * The default implementation uses the {@link RestResource#favicon() @RestResource.favicon()} annotation
- * to determine the file name and then searches the classpath then working directory
- * for that file.
- * </p>
+ * The default implementation uses the {@link RestResource#favicon() @RestResource.favicon()} annotation
+ * to determine the file name and then searches the classpath then working directory
+ * for that file.
*
* @return The icon file to use for this servlet.
* @throws IOException If icon file could not be loaded.
@@ -1959,17 +1906,14 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates the static files map for this servlet.
* <p>
- * This map defines static files that can be served up through subpaths on this servlet.
- * The map keys are subpaths (e.g. <js>"htdocs"</js>) and the values are locations to look in
- * the classpath and working directory for those files.
- * </p>
+ * This map defines static files that can be served up through subpaths on this servlet.
+ * The map keys are subpaths (e.g. <js>"htdocs"</js>) and the values are locations to look in
+ * the classpath and working directory for those files.
* <p>
- * Subclasses can override this method to provide their own mappings.
- * </p>
+ * Subclasses can override this method to provide their own mappings.
* <p>
- * The default implementation uses the {@link RestResource#staticFiles() @RestResource.staticFiles()} annotation
- * to determine the mappings.
- * </p>
+ * The default implementation uses the {@link RestResource#staticFiles() @RestResource.staticFiles()} annotation
+ * to determine the mappings.
*
* @return The list of static file mappings.
* @throws ParseException
@@ -1986,9 +1930,8 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the config manager used to create the config file in {@link #createConfigFile()}.
* <p>
- * The default implementation return {@link ConfigMgr#DEFAULT}, but subclasses can override
- * this if they want to provide their own customized config manager.
- * </p>
+ * The default implementation return {@link ConfigMgr#DEFAULT}, but subclasses can override
+ * this if they want to provide their own customized config manager.
*
* @return The config file manager.
*/
@@ -1999,12 +1942,10 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the logger associated with this servlet.
* <p>
- * Subclasses can override this method to provide their own Java Logging logger.
- * </p>
+ * Subclasses can override this method to provide their own Java Logging logger.
* <p>
- * Subclasses that use other logging libraries such as Apache Commons Logging should
- * override the {@link #log(Level, Throwable, String, Object...)} method instead.
- * </p>
+ * Subclasses that use other logging libraries such as Apache Commons Logging should
+ * override the {@link #log(Level, Throwable, String, Object...)} method instead.
*
* @return The logger associated with this servlet.
*/
@@ -2845,7 +2786,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* Returns the variable resolver for this servlet created by the {@link #createVarResolver()} method.
* <p>
- * Variable resolvers are used to replace variables in property values.
+ * Variable resolvers are used to replace variables in property values.
* </p>
* <h6 class='figure'>Example:</h6>
* <p class='bcode'>
@@ -2863,7 +2804,7 @@ public abstract class RestServlet extends HttpServlet {
* <jk>public class</jk> MyRestResource <jk>extends</jk> RestServletDefault {
* </p>
* <p>
- * A typical usage pattern is using variables for resolving URL links when rendering HTML:
+ * A typical usage pattern is using variables for resolving URL links when rendering HTML:
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(
@@ -2878,8 +2819,7 @@ public abstract class RestServlet extends HttpServlet {
* <jk>public</jk> LoggerEntry getLogger(RestRequest req, <ja>@Path</ja> String name) <jk>throws</jk> Exception {
* </p>
* <p>
- * Calls to <code>req.getProperties().getString(<js>"key"</js>)</code> returns strings with variables resolved.
- * </p>
+ * Calls to <code>req.getProperties().getString(<js>"key"</js>)</code> returns strings with variables resolved.
*
* @return The var resolver created by {@link #createVarResolver()}.
*/
@@ -2904,8 +2844,8 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates the reusable variable resolver for this servlet.
* <p>
- * Subclasses can override this method to provide their own or augment the existing
- * variable provider.
+ * Subclasses can override this method to provide their own or augment the existing
+ * variable provider.
* </p>
* <ul class='spaced-list'>
* <li><code>$C{...}</code> - Values from the config file returned by {@link #getConfig()}.
@@ -2914,19 +2854,15 @@ public abstract class RestServlet extends HttpServlet {
* <li><code>$I{...}</code> - Servlet initialization parameters.
* </ul>
* <p>
- * All variables can provide a 2nd parameter as a default value.
- * </p>
+ * All variables can provide a 2nd parameter as a default value.
* <p>
- * Example: <js>$S{myBooleanProperty,true}"</js>.
- * </p>
+ * Example: <js>$S{myBooleanProperty,true}"</js>.
* <p>
- * Like all other variables, keys and default values can themselves be arbitrarily nested.
- * </p>
+ * Like all other variables, keys and default values can themselves be arbitrarily nested.
* <p>
- * Example: <js>$S{$E{BOOLEAN_PROPERTY_NAME},$E{BOOLEAN_DEFAULT}}"</js>.
- * </p>
+ * Example: <js>$S{$E{BOOLEAN_PROPERTY_NAME},$E{BOOLEAN_DEFAULT}}"</js>.
* <p>
- * Subclasses can augment this list by adding their own variables.
+ * Subclasses can augment this list by adding their own variables.
* </p>
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -2964,7 +2900,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* Creates a properties map for the specified request.
* <p>
- * This map will automatically resolve any <js>"$X{...}"</js> variables using the {@link VarResolver}
+ * This map will automatically resolve any <js>"$X{...}"</js> variables using the {@link VarResolver}
* returned by {@link #getVarResolver()}.
*
* @param methodProperties The method-level properties.
@@ -3283,11 +3219,11 @@ public abstract class RestServlet extends HttpServlet {
* Same as {@link Class#getResourceAsStream(String)} except if it doesn't find the resource
* on this class, searches up the parent hierarchy chain.
* <p>
- * If the resource cannot be found in the classpath, then an attempt is made to look in the
- * JVM working directory.
+ * If the resource cannot be found in the classpath, then an attempt is made to look in the
+ * JVM working directory.
* <p>
- * If the <code>locale</code> is specified, then we look for resources whose name matches that locale.
- * For example, if looking for the resource <js>"MyResource.txt"</js> for the Japanese locale, we will
+ * If the <code>locale</code> is specified, then we look for resources whose name matches that locale.
+ * For example, if looking for the resource <js>"MyResource.txt"</js> for the Japanese locale, we will
* look for files in the following order:
* <ol>
* <li><js>"MyResource_ja_JP.txt"</js>
@@ -3348,8 +3284,7 @@ public abstract class RestServlet extends HttpServlet {
* Reads the input stream from {@link #getResource(String, Locale)} and parses it into a POJO
* using the parser matched by the specified media type.
* <p>
- * Useful if you want to load predefined POJOs from JSON files in your classpath.
- * </p>
+ * Useful if you want to load predefined POJOs from JSON files in your classpath.
*
* @param c The class type of the POJO to create.
* @param mediaType The media type of the data in the stream (e.g. <js>"text/json"</js>)
[5/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
index 0b165de..6829b17 100644
--- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
@@ -33,23 +33,23 @@ public final class MsgPackParserSession 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>
- * <li>{@link Reader}
- * <li>{@link CharSequence}
- * <li>{@link InputStream} containing UTF-8 encoded text.
- * <li>{@link File} containing system encoded text.
- * </ul>
+ * <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.
+ * 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>).
*/
public MsgPackParserSession(MsgPackParserContext 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/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index cd842d6..123155d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -25,13 +25,13 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>octal/msgpack</code>
+ * Handles <code>Accept</code> types: <code>octal/msgpack</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>octal/msgpack</code>
+ * Produces <code>Content-Type</code> types: <code>octal/msgpack</code>
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link MsgPackSerializerContext}
* <li>{@link SerializerContext}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 4b87867..c91a11d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -36,15 +36,15 @@ public final class MsgPackSerializerSession 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#getOutputStream()} 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 MsgPackSerializerSession(MsgPackSerializerContext 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/src/main/java/org/apache/juneau/parser/InputStreamParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/InputStreamParser.java b/juneau-core/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index 6abdeb5..f24609a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -19,17 +19,17 @@ import org.apache.juneau.annotation.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * This class is typically the parent class of all byte-based parsers.
- * It has 1 abstract method to implement...
+ * This class is typically the parent class of all byte-based parsers.
+ * It has 1 abstract method to implement...
* <ul>
* <li><code>parse(InputStream, ClassMeta, ParserContext)</code>
* </ul>
*
* <h6 class='topic'>@Consumes annotation</h6>
* <p>
- * The media types that this parser can handle is specified through the {@link Consumes @Consumes} annotation.
+ * The media types that this parser can handle is specified through the {@link Consumes @Consumes} annotation.
* <p>
- * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()} method.
+ * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()} method.
*/
public abstract class InputStreamParser extends Parser {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
index e3d9f9a..dab1bf0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
@@ -34,14 +34,14 @@ import org.apache.juneau.utils.*;
*
* <h6 class='topic'>@Consumes annotation</h6>
* <p>
- * The media types that this parser can handle is specified through the {@link Consumes @Consumes} annotation.
+ * The media types that this parser can handle is specified through the {@link Consumes @Consumes} annotation.
* <p>
- * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()} method.
+ * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()} method.
*
* <a id='ValidDataConversions'></a><h6 class='topic'>Valid data conversions</h6>
- * Parsers can parse any parsable POJO types, as specified in the <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a>.
+ * Parsers can parse any parsable POJO types, as specified in the <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">POJO Categories</a>.
* <p>
- * Some examples of conversions are shown below...
+ * Some examples of conversions are shown below...
* </p>
* <table class='styled'>
* <tr>
@@ -95,15 +95,15 @@ import org.apache.juneau.utils.*;
* </tr>
* </table>
* <p>
- * In addition, any class types with {@link PojoSwap PojoSwaps} associated with them on the registered
- * {@link #getBeanContext() beanContext} can also be passed in.
+ * In addition, any class types with {@link PojoSwap PojoSwaps} associated with them on the registered
+ * {@link #getBeanContext() beanContext} can also be passed in.
* <p>
- * For example, if the {@link CalendarSwap} transform is used to generalize {@code Calendar} objects to {@code String} objects. When registered
+ * For example, if the {@link CalendarSwap} transform is used to generalize {@code Calendar} objects to {@code String} objects. When registered
* with this parser, you can construct {@code Calendar} objects from {@code Strings} using the following syntax...
* <p class='bcode'>
* Calendar c = parser.parse(<js>"'Sun Mar 03 04:05:06 EST 2001'"</js>, GregorianCalendar.<jk>class</jk>);
* <p>
- * If <code>Object.<jk>class</jk></code> is specified as the target type, then the parser
+ * If <code>Object.<jk>class</jk></code> is specified as the target type, then the parser
* automatically determines the data types and generates the following object types...
* </p>
* <table class='styled'>
@@ -117,8 +117,8 @@ import org.apache.juneau.utils.*;
*
* <a id='SupportedTypes'></a><h6 class='topic'>Supported types</h6>
* <p>
- * Several of the methods below take {@link Type} parameters to identify the type of
- * object to create. Any of the following types can be passed in to these methods...
+ * Several of the methods below take {@link Type} parameters to identify the type of
+ * object to create. Any of the following types can be passed in to these methods...
* </p>
* <ul>
* <li>{@link ClassMeta}
@@ -127,10 +127,10 @@ import org.apache.juneau.utils.*;
* <li>{@link GenericArrayType}
* </ul>
* <p>
- * However, {@code ParameterizedTypes} and {@code GenericArrayTypes} should not contain
- * {@link WildcardType WildcardTypes} or {@link TypeVariable TypeVariables}.
+ * However, {@code ParameterizedTypes} and {@code GenericArrayTypes} should not contain
+ * {@link WildcardType WildcardTypes} or {@link TypeVariable TypeVariables}.
* <p>
- * Passing in <jk>null</jk> or <code>Object.<jk>class</jk></code> typically signifies that it's up to the parser
+ * Passing in <jk>null</jk> or <code>Object.<jk>class</jk></code> typically signifies that it's up to the parser
* to determine what object type is being parsed parsed based on the rules above.
*/
public abstract class Parser extends CoreApi {
@@ -160,10 +160,10 @@ public abstract class Parser extends CoreApi {
/**
* Workhorse method. Subclasses are expected to implement this method.
* @param session The runtime session object returned by {@link #createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)}.
- * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
+ * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
* @param type The class type of the object to create.
- * If <jk>null</jk> or <code>Object.<jk>class</jk></code>, object type is based on what's being parsed.
- * For example, when parsing JSON text, it may return a <code>String</code>, <code>Number</code>, <code>ObjectMap</code>, etc...
+ * If <jk>null</jk> or <code>Object.<jk>class</jk></code>, object type is based on what's being parsed.
+ * For example, when parsing JSON text, it may return a <code>String</code>, <code>Number</code>, <code>ObjectMap</code>, etc...
* @param <T> The class type of the object to create.
* @return The parsed object.
* @throws Exception If thrown from underlying stream, or if the input contains a syntax error or is malformed.
@@ -297,7 +297,7 @@ public abstract class Parser extends CoreApi {
*
* @param <T> The class type of the object being created.
* @param input The input.
- * See {@link #parse(Object, Type, Type...)} for details.
+ * See {@link #parse(Object, Type, Type...)} for details.
* @param type The object type to create.
* @return The parsed object.
* @throws ParseException If the input contains a syntax error or is malformed, or is not valid for the specified type.
@@ -314,7 +314,7 @@ public abstract class Parser extends CoreApi {
*
* @param <T> The class type of the object being created.
* @param input The input.
- * See {@link #parse(Object, Type, Type...)} for details.
+ * See {@link #parse(Object, Type, Type...)} for details.
* @param type The object type to create.
* @return The parsed object.
* @throws ParseException If the input contains a syntax error or is malformed, or is not valid for the specified type.
@@ -326,19 +326,19 @@ public abstract class Parser extends CoreApi {
/**
* Create the session object that will be passed in to the parse method.
* <p>
- * It's up to implementers to decide what the session object looks like, although typically
+ * It's up to implementers to decide what the session object looks like, although typically
* it's going to be a subclass of {@link ParserSession}.
*
* @param input The input. See {@link #parse(Object, ClassMeta)} for supported input types.
* @param op Optional additional properties.
* @param javaMethod Java method that invoked this serializer.
- * When using the REST API, this is the Java method invoked by the REST call.
- * Can be used to access annotations defined on the method or class.
+ * When using the REST API, this is the Java method invoked by the REST call.
+ * Can be used to access annotations defined on the method or class.
* @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>).
* @return The new session.
*/
@@ -366,9 +366,9 @@ public abstract class Parser extends CoreApi {
/**
* Parses the contents of the specified reader and loads the results into the specified map.
* <p>
- * Reader must contain something that serializes to a map (such as text containing a JSON object).
+ * Reader must contain something that serializes to a map (such as text containing a JSON object).
* <p>
- * Used in the following locations:
+ * Used in the following locations:
* <ul class='spaced-list'>
* <li>The various character-based constructors in {@link ObjectMap} (e.g. {@link ObjectMap#ObjectMap(CharSequence,Parser)}).
* </ul>
@@ -400,7 +400,7 @@ public abstract class Parser extends CoreApi {
* Implementation method.
* Default implementation throws an {@link UnsupportedOperationException}.
* @param session The runtime session object returned by {@link #createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)}.
- * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
+ * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
* @param m The map being loaded.
* @param keyType The class type of the keys, or <jk>null</jk> to default to <code>String.<jk>class</jk></code>.<br>
* @param valueType The class type of the values, or <jk>null</jk> to default to whatever is being parsed.<br>
@@ -415,7 +415,7 @@ public abstract class Parser extends CoreApi {
/**
* Parses the contents of the specified reader and loads the results into the specified collection.
* <p>
- * Used in the following locations:
+ * Used in the following locations:
* <ul class='spaced-list'>
* <li>The various character-based constructors in {@link ObjectList} (e.g. {@link ObjectList#ObjectList(CharSequence,Parser)}.
* </ul>
@@ -445,7 +445,7 @@ public abstract class Parser extends CoreApi {
* Implementation method.
* Default implementation throws an {@link UnsupportedOperationException}.
* @param session The runtime session object returned by {@link #createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)}.
- * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
+ * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
* @param c The collection being loaded.
* @param elementType The class type of the elements, or <jk>null</jk> to default to whatever is being parsed.
*
@@ -460,10 +460,10 @@ public abstract class Parser extends CoreApi {
* Parses the specified array input with each entry in the object defined by the {@code argTypes}
* argument.
* <p>
- * Used for converting arrays (e.g. <js>"[arg1,arg2,...]"</js>) into an {@code Object[]} that can be passed
+ * Used for converting arrays (e.g. <js>"[arg1,arg2,...]"</js>) into an {@code Object[]} that can be passed
* to the {@code Method.invoke(target, args)} method.
* <p>
- * Used in the following locations:
+ * Used in the following locations:
* <ul class='spaced-list'>
* <li>Used to parse argument strings in the {@link PojoIntrospector#invokeMethod(Method, Reader)} method.
* </ul>
@@ -493,7 +493,7 @@ public abstract class Parser extends CoreApi {
* Implementation method.
* Default implementation throws an {@link UnsupportedOperationException}.
* @param session The runtime session object returned by {@link #createSession(Object, ObjectMap, Method, Object, Locale, TimeZone, MediaType)}.
- * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
+ * If <jk>null</jk>, one will be created using {@link #createSession(Object)}.
* @param argTypes Specifies the type of objects to create for each entry in the array.
*
* @return An array of parsed objects.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/parser/ParserGroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/ParserGroup.java b/juneau-core/src/main/java/org/apache/juneau/parser/ParserGroup.java
index 3d9fa30..f78f733 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/ParserGroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/ParserGroup.java
@@ -24,7 +24,7 @@ import org.apache.juneau.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Provides the following features:
+ * Provides the following features:
* <ul class='spaced-list'>
* <li>Finds parsers based on HTTP <code>Content-Type</code> header values.
* <li>Sets common properties on all parsers in a single method call.
@@ -34,13 +34,13 @@ import org.apache.juneau.*;
*
* <h6 class='topic'>Match ordering</h6>
* <p>
- * Parsers are matched against <code>Content-Type</code> strings in the order they exist in this group.
+ * Parsers are matched against <code>Content-Type</code> strings in the order they exist in this group.
* <p>
- * Adding new entries will cause the entries to be prepended to the group.
- * This allows for previous parsers to be overridden through subsequent calls.
+ * Adding new entries will cause the entries to be prepended to the group.
+ * This allows for previous parsers to be overridden through subsequent calls.
* <p>
- * For example, calling <code>g.append(P1.<jk>class</jk>,P2.<jk>class</jk>).append(P3.<jk>class</jk>,P4.<jk>class</jk>)</code>
- * will result in the order <code>P3, P4, P1, P2</code>.
+ * For example, calling <code>g.append(P1.<jk>class</jk>,P2.<jk>class</jk>).append(P3.<jk>class</jk>,P4.<jk>class</jk>)</code>
+ * will result in the order <code>P3, P4, P1, P2</code>.
*
* <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/parser/ParserListener.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/ParserListener.java b/juneau-core/src/main/java/org/apache/juneau/parser/ParserListener.java
index 64f9371..e675f5c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/ParserListener.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/ParserListener.java
@@ -17,17 +17,17 @@ import org.apache.juneau.*;
/**
* Class for listening for certain parse events during a document parse.
* <p>
- * Listeners can be registered with parsers through the {@link Parser#addListener(ParserListener)} method.
- * </p>
- * It should be noted that listeners are not automatically copied over to new parsers when a parser is cloned.
+ * Listeners can be registered with parsers through the {@link Parser#addListener(ParserListener)} method.
+ * <p>
+ * It should be noted that listeners are not automatically copied over to new parsers when a parser is cloned.
*/
public class ParserListener {
/**
* Gets called when an unknown bean property is detected in a document.
* <p>
- * This method only gets called if {@link BeanContext#BEAN_ignoreUnknownBeanProperties} setting is <jk>true</jk>.
- * Otherwise, the parser will throw a {@link ParseException}.
+ * This method only gets called if {@link BeanContext#BEAN_ignoreUnknownBeanProperties} setting is <jk>true</jk>.
+ * Otherwise, the parser will throw a {@link ParseException}.
*
* @param <T> The class type of the bean.
* @param propertyName The property name encountered in the document.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/parser/ParserReader.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/ParserReader.java b/juneau-core/src/main/java/org/apache/juneau/parser/ParserReader.java
index de3187a..fa93caa 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/ParserReader.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/ParserReader.java
@@ -19,12 +19,12 @@ import org.apache.juneau.internal.*;
/**
* Similar to a {@link java.io.PushbackReader} with a pushback buffer of 1 character.
* <p>
- * Code is optimized to work with a 1 character buffer.
+ * Code is optimized to work with a 1 character buffer.
* <p>
- * Additionally keeps track of current line and column number, and provides the ability to set
+ * Additionally keeps track of current line and column number, and provides the ability to set
* mark points and capture characters from the previous mark point.
* <p>
- * <b>Warning:</b> Not thread safe.
+ * <b>Warning:</b> Not thread safe.
*/
public class ParserReader extends Reader {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/parser/ParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/ParserSession.java b/juneau-core/src/main/java/org/apache/juneau/parser/ParserSession.java
index 8a4a87b..c84e6e2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/ParserSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -44,32 +44,32 @@ public class ParserSession extends BeanSession {
* 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.
- * <br>For character-based parsers, this 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 (or whatever the encoding specified by {@link ParserContext#PARSER_inputStreamCharset}).
- * <li><code><jk>byte</jk>[]</code> containing UTF-8 encoded text (or whatever the encoding specified by {@link ParserContext#PARSER_inputStreamCharset}).
- * <li>{@link File} containing system encoded text (or whatever the encoding specified by {@link ParserContext#PARSER_fileCharset}).
- * </ul>
- * <br>For byte-based parsers, this can be any of the following types:
- * <ul>
- * <li><jk>null</jk>
- * <li>{@link InputStream}
- * <li><code><jk>byte</jk>[]</code>
- * <li>{@link File}
- * </ul>
+ * <br>For character-based parsers, this 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 (or whatever the encoding specified by {@link ParserContext#PARSER_inputStreamCharset}).
+ * <li><code><jk>byte</jk>[]</code> containing UTF-8 encoded text (or whatever the encoding specified by {@link ParserContext#PARSER_inputStreamCharset}).
+ * <li>{@link File} containing system encoded text (or whatever the encoding specified by {@link ParserContext#PARSER_fileCharset}).
+ * </ul>
+ * <br>For byte-based parsers, this can be any of the following types:
+ * <ul>
+ * <li><jk>null</jk>
+ * <li>{@link InputStream}
+ * <li><code><jk>byte</jk>[]</code>
+ * <li>{@link File}
+ * </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>).
*/
public ParserSession(ParserContext 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/src/main/java/org/apache/juneau/parser/ReaderParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/ReaderParser.java b/juneau-core/src/main/java/org/apache/juneau/parser/ReaderParser.java
index d0ea5b9..044038d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -19,17 +19,17 @@ import org.apache.juneau.annotation.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * This class is typically the parent class of all character-based parsers.
- * It has 1 abstract method to implement...
+ * This class is typically the parent class of all character-based parsers.
+ * It has 1 abstract method to implement...
* <ul>
* <li><code>parse(ParserSession, ClassMeta)</code>
* </ul>
*
* <h6 class='topic'>@Consumes annotation</h6>
* <p>
- * The media types that this parser can handle is specified through the {@link Consumes @Consumes} annotation.
+ * The media types that this parser can handle is specified through the {@link Consumes @Consumes} annotation.
* <p>
- * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()} method.
+ * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()} method.
*/
public abstract class ReaderParser extends Parser {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java b/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 68d6a33..86340c7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -23,20 +23,20 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/plain</code>
+ * Handles <code>Accept</code> types: <code>text/plain</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/plain</code>
+ * Produces <code>Content-Type</code> types: <code>text/plain</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Essentially just converts plain text to POJOs via static <code>fromString()</code> or <code>valueOf()</code>, or
+ * Essentially just converts plain text to POJOs via static <code>fromString()</code> or <code>valueOf()</code>, or
* through constructors that take a single string argument.
* <p>
- * Also parses objects using a transform if the object class has an {@link PojoSwap PojoSwap<?,String>} transform defined on it.
+ * Also parses objects using a transform if the object class has an {@link PojoSwap PojoSwap<?,String>} transform defined on it.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link ParserContext}
* </ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java b/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 0d04110..0cc9dcf 100644
--- a/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -22,19 +22,19 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/plain</code>
+ * Handles <code>Accept</code> types: <code>text/plain</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/plain</code>
+ * Produces <code>Content-Type</code> types: <code>text/plain</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Essentially converts POJOs to plain text using the <code>toString()</code> method.
+ * Essentially converts POJOs to plain text using the <code>toString()</code> method.
* <p>
- * Also serializes objects using a transform if the object class has an {@link PojoSwap PojoSwap<?,String>} transform defined on it.
+ * Also serializes objects using a transform if the object class has an {@link PojoSwap PojoSwap<?,String>} transform defined on it.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link SerializerContext}
* <li>{@link BeanContext}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java b/juneau-core/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index 0901c14..1c2a2d2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -22,18 +22,18 @@ import org.apache.juneau.internal.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * This class is typically the parent class of all byte-based serializers.
- * It has 1 abstract method to implement...
+ * This class is typically the parent class of all byte-based serializers.
+ * It has 1 abstract method to implement...
* <ul>
* <li>{@link #doSerialize(SerializerSession, Object)}
* </ul>
*
* <h6 class='topic'>@Produces annotation</h6>
* <p>
- * The media types that this serializer can produce is specified through the {@link Produces @Produces} annotation.
+ * The media types that this serializer can produce is specified through the {@link Produces @Produces} annotation.
* <p>
- * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()}
- * and {@link #getResponseContentType()} methods.
+ * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()}
+ * and {@link #getResponseContentType()} methods.
*/
public abstract class OutputStreamSerializer extends Serializer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
index 313ff47..abd00f5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -29,19 +29,19 @@ import org.apache.juneau.soap.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Base serializer class that serves as the parent class for all serializers.
+ * Base serializer class that serves as the parent class for all serializers.
* <p>
- * Subclasses should extend directly from {@link OutputStreamSerializer} or {@link WriterSerializer}.
+ * Subclasses should extend directly from {@link OutputStreamSerializer} or {@link WriterSerializer}.
*
* <h6 class='topic'>@Produces annotation</h6>
* <p>
- * The media types that this serializer can produce is specified through the {@link Produces @Produces} annotation.
+ * The media types that this serializer can produce is specified through the {@link Produces @Produces} annotation.
* <p>
- * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()}
- * and {@link #getResponseContentType()} methods.
+ * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()}
+ * and {@link #getResponseContentType()} methods.
*
* <h5 class='section'>Configurable properties:</h5>
- * See {@link SerializerContext} for a list of configurable properties that can be set on this class
+ * See {@link SerializerContext} for a list of configurable properties that can be set on this class
* using the {@link #setProperty(String, Object)} method.
*/
public abstract class Serializer extends CoreApi {
@@ -81,7 +81,7 @@ public abstract class Serializer extends CoreApi {
* <p>
* This method should NOT close the context object.
* @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}.<br>
- * If <jk>null</jk>, session is created using {@link #createSession(Object)}.
+ * If <jk>null</jk>, session is created using {@link #createSession(Object)}.
* @param o The object to serialize.
*
* @throws Exception If thrown from underlying stream, or if the input contains a syntax error or is malformed.
@@ -109,7 +109,7 @@ public abstract class Serializer extends CoreApi {
* Serialize the specified object using the specified session.
*
* @param session The serializer session object return by {@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}.<br>
- * If <jk>null</jk>, session is created using {@link #createSession(Object)}.
+ * If <jk>null</jk>, session is created using {@link #createSession(Object)}.
* @param o The object to serialize.
* @throws SerializeException If a problem occurred trying to convert the output.
*/
@@ -155,7 +155,7 @@ public abstract class Serializer extends CoreApi {
/**
* Create the session object that will be passed in to the serialize method.
* <p>
- * It's up to implementers to decide what the session object looks like, although typically
+ * It's up to implementers to decide what the session object looks like, although typically
* it's going to be a subclass of {@link SerializerSession}.
*
* @param output The output object.
@@ -172,12 +172,12 @@ public abstract class Serializer extends CoreApi {
* </ul>
* @param op Optional additional properties.
* @param javaMethod Java method that invoked this serializer.
- * When using the REST API, this is the Java method invoked by the REST call.
- * Can be used to access annotations defined on the method or class.
+ * When using the REST API, this is the Java method invoked by the REST call.
+ * Can be used to access annotations defined on the method or class.
* @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>).
* @return The new session.
*/
@@ -211,9 +211,9 @@ public abstract class Serializer extends CoreApi {
/**
* Converts the contents of the specified object array to a list.
* <p>
- * Works on both object and primitive arrays.
+ * Works on both object and primitive arrays.
* <p>
- * In the case of multi-dimensional arrays, the outgoing list will
+ * In the case of multi-dimensional arrays, the outgoing list will
* contain elements of type n-1 dimension. i.e. if {@code type} is <code><jk>int</jk>[][]</code>
* then {@code list} will have entries of type <code><jk>int</jk>[]</code>.
*
@@ -256,14 +256,14 @@ public abstract class Serializer extends CoreApi {
/**
* Optional method that specifies HTTP request headers for this serializer.
* <p>
- * For example, {@link SoapXmlSerializer} needs to set a <code>SOAPAction</code> header.
+ * For example, {@link SoapXmlSerializer} needs to set a <code>SOAPAction</code> header.
* <p>
- * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).
+ * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).
*
* @param properties Optional run-time properties (the same that are passed to {@link WriterSerializer#doSerialize(SerializerSession, Object)}.
- * Can be <jk>null</jk>.
+ * Can be <jk>null</jk>.
* @return The HTTP headers to set on HTTP requests.
- * Can be <jk>null</jk>.
+ * Can be <jk>null</jk>.
*/
public ObjectMap getResponseHeaders(ObjectMap properties) {
return ObjectMap.EMPTY_MAP;
@@ -272,12 +272,12 @@ public abstract class Serializer extends CoreApi {
/**
* Optional method that returns the response <code>Content-Type</code> for this serializer if it is different from the matched media type.
* <p>
- * This method is specified to override the content type for this serializer.
- * For example, the {@link org.apache.juneau.json.JsonSerializer.Simple} class returns that it handles media type <js>"text/json+simple"</js>, but returns
+ * This method is specified to override the content type for this serializer.
+ * For example, the {@link org.apache.juneau.json.JsonSerializer.Simple} class returns that it handles media type <js>"text/json+simple"</js>, but returns
* <js>"text/json"</js> as the actual content type.
- * This allows clients to request specific 'flavors' of content using specialized <code>Accept</code> header values.
+ * This allows clients to request specific 'flavors' of content using specialized <code>Accept</code> header values.
* <p>
- * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).
+ * This method is typically meaningless if the serializer is being used standalone (i.e. outside of a REST server or client).
*
* @return The response content type. If <jk>null</jk>, then the matched media type is used.
*/
@@ -570,7 +570,7 @@ public abstract class Serializer extends CoreApi {
* <ul>
* <li>This is equivalent to calling <code>setProperty(<jsf>SERIALIZER_trimEmptyMaps</jsf>, value)</code>.
* <li>Enabling this setting has the following effects on parsing:
- * <ul>
+ * <ul>
* <li>Bean properties with empty map values will not be set.
* </ul>
* </ul>
@@ -626,7 +626,7 @@ public abstract class Serializer extends CoreApi {
*
* <h5 class='section'>Example:</h5>
* <table class='styled'>
- * <tr><th>SERIALIZER_relativeUriBase</th><th>URI</th><th>Serialized URI</th></tr>
+ * <tr><th>SERIALIZER_relativeUriBase</th><th>URI</th><th>Serialized URI</th></tr>
* <tr>
* <td><code>http://foo:9080/bar/baz</code></td>
* <td><code>mywebapp</code></td>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
index 38fdfef..ba93403 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
@@ -153,7 +153,7 @@ public class SerializerContext extends BeanContext {
* <p>
* If <jk>true</jk>, null bean values will not be serialized to the output.
* <p>
- * Note that enabling this setting has the following effects on parsing:
+ * Note that enabling this setting has the following effects on parsing:
* <ul class='spaced-list'>
* <li>Map entries with <jk>null</jk> values will be lost.
* </ul>
@@ -193,7 +193,7 @@ public class SerializerContext extends BeanContext {
* If <jk>true</jk>, empty map values will not be serialized to the output.
* <p>
* Note that enabling this setting has the following effects on parsing:
- * <ul class='spaced-list'>
+ * <ul class='spaced-list'>
* <li>Bean properties with empty map values will not be set.
* </ul>
*/
@@ -229,7 +229,7 @@ public class SerializerContext extends BeanContext {
*
* <h5 class='section'>Example:</h5>
* <table class='styled'>
- * <tr><th>SERIALIZER_relativeUriBase</th><th>URI</th><th>Serialized URI</th></tr>
+ * <tr><th>SERIALIZER_relativeUriBase</th><th>URI</th><th>Serialized URI</th></tr>
* <tr>
* <td><code>http://foo:9080/bar/baz</code></td>
* <td><code>mywebapp</code></td>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroup.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
index d2d6847..24df1f5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
@@ -24,7 +24,7 @@ import org.apache.juneau.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Provides the following features:
+ * Provides the following features:
* <ul class='spaced-list'>
* <li>Finds serializers based on HTTP <code>Accept</code> header values.
* <li>Sets common properties on all serializers in a single method call.
@@ -34,13 +34,13 @@ import org.apache.juneau.*;
*
* <h6 class='topic'>Match ordering</h6>
* <p>
- * Serializers are matched against <code>Accept</code> strings in the order they exist in this group.
+ * Serializers are matched against <code>Accept</code> strings in the order they exist in this group.
* <p>
- * Adding new entries will cause the entries to be prepended to the group.
- * This allows for previous serializers to be overridden through subsequent calls.
+ * Adding new entries will cause the entries to be prepended to the group.
+ * This allows for previous serializers to be overridden through subsequent calls.
* <p>
- * For example, calling <code>g.append(S1.<jk>class</jk>,S2.<jk>class</jk>).append(S3.<jk>class</jk>,S4.<jk>class</jk>)</code>
- * will result in the order <code>S3, S4, S1, S2</code>.
+ * For example, calling <code>g.append(S1.<jk>class</jk>,S2.<jk>class</jk>).append(S3.<jk>class</jk>,S4.<jk>class</jk>)</code>
+ * will result in the order <code>S3, S4, S1, S2</code>.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -131,7 +131,7 @@ public final class SerializerGroup extends Lockable {
/**
* Searches the group for a serializer that can handle the specified <code>Accept</code> value.
* <p>
- * The <code>accept</code> value complies with the syntax described in RFC2616, Section 14.1, as described below:
+ * The <code>accept</code> value complies with the syntax described in RFC2616, Section 14.1, as described below:
* <p class='bcode'>
* Accept = "Accept" ":"
* #( media-range [ accept-params ] )
@@ -144,16 +144,16 @@ public final class SerializerGroup extends Lockable {
* accept-extension = ";" token [ "=" ( token | quoted-string ) ]
* </p>
* <p>
- * The general idea behind having the serializer resolution be a two-step process is so that
+ * The general idea behind having the serializer resolution be a two-step process is so that
* the matched media type can be passed in to the {@link WriterSerializer#doSerialize(SerializerSession, Object)} method.
- * For example...
+ * For example...
* <p class='bcode'>
* String acceptHeaderValue = request.getHeader(<js>"Accept"</js>);
* String matchingMediaType = group.findMatch(acceptHeaderValue);
* if (matchingMediaType == <jk>null</jk>)
* <jk>throw new</jk> RestException(<jsf>SC_NOT_ACCEPTABLE</jsf>);
* WriterSerializer s = (WriterSerializer)group.getSerializer(matchingMediaType);
- * s.serialize(getPojo(), response.getWriter(), response.getProperties(), matchingMediaType);
+ * s.serialize(getPojo(), response.getWriter(), response.getProperties(), matchingMediaType);
* </p>
*
* @param acceptHeader The HTTP <l>Accept</l> header string.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 69b6b26..34477b7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -71,26 +71,26 @@ public class SerializerSession extends BeanSession {
* 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.
- * <br>Character-based serializers can handle the following output class types:
- * <ul>
- * <li>{@link Writer}
- * <li>{@link OutputStream} - Output will be written as UTF-8 encoded stream.
- * <li>{@link File} - Output will be written as system-default encoded stream.
- * </ul>
- * <br>Stream-based serializers can handle the following output class types:
- * <ul>
- * <li>{@link OutputStream}
- * <li>{@link File}
- * </ul>
+ * <br>Character-based serializers can handle the following output class types:
+ * <ul>
+ * <li>{@link Writer}
+ * <li>{@link OutputStream} - Output will be written as UTF-8 encoded stream.
+ * <li>{@link File} - Output will be written as system-default encoded stream.
+ * </ul>
+ * <br>Stream-based serializers can handle the following output class types:
+ * <ul>
+ * <li>{@link OutputStream}
+ * <li>{@link File}
+ * </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 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>).
*/
public SerializerSession(SerializerContext 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/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerWriter.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
index 1e6272b..4d1b75a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
@@ -68,7 +68,7 @@ public class SerializerWriter extends Writer {
/**
* Performs a carriage return.
* <p>
- * Adds a newline and the specified number of tabs (if the {@code useWhitespace} setting is enabled) to the output.
+ * Adds a newline and the specified number of tabs (if the {@code useWhitespace} setting is enabled) to the output.
*
* @param depth The indentation.
* @throws IOException If a problem occurred trying to write to the writer.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/WriterSerializer.java b/juneau-core/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index 8a38a88..aefcb6e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -24,8 +24,8 @@ import org.apache.juneau.annotation.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * This class is typically the parent class of all character-based serializers.
- * It has 2 abstract methods to implement...
+ * This class is typically the parent class of all character-based serializers.
+ * It has 2 abstract methods to implement...
* <ul class='spaced-list'>
* <li>{@link #createSession(Object, ObjectMap, Method, Locale, TimeZone, MediaType)}
* <li>{@link #doSerialize(SerializerSession, Object)}
@@ -33,10 +33,10 @@ import org.apache.juneau.annotation.*;
*
* <h6 class='topic'>@Produces annotation</h6>
* <p>
- * The media types that this serializer can produce is specified through the {@link Produces @Produces} annotation.
+ * The media types that this serializer can produce is specified through the {@link Produces @Produces} annotation.
* <p>
- * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()}
- * and {@link #getResponseContentType()} methods.
+ * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()}
+ * and {@link #getResponseContentType()} methods.
*/
public abstract class WriterSerializer extends Serializer {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index c32dd80..a3a94b5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -24,17 +24,17 @@ import org.apache.juneau.xml.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Accept</code> types: <code>text/xml+soap</code>
+ * Handles <code>Accept</code> types: <code>text/xml+soap</code>
* <p>
- * Produces <code>Content-Type</code> types: <code>text/xml+soap</code>
+ * Produces <code>Content-Type</code> types: <code>text/xml+soap</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Essentially the same output as {@link XmlDocSerializer}, except wrapped in a standard SOAP envelope.
+ * Essentially the same output as {@link XmlDocSerializer}, except wrapped in a standard SOAP envelope.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link SoapXmlSerializerContext}
* <li>{@link BeanContext}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
index c6514fa..55ef915 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
@@ -43,7 +43,7 @@ import org.apache.juneau.svl.vars.*;
*
* <ja>@Override</ja>
* <jk>public</jk> String resolve(VarResolverSession session, String varVal) {
- * <jk>return</jk> System.<jsm>getProperty</jsm>(varVal);
+ * <jk>return</jk> System.<jsm>getProperty</jsm>(varVal);
* }
* }
*
@@ -119,7 +119,7 @@ public class VarResolver extends CoreApi {
* Register new variables with this resolver.
*
* @param vars The variable resolver classes.
- * These classes must subclass from {@link Var} and have no-arg constructors.
+ * These classes must subclass from {@link Var} and have no-arg constructors.
* @return This object (for method chaining).
*/
public VarResolver addVars(Class<?>...vars) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverContext.java b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverContext.java
index fb368d4..2767154 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverContext.java
@@ -20,8 +20,8 @@ import org.apache.juneau.internal.*;
/**
* Configurable properties on the {@link VarResolver} class.
- * <p>
- * Used to associate {@link Var Vars} and context objects with {@link VarResolver VarResolvers}.
+ * <p>
+ * Used to associate {@link Var Vars} and context objects with {@link VarResolver VarResolvers}.
* <p>
* See {@link ContextFactory} for more information about context properties.
*
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index e357584..419fd2a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -68,7 +68,7 @@ public class VarResolverSession extends Session {
*
* @param s The string to resolve variables in.
* @return The new string with all variables resolved, or the same string if no variables were found.
- * Null input results in a blank string.
+ * Null input results in a blank string.
*/
public String resolve(String s) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
index 3817910..91ad7b1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
@@ -19,11 +19,11 @@ import org.apache.juneau.internal.*;
/**
* Parent class for all bean filters.
* <p>
- * Bean filters are used to control aspects of how beans are handled during serialization and parsing.
+ * Bean filters are used to control aspects of how beans are handled during serialization and parsing.
* <p>
- * This class can be considered a programmatic equivalent to using the {@link Bean @Bean} annotation on bean classes.
- * Thus, it can be used to perform the same function as the <code>@Bean</code> annotation when you don't have
- * the ability to annotate those classes (e.g. you don't have access to the source code).
+ * This class can be considered a programmatic equivalent to using the {@link Bean @Bean} annotation on bean classes.
+ * Thus, it can be used to perform the same function as the <code>@Bean</code> annotation when you don't have
+ * the ability to annotate those classes (e.g. you don't have access to the source code).
*/
public class BeanFilter {
@@ -87,8 +87,8 @@ public class BeanFilter {
/**
* Returns <jk>true</jk> if the properties defined on this bean class should be ordered alphabetically.
* <p>
- * This method is only used when the {@link #getProperties()} method returns <jk>null</jk>.
- * Otherwise, the ordering of the properties in the returned value is used.
+ * This method is only used when the {@link #getProperties()} method returns <jk>null</jk>.
+ * Otherwise, the ordering of the properties in the returned value is used.
*
* @return <jk>true</jk> if bean properties should be sorted.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
index c579ae6..b44da60 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
@@ -20,8 +20,8 @@ import org.apache.juneau.*;
/**
* Builder class for {@link BeanFilter} objects.
* <p>
- * Bean filter builders must have a public no-arg constructor.
- * Builder settings should be set in the constructor using the provided setters on this class.
+ * Bean filter builders must have a public no-arg constructor.
+ * Builder settings should be set in the constructor using the provided setters on this class.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -126,7 +126,7 @@ public abstract class BeanFilterBuilder {
* String r = s.serialize(a1);
* <jsm>assertEquals</jsm>(<js>"{f0:'f0'}"</js>, r); <jc>// Note f1 is not serialized</jc>
* </p>
- * <p>
+ * <p>
* Note that this filter can be used on the parent class so that it filters to all child classes,
* or can be set individually on the child classes.
*
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java b/juneau-core/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
index f3032f8..0ccafaf 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
@@ -18,8 +18,8 @@ import org.apache.juneau.*;
* Simple bean filter that simply identifies a class to be used as an interface
* class for all child classes.
* <p>
- * These objects are created when you pass in non-<code>BeanFilterBuilder</code> classes to {@link ContextFactory#addToProperty(String,Object)},
- * and are equivalent to adding a <code><ja>@Bean</ja>(interfaceClass=Foo.<jk>class</jk>)</code> annotation on the <code>Foo</code> class.
+ * These objects are created when you pass in non-<code>BeanFilterBuilder</code> classes to {@link ContextFactory#addToProperty(String,Object)},
+ * and are equivalent to adding a <code><ja>@Bean</ja>(interfaceClass=Foo.<jk>class</jk>)</code> annotation on the <code>Foo</code> class.
*/
public class InterfaceBeanFilterBuilder extends BeanFilterBuilder {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java b/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
index fdcd3bd..7c36e7b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
@@ -30,58 +30,58 @@ import org.apache.juneau.serializer.*;
* parser, you can convert a {@code Date} object to a {@code String} during serialization, and convert that {@code String} object back into
* a {@code Date} object during parsing.
* <p>
- * Swaps MUST declare a public no-arg constructor so that the bean context can instantiate them.
+ * Swaps MUST declare a public no-arg constructor so that the bean context can instantiate them.
* <p>
* <code>PojoSwaps</code> are associated with instances of {@link BeanContext BeanContexts} by passing the swap class to
* the {@link CoreApi#addPojoSwaps(Class...)} method.<br>
- * When associated with a bean context, fields of the specified type will automatically be converted when the
+ * When associated with a bean context, fields of the specified type will automatically be converted when the
* {@link BeanMap#get(Object)} or {@link BeanMap#put(String, Object)} methods are called.<br>
* <p>
- * <code>PojoSwaps</code> have two parameters:
- * <ol>
- * <li>{@code <T>} - The normal representation of an object.
- * <li>{@code <S>} - The swapped representation of an object.
- * </ol>
- * <br>
- * {@link Serializer Serializers} use swaps to convert objects of type T into objects of type S, and on calls to {@link BeanMap#get(Object)}.<br>
- * {@link Parser Parsers} use swaps to convert objects of type S into objects of type T, and on calls to {@link BeanMap#put(String,Object)}.
+ * <code>PojoSwaps</code> have two parameters:
+ * <ol>
+ * <li>{@code <T>} - The normal representation of an object.
+ * <li>{@code <S>} - The swapped representation of an object.
+ * </ol>
+ * <br>
+ * {@link Serializer Serializers} use swaps to convert objects of type T into objects of type S, and on calls to {@link BeanMap#get(Object)}.<br>
+ * {@link Parser Parsers} use swaps to convert objects of type S into objects of type T, and on calls to {@link BeanMap#put(String,Object)}.
*
* <h6 class='topic'>Subtypes</h6>
* <p>
- * The following abstract subclasses are provided for common swap types:
- * <ol>
- * <li>{@link StringSwap} - Objects swapped with strings.
- * <li>{@link MapSwap} - Objects swapped with {@link ObjectMap ObjectMaps}.
- * </ol>
+ * The following abstract subclasses are provided for common swap types:
+ * <ol>
+ * <li>{@link StringSwap} - Objects swapped with strings.
+ * <li>{@link MapSwap} - Objects swapped with {@link ObjectMap ObjectMaps}.
+ * </ol>
*
* <h6 class='topic'>Localization</h6>
* <p>
- * Swaps have access to the session locale and timezone through the {@link BeanSession#getLocale()} and {@link BeanSession#getTimeZone()}
+ * Swaps have access to the session locale and timezone through the {@link BeanSession#getLocale()} and {@link BeanSession#getTimeZone()}
* methods. This allows you to specify localized swap values when needed.
- * If using the REST server API, the locale and timezone are set based on the <code>Accept-Language</code> and <code>Time-Zone</code> headers
+ * If using the REST server API, the locale and timezone are set based on the <code>Accept-Language</code> and <code>Time-Zone</code> headers
* on the request.
*
* <h6 class='topic'>Swap Class Type {@code <S>}</h6>
* <p>
- * The swapped object representation of an object must be an object type that the serializers can
+ * The swapped object representation of an object must be an object type that the serializers can
* natively convert to JSON (or language-specific equivalent). The list of valid transformed types are as follows...
- * <ul class='spaced-list'>
- * <li>{@link String}
- * <li>{@link Number}
- * <li>{@link Boolean}
- * <li>{@link Collection} containing anything on this list.
- * <li>{@link Map} containing anything on this list.
- * <li>A java bean with properties of anything on this list.
- * <li>An array of anything on this list.
- * </ul>
+ * <ul class='spaced-list'>
+ * <li>{@link String}
+ * <li>{@link Number}
+ * <li>{@link Boolean}
+ * <li>{@link Collection} containing anything on this list.
+ * <li>{@link Map} containing anything on this list.
+ * <li>A java bean with properties of anything on this list.
+ * <li>An array of anything on this list.
+ * </ul>
*
* <h6 class='topic'>Normal Class Type {@code <T>}</h6>
* <p>
- * The normal object representation of an object.<br>
+ * The normal object representation of an object.<br>
*
* <h6 class='topic'>One-way vs. Two-way Serialization</h6>
* <p>
- * Note that while there is a unified interface for handling swaps during both serialization and parsing,
+ * Note that while there is a unified interface for handling swaps during both serialization and parsing,
* in many cases only one of the {@link #swap(BeanSession, Object)} or {@link #unswap(BeanSession, Object, ClassMeta)} methods will be defined
* because the swap is one-way. For example, a swap may be defined to convert an {@code Iterator} to a {@code ObjectList}, but
* it's not possible to unswap an {@code Iterator}. In that case, the {@code swap(Object}} method would
@@ -131,18 +131,18 @@ public abstract class PojoSwap<T,S> {
/**
* If this transform is to be used to serialize non-serializable POJOs, it must implement this method.
* <p>
- * The object must be converted into one of the following serializable types:
- * <ul class='spaced-list'>
- * <li>{@link String}
- * <li>{@link Number}
- * <li>{@link Boolean}
- * <li>{@link Collection} containing anything on this list.
- * <li>{@link Map} containing anything on this list.
- * <li>A java bean with properties of anything on this list.
- * <li>An array of anything on this list.
- * </ul>
+ * The object must be converted into one of the following serializable types:
+ * <ul class='spaced-list'>
+ * <li>{@link String}
+ * <li>{@link Number}
+ * <li>{@link Boolean}
+ * <li>{@link Collection} containing anything on this list.
+ * <li>{@link Map} containing anything on this list.
+ * <li>A java bean with properties of anything on this list.
+ * <li>An array of anything on this list.
+ * </ul>
* @param session The bean session to use to get the class meta.
- * This is always going to be the same bean context that created this swap.
+ * This is always going to be the same bean context that created this swap.
* @param o The object to be transformed.
*
* @return The transformed object.
@@ -155,11 +155,11 @@ public abstract class PojoSwap<T,S> {
/**
* If this transform is to be used to reconstitute POJOs that aren't true Java beans, it must implement this method.
* @param session The bean session to use to get the class meta.
- * This is always going to be the same bean context that created this swap.
+ * This is always going to be the same bean context that created this swap.
* @param f The transformed object.
* @param hint If possible, the parser will try to tell you the object type being created. For example,
* on a serialized date, this may tell you that the object being created must be of type {@code GregorianCalendar}.<br>
- * This may be <jk>null</jk> if the parser cannot make this determination.
+ * This may be <jk>null</jk> if the parser cannot make this determination.
*
* @return The narrowed object.
* @throws ParseException If this method is not implemented.
@@ -180,7 +180,7 @@ public abstract class PojoSwap<T,S> {
/**
* Returns the G class, the generialized form of the class.
* <p>
- * Subclasses must override this method if the generialized class is {@code Object},
+ * Subclasses must override this method if the generialized class is {@code Object},
* meaning it can produce multiple generialized forms.
*
* @return The transformed form of this class.
@@ -194,7 +194,7 @@ public abstract class PojoSwap<T,S> {
* This value is cached for quick lookup.
*
* @param beanContext The bean context to use to get the class meta.
- * This is always going to be the same bean context that created this swap.
+ * This is always going to be the same bean context that created this swap.
* @return The {@link ClassMeta} of the transformed class type.
*/
public ClassMeta<?> getSwapClassMeta(BeanContext beanContext) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transforms/BeanStringSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/BeanStringSwap.java b/juneau-core/src/main/java/org/apache/juneau/transforms/BeanStringSwap.java
index c7d1c67..f438551 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/BeanStringSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/BeanStringSwap.java
@@ -18,11 +18,11 @@ import org.apache.juneau.transform.*;
/**
* Transforms beans into {@link String Strings} by simply calling the {@link Object#toString()} method.
* <p>
- * Allows you to specify classes that should just be converted to {@code Strings} instead of potentially
+ * Allows you to specify classes that should just be converted to {@code Strings} instead of potentially
* being turned into Maps by the {@link BeanContext} (or worse, throwing {@link BeanRuntimeException BeanRuntimeExceptions}).
* <p>
- * This is usually a one-way transform.
- * Beans serialized as strings cannot be reconstituted using a parser unless it is a <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">Type 5 POJO</a>.
+ * This is usually a one-way transform.
+ * Beans serialized as strings cannot be reconstituted using a parser unless it is a <a class="doclink" href="../../../../overview-summary.html#Core.PojoCategories">Type 5 POJO</a>.
*
* @param <T> The class type of the bean.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transforms/CalendarSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/CalendarSwap.java b/juneau-core/src/main/java/org/apache/juneau/transforms/CalendarSwap.java
index a4bf22c..2b180c2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/CalendarSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/CalendarSwap.java
@@ -27,7 +27,7 @@ import org.apache.juneau.transform.*;
*
* <h6 class='topic'>Behavior-specific subclasses</h6>
* <p>
- * The following direct subclasses are provided for convenience to the following formats:
+ * The following direct subclasses are provided for convenience to the following formats:
* <ul class='spaced-list'>
* <li>{@link ToString} - To {@link String Strings} using the {@code Date.toString()} method.
* <li>{@link ISO8601DT} - To ISO8601 date-time strings.
@@ -67,13 +67,13 @@ public class CalendarSwap extends StringSwap<Calendar> {
* Only one of the <code>pattern</code> or <code>style</code> parameters should
*
* @param pattern The {@link SimpleDateFormat} pattern.
- * If <jk>null</jk>, <code>style</code> is used instead.
+ * If <jk>null</jk>, <code>style</code> is used instead.
* @param dateStyle The {@link DateFormat} date style (e.g. {@link DateFormat#SHORT}).
- * Ignored if <code>pattern</code> is not <jk>null</jk>.
- * Ignored if <code>-1</code>.
+ * Ignored if <code>pattern</code> is not <jk>null</jk>.
+ * Ignored if <code>-1</code>.
* @param timeStyle The {@link DateFormat} time style (e.g. {@link DateFormat#SHORT}).
- * Ignored if <code>pattern</code> is not <jk>null</jk>.
- * Ignored if <code>-1</code>.
+ * Ignored if <code>pattern</code> is not <jk>null</jk>.
+ * Ignored if <code>-1</code>.
* @param timeZone The timeZone to use for dates. If <jk>null</jk> then either the
* timezone specified on the {@link Calendar} object or the timezone returned
* by {@link BeanSession#getTimeZone()} is used.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transforms/DateSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/DateSwap.java b/juneau-core/src/main/java/org/apache/juneau/transforms/DateSwap.java
index 8e8b8a7..913f649 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/DateSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/DateSwap.java
@@ -27,7 +27,7 @@ import org.apache.juneau.transform.*;
*
* <h6 class='topic'>Behavior-specific subclasses</h6>
* <p>
- * The following direct subclasses are provided for convenience to the following formats:
+ * The following direct subclasses are provided for convenience to the following formats:
* <ul class='spaced-list'>
* <li>{@link ToString} - To {@link String Strings} using the {@code Date.toString()} method.
* <li>{@link ISO8601DT} - To ISO8601 date-time strings.
@@ -67,13 +67,13 @@ public class DateSwap extends StringSwap<Date> {
* Only one of the <code>pattern</code> or <code>style</code> parameters should
*
* @param pattern The {@link SimpleDateFormat} pattern.
- * If <jk>null</jk>, <code>style</code> is used instead.
+ * If <jk>null</jk>, <code>style</code> is used instead.
* @param dateStyle The {@link DateFormat} date style (e.g. {@link DateFormat#SHORT}).
- * Ignored if <code>pattern</code> is not <jk>null</jk>.
- * Ignored if <code>-1</code>.
+ * Ignored if <code>pattern</code> is not <jk>null</jk>.
+ * Ignored if <code>-1</code>.
* @param timeStyle The {@link DateFormat} time style (e.g. {@link DateFormat#SHORT}).
- * Ignored if <code>pattern</code> is not <jk>null</jk>.
- * Ignored if <code>-1</code>.
+ * Ignored if <code>pattern</code> is not <jk>null</jk>.
+ * Ignored if <code>-1</code>.
* @param timeZone The timeZone to use for dates. If <jk>null</jk> then the timezone returned
* by {@link BeanSession#getTimeZone()} is used.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transforms/EnumerationSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/EnumerationSwap.java b/juneau-core/src/main/java/org/apache/juneau/transforms/EnumerationSwap.java
index 3930aba..d1846c7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/EnumerationSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/EnumerationSwap.java
@@ -20,7 +20,7 @@ import org.apache.juneau.transform.*;
/**
* Transforms {@link Enumeration Enumerations} to {@code List<Object>} objects.
* <p>
- * This is a one-way transform, since {@code Enumerations} cannot be reconstituted.
+ * This is a one-way transform, since {@code Enumerations} cannot be reconstituted.
*/
@SuppressWarnings({"unchecked","rawtypes"})
public class EnumerationSwap extends PojoSwap<Enumeration,List> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transforms/IteratorSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/IteratorSwap.java b/juneau-core/src/main/java/org/apache/juneau/transforms/IteratorSwap.java
index 439e70f..37ccaff 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/IteratorSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/IteratorSwap.java
@@ -20,7 +20,7 @@ import org.apache.juneau.transform.*;
/**
* Transforms {@link Iterator Iterators} to {@code List<Object>} objects.
* <p>
- * This is a one-way transform, since {@code Iterators} cannot be reconstituted.
+ * This is a one-way transform, since {@code Iterators} cannot be reconstituted.
*/
@SuppressWarnings({"unchecked","rawtypes"})
public class IteratorSwap extends PojoSwap<Iterator,List> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transforms/ReaderSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/ReaderSwap.java b/juneau-core/src/main/java/org/apache/juneau/transforms/ReaderSwap.java
index f8129ac..5722e04 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/ReaderSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/ReaderSwap.java
@@ -28,16 +28,16 @@ import org.apache.juneau.xml.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * The {@code Reader} must contain JSON, Juneau-generated XML (output from {@link XmlSerializer}),
- * or Juneau-generated HTML (output from {@link JsonSerializer}) in order to be parsed correctly.
+ * The {@code Reader} must contain JSON, Juneau-generated XML (output from {@link XmlSerializer}),
+ * or Juneau-generated HTML (output from {@link JsonSerializer}) in order to be parsed correctly.
* <p>
- * Useful for serializing models that contain {@code Readers} created by {@code RestCall} instances.
+ * Useful for serializing models that contain {@code Readers} created by {@code RestCall} instances.
* <p>
- * This is a one-way transform, since {@code Readers} cannot be reconstituted.
+ * This is a one-way transform, since {@code Readers} cannot be reconstituted.
*
* <h6 class='topic'>Behavior-specific subclasses</h6>
* <p>
- * The following direct subclasses are provided for convenience:
+ * The following direct subclasses are provided for convenience:
* <ul class='spaced-list'>
* <li>{@link Json} - Parses JSON text.
* <li>{@link Xml} - Parses XML text.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java b/juneau-core/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java
index d29327e..9808bcf 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java
@@ -23,9 +23,9 @@ import org.apache.juneau.transform.*;
/**
* Transforms {@link XMLGregorianCalendar XMLGregorianCalendars} to ISO8601 date-time {@link String Strings}.
* <p>
- * Objects are converted to strings using {@link XMLGregorianCalendar#toXMLFormat()}.
+ * Objects are converted to strings using {@link XMLGregorianCalendar#toXMLFormat()}.
* <p>
- * Strings are converted to objects using {@link DatatypeFactory#newXMLGregorianCalendar(String)}.
+ * Strings are converted to objects using {@link DatatypeFactory#newXMLGregorianCalendar(String)}.
*/
public class XMLGregorianCalendarSwap extends StringSwap<XMLGregorianCalendar> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
index 2ada474..948d92b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
@@ -28,15 +28,15 @@ import org.apache.juneau.transform.*;
*
* <h5 class='section'>Media types:</h5>
* <p>
- * Handles <code>Content-Type</code> types: <code>text/uon</code>
+ * Handles <code>Content-Type</code> types: <code>text/uon</code>
*
* <h5 class='section'>Description:</h5>
* <p>
- * This parser uses a state machine, which makes it very fast and efficient.
+ * This parser uses a state machine, which makes it very fast and efficient.
*
* <h5 class='section'>Configurable properties:</h5>
* <p>
- * This class has the following properties associated with it:
+ * This class has the following properties associated with it:
* <ul>
* <li>{@link UonParserContext}
* <li>{@link ParserContext}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParserSession.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParserSession.java
index 54b8927..cea28dc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParserSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParserSession.java
@@ -35,23 +35,23 @@ public class UonParserSession 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.
+ * he 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>
+ * <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.
+ * 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>).
*/
public UonParserSession(UonParserContext ctx, ObjectMap op, Object input, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {
[7/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/Consumes.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Consumes.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Consumes.java
index 867db1c..49d524d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Consumes.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Consumes.java
@@ -24,23 +24,23 @@ import org.apache.juneau.parser.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Provides a way to define the contents of {@link Parser#getMediaTypes()} through an annotation.
+ * Provides a way to define the contents of {@link Parser#getMediaTypes()} through an annotation.
* <p>
- * The {@link Parser#getMediaTypes()} default implementation gathers the media types by looking
- * for this annotation.
- * It should be noted that this annotation is optional and that the {@link Parser#getMediaTypes()} method can
- * be overridden by subclasses to return the media types programmatically.
+ * The {@link Parser#getMediaTypes()} default implementation gathers the media types by looking
+ * for this annotation.
+ * It should be noted that this annotation is optional and that the {@link Parser#getMediaTypes()} method can
+ * be overridden by subclasses to return the media types programmatically.
*
* <h5 class='section'>Example:</h5>
* <p>
- * Standard example:
+ * Standard example:
* <p class='bcode'>
* <ja>@Consumes</ja>(<js>"application/json,text/json"</js>)
* <jk>public class</jk> JsonParser <jk>extends</jk> ReaderParser {...}
* </p>
* <p>
- * The media types can also be <code>media-range</code> values per
- * <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC2616/14.1</a>.
+ * The media types can also be <code>media-range</code> values per
+ * <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC2616/14.1</a>.
* <p class='bcode'>
* <jc>// Consumes any text</jc>
* <ja>@Consumes</ja>(<js>"text\/*"</js>)
@@ -60,7 +60,7 @@ public @interface Consumes {
/**
* A comma-delimited list of media types that the parser can handle.
* <p>
- * Can contain meta-characters per the <code>media-type</code> specification of
+ * Can contain meta-characters per the <code>media-type</code> specification of
* <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC2616/14.1</a>
* @return The media types that the parser can handle.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
index 0f0e821..18897a1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
@@ -40,7 +40,7 @@ public @interface Pojo {
*
* <h5 class='section'>Example:</h5>
* <p>
- * In this case, a swap is being applied to a bean that will force it to be serialized as a <code>String</code>
+ * In this case, a swap is being applied to a bean that will force it to be serialized as a <code>String</code>
* <p class='bcode'>
* <jc>// Our bean class</jc>
* <ja>@Pojo</ja>(swap=BSwap.<jk>class</jk>)
@@ -73,7 +73,7 @@ public @interface Pojo {
* }
* </p>
* <p>
- * Note that using this annotation is functionally equivalent to adding swaps to the serializers and parsers:
+ * Note that using this annotation is functionally equivalent to adding swaps to the serializers and parsers:
* <p class='bcode'>
* WriterSerializer s = <jk>new</jk> JsonSerializer.addPojoSwaps(BSwap.<jk>class</jk>);
* ReaderParser p = <jk>new</jk> JsonParser.addPojoSwaps(BSwap.<jk>class</jk>);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java
index 2361734..4e76c64 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java
@@ -24,25 +24,25 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Description:</h5>
* <p>
- * Provides a way to define the contents of {@link Serializer#getMediaTypes()} through an annotation.
+ * Provides a way to define the contents of {@link Serializer#getMediaTypes()} through an annotation.
* <p>
- * The {@link Serializer#getMediaTypes()} default implementation gathers the media types by looking
- * for this annotation.
- * It should be noted that this annotation is optional and that the {@link Serializer#getMediaTypes()} method can
- * be overridden by subclasses to return the media types programmatically.
+ * The {@link Serializer#getMediaTypes()} default implementation gathers the media types by looking
+ * for this annotation.
+ * It should be noted that this annotation is optional and that the {@link Serializer#getMediaTypes()} method can
+ * be overridden by subclasses to return the media types programmatically.
*
* <h5 class='section'>Example:</h5>
* <p>
- * Standard example:
+ * Standard example:
* <p class='bcode'>
* <ja>@Produces</ja>(<js>"application/json,text/json"</js>)
* <jk>public class</jk> JsonSerializer <jk>extends</jk> WriterSerializer {...}
* </p>
* <p>
- * The media types can also be <code>media-range</code> values per
- * <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC2616/14.1</a>.
- * When meta-characters are used, you should specify the {@link #contentType()} value to
- * indicate the real media type value that can be set on the <code>Content-Type</code> response header.
+ * The media types can also be <code>media-range</code> values per
+ * <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC2616/14.1</a>.
+ * When meta-characters are used, you should specify the {@link #contentType()} value to
+ * indicate the real media type value that can be set on the <code>Content-Type</code> response header.
*
* <p class='bcode'>
* <jc>// Produces any text</jc>
@@ -63,7 +63,7 @@ public @interface Produces {
/**
* A comma-delimited list of the media types that the serializer can handle.
* <p>
- * Can contain meta-characters per the <code>media-type</code> specification of
+ * Can contain meta-characters per the <code>media-type</code> specification of
* <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC2616/14.1</a>
* @return The media types that the parser can handle.
*/
@@ -72,9 +72,9 @@ public @interface Produces {
/**
* The content type that this serializer produces.
* <p>
- * Can be used to override the <code>Content-Type</code> response type if the media types
- * are <code>media-ranges</code> with meta-characters, or the <code>Content-Type</code>
- * differs from the media type for some reason.
+ * Can be used to override the <code>Content-Type</code> response type if the media types
+ * are <code>media-ranges</code> with meta-characters, or the <code>Content-Type</code>
+ * differs from the media type for some reason.
* @return The content type that this serializer produces, or blank if no overriding value exists.
*/
String contentType() default "";
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/annotation/URI.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/URI.java b/juneau-core/src/main/java/org/apache/juneau/annotation/URI.java
index 7e7c0ad..7a3a19c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/URI.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/URI.java
@@ -23,16 +23,16 @@ import org.apache.juneau.serializer.*;
/**
* Used to identify a class or bean property as a URI.
* <p>
- * By default, instances of {@link URL} and {@link URI} are considered URIs during serialization, and are
- * handled differently depending on the serializer (e.g. <code>HtmlSerializer</code> creates a hyperlink,
- * <code>RdfXmlSerializer</code> creates an <code>rdf:resource</code> object, etc...).
+ * By default, instances of {@link URL} and {@link URI} are considered URIs during serialization, and are
+ * handled differently depending on the serializer (e.g. <code>HtmlSerializer</code> creates a hyperlink,
+ * <code>RdfXmlSerializer</code> creates an <code>rdf:resource</code> object, etc...).
* <p>
- * This annotation allows you to identify other classes that return URIs via <code>toString()</code> as URI objects.
+ * This annotation allows you to identify other classes that return URIs via <code>toString()</code> as URI objects.
* <p>
- * Relative URIs are automatically prepended with {@link SerializerContext#SERIALIZER_absolutePathUriBase} and {@link SerializerContext#SERIALIZER_relativeUriBase}
- * during serialization just like relative <code>URIs</code>.
+ * Relative URIs are automatically prepended with {@link SerializerContext#SERIALIZER_absolutePathUriBase} and {@link SerializerContext#SERIALIZER_relativeUriBase}
+ * during serialization just like relative <code>URIs</code>.
* <p>
- * This annotation can be applied to classes, interfaces, or bean property methods for fields.
+ * This annotation can be applied to classes, interfaces, or bean property methods for fields.
*
* <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/dto/Link.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/Link.java b/juneau-core/src/main/java/org/apache/juneau/dto/Link.java
index 8c747ae..e3a3cd3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/Link.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/Link.java
@@ -21,12 +21,12 @@ import org.apache.juneau.utils.*;
/**
* Simple bean that implements a hyperlink for the HTML serializer.
* <p>
- * The name and url properties correspond to the following parts of a hyperlink in an HTML document...
+ * The name and url properties correspond to the following parts of a hyperlink in an HTML document...
* <p class='bcode'>
* <xt><a</xt> <xa>href</xa>=<xs>'href'</xs><xt>></xt>name<xt></a></xt>
* <p>
- * When encountered by the {@link HtmlSerializer} class, this object gets converted to a hyperlink.<br>
- * All other serializers simply convert it to a simple bean.
+ * When encountered by the {@link HtmlSerializer} class, this object gets converted to a hyperlink.<br>
+ * All other serializers simply convert it to a simple bean.
*/
@HtmlLink(nameProperty = "name", hrefProperty = "href")
public class Link implements Comparable<Link> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
index 8af8d4f..6c7f6a8 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Top-level ATOM feed object.
* <p>
- * Represents an <code>atomFeed</code> construct in the RFC4287 specification.
+ * Represents an <code>atomFeed</code> construct in the RFC4287 specification.
* <p>
* <h6 class='figure'>Schema</h6>
* <p class='bcode'>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
index 40578bb..90f4b28 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
@@ -127,7 +127,7 @@ public class Link extends Common {
/**
* Sets the content type of the target of this link.
* <p>
- * Must be one of the following:
+ * Must be one of the following:
* <ul>
* <li><js>"text"</js>
* <li><js>"html"</js>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java
index 7ff2d02..6a58ff9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java
@@ -81,7 +81,7 @@ public class Text extends Common {
/**
* Sets the content type of this content.
* <p>
- * Must be one of the following:
+ * Must be one of the following:
* <ul>
* <li><js>"text"</js>
* <li><js>"html"</js>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
index a494cb9..f880815 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
@@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents a meta-data column in a Cognos dataset.
* <p>
- * When serialized to XML, creates the following construct:
+ * When serialized to XML, creates the following construct:
* <p class='bcode'>
* <xt><item</xt> <xa>name</xa>=<xs>'name'</xs> <xa>type</xa>=<xs>'xs:String'</xs> <xa>length</xa>=<xs>'255'</xs>/>
* </p>
@@ -61,11 +61,11 @@ public class Column {
/**
* Associates a POJO swap with this column.
* <p>
- * Typically used to define columns that don't exist on the underlying beans being serialized.
+ * Typically used to define columns that don't exist on the underlying beans being serialized.
* <p>
- * For example, the <code>AddressBookResource</code> sample defined the following POJO swap
- * to define an additional <js>"numAddresses"</js> column even though no such property exists
- * on the serialized beans.
+ * For example, the <code>AddressBookResource</code> sample defined the following POJO swap
+ * to define an additional <js>"numAddresses"</js> column even though no such property exists
+ * on the serialized beans.
* <p class='bcode'>
* Column c = <jk>new</jk> Column(<js>"numAddresses"</js>, <js>"xs:int"</js>)
* .addPojoSwaps(
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
index 5a57e52..2829631 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
@@ -21,7 +21,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents a Cognos dataset.
* <p>
- * When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):
+ * When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):
* <p class='bcode'>
* <xt><?xml</xt> <xa>version</xa>=<xs>'1.0'</xs> <xa>encoding</xa>=<xs>'UTF-8'</xs><xt>?></xt>
* <xt><c:dataset <xa>xmlns:c</xa>=<xs>'http://developer.cognos.com/schemas/xmldata/1/'</xs>></xt>
@@ -45,12 +45,12 @@ import org.apache.juneau.xml.annotation.*;
* <xt></c:dataset></xt>
* </p>
* <p>
- * Only 2-dimentional POJOs (arrays or collections of maps or beans) can be serialized to Cognos.
+ * Only 2-dimentional POJOs (arrays or collections of maps or beans) can be serialized to Cognos.
*
* <h5 class='section'>Example:</h5>
* <p>
- * The construct shown above is a serialized <code>AddressBook</code> object which is a subclass of <code>LinkedList<Person></code>.
- * The code for generating the XML is as follows...
+ * The construct shown above is a serialized <code>AddressBook</code> object which is a subclass of <code>LinkedList<Person></code>.
+ * The code for generating the XML is as follows...
* </p>
* <p class='bcode'>
* Column[] items = {
@@ -87,7 +87,7 @@ public class DataSet {
*
* @param columns The meta-data that represents the columns in the dataset.
* @param o The POJO being serialized to Cognos.
- * Must be an array/collection of beans/maps.
+ * Must be an array/collection of beans/maps.
* @param session The bean session used to convert POJOs to strings.
* @throws Exception An error occurred trying to serialize the POJO.
*/
@@ -123,7 +123,7 @@ public class DataSet {
/**
* Represents a row of data.
* <p>
- * When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):
+ * When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):
* <p class='bcode'>
* <xt><row></xt>
* <xt><value></xt>Barack Obama<xt></value></xt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java
index dc3c3cc..2bb181f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java
@@ -27,7 +27,7 @@ public class A extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
* Whether to download the resource instead of navigating to it, and its file name if so.
* @param download The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final A download(Object download) {
@@ -39,7 +39,7 @@ public class A extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
* Address of the hyperlink.
* @param href The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final A href(Object href) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java
index 711f26d..cc4894d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java
@@ -49,7 +49,7 @@ public class Area extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
* Whether to download the resource instead of navigating to it, and its file name if so.
* @param download The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Area download(Object download) {
@@ -61,7 +61,7 @@ public class Area extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
* Address of the hyperlink.
* @param href The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Area href(Object href) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Audio.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Audio.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Audio.java
index 8f1edb4..8c4fcc6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Audio.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Audio.java
@@ -27,7 +27,7 @@ public class Audio extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-autoplay">autoplay</a> attribute.
* Hint that the media resource can be started automatically when the page is loaded.
* @param autoplay The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Audio autoplay(Object autoplay) {
@@ -39,7 +39,7 @@ public class Audio extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-controls">controls</a> attribute.
* Show user agent controls.
* @param controls The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Audio controls(Object controls) {
@@ -62,7 +62,7 @@ public class Audio extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-loop">loop</a> attribute.
* Whether to loop the media resource.
* @param loop The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Audio loop(Object loop) {
@@ -85,7 +85,7 @@ public class Audio extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-muted">muted</a> attribute.
* Whether to mute the media resource by default.
* @param muted The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Audio muted(Object muted) {
@@ -108,7 +108,7 @@ public class Audio extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Audio src(Object src) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Base.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Base.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Base.java
index 818d44f..a607bcf 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Base.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Base.java
@@ -27,7 +27,7 @@ public class Base extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-base-href">href</a> attribute.
* Document base URL.
* @param href The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Base href(Object href) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Button.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Button.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Button.java
index f0c5eda..4c47ab2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Button.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Button.java
@@ -25,7 +25,7 @@ public class Button extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
* Automatically focus the form control when the page is loaded.
* @param autofocus The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Button autofocus(Object autofocus) {
@@ -37,7 +37,7 @@ public class Button extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Button disabled(Object disabled) {
@@ -148,7 +148,7 @@ public class Button extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-button-value">value</a> attribute.
* Value to be used for form submission.
* @param value The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Button value(Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Canvas.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Canvas.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Canvas.java
index 8c1f482..759fab6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Canvas.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Canvas.java
@@ -25,7 +25,7 @@ public class Canvas extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-canvas-height">height</a> attribute.
* Vertical dimension.
* @param height The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Canvas height(Object height) {
@@ -37,7 +37,7 @@ public class Canvas extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-canvas-width">width</a> attribute.
* Horizontal dimension.
* @param width The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Canvas width(Object width) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Col.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Col.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Col.java
index 97fea6f..9b4169e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Col.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Col.java
@@ -25,7 +25,7 @@ public class Col extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-col-span">span</a> attribute.
* Number of columns spanned by the element.
* @param span The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Col span(Object span) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Colgroup.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
index 27e3f56..84ffc0a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
@@ -25,7 +25,7 @@ public class Colgroup extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-colgroup-span">span</a> attribute.
* Number of columns spanned by the element.
* @param span The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Colgroup span(Object span) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Data.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Data.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Data.java
index 493186a..31d3281 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Data.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Data.java
@@ -25,7 +25,7 @@ public class Data extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#attr-data-value">value</a> attribute.
* Machine-readable value.
* @param value The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Data value(Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Embed.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Embed.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Embed.java
index 2624f72..9f189a6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Embed.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Embed.java
@@ -27,7 +27,7 @@ public class Embed extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a> attribute.
* Vertical dimension.
* @param height The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Embed height(Object height) {
@@ -39,7 +39,7 @@ public class Embed extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-embed-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Embed src(Object src) {
@@ -62,7 +62,7 @@ public class Embed extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
* Horizontal dimension.
* @param width The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Embed width(Object width) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Fieldset.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
index 38d015a..a1a41eb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
@@ -25,7 +25,7 @@ public class Fieldset extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fieldset-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Fieldset disabled(Boolean disabled) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Form.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Form.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Form.java
index 552622a..1960b36 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Form.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Form.java
@@ -91,7 +91,7 @@ public class Form extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-novalidate">novalidate</a> attribute.
* Bypass form control validation for form submission.
* @param novalidate The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Form novalidate(Boolean novalidate) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
index 22e2de2..da82778 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
@@ -111,7 +111,7 @@ public abstract class HtmlElement {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#attr-contenteditable">contenteditable</a> attribute.
* @param contenteditable The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public HtmlElement contenteditable(Object contenteditable) {
@@ -132,7 +132,7 @@ public abstract class HtmlElement {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#the-hidden-attribute">hidden</a> attribute.
* @param hidden The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public HtmlElement hidden(Object hidden) {
@@ -663,7 +663,7 @@ public abstract class HtmlElement {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#attr-spellcheck">spellcheck</a> attribute.
* @param spellcheck The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public HtmlElement spellcheck(Object spellcheck) {
@@ -684,7 +684,7 @@ public abstract class HtmlElement {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#attr-tabindex">tabindex</a> attribute.
* @param tabindex The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public HtmlElement tabindex(Object tabindex) {
@@ -705,7 +705,7 @@ public abstract class HtmlElement {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#attr-translate">translate</a> attribute.
* @param translate The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public HtmlElement translate(Object translate) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
index 65b779e..0430528 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
@@ -75,7 +75,7 @@ public class HtmlElementMixed extends HtmlElement {
/**
* Adds one or more child elements to this element.
* @param children The children to add as child elements.
- * Can be a mixture of strings and {@link HtmlElement} objects.
+ * Can be a mixture of strings and {@link HtmlElement} objects.
* @return This object (for method chaining).
*/
@SuppressWarnings("hiding")
@@ -92,7 +92,7 @@ public class HtmlElementMixed extends HtmlElement {
/**
* Adds a child element to this element.
* @param child The child to add as a child element.
- * Can be a string or {@link HtmlElement}.
+ * Can be a string or {@link HtmlElement}.
* @return This object (for method chaining).
*/
public HtmlElement child(Object child) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Iframe.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Iframe.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Iframe.java
index e7be7d3..4f01b54 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Iframe.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Iframe.java
@@ -27,7 +27,7 @@ public class Iframe extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a> attribute.
* Vertical dimension.
* @param height The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Iframe height(Object height) {
@@ -61,7 +61,7 @@ public class Iframe extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Iframe src(Object src) {
@@ -84,7 +84,7 @@ public class Iframe extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
* Horizontal dimension.
* @param width The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Iframe width(Object width) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Img.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Img.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Img.java
index 9f7d7e7..5696d23 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Img.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Img.java
@@ -48,7 +48,7 @@ public class Img extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a> attribute.
* Vertical dimension.
* @param height The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Img height(Object height) {
@@ -60,7 +60,7 @@ public class Img extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-img-ismap">ismap</a> attribute.
* Whether the image is a server-side image map.
* @param ismap The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Img ismap(Object ismap) {
@@ -72,7 +72,7 @@ public class Img extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-img-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Img src(Object src) {
@@ -95,7 +95,7 @@ public class Img extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
* Horizontal dimension.
* @param width The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Img width(Object width) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Input.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Input.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Input.java
index fdcc6bf..8c9343c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Input.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Input.java
@@ -71,7 +71,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-checked">checked</a> attribute.
* Whether the command or control is checked.
* @param checked The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Input checked(Object checked) {
@@ -94,7 +94,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Input disabled(Object disabled) {
@@ -172,7 +172,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a> attribute.
* Vertical dimension.
* @param height The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input height(Object height) {
@@ -206,7 +206,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-max">max</a> attribute.
* Maximum value.
* @param max The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input max(Object max) {
@@ -218,7 +218,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-maxlength">maxlength</a> attribute.
* Maximum length of value.
* @param maxlength The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input maxlength(Object maxlength) {
@@ -230,7 +230,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-min">min</a> attribute.
* Minimum value.
* @param min The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input min(Object min) {
@@ -242,7 +242,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-minlength">minlength</a> attribute.
* Minimum length of value.
* @param minlength The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input minlength(Object minlength) {
@@ -254,7 +254,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-multiple">multiple</a> attribute.
* Whether to allow multiple values.
* @param multiple The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Input multiple(Object multiple) {
@@ -299,7 +299,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-readonly">readonly</a> attribute.
* Whether to allow the value to be edited by the user.
* @param readonly The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Input readonly(Object readonly) {
@@ -311,7 +311,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-readonly">required</a> attribute.
* Whether the control is required for form submission.
* @param required The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Input required(Object required) {
@@ -323,7 +323,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-size">size</a> attribute.
* Size of the control.
* @param size The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input size(Object size) {
@@ -335,7 +335,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Input src(Object src) {
@@ -369,7 +369,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-value">value</a> attribute.
* Value of the form control.
* @param value The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input value(Object value) {
@@ -381,7 +381,7 @@ public class Input extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
* Horizontal dimension.
* @param width The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Input width(Object width) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
index 4f69a64..3e5bd32 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
@@ -25,7 +25,7 @@ public class Keygen extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
* Automatically focus the form control when the page is loaded.
* @param autofocus The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Keygen autofocus(Object autofocus) {
@@ -48,7 +48,7 @@ public class Keygen extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Keygen disabled(Object disabled) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
index 51e37d1..ef9a4c4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
@@ -38,7 +38,7 @@ public class Link extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-link-href">href</a> attribute.
* Address of the hyperlink.
* @param href The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Link href(Object href) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
index 27cc447..26fdde0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
@@ -25,7 +25,7 @@ public class Meter extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-high">high</a> attribute.
* Low limit of high range.
* @param high The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Meter high(Object high) {
@@ -37,7 +37,7 @@ public class Meter extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-low">low</a> attribute.
* High limit of low range.
* @param low The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Meter low(Object low) {
@@ -49,7 +49,7 @@ public class Meter extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-max">max</a> attribute.
* Upper bound of range.
* @param max The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Meter max(Object max) {
@@ -61,7 +61,7 @@ public class Meter extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-min">min</a> attribute.
* Lower bound of range.
* @param min The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Meter min(Object min) {
@@ -73,7 +73,7 @@ public class Meter extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-optimum">optimum</a> attribute.
* Optimum value in gauge.
* @param optimum The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Meter optimum(Object optimum) {
@@ -85,7 +85,7 @@ public class Meter extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-value">value</a> attribute.
* Current value of the element.
* @param value The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Meter value(Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
index 28ff4d1..601fd61 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
@@ -47,7 +47,7 @@ public class Object2 extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a> attribute.
* Vertical dimension.
* @param height The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Object2 height(Object height) {
@@ -81,7 +81,7 @@ public class Object2 extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-object-typemustmatch">typemustmatch</a> attribute.
* Whether the type attribute and the Content-Type value need to match for the resource to be used.
* @param typemustmatch The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Object2 typemustmatch(Object typemustmatch) {
@@ -104,7 +104,7 @@ public class Object2 extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
* Horizontal dimension.
* @param width The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Object2 width(Object width) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
index 7339383..81c4f77 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
@@ -25,7 +25,7 @@ public class Ol extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-ol-reversed">reversed</a> attribute.
* Number the list backwards..
* @param reversed The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Ol reversed(Object reversed) {
@@ -37,7 +37,7 @@ public class Ol extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-ol-start">start</a> attribute.
* Ordinal value of the first item.
* @param start The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Ol start(Object start) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
index 6238c46..a3facae 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
@@ -25,7 +25,7 @@ public class Optgroup extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-optgroup-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Optgroup disabled(Object disabled) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
index ca84eb9..743a779 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
@@ -25,7 +25,7 @@ public class Option extends HtmlElementText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-option-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Option disabled(Object disabled) {
@@ -48,7 +48,7 @@ public class Option extends HtmlElementText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-option-selected">selected</a> attribute.
* Whether the option is selected by default.
* @param selected The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Option selected(Object selected) {
@@ -60,7 +60,7 @@ public class Option extends HtmlElementText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-option-value">value</a> attribute.
* Value to be used for form submission.
* @param value The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Option value(Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Param.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Param.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Param.java
index 88c952a..00a6136 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Param.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Param.java
@@ -36,7 +36,7 @@ public class Param extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-param-value">value</a> attribute.
* Value of parameter.
* @param value The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Param value(Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
index 059bef7..2dd5ffb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
@@ -25,7 +25,7 @@ public class Progress extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-progress-max">max</a> attribute.
* Upper bound of range.
* @param max The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Progress max(Object max) {
@@ -37,7 +37,7 @@ public class Progress extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-progress-value">value</a> attribute.
* Current value of the element.
* @param value The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Progress value(Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
index 06f2fb4..3008010 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
@@ -27,7 +27,7 @@ public class Script extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-async">async</a> attribute.
* Execute script asynchronously.
* @param async The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Script async(Object async) {
@@ -61,7 +61,7 @@ public class Script extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-defer">defer</a> attribute.
* Defer script execution.
* @param defer The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Script defer(Object defer) {
@@ -73,7 +73,7 @@ public class Script extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Script src(Object src) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
index 1279781..0518c14 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
@@ -25,7 +25,7 @@ public class Select extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
* Automatically focus the form control when the page is loaded.
* @param autofocus The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Select autofocus(Object autofocus) {
@@ -37,7 +37,7 @@ public class Select extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Select disabled(Object disabled) {
@@ -60,7 +60,7 @@ public class Select extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-select-multiple">multiple</a> attribute.
* Whether to allow multiple values.
* @param multiple The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Select multiple(Object multiple) {
@@ -83,7 +83,7 @@ public class Select extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-select-required">required</a> attribute.
* Whether the control is required for form submission.
* @param required The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Select required(Object required) {
@@ -95,7 +95,7 @@ public class Select extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-select-size">size</a> attribute.
* Size of the control.
* @param size The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Select size(Object size) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Source.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Source.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Source.java
index 0c4c5fb..d4e9286 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Source.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Source.java
@@ -27,7 +27,7 @@ public class Source extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-source-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Source src(Object src) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
index b4a61f0..f4aea7b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
@@ -25,7 +25,7 @@ public class Table extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-table-border">border</a> attribute.
* //sortable - Enables a sorting interface for the table.
* @param border The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Table border(Object border) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
index 15acc90..c54414c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
@@ -25,7 +25,7 @@ public class Td extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-colspan">colspan</a> attribute.
* Number of columns that the cell is to span.
* @param colspan The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Td colspan(Object colspan) {
@@ -48,7 +48,7 @@ public class Td extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-rowspan">rowspan</a> attribute.
* Number of rows that the cell is to span.
* @param rowspan The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Td rowspan(Object rowspan) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
index f92ed65..a5159e0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
@@ -36,7 +36,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
* Automatically focus the form control when the page is loaded.
* @param autofocus The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea autofocus(Boolean autofocus) {
@@ -48,7 +48,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-cols">cols</a> attribute.
* Maximum number of characters per line.
* @param cols The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea cols(Object cols) {
@@ -71,7 +71,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
* Whether the form control is disabled.
* @param disabled The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea disabled(Object disabled) {
@@ -105,7 +105,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-maxlength">maxlength</a> attribute.
* Maximum length of value.
* @param maxlength The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea maxlength(Object maxlength) {
@@ -117,7 +117,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-minlength">minlength</a> attribute.
* Minimum length of value.
* @param minlength The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea minlength(Object minlength) {
@@ -151,7 +151,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-readonly">readonly</a> attribute.
* Whether to allow the value to be edited by the user.
* @param readonly The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea readonly(Object readonly) {
@@ -163,7 +163,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-required">required</a> attribute.
* Whether the control is required for form submission.
* @param required The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea required(Object required) {
@@ -175,7 +175,7 @@ public class Textarea extends HtmlElementRawText {
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-rows">rows</a> attribute.
* Number of lines to show.
* @param rows The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Textarea rows(Number rows) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
index 8b268e3..3c44c0b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
@@ -36,7 +36,7 @@ public class Th extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-colspan">colspan</a> attribute.
* Number of columns that the cell is to span.
* @param colspan The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Th colspan(Object colspan) {
@@ -59,7 +59,7 @@ public class Th extends HtmlElementMixed {
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-rowspan">rowspan</a> attribute.
* Number of rows that the cell is to span.
* @param rowspan The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Th rowspan(Object rowspan) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Track.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Track.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Track.java
index fb52d84..15c1208 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Track.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Track.java
@@ -60,7 +60,7 @@ public class Track extends HtmlElementVoid {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-track-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Track src(Object src) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
index 0cd7b27..846fc32 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
@@ -27,7 +27,7 @@ public class Video extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-autoplay">autoplay</a> attribute.
* Hint that the media resource can be started automatically when the page is loaded.
* @param autoplay The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Video autoplay(Object autoplay) {
@@ -39,7 +39,7 @@ public class Video extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-controls">controls</a> attribute.
* Show user agent controls.
* @param controls The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Video controls(Object controls) {
@@ -62,7 +62,7 @@ public class Video extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a> attribute.
* Vertical dimension.
* @param height The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Video height(Object height) {
@@ -74,7 +74,7 @@ public class Video extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-loop">loop</a> attribute.
* Whether to loop the media resource.
* @param loop The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Video loop(Object loop) {
@@ -97,7 +97,7 @@ public class Video extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-muted">muted</a> attribute.
* Whether to mute the media resource by default.
* @param muted The new value for this attribute.
- * Typically a {@link Boolean} or {@link String}.
+ * Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
*/
public final Video muted(Object muted) {
@@ -131,7 +131,7 @@ public class Video extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src">src</a> attribute.
* Address of the resource.
* @param src The new value for this attribute.
- * Typically a {@link URL} or {@link String}.
+ * Typically a {@link URL} or {@link String}.
* @return This object (for method chaining).
*/
public final Video src(Object src) {
@@ -143,7 +143,7 @@ public class Video extends HtmlElementContainer {
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
* Horizontal dimension.
* @param width The new value for this attribute.
- * Typically a {@link Number} or {@link String}.
+ * Typically a {@link Number} or {@link String}.
* @return This object (for method chaining).
*/
public final Video width(Object width) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index 9fcf5d0..a5ec69a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -15,9 +15,9 @@ package org.apache.juneau.dto.jsonschema;
/**
* Represents possible JSON types in the JSON-Schema core specification.
* <p>
- * Implements custom <code>toString()</code> and <code>fromString(String)</code> methods
- * that override the default serialization/parsing behavior of <code>Enum</code> types
- * so that they are represented in lowercase form (as per the specification).
+ * Implements custom <code>toString()</code> and <code>fromString(String)</code> methods
+ * that override the default serialization/parsing behavior of <code>Enum</code> types
+ * so that they are represented in lowercase form (as per the specification).
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -26,7 +26,7 @@ package org.apache.juneau.dto.jsonschema;
* </p>
*
* <p>
- * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
public enum JsonType {
[2/9] incubator-juneau git commit: Clean up javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletContext.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletContext.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletContext.java
index b8a3797..1ea0340 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletContext.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletContext.java
@@ -23,14 +23,14 @@ import org.apache.juneau.serializer.*;
/**
* Configurable properties on the {@link RestServlet} class.
* <p>
- * Properties can be set on the {@link RestServlet} class using the {@link RestResource#properties} or {@link RestMethod#properties} annotations.
+ * Properties can be set on the {@link RestServlet} class using the {@link RestResource#properties} or {@link RestMethod#properties} annotations.
* <p>
- * These properties can also be passed in as servlet init parameters or system properties.
+ * These properties can also be passed in as servlet init parameters or system properties.
* <p>
- * Some of these properties are only applicable on the servlet class, and others can be specified on the servlet class or method.<br>
- * These distinctions are noted below.
+ * Some of these properties are only applicable on the servlet class, and others can be specified on the servlet class or method.<br>
+ * These distinctions are noted below.
* <p>
- * See {@link ContextFactory} for more information about context properties.
+ * See {@link ContextFactory} for more information about context properties.
*/
public final class RestServletContext extends Context {
@@ -43,14 +43,14 @@ public final class RestServletContext extends Context {
* <li><b>Default:</b> <jk>true</jk>
* </ul>
* <p>
- * When enabled, headers such as <js>"Accept"</js> and <js>"Content-Type"</js> to be passed in as URL query parameters.
- * For example: <js>"?Accept=text/json&Content-Type=text/json"</js>
+ * When enabled, headers such as <js>"Accept"</js> and <js>"Content-Type"</js> to be passed in as URL query parameters.
+ * For example: <js>"?Accept=text/json&Content-Type=text/json"</js>
* <p>
- * Parameter names are case-insensitive.
+ * Parameter names are case-insensitive.
* <p>
- * Useful for debugging REST interface using only a browser.
+ * Useful for debugging REST interface using only a browser.
* <p>
- * Applicable to servlet class only.
+ * Applicable to servlet class only.
*/
public static final String REST_allowHeaderParams = "RestServlet.allowHeaderParams";
@@ -63,20 +63,20 @@ public final class RestServletContext extends Context {
* <li><b>Default:</b> <js>""</js>
* </ul>
* <p>
- * When specified, the HTTP method can be overridden by passing in a <js>"method"</js> URL parameter on a regular GET request.
- * For example: <js>"?method=OPTIONS"</js>
+ * When specified, the HTTP method can be overridden by passing in a <js>"method"</js> URL parameter on a regular GET request.
+ * For example: <js>"?method=OPTIONS"</js>
* <p>
- * Format is a comma-delimited list of HTTP method names that can be passed in as a method parameter.
- * Parameter name is case-insensitive.
- * Use "*" to represent all methods.
- * For backwards compatibility, "true" also means "*".
+ * Format is a comma-delimited list of HTTP method names that can be passed in as a method parameter.
+ * Parameter name is case-insensitive.
+ * Use "*" to represent all methods.
+ * For backwards compatibility, "true" also means "*".
* <p>
- * Note that per the <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html">HTTP specification</a>, special care should
+ * Note that per the <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html">HTTP specification</a>, special care should
* be taken when allowing non-safe (POST, PUT, DELETE) methods to be invoked through GET requests.
* <p>
- * Applicable to servlet class only.
+ * Applicable to servlet class only.
* <p>
- * Example: <js>"HEAD,OPTIONS"</js>
+ * Example: <js>"HEAD,OPTIONS"</js>
*/
public static final String REST_allowMethodParam = "RestServlet.allowMethodParam";
@@ -89,14 +89,14 @@ public final class RestServletContext extends Context {
* <li><b>Default:</b> <jk>true</jk>
* </ul>
* <p>
- * When enabled, the HTTP body content on PUT and POST requests can be passed in as text using the <js>"body"</js> URL parameter.
- * For example: <js>"?body={name:'John%20Smith',age:45}"</js>
+ * When enabled, the HTTP body content on PUT and POST requests can be passed in as text using the <js>"body"</js> URL parameter.
+ * For example: <js>"?body={name:'John%20Smith',age:45}"</js>
* <p>
- * Parameter name is case-insensitive.
+ * Parameter name is case-insensitive.
* <p>
- * Useful for debugging PUT and POST methods using only a browser.
+ * Useful for debugging PUT and POST methods using only a browser.
* <p>
- * Applicable to servlet class only.
+ * Applicable to servlet class only.
*/
public static final String REST_allowBodyParam = "RestServlet.allowBodyParam";
@@ -109,12 +109,12 @@ public final class RestServletContext extends Context {
* <li><b>Default:</b> <jk>false</jk>
* </ul>
* <p>
- * Render stack traces in HTTP response bodies when errors occur.
+ * Render stack traces in HTTP response bodies when errors occur.
* <p>
- * When enabled, Java stack traces will be rendered in the output response.
- * Useful for debugging, although allowing stack traces to be rendered may cause security concerns.
+ * When enabled, Java stack traces will be rendered in the output response.
+ * Useful for debugging, although allowing stack traces to be rendered may cause security concerns.
* <p>
- * Applicable to servlet class only.
+ * Applicable to servlet class only.
*/
public static final String REST_renderResponseStackTraces = "RestServlet.renderResponseStackTraces";
@@ -127,10 +127,10 @@ public final class RestServletContext extends Context {
* <li><b>Default:</b> <jk>true</jk>
* </ul>
* <p>
- * When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,
+ * When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,
* made available through the {@link RestException#getOccurrence()} method.
* <p>
- * Applicable to servlet class only.
+ * Applicable to servlet class only.
*/
public static final String REST_useStackTraceHashes = "RestServlet.useStackTraceHashes";
@@ -143,9 +143,9 @@ public final class RestServletContext extends Context {
* <li><b>Default:</b> <js>"utf-8"</js>
* </ul>
* <p>
- * The default character encoding for the request and response if not specified on the request.
+ * The default character encoding for the request and response if not specified on the request.
* <p>
- * Applicable to servlet class and methods.
+ * Applicable to servlet class and methods.
*/
public static final String REST_defaultCharset = "RestServlet.defaultCharset";
@@ -158,22 +158,22 @@ public final class RestServletContext extends Context {
* <li><b>Default:</b> <js>"UON"</js>
* </ul>
* <p>
- * Possible values:
+ * Possible values:
* <ul class='spaced-list'>
* <li><js>"UON"</js> - URL-Encoded Object Notation.<br>
- * This notation allows for request parameters to contain arbitrarily complex POJOs.
+ * This notation allows for request parameters to contain arbitrarily complex POJOs.
* <li><js>"PLAIN"</js> - Plain text.<br>
- * This treats request parameters as plain text.<br>
- * Only POJOs directly convertable from <l>Strings</l> can be represented in parameters when using this mode.
+ * This treats request parameters as plain text.<br>
+ * Only POJOs directly convertable from <l>Strings</l> can be represented in parameters when using this mode.
* </ul>
* <p>
- * Note that the parameter value <js>"(foo)"</js> is interpreted as <js>"(foo)"</js> when using plain mode, but
+ * Note that the parameter value <js>"(foo)"</js> is interpreted as <js>"(foo)"</js> when using plain mode, but
* <js>"foo"</js> when using UON mode.
* <p>
- * The format can also be specified per-parameter using the {@link FormData#format() @FormData.format()} and {@link Query#format() @Query.format()}
+ * The format can also be specified per-parameter using the {@link FormData#format() @FormData.format()} and {@link Query#format() @Query.format()}
* annotations.
* <p>
- * Applicable to servlet class and methods.
+ * Applicable to servlet class and methods.
*/
public static final String REST_paramFormat = "RestServlet.paramFormat";
@@ -184,94 +184,94 @@ public final class RestServletContext extends Context {
/**
* The request servlet path.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getServletPath()}
+ * Equivalent to the value returned by {@link RestRequest#getServletPath()}
*/
public static final String REST_servletPath = "RestServlet.servletPath";
/**
* The request servlet URI.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getServletURI()}
+ * Equivalent to the value returned by {@link RestRequest#getServletURI()}
*/
public static final String REST_servletURI = "RestServlet.servletURI";
/**
* The request servlet URI.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getRelativeServletURI()}
+ * Equivalent to the value returned by {@link RestRequest#getRelativeServletURI()}
*/
public static final String REST_relativeServletURI = "RestServlet.relativeServletURI";
/**
* The request URI path info.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getPathInfo()}
+ * Equivalent to the value returned by {@link RestRequest#getPathInfo()}
*/
public static final String REST_pathInfo = "RestServlet.pathInfo";
/**
* The request URI.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getRequestURI()}
+ * Equivalent to the value returned by {@link RestRequest#getRequestURI()}
*/
public static final String REST_requestURI = "RestServlet.requestURI";
/**
* The request method.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getMethod()}
+ * Equivalent to the value returned by {@link RestRequest#getMethod()}
*/
public static final String REST_method = "RestServlet.method";
/**
* The localized servlet title.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getServletTitle()}
+ * Equivalent to the value returned by {@link RestRequest#getServletTitle()}
*/
public static final String REST_servletTitle = "RestServlet.servletTitle";
/**
* The localized servlet description.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getServletDescription()}
+ * Equivalent to the value returned by {@link RestRequest#getServletDescription()}
*/
public static final String REST_servletDescription = "RestServlet.servletDescription";
/**
* The localized method summary.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getMethodSummary()}
+ * Equivalent to the value returned by {@link RestRequest#getMethodSummary()}
*/
public static final String REST_methodSummary = "RestServlet.methodSummary";
/**
* The localized method description.
* <p>
- * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
+ * Automatically added to properties return by {@link RestServlet#createRequestProperties(org.apache.juneau.ObjectMap, RestRequest)}
* and are therefore available through {@link SerializerSession#getProperties()} and {@link ParserSession#getProperties()}.
* <p>
- * Equivalent to the value returned by {@link RestRequest#getMethodDescription()}
+ * Equivalent to the value returned by {@link RestRequest#getMethodDescription()}
*/
public static final String REST_methodDescription = "RestServlet.methodDescription";
@@ -282,7 +282,7 @@ public final class RestServletContext extends Context {
/**
* Constructor.
* <p>
- * Typically only called from {@link ContextFactory#getContext(Class)}.
+ * Typically only called from {@link ContextFactory#getContext(Class)}.
*
* @param cf The factory that created this context.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
index a95ae6d..12e83b7 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletDefault.java
@@ -29,7 +29,7 @@ import org.apache.juneau.xml.*;
/**
* Subclass of {@link RestServlet} with default serializers and parsers defined.
* <p>
- * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:
+ * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:
* </p>
* <table class='styled'>
* <tr>
@@ -99,7 +99,7 @@ import org.apache.juneau.xml.*;
* </tr>
* </table>
* <p>
- * Supports the following request <code>Content-Type</code> header values:
+ * Supports the following request <code>Content-Type</code> header values:
* </p>
* <table class='styled'>
* <tr>
@@ -132,22 +132,18 @@ import org.apache.juneau.xml.*;
* </tr>
* </table>
* <p>
- * It should be noted that we do NOT add {@link JavaSerializedObjectParser} to the list of parsers since this could
- * cause security issues. Use caution when using this particular parser as it could inadvertantly cause
- * code execution security holes.
- * </p>
+ * It should be noted that we do NOT add {@link JavaSerializedObjectParser} to the list of parsers since this could
+ * cause security issues. Use caution when using this particular parser as it could inadvertantly cause
+ * code execution security holes.
* <p>
- * The list of serializers and parsers can be appended to using the {@link RestResource#serializers() @RestResource.serializers()}
- * and {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.
- * </p>
+ * The list of serializers and parsers can be appended to using the {@link RestResource#serializers() @RestResource.serializers()}
+ * and {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.
* <p>
- * This subclass also provides a default OPTIONS page by implementing a {@link #getOptions(RestRequest)} that returns a POJO consisting
- * of beans describing the class.
- * </p>
+ * This subclass also provides a default OPTIONS page by implementing a {@link #getOptions(RestRequest)} that returns a POJO consisting
+ * of beans describing the class.
* <img class='bordered' src='doc-files/OptionsPage.png'>
* <p>
- * The OPTIONS page can be modified or augmented by overriding this method and providing your own data.
- * </p>
+ * The OPTIONS page can be modified or augmented by overriding this method and providing your own data.
*
* <h6 class='topic'>Other Notes</h6>
* <ul class='spaced-list'>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
index 77a95a6..872d372 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
@@ -18,10 +18,10 @@ import org.apache.juneau.rest.labels.*;
/**
* Specialized subclass of {@link RestServletDefault} for showing "group" pages.
* <p>
- * Group pages consist of simple lists of child resource URLs and their labels.
- * They're meant to be used as jumping-off points for child resources.
+ * Group pages consist of simple lists of child resource URLs and their labels.
+ * They're meant to be used as jumping-off points for child resources.
* <p>
- * Child resources are specified using the {@link RestResource#children()} annotation.
+ * Child resources are specified using the {@link RestResource#children()} annotation.
*/
@RestResource()
public abstract class RestServletGroupDefault extends RestServletDefault {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Body.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Body.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Body.java
index f302e34..db5dcbe 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Body.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Body.java
@@ -30,7 +30,7 @@ import java.lang.annotation.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"POST"</js>)
@@ -40,8 +40,8 @@ import java.lang.annotation.*;
* }
* </p>
* <p>
- * {@link Reader Readers} and {@link InputStream InputStreams} can also be specified as content parameters.
- * When specified, any registered parsers are bypassed.
+ * {@link Reader Readers} and {@link InputStream InputStreams} can also be specified as content parameters.
+ * When specified, any registered parsers are bypassed.
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"POST"</js>)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/FormData.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/FormData.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/FormData.java
index 1086956..055b805 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/FormData.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/FormData.java
@@ -32,7 +32,7 @@ import org.apache.juneau.rest.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"POST"</js>)
@@ -46,11 +46,11 @@ import org.apache.juneau.rest.*;
*
* <h6 class='topic'>Important note concerning FORM posts</h6>
* <p>
- * This annotation should not be combined with the {@link Body @Body} annotation or {@link RestRequest#getBody(Class)} method
+ * This annotation should not be combined with the {@link Body @Body} annotation or {@link RestRequest#getBody(Class)} method
* for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet
* API to parse the body content as key-value pairs resulting in empty content.
* <p>
- * The {@link Query @Query} annotation can be used to retrieve a URL parameter
+ * The {@link Query @Query} annotation can be used to retrieve a URL parameter
* in the URL string without triggering the servlet to drain the body content.
*/
@Documented
@@ -67,12 +67,12 @@ public @interface FormData {
/**
* Specify <jk>true</jk> if using multi-part parameters to represent collections and arrays.
* <p>
- * Normally, we expect single parameters to be specified in UON notation for representing
- * collections of values (e.g. <js>"key=(1,2,3)"</js>.
- * This annotation allows the use of multi-part parameters to represent collections
- * (e.g. <js>"key=1&key=2&key=3"</js>.
+ * Normally, we expect single parameters to be specified in UON notation for representing
+ * collections of values (e.g. <js>"key=(1,2,3)"</js>.
+ * This annotation allows the use of multi-part parameters to represent collections
+ * (e.g. <js>"key=1&key=2&key=3"</js>.
* <p>
- * This setting should only be applied to Java parameters of type array or Collection.
+ * This setting should only be applied to Java parameters of type array or Collection.
*/
boolean multipart() default false;
@@ -82,10 +82,10 @@ public @interface FormData {
* Possible values:
* <ul class='spaced-list'>
* <li><js>"UON"</js> - URL-Encoded Object Notation.<br>
- * This notation allows for request parameters to contain arbitrarily complex POJOs.
+ * This notation allows for request parameters to contain arbitrarily complex POJOs.
* <li><js>"PLAIN"</js> - Plain text.<br>
- * This treats request parameters as plain text.<br>
- * Only POJOs directly convertable from <l>Strings</l> can be represented in parameters when using this mode.
+ * This treats request parameters as plain text.<br>
+ * Only POJOs directly convertable from <l>Strings</l> can be represented in parameters when using this mode.
* <li><js>"INHERIT"</js> (default) - Inherit from the {@link RestServletContext#REST_paramFormat} property on the servlet method or class.
* </ul>
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
index 3a8e207..79d9ba0 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
@@ -23,7 +23,7 @@ import org.apache.juneau.rest.*;
* Annotation that can be applied to a parameter of a {@link RestMethod} annotated method
* to identify whether or not the request has the specified multipart form POST parameter.
* <p>
- * Note that this can be used to detect the existence of a parameter when it's not set to a particular value.
+ * Note that this can be used to detect the existence of a parameter when it's not set to a particular value.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -33,7 +33,7 @@ import org.apache.juneau.rest.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"POST"</js>)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
index 0d60f43..880b1b7 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
@@ -36,7 +36,7 @@ import org.apache.juneau.rest.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Header.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Header.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Header.java
index bc4cdb5..aacc510 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Header.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Header.java
@@ -29,7 +29,7 @@ import java.lang.annotation.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Messages.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Messages.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Messages.java
index ae396a3..4cf84f3 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Messages.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Messages.java
@@ -24,7 +24,7 @@ import org.apache.juneau.utils.*;
* Annotation that can be applied to a parameter of a {@link RestMethod} annotated method
* to identify it as the resource bundle for the request locale.
* <p>
- * Parameter type must be either {@link ResourceBundle} or {@link MessageBundle}.
+ * Parameter type must be either {@link ResourceBundle} or {@link MessageBundle}.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -34,7 +34,7 @@ import org.apache.juneau.utils.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Method.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Method.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Method.java
index fbdbe66..aab6843 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Method.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Method.java
@@ -21,7 +21,7 @@ import java.lang.annotation.*;
* Annotation that can be applied to a parameter of a {@link RestMethod} annotated method
* to identify it as the HTTP method.
* <p>
- * Typically used for HTTP method handlers of type <js>"*"</js> (i.e. handle all requests).
+ * Typically used for HTTP method handlers of type <js>"*"</js> (i.e. handle all requests).
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -31,7 +31,7 @@ import java.lang.annotation.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"*"</js>)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Parameter.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
index 668638a..76c7b77 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
@@ -88,9 +88,9 @@ public @interface Parameter {
/**
* The schema defining the type used for the body parameter.
* <p>
- * Only applicable for <code>in</code> of type <js>"body"</js>.
+ * Only applicable for <code>in</code> of type <js>"body"</js>.
* <p>
- * The schema is a JSON object specified <a class="doclink" href="http://swagger.io/specification/#schemaObject">here</a>.
+ * The schema is a JSON object specified <a class="doclink" href="http://swagger.io/specification/#schemaObject">here</a>.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Path.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Path.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Path.java
index 1333656..d9bdff9 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Path.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Path.java
@@ -30,10 +30,10 @@ import java.lang.annotation.*;
* }
* </p>
* <p>
- * The <ja>@Path</ja> annotation is optional if the parameters are specified immediately
+ * The <ja>@Path</ja> annotation is optional if the parameters are specified immediately
* following the <code>RestRequest</code> and <code>RestResponse</code> parameters,
* and are specified in the same order as the variables in the URL path pattern.
- * The following example is equivalent to the previous example.
+ * The following example is equivalent to the previous example.
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
@@ -43,9 +43,9 @@ import java.lang.annotation.*;
* }
* </p>
* <p>
- * If the order of parameters is not the default order shown above, the
+ * If the order of parameters is not the default order shown above, the
* attribute names must be specified (since parameter names are lost during compilation).
- * The following example is equivalent to the previous example, except
+ * The following example is equivalent to the previous example, except
* the parameter order has been switched, requiring the use of the <ja>@Path</ja>
* annotations.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
index ea93705..95f7f51 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
@@ -29,7 +29,7 @@ import java.lang.annotation.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo/*"</js>)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Properties.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Properties.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Properties.java
index 4957c1d..a41a24c 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Properties.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Properties.java
@@ -32,7 +32,7 @@ import org.apache.juneau.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>)
* <jk>public Person</jk> doGetPerson(RestResponse res) {
@@ -51,7 +51,7 @@ import org.apache.juneau.*;
* }
* </p>
* <p>
- * The parameter type can be one of the following:
+ * The parameter type can be one of the following:
* <ul>
* <li>{@link ObjectMap}
* <li><code>Map<String,Object></code>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Property.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Property.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Property.java
index a4a8344..7e59b41 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Property.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Property.java
@@ -27,7 +27,7 @@ import org.apache.juneau.xml.*;
/**
* Property name/value pair used in the {@link RestResource#properties()} annotation.
* <p>
- * Any of the following property names can be specified:
+ * Any of the following property names can be specified:
* <ul>
* <li>{@link BeanContext}
* <li>{@link SerializerContext}
@@ -40,10 +40,10 @@ import org.apache.juneau.xml.*;
* <li>{@link XmlParserContext}
* </ul>
* <p>
- * Property values types that are not <code>Strings</code> will automatically be converted to the
- * correct type (e.g. <code>Boolean</code>, etc...).
+ * Property values types that are not <code>Strings</code> will automatically be converted to the
+ * correct type (e.g. <code>Boolean</code>, etc...).
* <p>
- * See {@link RestResource#properties} for more information.
+ * See {@link RestResource#properties} for more information.
*/
@Documented
@Target(ANNOTATION_TYPE)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Query.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Query.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Query.java
index 649b7cd..4bac857 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Query.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Query.java
@@ -37,7 +37,7 @@ import org.apache.juneau.rest.*;
* }
* </p>
* <p>
- * This is functionally equivalent to the following code...
+ * This is functionally equivalent to the following code...
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>)
@@ -63,12 +63,12 @@ public @interface Query {
/**
* Specify <jk>true</jk> if using multi-part parameters to represent collections and arrays.
* <p>
- * Normally, we expect single parameters to be specified in UON notation for representing
+ * Normally, we expect single parameters to be specified in UON notation for representing
* collections of values (e.g. <js>"&key=(1,2,3)"</js>.
- * This annotation allows the use of multi-part parameters to represent collections
+ * This annotation allows the use of multi-part parameters to represent collections
* (e.g. <js>"&key=1&key=2&key=3"</js>.
* <p>
- * This setting should only be applied to Java parameters of type array or Collection.
+ * This setting should only be applied to Java parameters of type array or Collection.
*/
boolean multipart() default false;
@@ -78,10 +78,10 @@ public @interface Query {
* Possible values:
* <ul class='spaced-list'>
* <li><js>"UON"</js> - URL-Encoded Object Notation.<br>
- * This notation allows for request parameters to contain arbitrarily complex POJOs.
+ * This notation allows for request parameters to contain arbitrarily complex POJOs.
* <li><js>"PLAIN"</js> - Plain text.<br>
- * This treats request parameters as plain text.<br>
- * Only POJOs directly convertable from <l>Strings</l> can be represented in parameters when using this mode.
+ * This treats request parameters as plain text.<br>
+ * Only POJOs directly convertable from <l>Strings</l> can be represented in parameters when using this mode.
* <li><js>"INHERIT"</js> (default) - Inherit from the {@link RestServletContext#REST_paramFormat} property on the servlet method or class.
* </ul>
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1ead8e/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index 3d1e941..6b0a991 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -36,13 +36,13 @@ public @interface RestMethod {
/**
* REST method name.
* <p>
- * Typically <js>"GET"</js>, <js>"PUT"</js>, <js>"POST"</js>, <js>"DELETE"</js>, or <js>"OPTIONS"</js>.
+ * Typically <js>"GET"</js>, <js>"PUT"</js>, <js>"POST"</js>, <js>"DELETE"</js>, or <js>"OPTIONS"</js>.
* <p>
- * Can also be a non-HTTP-standard name that is passed in through a <code>&method=methodName</code> URL parameter.
+ * Can also be a non-HTTP-standard name that is passed in through a <code>&method=methodName</code> URL parameter.
* <p>
- * Method names are case-insensitive (always folded to upper-case).
+ * Method names are case-insensitive (always folded to upper-case).
* <p>
- * If a method name is not specified, then the method name is determined based on the Java method name.<br>
+ * If a method name is not specified, then the method name is determined based on the Java method name.<br>
* For example, if the method is <code>doPost(...)</code>, then the method name is automatically detected as <js>"POST"</js>.
*/
@@ -51,8 +51,8 @@ public @interface RestMethod {
/**
* Optional path pattern for the specified method.
* <p>
- * Appending <js>"/*"</js> to the end of the path pattern will make it match any remainder too.<br>
- * Not appending <js>"/*"</js> to the end of the pattern will cause a 404 (Not found) error to occur
+ * Appending <js>"/*"</js> to the end of the path pattern will make it match any remainder too.<br>
+ * Not appending <js>"/*"</js> to the end of the pattern will cause a 404 (Not found) error to occur
* if the exact pattern is not found.
*/
String path() default "/*";
@@ -60,9 +60,9 @@ public @interface RestMethod {
/**
* URL path pattern priority.
* <p>
- * To force path patterns to be checked before other path patterns, use a higher priority number.
+ * To force path patterns to be checked before other path patterns, use a higher priority number.
* <p>
- * By default, it's <code>0</code>, which means it will use an internal heuristic to
+ * By default, it's <code>0</code>, which means it will use an internal heuristic to
* determine a best match.
*/
int priority() default 0;
@@ -70,10 +70,10 @@ public @interface RestMethod {
/**
* Method guards.
* <p>
- * Associates one or more {@link RestGuard RestGuards} with a method call.
- * These guards get called immediately before execution of the REST method.
+ * Associates one or more {@link RestGuard RestGuards} with a method call.
+ * These guards get called immediately before execution of the REST method.
* <p>
- * Typically, guards will be used for permissions checking on the user making the request,
+ * Typically, guards will be used for permissions checking on the user making the request,
* but it can also be used for other purposes like pre-call validation of a request.
*/
Class<? extends RestGuard>[] guards() default {};
@@ -81,34 +81,34 @@ public @interface RestMethod {
/**
* Method response converters.
* <p>
- * Associates one or more {@link RestConverter RestConverters} with a method call.
- * These converters get called immediately after execution of the REST method in the same
+ * Associates one or more {@link RestConverter RestConverters} with a method call.
+ * These converters get called immediately after execution of the REST method in the same
* order specified in the annotation.
* <p>
- * Can be used for performing post-processing on the response object before serialization.
+ * Can be used for performing post-processing on the response object before serialization.
* <p>
- * Default converters are available in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.
+ * Default converters are available in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package.
*/
Class<? extends RestConverter>[] converters() default {};
/**
* Method matchers.
* <p>
- * Associates one more more {@link RestMatcher RestMatchers} with this method.
+ * Associates one more more {@link RestMatcher RestMatchers} with this method.
* <p>
- * Matchers are used to allow multiple Java methods to handle requests assigned to the same
- * URL path pattern, but differing based on some request attribute, such as a specific header value.
+ * Matchers are used to allow multiple Java methods to handle requests assigned to the same
+ * URL path pattern, but differing based on some request attribute, such as a specific header value.
* <p>
- * See {@link RestMatcher} for details.
+ * See {@link RestMatcher} for details.
*/
Class<? extends RestMatcher>[] matchers() default {};
/**
* Overrides the list of serializers assigned at the method level.
* <p>
- * Use this annotation when the list of serializers assigned to a method differs from the list of serializers assigned at the servlet level.
+ * Use this annotation when the list of serializers assigned to a method differs from the list of serializers assigned at the servlet level.
* <p>
- * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.
+ * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.
*
* <p class='bcode'>
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
@@ -130,14 +130,14 @@ public @interface RestMethod {
/**
* Used in conjunction with {@link #serializers()} to identify what class-level settings are inherited by the method serializer group.
* <p>
- * Possible values:
+ * Possible values:
* <ul>
* <li>{@link Inherit#SERIALIZERS} - Inherit class-level serializers.
* <li>{@link Inherit#PROPERTIES} - Inherit class-level properties.
* <li>{@link Inherit#TRANSFORMS} - Inherit class-level transforms.
* </ul>
* <p>
- * For example, to inherit all serializers, properties, and transforms from the servlet class:
+ * For example, to inherit all serializers, properties, and transforms from the servlet class:
* </p>
* <p class='bcode'>
* <ja>@RestMethod</ja>(
@@ -152,9 +152,9 @@ public @interface RestMethod {
/**
* Overrides the list of parsers assigned at the method level.
* <p>
- * Use this annotation when the list of parsers assigned to a method differs from the list of parsers assigned at the servlet level.
+ * Use this annotation when the list of parsers assigned to a method differs from the list of parsers assigned at the servlet level.
* <p>
- * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.
+ * To append to the list of serializers assigned at the servlet level, use <code>serializersInherit=<jsf>SERIALIZERS</jsf></code>.
*
* <p class='bcode'>
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
@@ -176,14 +176,14 @@ public @interface RestMethod {
/**
* Used in conjunction with {@link #parsers()} to identify what class-level settings are inherited by the method parser group.
* <p>
- * Possible values:
+ * Possible values:
* <ul>
* <li>{@link Inherit#PARSERS} - Inherit class-level parsers.
* <li>{@link Inherit#PROPERTIES} - Inherit class-level properties.
* <li>{@link Inherit#TRANSFORMS} - Inherit class-level transforms.
* </ul>
* <p>
- * For example, to inherit all parsers, properties, and transforms from the servlet class:
+ * For example, to inherit all parsers, properties, and transforms from the servlet class:
* <p class='bcode'>
* <ja>@RestMethod</ja>(
* path=<js>"/foo"</js>,
@@ -197,9 +197,9 @@ public @interface RestMethod {
/**
* Appends to the list of {@link Encoder encoders} specified on the servlet.
* <p>
- * Use this annotation when the list of encoders assigned to a method differs from the list of encoders assigned at the servlet level.
+ * Use this annotation when the list of encoders assigned to a method differs from the list of encoders assigned at the servlet level.
* <p>
- * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.
+ * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.
*
* <p class='bcode'>
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
@@ -215,7 +215,7 @@ public @interface RestMethod {
* }
* </p>
* <p>
- * If you want to OVERRIDE the set of encoders specified by the servlet, combine this annotation with <code><ja>@RestMethod</ja>(inheritEncoders=<jk>false</jk>)</code>.
+ * If you want to OVERRIDE the set of encoders specified by the servlet, combine this annotation with <code><ja>@RestMethod</ja>(inheritEncoders=<jk>false</jk>)</code>.
*/
Class<? extends Encoder>[] encoders() default {};
@@ -227,7 +227,7 @@ public @interface RestMethod {
/**
* Same as {@link RestResource#properties()}, except defines property values by default when this method is called.
* <p>
- * This is equivalent to simply calling <code>res.addProperties()</code> in the Java method, but is provided for convenience.
+ * This is equivalent to simply calling <code>res.addProperties()</code> in the Java method, but is provided for convenience.
*/
Property[] properties() default {};
@@ -244,16 +244,16 @@ public @interface RestMethod {
/**
* Specifies default values for request headers.
* <p>
- * Strings are of the format <js>"Header-Name: header-value"</js>.
+ * Strings are of the format <js>"Header-Name: header-value"</js>.
* <p>
- * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.
+ * Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.
* <p>
- * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not specified
+ * The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not specified
* so that a particular default {@link Serializer} is picked.
* <p>
- * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).
+ * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries).
* <p>
- * Header values specified at the method level override header values specified at the servlet level.
+ * Header values specified at the method level override header values specified at the servlet level.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -269,47 +269,47 @@ public @interface RestMethod {
/**
* Optional summary for the exposed API.
* <p>
- * This summary is used in the following locations:
+ * This summary is used in the following locations:
* <ul class='spaced-list'>
* <li>The value returned by {@link RestRequest#getMethodSummary()}.
* <li>The <js>"$R{methodSummary}"</js> variable.
* <li>The summary of the method in the Swagger page.
* </ul>
* <p>
- * The default value pulls the description from the <code>(className.?)[javaMethodName].summary</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>(className.?)[javaMethodName].summary</code> entry in the servlet resource bundle.
* (e.g. <js>"MyClass.myMethod.summary = foo"</js> or <js>"myMethod.summary = foo"</js>).
* <p>
- * This field value can contain variables (e.g. "$L{my.localized.variable}").
+ * This field value can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/paths/{path}/{method}/summary</code>.
+ * Corresponds to the swagger field <code>/paths/{path}/{method}/summary</code>.
*/
String summary() default "";
/**
* Optional description for the exposed API.
* <p>
- * This description is used in the following locations:
+ * This description is used in the following locations:
* <ul class='spaced-list'>
* <li>The value returned by {@link RestRequest#getMethodDescription()}.
* <li>The <js>"$R{methodDescription}"</js> variable.
* <li>The description of the method in the Swagger page.
* </ul>
* <p>
- * The default value pulls the description from the <code>(className.?)[javaMethodName].description</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>(className.?)[javaMethodName].description</code> entry in the servlet resource bundle.
* (e.g. <js>"MyClass.myMethod.description = foo"</js> or <js>"myMethod.description = foo"</js>).
* <p>
- * This field value can contain variables (e.g. "$L{my.localized.variable}").
+ * This field value can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/paths/{path}/{method}/description</code>.
+ * Corresponds to the swagger field <code>/paths/{path}/{method}/description</code>.
*/
String description() default "";
/**
* Optional external documentation information for the exposed API.
* <p>
- * Used to populate the Swagger external documentation field.
+ * Used to populate the Swagger external documentation field.
* <p>
- * A simplified JSON string with the following fields:
+ * A simplified JSON string with the following fields:
* <p class='bcode'>
* {
* description: string,
@@ -317,7 +317,7 @@ public @interface RestMethod {
* }
* </p>
* <p>
- * The default value pulls the description from the <code>(className.?)[javaMethodName].externalDocs</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>(className.?)[javaMethodName].externalDocs</code> entry in the servlet resource bundle.
* (e.g. <js>"MyClass.myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js> or <js>"myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js>).
*
* <h5 class='section'>Example:</h5>
@@ -325,21 +325,21 @@ public @interface RestMethod {
* <ja>@RestMethod</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>)
* </p>
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/paths/{path}/{method}/externalDocs</code>.
+ * Corresponds to the swagger field <code>/paths/{path}/{method}/externalDocs</code>.
*/
String externalDocs() default "";
/**
* Optional tagging information for the exposed API.
* <p>
- * Used to populate the Swagger tags field.
+ * Used to populate the Swagger tags field.
* <p>
- * A comma-delimited list of tags for API documentation control.
- * Tags can be used for logical grouping of operations by resources or any other qualifier.
+ * A comma-delimited list of tags for API documentation control.
+ * Tags can be used for logical grouping of operations by resources or any other qualifier.
* <p>
- * The default value pulls the description from the <code>(className.?)[javaMethodName].tags</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>(className.?)[javaMethodName].tags</code> entry in the servlet resource bundle.
* (e.g. <js>"MyClass.myMethod.tags = foo,bar"</js> or <js>"myMethod.tags = foo,bar"</js>).
*
* <h5 class='section'>Example:</h5>
@@ -347,18 +347,18 @@ public @interface RestMethod {
* <ja>@RestMethod</ja>(tags=<js>"foo,bar"</js>)
* </p>
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/paths/{path}/{method}/tags</code>.
+ * Corresponds to the swagger field <code>/paths/{path}/{method}/tags</code>.
*/
String tags() default "";
/**
* Optional deprecated flag for the exposed API.
* <p>
- * Used to populate the Swagger deprecated field.
+ * Used to populate the Swagger deprecated field.
* <p>
- * The default value pulls the description from the <code>(className.?)[javaMethodName].deprecated</code> entry in the servlet resource bundle.
+ * The default value pulls the description from the <code>(className.?)[javaMethodName].deprecated</code> entry in the servlet resource bundle.
* (e.g. <js>"MyClass.myMethod.deprecated = true"</js> or <js>"myMethod.deprecated = foo,bar"</js>).
*
* <h5 class='section'>Example:</h5>
@@ -366,17 +366,17 @@ public @interface RestMethod {
* <ja>@RestMethod</ja>(deprecated=<jk>true</jk>)
* </p>
* <p>
- * This field can contain variables (e.g. "$L{my.localized.variable}").
+ * This field can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/paths/{path}/{method}/deprecated</code>.
+ * Corresponds to the swagger field <code>/paths/{path}/{method}/deprecated</code>.
*/
boolean deprecated() default false;
/**
* Optional parameter descriptions.
* <p>
- * This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js> column
- * on the Swagger page.
+ * This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js> column
+ * on the Swagger page.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -391,7 +391,7 @@ public @interface RestMethod {
* }
* )
* </p>
- * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in this case
+ * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in this case
* the strings are internationalized.
* <p class='bcode'>
* <jk>MyClass.myMethod.description</jk> = <js>This is my method.</js>
@@ -400,20 +400,20 @@ public @interface RestMethod {
* <jk>MyClass.myMethod.req.body.description</jk> = <js>The HTTP content</js>
* <jk>MyClass.myMethod.req.header.d.description</jk> = <js>The 'D' header</js>
* <p>
- * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support English),
+ * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support English),
* and use resource bundles if you need to support localization.
* <p>
- * These annotations can contain variables (e.g. "$L{my.localized.variable}").
+ * These annotations can contain variables (e.g. "$L{my.localized.variable}").
* <p>
- * Corresponds to the swagger field <code>/paths/{path}/{method}/parameters</code>.
+ * Corresponds to the swagger field <code>/paths/{path}/{method}/parameters</code>.
*/
Parameter[] parameters() default {};
/**
* Optional output description.
* <p>
- * This annotation is provided for documentation purposes and is used to populate the method <js>"responses"</js> column
- * on the Swagger page.
+ * This annotation is provided for documentation purposes and is used to populate the method <js>"responses"</js> column
+ * on the Swagger page.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
@@ -431,32 +431,32 @@ public @interface RestMethod {
* }
* )
* </p>
- * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in this case
+ * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in this case
* the strings are internationalized.
* <p class='bcode'>
* <jk>MyClass.myMethod.res.200.description</jk> = <js>OK</js>
* <jk>MyClass.myMethod.res.302.description</jk> = <js>Thing wasn't found here</js>
* <jk>MyClass.myMethod.res.302.header.Location.description</jk> = <js>The place to find the thing</js>
* <p>
- * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support English),
+ * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support English),
* and use resource bundles if you need to support localization.
* <p>
- * These annotations can contain variables (e.g. "$L{my.localized.variable}").
+ * These annotations can contain variables (e.g. "$L{my.localized.variable}").
*/
Response[] responses() default {};
/**
* Specifies whether this method can be called based on the client version.
* <p>
- * The client version is identified via the HTTP request header identified by {@link RestResource#clientVersionHeader()} which
+ * The client version is identified via the HTTP request header identified by {@link RestResource#clientVersionHeader()} which
* by default is <js>"X-Client-Version"</js>.
* <p>
- * This is a specialized kind of {@link RestMatcher} that allows you to invoke different Java methods for the same method/path based
+ * This is a specialized kind of {@link RestMatcher} that allows you to invoke different Java methods for the same method/path based
* on the client version.
* <p>
- * The format of the client version range is similar to that of OSGi versions.
+ * The format of the client version range is similar to that of OSGi versions.
* <p>
- * In the following example, the Java methods are mapped to the same HTTP method and URL <js>"/foobar"</js>.
+ * In the following example, the Java methods are mapped to the same HTTP method and URL <js>"/foobar"</js>.
* <p class='bcode'>
* <jc>// Call this method if X-Client-Version is at least 2.0.
* // Note that this also matches 2.0.1.</jc>
@@ -478,7 +478,7 @@ public @interface RestMethod {
* }
* </p>
* <p>
- * It's common to combine the client version with transforms that will convert new POJOs into older POJOs for backwards compatability.
+ * It's common to combine the client version with transforms that will convert new POJOs into older POJOs for backwards compatability.
* <p class='bcode'>
* <jc>// Call this method if X-Client-Version is at least 2.0.</jc>
* <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
@@ -492,9 +492,9 @@ public @interface RestMethod {
* <jk>return</jk> newMethod()
* }
* <p>
- * Note that in the previous example, we're returning the exact same POJO, but using a transform to convert it into an older form.
- * The old method could also just return back a completely different object.
- * The range can be any of the following:
+ * Note that in the previous example, we're returning the exact same POJO, but using a transform to convert it into an older form.
+ * The old method could also just return back a completely different object.
+ * The range can be any of the following:
* <ul>
* <li><js>"[0,1.0)"</js> = Less than 1.0. 1.0 and 1.0.0 does not match.
* <li><js>"[0,1.0]"</js> = Less than or equal to 1.0. Note that 1.0.1 will match.