Repository: incubator-juneau Updated Branches: refs/heads/master 724a7b256 -> 9140de110
Fix javadoc issues. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/9140de11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/9140de11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/9140de11 Branch: refs/heads/master Commit: 9140de110f391dbd9547a72277f7b1023a60a0a0 Parents: 724a7b2 Author: JamesBognar <[email protected]> Authored: Sun Feb 5 15:36:03 2017 -0500 Committer: JamesBognar <[email protected]> Committed: Sun Feb 5 15:36:03 2017 -0500 ---------------------------------------------------------------------- .../apache/juneau/jena/RdfCommonContext.java | 17 +++++----- .../org/apache/juneau/BeanDictionaryList.java | 1 + .../main/java/org/apache/juneau/MediaType.java | 1 + .../java/org/apache/juneau/annotation/Bean.java | 6 ++-- .../java/org/apache/juneau/dto/atom/Entry.java | 24 +++++++------- .../java/org/apache/juneau/dto/atom/Feed.java | 24 +++++++------- .../java/org/apache/juneau/dto/atom/Person.java | 6 ++-- .../java/org/apache/juneau/dto/atom/Source.java | 24 +++++++------- .../org/apache/juneau/dto/atom/package.html | 34 ++++++++++---------- .../org/apache/juneau/dto/cognos/Column.java | 2 +- .../org/apache/juneau/dto/cognos/DataSet.java | 2 +- .../juneau/dto/swagger/ParameterInfo.java | 4 +-- .../org/apache/juneau/internal/ClassUtils.java | 2 +- .../org/apache/juneau/internal/StringUtils.java | 4 +-- .../java/org/apache/juneau/parser/Parser.java | 2 +- .../org/apache/juneau/parser/ParserContext.java | 2 +- .../apache/juneau/transform/SurrogateSwap.java | 2 +- .../apache/juneau/urlencoding/UonReader.java | 2 +- .../juneau/urlencoding/UrlEncodingContext.java | 6 ++-- .../juneau/urlencoding/UrlEncodingParser.java | 2 +- .../urlencoding/UrlEncodingParserContext.java | 6 ++-- .../UrlEncodingSerializerContext.java | 6 ++-- .../org/apache/juneau/utils/MessageBundle.java | 6 ++-- .../java/org/apache/juneau/xml/XmlBeanMeta.java | 1 + .../org/apache/juneau/xml/XmlParserContext.java | 8 ++--- .../java/org/apache/juneau/xml/XmlUtils.java | 2 +- juneau-core/src/main/javadoc/overview.html | 26 +++++++-------- .../microservice/resources/LogsResource.java | 20 ++++++------ .../org/apache/juneau/rest/RestRequest.java | 26 +++++++-------- .../org/apache/juneau/rest/RestServlet.java | 4 +-- .../apache/juneau/rest/RestServletContext.java | 2 +- .../apache/juneau/rest/RestServletDefault.java | 1 + .../apache/juneau/rest/annotation/FormData.java | 2 +- .../juneau/rest/annotation/HasFormData.java | 16 ++++----- .../juneau/rest/annotation/Parameter.java | 2 +- .../apache/juneau/rest/annotation/Query.java | 4 +-- .../rest/jena/RestServletJenaDefault.java | 1 + 37 files changed, 152 insertions(+), 148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 bd99d10..61414c1 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 @@ -153,7 +153,7 @@ import org.apache.juneau.xml.annotation.*; * <tr> * <td>{@link #RDF_n3_subjectColumn}</td> * <td>N3/Turtle property: <code>subjectColumn</code>.</td> - * <td>code>Integer</code></td> + * <td><code>Integer</code></td> * <td>indent column</td> * </tr> * <tr> @@ -694,14 +694,13 @@ public interface RdfCommonContext { * </ul> * <p> * Possible values: - * <ul class='spaced-list'> - * <li><js>"DEFAULT"</js> - Default format. The default is an RDF Sequence container. - * <li><js>"SEQ"</js> - RDF Sequence container. - * <li><js>"BAG"</js> - RDF Bag container. - * <li><js>"LIST"</js> - RDF List container. - * <li><js>"MULTI_VALUED"</js> - Multi-valued properties. - * </ul> - * </p> + * <ul class='spaced-list'> + * <li><js>"DEFAULT"</js> - Default format. The default is an RDF Sequence container. + * <li><js>"SEQ"</js> - RDF Sequence container. + * <li><js>"BAG"</js> - RDF Bag container. + * <li><js>"LIST"</js> - RDF List container. + * <li><js>"MULTI_VALUED"</js> - Multi-valued properties. + * </ul> * <p> * Important Note: If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements * in the collection will get lost. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 3ce75d0..58a4435 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanDictionaryList.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanDictionaryList.java @@ -24,6 +24,7 @@ import org.apache.juneau.annotation.*; * <li>Beans that provide a dictionary name using the {@link Bean#typeName()} annotation. * <li>Other subclasses of {@link BeanDictionaryList}. * <li>Other subclasses of {@link BeanDictionaryMap}. + * </ul> * <p> * Subclasses must implement a public no-arg constructor so that it can be instantiated by the bean context code. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/MediaType.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/MediaType.java b/juneau-core/src/main/java/org/apache/juneau/MediaType.java index 53eed39..6fa1819 100644 --- a/juneau-core/src/main/java/org/apache/juneau/MediaType.java +++ b/juneau-core/src/main/java/org/apache/juneau/MediaType.java @@ -123,6 +123,7 @@ public final class MediaType { * <li>One or both types are <js>'*'</js> and the subtypes are the same. * <li>One or both subtypes are <js>'*'</js> and the types are the same. * <li>Either is <js>'*\/*'</js>. + * </ul> * * @param o The media type to compare with. * @return <jk>true</jk> if the media types match. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 f694e0e..03c2bd3 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 @@ -82,9 +82,9 @@ public @interface Bean { * </p> * <p class='bcode'> * { - * <jsa>x</jsa>: [ - * {<jsa>_type</jsa>:<jss>'bar'</jss>}, - * {<jsa>_type</jsa>:<jss>'baz'</jss>} + * x: [ + * {_type:<js>'bar'</js>}, + * {_type>:<js>'baz'</js>} * ] * } * * </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java index 72f978f..15a0029 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java @@ -28,18 +28,18 @@ import static org.apache.juneau.dto.atom.Utils.*; * element atom:entry { * atomCommonAttributes, * (atomAuthor* - * & atomCategory* - * & atomContent? - * & atomContributor* - * & atomId - * & atomLink* - * & atomPublished? - * & atomRights? - * & atomSource? - * & atomSummary? - * & atomTitle - * & atomUpdated - * & extensionElement*) + * & atomCategory* + * & atomContent? + * & atomContributor* + * & atomId + * & atomLink* + * & atomPublished? + * & atomRights? + * & atomSource? + * & atomSummary? + * & atomTitle + * & atomUpdated + * & extensionElement*) * } * </p> * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 3fc80cf..fdca2ab 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 @@ -31,18 +31,18 @@ import org.apache.juneau.xml.annotation.*; * element atom:feed { * atomCommonAttributes, * (atomAuthor* - * & atomCategory* - * & atomContributor* - * & atomGenerator? - * & atomIcon? - * & atomId - * & atomLink* - * & atomLogo? - * & atomRights? - * & atomSubtitle? - * & atomTitle - * & atomUpdated - * & extensionElement*), + * & atomCategory* + * & atomContributor* + * & atomGenerator? + * & atomIcon? + * & atomId + * & atomLink* + * & atomLogo? + * & atomRights? + * & atomSubtitle? + * & atomTitle + * & atomUpdated + * & extensionElement*), * atomEntry* * } * </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java index 26561a2..d843360 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java @@ -25,9 +25,9 @@ import static org.apache.juneau.dto.atom.Utils.*; * atomPersonConstruct = * atomCommonAttributes, * (element atom:name { text } - * & element atom:uri { atomUri }? - * & element atom:email { atomEmailAddress }? - * & extensionElement*) + * & element atom:uri { atomUri }? + * & element atom:email { atomEmailAddress }? + * & extensionElement*) * </p> * <p> * Refer to {@link org.apache.juneau.dto.atom} for further information about ATOM support. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java index 07f9142..0e16785 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java @@ -26,18 +26,18 @@ import org.apache.juneau.annotation.*; * element atom:source { * atomCommonAttributes, * (atomAuthor* - * & atomCategory* - * & atomContributor* - * & atomGenerator? - * & atomIcon? - * & atomId? - * & atomLink* - * & atomLogo? - * & atomRights? - * & atomSubtitle? - * & atomTitle? - * & atomUpdated? - * & extensionElement*) + * & atomCategory* + * & atomContributor* + * & atomGenerator? + * & atomIcon? + * & atomId? + * & atomLink* + * & atomLogo? + * & atomRights? + * & atomSubtitle? + * & atomTitle? + * & atomUpdated? + * & extensionElement*) * } * </p> * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html index f3b032d..249b04b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html @@ -96,27 +96,27 @@ Feed feed = <jsm>feed</jsm>(<js>"tag:juneau.apache.org"</js>, <js>"Juneau ATOM specification"</js>, <js>"2016-01-02T03:04:05Z"</js>) - .subtitle(<jsm>text</jsm>(<js>"html"</js>).children(<js>"Describes <em>stuff</em> about Juneau"</js>)) + .subtitle(<jsm>text</jsm>(<js>"html"</js>).text(<js>"Describes <em>stuff</em> about Juneau"</js>)) .links( - <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/";</js>).hreflang(<js>"en"</js>), - <jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://www.sample.com/feed.atom";</js>) + <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org";</js>).hreflang(<js>"en"</js>), + <jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://juneau.apache.org/feed.atom";</js>) ) .rights(<js>"Copyright (c) 2016, Apache Foundation"</js>) .generator( - <jsm>generator</jsm>(<js>"Juneau"</js>).uri(<js>"http://juneau.apache.org/";</js>).version(<js>"1.0"</js>) + <jsm>generator</jsm>(<js>"Juneau"</js>).uri(<js>"http://juneau.apache.org";</js>).version(<js>"1.0"</js>) ) .entries( <jsm>entry</jsm>(<js>"tag:juneau.sample.com,2013:1.2345"</js>, <js>"Juneau ATOM specification snapshot"</js>, <js>"2016-01-02T03:04:05Z"</js>) .links( - <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/2012/05/08/juneau.atom";</js>), - <jsm>link</jsm>(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://www.sample.com/audio/juneau_podcast.mp3";</js>).length(1337) + <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/juneau.atom";</js>), + <jsm>link</jsm>(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://juneau.apache.org/audio/juneau_podcast.mp3";</js>).length(1337) ) .published(<js>"2016-01-02T03:04:05Z"</js>) .authors( - <jsm>person</jsm>(<js>"James Bognar"</js>).uri(<js>"http://www.sample.com/";</js>).email(<js>"[email protected]"</js>) + <jsm>person</jsm>(<js>"Jane Smith"</js>).uri(<js>"http://juneau.apache.org";</js>).email(<js>"[email protected]"</js>) ) .contributors( - <jsm>person</jsm>(<js>"Barry M. Caceres"</js>) + <jsm>person</jsm>(<js>"John Smith"</js>) ) .content( <jsm>content</jsm>(<js>"xhtml"</js>) @@ -162,12 +162,12 @@ <xt></subtitle></xt> <xt><entry></xt> <xt><author></xt> - <xt><name></xt>James Bognar<xt></name></xt> + <xt><name></xt>Jane Smith<xt></name></xt> <xt><uri></xt>http://juneau.apache.org/<xt></uri></xt> - <xt><email></xt>[email protected]<xt></email></xt> + <xt><email></xt>[email protected]<xt></email></xt> <xt></author></xt> <xt><contributor></xt> - <xt><name></xt>Barry M. Caceres<xt></name></xt> + <xt><name></xt>John Smith<xt></name></xt> <xt></contributor></xt> <xt><id></xt> tag:juneau.apache.org @@ -226,12 +226,12 @@ <xt></atom:subtitle></xt> <xt><atom:entry></xt> <xt><atom:author></xt> - <xt><atom:name></xt>James Bognar<xt></atom:name></xt> + <xt><atom:name></xt>Jane Smith<xt></atom:name></xt> <xt><atom:uri></xt>http://juneau.apache.org/<xt></atom:uri></xt> - <xt><atom:email></xt>[email protected]<xt></atom:email></xt> + <xt><atom:email></xt>[email protected]<xt></atom:email></xt> <xt></atom:author></xt> <xt><atom:contributor></xt> - <xt><atom:name></xt>Barry M. Caceres<xt></atom:name></xt> + <xt><atom:name></xt>John Smith<xt></atom:name></xt> <xt></atom:contributor></xt> <xt><atom:id></xt> tag:juneau.apache.org @@ -289,12 +289,12 @@ <xt></subtitle></xt> <xt><entry></xt> <xt><author></xt> - <xt><name></xt>James Bognar<xt></name></xt> + <xt><name></xt>Jane Smith<xt></name></xt> <xt><uri></xt>http://juneau.apache.org/<xt></uri></xt> - <xt><email></xt>[email protected]<xt></email></xt> + <xt><email></xt>[email protected]<xt></email></xt> <xt></author></xt> <xt><contributor></xt> - <xt><name></xt>Barry M. Caceres<xt></name></xt> + <xt><name></xt>John Smith<xt></name></xt> <xt></contributor></xt> <xt><id></xt> tag:juneau.apache.org http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 afb83c4..e1780f7 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 @@ -69,7 +69,7 @@ public class Column { * <p class='bcode'> * Column c = <jk>new</jk> Column(<js>"numAddresses"</js>, <js>"xs:int"</js>) * .addPojoSwaps( - * <jk>new</jk> PojoSwap<Person,Integer>() { + * <jk>new</jk> PojoSwap<Person,Integer>() { * <ja>@Override</ja> * <jk>public</jk> Integer swap(Person p) { * <jk>return</jk> p.<jf>addresses</jf>.size(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 23afc24..6a0bc5d 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 @@ -58,7 +58,7 @@ import org.apache.juneau.xml.annotation.*; * <jk>new</jk> Column(<js>"age"</js>, <js>"xs:int"</js>), * <jk>new</jk> Column(<js>"numAddresses"</js>, <js>"xs:int"</js>) * .addPojoSwap( - * <jk>new</jk> PojoSwap<Person,Integer>() { + * <jk>new</jk> PojoSwap<Person,Integer>() { * <ja>@Override</ja> * <jk>public</jk> Integer swap(Person p) { * <jk>return</jk> p.<jf>addresses</jf>.size(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 4521fa3..815e71f 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 @@ -41,10 +41,10 @@ import org.apache.juneau.json.*; * Form parameters have a different format based on the content-type used (for further details, consult <code>http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4</code>): * <ul> * <li><js>"application/x-www-form-urlencoded"</js> - Similar to the format of Query parameters but as a payload. - * For example, <code>foo=1&bar=swagger</code> - both <code>foo</code> and <code>bar</code> are form parameters. + * For example, <code>foo=1&bar=swagger</code> - both <code>foo</code> and <code>bar</code> are form parameters. * This is normally used for simple parameters that are being transferred. * <li><js>"multipart/form-data"</js> - each parameter takes a section in the payload with an internal header. - * For example, for the header <code>Content-Disposition: form-data; name="submit-name"<code> the name of the parameter is <code>submit-name</code>. + * For example, for the header <code>Content-Disposition: form-data; name="submit-name"</code> the name of the parameter is <code>submit-name</code>. * This type of form parameters is more commonly used for file transfers. * </ul> * </li> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/internal/ClassUtils.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/ClassUtils.java b/juneau-core/src/main/java/org/apache/juneau/internal/ClassUtils.java index c4fb6b6..fc063bc 100644 --- a/juneau-core/src/main/java/org/apache/juneau/internal/ClassUtils.java +++ b/juneau-core/src/main/java/org/apache/juneau/internal/ClassUtils.java @@ -344,7 +344,7 @@ public final class ClassUtils { /** * Finds the real parameter type of the specified class. * - * @param c The class containing the parameters (e.g. PojoSwap<T,S>) + * @param c The class containing the parameters (e.g. PojoSwap<T,S>) * @param index The zero-based index of the parameter to resolve. * @param oc The class we're trying to resolve the parameter type for. * @return The resolved real class. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 cd2a76b..8fd3928 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 @@ -788,8 +788,8 @@ public final class StringUtils { * the number of generated IDs that would produce a 50% chance of collision is: * <code>sqrt(36^N)</code>. * Dividing this number by 10 gives you an approximation of the number of generated IDs - * needed to produce a <1% chance of collision. - * For example, given 5 characters, the number of generated IDs need to produce a <1% chance of + * needed to produce a <1% chance of collision. + * For example, given 5 characters, the number of generated IDs need to produce a <1% chance of * collision would be: * <code>sqrt(36^5)/10=777</code> * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 d546b18..08fb31f 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 @@ -290,7 +290,7 @@ public abstract class Parser extends CoreApi { * <p class='bcode'> * ReaderParser p = JsonParser.<jsf>DEFAULT</jsf>; * ClassMeta<Map<String,MyBean>> cm = p.getBeanContext().getMapClassMeta(LinkedList.<jk>class</jk>, String.<jk>class</jk>, MyBean.<jk>class</jk>); - * Map<String,MyBean> m = p.parse(json, cm, <jk>null</jk>); + * Map<String,MyBean> m = p.parse(json, cm, <jk>null</jk>); * </p> * * @param <T> The class type of the object to create. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/parser/ParserContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/ParserContext.java b/juneau-core/src/main/java/org/apache/juneau/parser/ParserContext.java index a258bee..a314a41 100644 --- a/juneau-core/src/main/java/org/apache/juneau/parser/ParserContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/parser/ParserContext.java @@ -83,7 +83,7 @@ public class ParserContext extends BeanContext { * However, all reader-based parsers will * <p> * <table class='styled'> - * <tr><th>Parser class</th><th>Strict behavior</td></tr> + * <tr><th>Parser class</th><th>Strict behavior</th></tr> * <tr> * <td>All reader-based parsers</td> * <td> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/transform/SurrogateSwap.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/SurrogateSwap.java b/juneau-core/src/main/java/org/apache/juneau/transform/SurrogateSwap.java index 8c23525..b8e4991 100644 --- a/juneau-core/src/main/java/org/apache/juneau/transform/SurrogateSwap.java +++ b/juneau-core/src/main/java/org/apache/juneau/transform/SurrogateSwap.java @@ -113,7 +113,7 @@ import org.apache.juneau.serializer.*; * <jk>public</jk> Surrogate swap(Normal n) <jk>throws</jk> SerializeException { * <jk>return new</jk> Surrogate(n); * } - * <jk>public</jk> Normal unswap(Surrogate s, ClassMeta<?> hint) <jk>throws</jk> ParseException { + * <jk>public</jk> Normal unswap(Surrogate s, ClassMeta<?> hint) <jk>throws</jk> ParseException { * <jk>return</jk> Surrogate.<jsm>toNormal</jsm>(s); * } * } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonReader.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonReader.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonReader.java index 8117877..feb0557 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonReader.java +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonReader.java @@ -23,7 +23,7 @@ import org.apache.juneau.parser.*; * <p> * If decoding is enabled, the following character replacements occur so that boundaries are not lost: * <ul> - * <li><js>'&'</js> -> <js>'\u0001'</js> + * <li><js>'&'</js> -> <js>'\u0001'</js> * <li><js>'='</js> -> <js>'\u0002'</js> * </ul> */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 ec9b96a..6e6a8d4 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 @@ -24,7 +24,7 @@ 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>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>. * <p> * Example: * <p class='bcode'> @@ -36,8 +36,8 @@ public final class UrlEncodingContext implements Cloneable { * UrlEncodingSerializer s1 = <jk>new</jk> UrlEncodingParser(); * UrlEncodingSerializer s2 = <jk>new</jk> UrlEncodingParser().setProperty(UrlEncodingContext.<jsf>URLENC_expandedParams</jsf>, <jk>true</jk>); * - * String s1 = p1.serialize(<jk>new</jk> A()); <jc>// Produces "f1=(a,b)&f2=(c,d)"</jc> - * String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc> + * String s1 = p1.serialize(<jk>new</jk> A()); <jc>// Produces "f1=(a,b)&f2=(c,d)"</jc> + * String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc> * </p> * <p> * <b>Important note:</b> If parsing multi-part parameters, it's highly recommended to use Collections or Lists http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 89d428e..a3a6722 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 @@ -33,7 +33,7 @@ import org.apache.juneau.transform.*; * * <h6 class='topic'>Description</h6> * <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. * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 dcfa0a9..5df8849 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 @@ -58,7 +58,7 @@ public class UrlEncodingParserContext extends UonParserContext { * </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>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>. * * <h6 class='topic'>Example:</h6> * <p class='bcode'> @@ -70,8 +70,8 @@ public class UrlEncodingParserContext extends UonParserContext { * UrlEncodingSerializer s1 = <jk>new</jk> UrlEncodingParser(); * UrlEncodingSerializer s2 = <jk>new</jk> UrlEncodingParser().setProperty(UrlEncodingContext.<jsf>URLENC_expandedParams</jsf>, <jk>true</jk>); * - * String s1 = p1.serialize(<jk>new</jk> A()); <jc>// Produces "f1=(a,b)&f2=(c,d)"</jc> - * String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc> + * String s1 = p1.serialize(<jk>new</jk> A()); <jc>// Produces "f1=(a,b)&f2=(c,d)"</jc> + * String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc> * </p> * <p> * <b>Important note:</b> If parsing multi-part parameters, it's highly recommended to use Collections or Lists http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.java index eb91f70..fc5bd2c 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.java @@ -59,7 +59,7 @@ public class UrlEncodingSerializerContext extends UonSerializerContext { * </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>true</jk>, serializing the same array results in <code>?key=1&key=2&key=3</code>. * * <h6 class='topic'>Example:</h6> * <p class='bcode'> @@ -71,8 +71,8 @@ public class UrlEncodingSerializerContext extends UonSerializerContext { * UrlEncodingSerializer s1 = <jk>new</jk> UrlEncodingParser(); * UrlEncodingSerializer s2 = <jk>new</jk> UrlEncodingParser().setProperty(UrlEncodingContext.<jsf>URLENC_expandedParams</jsf>, <jk>true</jk>); * - * String s1 = p1.serialize(<jk>new</jk> A()); <jc>// Produces "f1=(a,b)&f2=(c,d)"</jc> - * String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc> + * String s1 = p1.serialize(<jk>new</jk> A()); <jc>// Produces "f1=(a,b)&f2=(c,d)"</jc> + * String s2 = p2.serialize(<jk>new</jk> A()); <jc>// Produces "f1=a&f1=b&f2=c&f2=d"</jc> * </p> * <p> * <b>Important note:</b> If parsing multi-part parameters, it's highly recommended to use Collections or Lists http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 9ea1e52..965a2d9 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 @@ -155,7 +155,7 @@ public class MessageBundle extends ResourceBundle { * * @param key The resource bundle key. * @param args Optional variable replacement arguments. - * @return The resolved value. Never <jk>null</jk>. <js>"{!!key}"</j> if the bundle is missing. <js>"{!key}"</j> if the key is missing. + * @return The resolved value. Never <jk>null</jk>. <js>"{!!key}"</js> if the bundle is missing. <js>"{!key}"</js> if the key is missing. */ public String getString(String key, Object...args) { String s = getString(key); @@ -172,7 +172,7 @@ public class MessageBundle extends ResourceBundle { * @param locale The locale of the resource bundle to retrieve message from. * @param key The resource bundle key. * @param args Optional variable replacement arguments. - * @return The resolved value. Never <jk>null</jk>. <js>"{!!key}"</j> if the bundle is missing. <js>"{!key}"</j> if the key is missing. + * @return The resolved value. Never <jk>null</jk>. <js>"{!!key}"</js> if the bundle is missing. <js>"{!key}"</js> if the key is missing. */ public String getString(Locale locale, String key, Object...args) { if (locale == null) @@ -185,7 +185,7 @@ public class MessageBundle extends ResourceBundle { * * @param key The resource bundle key. * @param args Optional variable replacement arguments. - * @return The resolved value. Never <jk>null</jk>. <js>"{!!key}"</j> if the bundle is missing. <js>"{!key}"</j> if the key is missing. + * @return The resolved value. Never <jk>null</jk>. <js>"{!!key}"</js> if the bundle is missing. <js>"{!key}"</js> if the key is missing. */ public String getClientString(String key, Object...args) { return getString(clientLocale.get(), key, args); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java index 4e69c54..4135272 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java @@ -222,6 +222,7 @@ public class XmlBeanMeta extends BeanMetaExtended { * <li>{@link XmlFormat#TEXT_PWS} * <li>{@link XmlFormat#XMLTEXT} * <li><jk>null</jk> + * </ul> * * @return The format of the inner XML content of this bean. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 3e67c33..765fbd6 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 @@ -43,14 +43,14 @@ import org.apache.juneau.parser.*; * <tr> * <td>{@link #XML_xsiNs}</td> * <td>XMLSchema-instance namespace URI.</td> - * <td><code>String<code></td> + * <td><code>String</code></td> * <td><js>"http://www.w3.org/2001/XMLSchema-instance";</js></td> * <td><jk>true</jk></td> * </tr> * <tr> * <td>{@link #XML_validating}</td> * <td>Enable validation.</td> - * <td><code>Boolean<code></td> + * <td><code>Boolean</code></td> * <td><jk>false</jk></td> * <td><jk>true</jk></td> * </tr> @@ -78,7 +78,7 @@ import org.apache.juneau.parser.*; * <tr> * <td>{@link #XML_preserveRootElement}</td> * <td>Preserve root element during generalized parsing.</td> - * <td><code>Boolean<code></td> + * <td><code>Boolean</code></td> * <td><jk>false</jk></td> * <td><jk>true</jk></td> * </tr> @@ -188,7 +188,7 @@ public class XmlParserContext extends ParserContext { * <td>ObjectMap.toString(), preserveRootElement==true</td> * </tr> * <tr> - * <td><code><xt><root><a></xt>foobar<xt></a></root></xt><code></td> + * <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> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 8220ef3..76e8a0a 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 @@ -68,7 +68,7 @@ public final class XmlUtils { /** * Encodes any invalid XML text characters to <code>_x####_</code> sequences and sends the response * to the specified writer. - * Encodes <js>'&'</js>, <js>'<'</js>, and <js>'>'</js> as XML entities.<br> + * Encodes <js>'&'</js>, <js>'<'</js>, and <js>'>'</js> as XML entities.<br> * Encodes invalid XML text characters to <code>_x####_</code> sequences. * * @param w The writer to send the output to. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-core/src/main/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/overview.html b/juneau-core/src/main/javadoc/overview.html index e94aa65..f55c6a2 100644 --- a/juneau-core/src/main/javadoc/overview.html +++ b/juneau-core/src/main/javadoc/overview.html @@ -992,9 +992,9 @@ </p> <p class='bcode'> { - <jsa>x</jsa>: [ - {<jsa>_type</jsa>:<jss>'bar'</jss>}, - {<jsa>_type</jsa>:<jss>'baz'</jss>} + x: [ + {_type:<js>'bar'</js>}, + {_type:<js>'baz'</js>} ] } </p> @@ -1602,10 +1602,10 @@ Feed feed = <jsm>feed</jsm>(<js>"tag:juneau.apache.org"</js>, <js>"Juneau ATOM specification"</js>, <js>"2016-01-02T03:04:05Z"</js>) - .subtitle(<jsm>text</jsm>(<js>"html"</js>).children(<js>"Describes <em>stuff</em> about Juneau"</js>)) + .subtitle(<jsm>text</jsm>(<js>"html"</js>).text(<js>"Describes <em>stuff</em> about Juneau"</js>)) .links( - <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/";</js>).hreflang(<js>"en"</js>), - <jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://www.sample.com/feed.atom";</js>) + <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org";</js>).hreflang(<js>"en"</js>), + <jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://juneau.apache.org/feed.atom";</js>) ) .rights(<js>"Copyright (c) 2016, Apache Foundation"</js>) .generator( @@ -1614,15 +1614,15 @@ .entries( <jsm>entry</jsm>(<js>"tag:juneau.sample.com,2013:1.2345"</js>, <js>"Juneau ATOM specification snapshot"</js>, <js>"2016-01-02T03:04:05Z"</js>) .links( - <jsm>link</jsm><js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/2012/05/08/juneau.atom";</js>), - <jsm>link</jsm>(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://www.sample.com/audio/juneau_podcast.mp3";</js>).length(1337) + <jsm>link</jsm><js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/juneau.atom";</js>), + <jsm>link</jsm>(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://juneau.apache.org/audio/juneau_podcast.mp3";</js>).length(1337) ) .published(<js>"2016-01-02T03:04:05Z"</js>) .authors( - <jsm>person</jsm>(<js>"James Bognar"</js>).uri(<js>"http://www.sample.com/";</js>).email(<js>"[email protected]"</js>) + <jsm>person</jsm>(<js>"Jane Smith"</js>).uri(<js>"http://juneau.apache.org/";</js>).email(<js>"[email protected]"</js>) ) .contributors( - <jsm>person</jsm>(<js>"Barry M. Caceres"</js>) + <jsm>person</jsm>(<js>"John Smith"</js>) ) .content( <jsm>content</jsm>(<js>"xhtml"</js>) @@ -1668,12 +1668,12 @@ <xt></subtitle></xt> <xt><entry></xt> <xt><author></xt> - <xt><name></xt>James Bognar<xt></name></xt> + <xt><name></xt>Jane Smith<xt></name></xt> <xt><uri></xt>http://juneau.apache.org/<xt></uri></xt> - <xt><email></xt>[email protected]<xt></email></xt> + <xt><email></xt>[email protected]<xt></email></xt> <xt></author></xt> <xt><contributor></xt> - <xt><name></xt>Barry M. Caceres<xt></name></xt> + <xt><name></xt>John Smith<xt></name></xt> <xt></contributor></xt> <xt><id></xt> tag:juneau.apache.org http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java index 5925eb1..ea1bc2f 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java @@ -108,11 +108,11 @@ public class LogsResource extends Resource { * @param path The log file path. * @param properties The writable properties for setting the descriptions. * @param highlight If <code>true</code>, add color highlighting based on severity. - * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&start=2014-01-23 11:25:47". - * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&end=2014-01-23 11:25:47". - * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&thread=pool-33-thread-1". - * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&loggers=(LinkIndexService,LinkIndexRestService)". - * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&severity=(ERROR,WARN)". + * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&start=2014-01-23 11:25:47". + * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&end=2014-01-23 11:25:47". + * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&thread=pool-33-thread-1". + * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&loggers=(LinkIndexService,LinkIndexRestService)". + * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&severity=(ERROR,WARN)". * @throws Exception */ @RestMethod(name="VIEW", path="/*", responses={@Response(200),@Response(404)}) @@ -180,11 +180,11 @@ public class LogsResource extends Resource { * * @param req The HTTP request. * @param path The log file path. - * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&start=2014-01-23 11:25:47". - * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&end=2014-01-23 11:25:47". - * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&thread=pool-33-thread-1". - * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&loggers=(LinkIndexService,LinkIndexRestService)". - * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&severity=(ERROR,WARN)". + * @param start Optional start timestamp. Don't print lines logged before the specified timestamp. Example: "&start=2014-01-23 11:25:47". + * @param end Optional end timestamp. Don't print lines logged after the specified timestamp. Example: "&end=2014-01-23 11:25:47". + * @param thread Optional thread name filter. Only show log entries with the specified thread name. Example: "&thread=pool-33-thread-1". + * @param loggers Optional logger filter. Only show log entries if they were produced by one of the specified loggers (simple class name). Example: "&loggers=(LinkIndexService,LinkIndexRestService)". + * @param severity Optional severity filter. Only show log entries with the specified severity. Example: "&severity=(ERROR,WARN)". * @return The parsed contents of the log file. * @throws Exception */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 676f451..748aaca 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 @@ -315,7 +315,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * Example: <js>"text/json"</js>. * <p> * If the content type is not specified, and the content is specified via a - * <code>&body</code> query parameter, the content type is assumed to be + * <code>&body</code> query parameter, the content type is assumed to be * <js>"text/uon"</js>. Otherwise, the content type is assumed to be <js>"text/json"</js>. * * @return The <code>Content-Type</code> media-type header value on the request. @@ -437,7 +437,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * servlet API to load and parse the request body. * * @param name The URL parameter name. - * @return The parameter value, or <jk>null</jk> if parameter not specified or has no value (e.g. <js>"&foo"</js>. + * @return The parameter value, or <jk>null</jk> if parameter not specified or has no value (e.g. <js>"&foo"</js>. */ public String getQueryParameter(String name) { String s = null; @@ -464,7 +464,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * * @param name The URL parameter name. * @param def The default value. - * @return The parameter value, or the default value if parameter not specified or has no value (e.g. <js>"&foo"</js>. + * @return The parameter value, or the default value if parameter not specified or has no value (e.g. <js>"&foo"</js>. */ public String getQueryParameter(String name, String def) { String s = getQueryParameter(name); @@ -526,7 +526,7 @@ public final class RestRequest extends HttpServletRequestWrapper { /** * Same as {@link #getQueryParameter(String, Class)} except for use on multi-part parameters - * (e.g. <js>"&key=1&key=2&key=3"</js> instead of <js>"&key=(1,2,3)"</js>). + * (e.g. <js>"&key=1&key=2&key=3"</js> instead of <js>"&key=(1,2,3)"</js>). * <p> * This method must only be called when parsing into classes of type Collection or array. * @@ -556,7 +556,7 @@ public final class RestRequest extends HttpServletRequestWrapper { /** * Same as {@link #getQueryParameter(String, Type)} except for use on multi-part parameters - * (e.g. <js>"&key=1&key=2&key=3"</js> instead of <js>"&key=(1,2,3)"</js>). + * (e.g. <js>"&key=1&key=2&key=3"</js> instead of <js>"&key=(1,2,3)"</js>). * <p> * This method must only be called when parsing into classes of type Collection or array. * @@ -593,7 +593,7 @@ public final class RestRequest extends HttpServletRequestWrapper { /** * Same as {@link #getQueryParameter(String, ClassMeta)} except for use on multi-part parameters - * (e.g. <js>"&key=1&key=2&key=3"</js> instead of <js>"&key=(1,2,3)"</js>). + * (e.g. <js>"&key=1&key=2&key=3"</js> instead of <js>"&key=(1,2,3)"</js>). * <p> * This method must only be called when parsing into classes of type Collection or array. * @@ -788,7 +788,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * Unlike {@link #getFormDataParameter(String, Class, Object)}, this method can be used to parse parameters * of complex types involving JCF classes. * <p class='bcode'> - * ClassMeta<Map<String,Integer>> cm = request.getBeanContext().getMapClassMeta(TreeMap.<jk>class</jk>, String.<jk>class</jk>, Integer.<jk>class</jk>); + * ClassMeta<Map<String,Integer>> cm = request.getBeanContext().getMapClassMeta(TreeMap.<jk>class</jk>, String.<jk>class</jk>, Integer.<jk>class</jk>); * Map<String,Integer> m = request.getFormDataParameter(<js>"myParameter"</js>, cm, <jk>new</jk> TreeMap<String,Integer>()); * </p> * @@ -825,7 +825,7 @@ public final class RestRequest extends HttpServletRequestWrapper { /** * Same as {@link #getFormDataParameter(String, Class)} except for use on multi-part parameters - * (e.g. <js>"key=1&key=2&key=3"</js> instead of <js>"key=(1,2,3)"</js>) + * (e.g. <js>"key=1&key=2&key=3"</js> instead of <js>"key=(1,2,3)"</js>) * <p> * This method must only be called when parsing into classes of type Collection or array. * @@ -853,7 +853,7 @@ public final class RestRequest extends HttpServletRequestWrapper { /** * Same as {@link #getFormDataParameter(String, Class)} except for use on multi-part parameters - * (e.g. <js>"key=1&key=2&key=3"</js> instead of <js>"key=(1,2,3)"</js>) + * (e.g. <js>"key=1&key=2&key=3"</js> instead of <js>"key=(1,2,3)"</js>) * <p> * This method must only be called when parsing into classes of type Collection or array. * @@ -898,7 +898,7 @@ public final class RestRequest extends HttpServletRequestWrapper { /** * Same as {@link #getFormDataParameter(String, ClassMeta)} except for use on multi-part parameters - * (e.g. <js>"key=1&key=2&key=3"</js> instead of <js>"key=(1,2,3)"</js>) + * (e.g. <js>"key=1&key=2&key=3"</js> instead of <js>"key=(1,2,3)"</js>) * <p> * This method must only be called when parsing into classes of type Collection or array. * @@ -1592,7 +1592,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * Returns the method of this request. * <p> * If <code>allowHeaderParams</code> init parameter is <jk>true</jk>, then first looks - * for <code>&method=xxx</code> in the URL query string. + * for <code>&method=xxx</code> in the URL query string. */ @Override /* ServletRequest */ public String getMethod() { @@ -1606,14 +1606,14 @@ public final class RestRequest extends HttpServletRequestWrapper { } /** - * Returns <jk>true</jk> if <code>&plainText=true</code> was specified as a URL parameter. + * Returns <jk>true</jk> if <code>&plainText=true</code> was specified as a URL parameter. * <p> * This indicates that the <code>Content-Type</code> of the output should always be set to <js>"text/plain"</js> * to make it easy to render in a browser. * <p> * This feature is useful for debugging. * - * @return <jk>true</jk> if {@code &plainText=true} was specified as a URL parameter + * @return <jk>true</jk> if {@code &plainText=true} was specified as a URL parameter */ public boolean isPlainText() { return "true".equals(getQueryParameter("plainText", "false")); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 5fb405a..a6606c1 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 @@ -1122,8 +1122,8 @@ 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> * </p> + * <p> * The default implementation simply logs errors to the <code>RestServlet</code> logger. * </p> * <p> @@ -1141,7 +1141,7 @@ public abstract class RestServlet extends HttpServlet { * * <jc>// This is the first time we've countered this error, so log a stack trace * // unless ?noTrace was passed in as a URL parameter.</jc> - * <jk>else if</jk> (c == 1 && ! noTrace) + * <jk>else if</jk> (c == 1 && ! noTrace) * myLogger.log(Level.<jsf>WARNING</jsf>, <jsm>format</jsm>(<js>"[%h.%s.%s] %s"</js>, e.hashCode(), e.getStatus(), c, msg), e); * * <jc>// This error occurred before. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 70538be..5124931 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 @@ -91,7 +91,7 @@ public final class RestServletContext extends Context { * </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> + * For example: <js>"?Accept=text/json&Content-Type=text/json"</js> * <p> * Parameter names are case-insensitive. * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 074a3d4..f61c213 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 @@ -47,6 +47,7 @@ import org.apache.juneau.xml.*; * <td class='code'>application/json</td> * <td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td> * </tr> + * <tr> * <td class='code'>application/json+schema<br>text/json+schema</td> * <td class='code'>application/json</td> * <td>{@link JsonSchemaSerializer}</td> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 42b25be..293f3b8 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 @@ -70,7 +70,7 @@ public @interface FormData { * 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>. + * (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. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 5762c91..527a6c9 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 @@ -52,23 +52,23 @@ import org.apache.juneau.rest.*; * </tr> * <tr> * <td><code>a=foo</code></td> - * <td><code><jk>true</jk></td> - * <td><code><js>"foo"</js></td> + * <td><jk>true</jk></td> + * <td><js>"foo"</js></td> * </tr> * <tr> * <td><code>a=</code></td> - * <td><code><jk>true</jk></td> - * <td><code><js>""</js></td> + * <td><jk>true</jk></td> + * <td><js>""</js></td> * </tr> * <tr> * <td><code>a</code></td> - * <td><code><jk>true</jk></td> - * <td><code><jk>null</jk></td> + * <td><jk>true</jk></td> + * <td><jk>null</jk></td> * </tr> * <tr> * <td><code>b=foo</code></td> - * <td><code><jk>false</jk></td> - * <td><code><jk>null</jk></td> + * <td><jk>false</jk></td> + * <td><jk>null</jk></td> * </tr> * </table> * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 6b88277..77a9c23 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 @@ -161,7 +161,7 @@ public @interface Parameter { * <li><js>"ssv"</js> - space separated values <js>"foo bar"</js>. * <li><js>"tsv"</js> - tab separated values <js>"foo\tbar"</js>. * <li><js>"pipes"</js> - pipe separated values <js>"foo|bar"</js>. - * <li><js>"multi"</js> - corresponds to multiple parameter instances instead of multiple values for a single instance <js>"foo=bar&foo=baz"</js>. + * <li><js>"multi"</js> - corresponds to multiple parameter instances instead of multiple values for a single instance <js>"foo=bar&foo=baz"</js>. * This is valid only for parameters <code>in</code> <js>"query"</js> or <js>"formData"</js>. * </ul> * Default value is <js>"csv"</js>. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 42cb4b0..a08113a 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 @@ -64,9 +64,9 @@ 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 - * collections of values (e.g. <js>"&key=(1,2,3)"</js>. + * 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>. + * (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. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/9140de11/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 963a258..ce8823a 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 @@ -52,6 +52,7 @@ import org.apache.juneau.xml.*; * <td class='code'>application/json</td> * <td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td> * </tr> + * <tr> * <td class='code'>application/json+schema<br>text/json+schema</td> * <td class='code'>application/json</td> * <td>{@link JsonSchemaSerializer}</td>
