Repository: incubator-juneau Updated Branches: refs/heads/master e71a83b9d -> 542fb4866
Javadoc fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/542fb486 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/542fb486 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/542fb486 Branch: refs/heads/master Commit: 542fb486681badf4d6010e6a687fad10718438ec Parents: e71a83b Author: JamesBognar <[email protected]> Authored: Sun Jun 25 12:43:31 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Sun Jun 25 12:43:31 2017 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/juneau/BeanMeta.java | 4 +- .../juneau/html/HtmlDocSerializerContext.java | 1 - .../org/apache/juneau/html/HtmlDocTemplate.java | 6 ++- .../java/org/apache/juneau/html/HtmlRender.java | 8 ++-- .../org/apache/juneau/http/CacheControl.java | 4 +- .../main/java/org/apache/juneau/http/Host.java | 2 +- .../java/org/apache/juneau/http/HttpMethod.java | 2 +- .../java/org/apache/juneau/http/Warning.java | 2 +- .../org/apache/juneau/remoteable/FormData.java | 2 +- .../org/apache/juneau/remoteable/Header.java | 2 +- .../org/apache/juneau/remoteable/Query.java | 2 +- .../java/org/apache/juneau/xml/XmlUtils.java | 6 +-- .../eclipse-preferences/user-dictionary.txt | 49 ++++++++++++++++++++ .../juneau/rest/client/RestClientBuilder.java | 2 +- .../org/apache/juneau/rest/RequestQuery.java | 28 +++++------ .../java/org/apache/juneau/rest/RestConfig.java | 6 +-- .../juneau/rest/RestResourceResolver.java | 4 +- .../apache/juneau/rest/annotation/HtmlDoc.java | 8 ++-- .../juneau/rest/annotation/RestMethod.java | 4 +- .../juneau/rest/annotation/RestResource.java | 4 +- 20 files changed, 98 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/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 777a2b4..a6b73a2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java @@ -741,8 +741,8 @@ public class BeanMeta<T> { * <p> * 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>; + * 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! http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/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 94e9665..66e7929 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 @@ -446,7 +446,6 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { * Adds the specified CSS instructions to the HTML page. * * <h5 class='section'>Example:</h5> - * </p> * <p class='bcode'> * <ja>@RestResource</ja>( * properties={ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java index 6748540..8de526b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java @@ -21,11 +21,13 @@ package org.apache.juneau.html; * <head> * <style <xa>type</xa>=<xs>'text/css'</xs>> * <xv>CSS styles and links to stylesheets</xv> - * </style> + * </style> * </head> * <body> * <header> - * <xv>Page title and description</xv> + * <h3 <xa>class</xa>=<xs>'title'</xs>><xv>Page title</xv></h3> + * <h5 <xa>class</xa>=<xs>'description'</xs>><xv>Page description</xv></h5> + * <xv>Arbitrary page branding</xv> * </header> * <nav> * <xv>Page links</xv> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/html/HtmlRender.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlRender.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlRender.java index b31fea7..b3dba1b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlRender.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlRender.java @@ -62,9 +62,9 @@ import org.apache.juneau.serializer.*; * <ja>@Html</ja>(render=FileSpaceStatusRender.<jk>class</jk>) * <jk>public</jk> FileSpaceStatus getStatus() { * <jk>float</jk> pf = getPctFull(); - * <jk>if</jk> (pf < 80) + * <jk>if</jk> (pf < 80) * <jk>return</jk> FileSpaceStatus.<jsf>OK</jsf>; - * <jk>if</jk> (pf < 90) + * <jk>if</jk> (pf < 90) * <jk>return</jk> FileSpaceStatus.<jsf>WARNING</jsf>; * <jk>return</jk> FileSpaceStatus.<jsf>SEVERE</jsf>; * } @@ -80,9 +80,9 @@ import org.apache.juneau.serializer.*; * * <ja>@Override</ja> * <jk>public</jk> String getStyle(SerializerSession session, Float value) { - * <jk>if</jk> (value < 80) + * <jk>if</jk> (value < 80) * <jk>return</jk> <js>"background-color:lightgreen;text-align:center"</js>; - * <jk>if</jk> (value < 90) + * <jk>if</jk> (value < 90) * <jk>return</jk> <js>"background-color:yellow;text-align:center"</js>; * <jk>return</jk> <js>"background-color:red;text-align:center;border:;animation:color_change 0.5s infinite alternate"</js>; * } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/http/CacheControl.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/http/CacheControl.java b/juneau-core/src/main/java/org/apache/juneau/http/CacheControl.java index 8967523..e2ffa72 100644 --- a/juneau-core/src/main/java/org/apache/juneau/http/CacheControl.java +++ b/juneau-core/src/main/java/org/apache/juneau/http/CacheControl.java @@ -53,8 +53,8 @@ package org.apache.juneau.http; * | cache-extension ; Section 14.9.6 * cache-response-directive = * "public" ; Section 14.9.1 - * | "private" [ "=" <"> 1#field-name <"> ] ; Section 14.9.1 - * | "no-cache" [ "=" <"> 1#field-name <"> ]; Section 14.9.1 + * | "private" [ "=" <"> 1#field-name <"> ] ; Section 14.9.1 + * | "no-cache" [ "=" <"> 1#field-name <"> ]; Section 14.9.1 * | "no-store" ; Section 14.9.2 * | "no-transform" ; Section 14.9.5 * | "must-revalidate" ; Section 14.9.4 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/http/Host.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/http/Host.java b/juneau-core/src/main/java/org/apache/juneau/http/Host.java index 48feb16..eed7318 100644 --- a/juneau-core/src/main/java/org/apache/juneau/http/Host.java +++ b/juneau-core/src/main/java/org/apache/juneau/http/Host.java @@ -39,7 +39,7 @@ package org.apache.juneau.http; * <p> * A "host" without any trailing port information implies the default port for the service requested (e.g., "80" for an * HTTP URL). - * For example, a request on the origin server for <http://www.w3.org/pub/WWW/> would properly include: + * For example, a request on the origin server for <http://www.w3.org/pub/WWW/> would properly include: * <p class='bcode'> * GET /pub/WWW/ HTTP/1.1 * Host: www.w3.org http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/http/HttpMethod.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/http/HttpMethod.java b/juneau-core/src/main/java/org/apache/juneau/http/HttpMethod.java index 9408a17..1ff778b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/http/HttpMethod.java +++ b/juneau-core/src/main/java/org/apache/juneau/http/HttpMethod.java @@ -15,7 +15,7 @@ package org.apache.juneau.http; import java.util.*; /** - * Represents valid HTTP 1.1 method names per the <a class='doclink' href='https://www.ietf.org/rfc/rfc2616.txt'>RFC 2616</a> spec. + * Represents valid HTTP 1.1 method names per the RFC 2616 spec. * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/http/Warning.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/http/Warning.java b/juneau-core/src/main/java/org/apache/juneau/http/Warning.java index 3e18c3c..3828fbe 100644 --- a/juneau-core/src/main/java/org/apache/juneau/http/Warning.java +++ b/juneau-core/src/main/java/org/apache/juneau/http/Warning.java @@ -39,7 +39,7 @@ package org.apache.juneau.http; * ; the name or pseudonym of the server adding * ; the Warning header, for use in debugging * warn-text = quoted-string - * warn-date = <"> HTTP-date <"> + * warn-date = <"> HTTP-date <"> * </p> * <p> * A response MAY carry more than one Warning header. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/remoteable/FormData.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/remoteable/FormData.java b/juneau-core/src/main/java/org/apache/juneau/remoteable/FormData.java index 02dcf6c..396eb6f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/remoteable/FormData.java +++ b/juneau-core/src/main/java/org/apache/juneau/remoteable/FormData.java @@ -175,7 +175,7 @@ public @interface FormData { * String getFoo(); * } * </p> - * </ul> + * </li> * </ul> */ String name() default ""; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/remoteable/Header.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/remoteable/Header.java b/juneau-core/src/main/java/org/apache/juneau/remoteable/Header.java index 07efa03..5dba1df 100644 --- a/juneau-core/src/main/java/org/apache/juneau/remoteable/Header.java +++ b/juneau-core/src/main/java/org/apache/juneau/remoteable/Header.java @@ -161,7 +161,7 @@ public @interface Header { * String getFoo(); * } * </p> - * </ul> + * </li> * </ul> */ String name() default ""; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-core/src/main/java/org/apache/juneau/remoteable/Query.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/remoteable/Query.java b/juneau-core/src/main/java/org/apache/juneau/remoteable/Query.java index e362848..6126408 100644 --- a/juneau-core/src/main/java/org/apache/juneau/remoteable/Query.java +++ b/juneau-core/src/main/java/org/apache/juneau/remoteable/Query.java @@ -174,7 +174,7 @@ public @interface Query { * String getFoo(); * } * </p> - * </ul> + * </li> * </ul> */ String name() default ""; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/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 5ffef5c..28d858a 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 @@ -167,7 +167,7 @@ public final class XmlUtils { * <p> * Encodes any invalid XML text characters to <code>_x####_</code> sequences and sends the response * to the specified writer. - * <br>Encodes <js>'&'</js>, <js>'<'</js>, and <js>'>'</js> as XML entities.<br> + * <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. @@ -301,8 +301,8 @@ public final class XmlUtils { * <p> * Encodes any invalid XML text characters to <code>_x####_</code> sequences and sends the response * to the specified writer. - * <br>Encodes <js>'&'</js>, <js>'<'</js>, <js>'>'</js>, <js>'"'</js>, and <js>'\''</js> as XML entities.<br> - * <br?Encodes invalid XML text characters to <code>_x####_</code> sequences. + * <br>Encodes <js>'&'</js>, <js>'<'</js>, <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. * @param o The object being encoded. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-releng/eclipse-preferences/user-dictionary.txt ---------------------------------------------------------------------- diff --git a/juneau-releng/eclipse-preferences/user-dictionary.txt b/juneau-releng/eclipse-preferences/user-dictionary.txt index 1ae6596..4db9ef8 100644 --- a/juneau-releng/eclipse-preferences/user-dictionary.txt +++ b/juneau-releng/eclipse-preferences/user-dictionary.txt @@ -22,3 +22,52 @@ json xml html javadoc +jc +jd +jt +jk +js +jf +jsa +jsf +jsm +jss +ja +xt +xa +xc +xs +xv +mk +mv +cc +cs +ck +ce +cv +l +properties +ua +uk +un +us + +bcode +int +myparam +foo +remoteable +url +proxies +proxy +marshalled +doclink +href +myurl +foo +baz +bcode +serializers +mybeans +serializer +foobar http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java index 55d3a1c..529a068 100644 --- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java +++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java @@ -251,7 +251,7 @@ public class RestClientBuilder extends CoreObjectBuilder { * This root URL is ignored on those methods if you pass in a {@link URL}, {@link URI}, or an absolute URL string. * * @param rootUrl The root URL to prefix to relative URL strings. Trailing slashes are trimmed. - * Usually a <code>String<code> but you can also pass in <code>URI</code> and <code>URL</code> objects as well. + * Usually a <code>String</code> but you can also pass in <code>URI</code> and <code>URL</code> objects as well. * @return This object (for method chaining). */ public RestClientBuilder rootUrl(Object rootUrl) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-rest/src/main/java/org/apache/juneau/rest/RequestQuery.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RequestQuery.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RequestQuery.java index d7d6cfe..104e4b9 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RequestQuery.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RequestQuery.java @@ -215,10 +215,10 @@ public final class RequestQuery extends LinkedHashMap<String,String[]> { * <h5 class='section'>Examples:</h5> * <p class='bcode'> * <jc>// Parse into a linked-list of strings.</jc> - * Listt<String> myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); + * List<String> myparam = req.getQueryParameter(<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.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); + * List<List<String>> myparam = req.getQueryParameter(<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.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>); @@ -313,20 +313,20 @@ public final class RequestQuery extends LinkedHashMap<String,String[]> { * <p> * The query arguments are as follows: * <ul> - * <li><js>"&s="</js> - A comma-delimited list of column-name/search-token pairs. - * <br>Example: <js>"&s=column1=foo*,column2=*bar"</js> - * <li><js>"&v="</js> - A comma-delimited list column names to view. - * <br>Example: <js>"&v=column1,column2"</js> - * <li><js>"&o="</js> - A comma-delimited list column names to sort by. + * <li><js>"&s="</js> - A comma-delimited list of column-name/search-token pairs. + * <br>Example: <js>"&s=column1=foo*,column2=*bar"</js> + * <li><js>"&v="</js> - A comma-delimited list column names to view. + * <br>Example: <js>"&v=column1,column2"</js> + * <li><js>"&o="</js> - A comma-delimited list column names to sort by. * <br>Column names can be suffixed with <js>'-'</js> to indicate descending order. - * <br>Example: <js>"&o=column1,column2-"</js> - * <li><js>"&p="</js> - The zero-index row number of the first row to display. - * <br>Example: <js>"&p=100"</js> - * <li><js>"&l="</js> - The number of rows to return. + * <br>Example: <js>"&o=column1,column2-"</js> + * <li><js>"&p="</js> - The zero-index row number of the first row to display. + * <br>Example: <js>"&p=100"</js> + * <li><js>"&l="</js> - The number of rows to return. * <br><code>0</code> implies return all rows. - * <br>Example: <js>"&l=100"</js> - * <li><js>"&i="</js> - The case-insensitive search flag. - * <br>Example: <js>"&i=true"</js> + * <br>Example: <js>"&l=100"</js> + * <li><js>"&i="</js> - The case-insensitive search flag. + * <br>Example: <js>"&i=true"</js> * </ul> * <p> * Whitespace is trimmed in the parameters. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java index 1423819..df84f52 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java @@ -68,7 +68,7 @@ import org.apache.juneau.svl.vars.*; * this object instead. Also, this method can throw any exception, not just a {@link ServletException}. * <p> * The parent <code>init(RestServletConfig)</code> method will construct a read-only {@link RestContext} object - * that contains a snapshot of these settings. If you call <code><jk>super</jk>.init(RestServletConfig)<code> before + * that contains a snapshot of these settings. If you call <code><jk>super</jk>.init(RestServletConfig)</code> before * you modify this config object, you won't see the changes! */ @SuppressWarnings({"hiding"}) @@ -1070,7 +1070,7 @@ public class RestConfig implements ServletConfig { * <li><code><ja>@RestResource</ja>(title)</code> annotation. * <li><code>{servletClass}.title</code> resource bundle value. * <li><code>info/title</code> entry in swagger file. - * <ol> + * </ol> * <p> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). * <p> @@ -1111,7 +1111,7 @@ public class RestConfig implements ServletConfig { * <li><code>summary</code> entry in swagger file for method. * <li><code>{servletClass}.description</code> resource bundle value. * <li><code>info/description</code> entry in swagger file. - * <ol> + * </ol> * <p> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-rest/src/main/java/org/apache/juneau/rest/RestResourceResolver.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestResourceResolver.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestResourceResolver.java index ae8d9d3..057eb3b 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestResourceResolver.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestResourceResolver.java @@ -42,8 +42,8 @@ import org.apache.juneau.rest.annotation.*; * Non-<code>RestServlet</code> classes can also add the following two methods to get access to the * {@link RestConfig} and {@link RestContext} objects: * <ul> - * <li><jk>public void</jk> init(RestConfig);</code> - * <li><jk>public void</jk> init(RestContext);</code> + * <li><code><jk>public void</jk> init(RestConfig);</code> + * <li><code><jk>public void</jk> init(RestContext);</code> * </ul> */ public class RestResourceResolver { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java index 83d50b8..5402a3a 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java @@ -47,7 +47,7 @@ import org.apache.juneau.rest.*; * <head> * <style <xa>type</xa>=<xs>'text/css'</xs>> * <xv>CSS styles and links to stylesheets</xv> - * </style> + * </style> * </head> * <body> * <header> @@ -88,7 +88,7 @@ public @interface HtmlDoc { * <li><code><ja>@RestResource</ja>(title)</code> annotation. * <li><code>{servletClass}.title</code> resource bundle value. * <li><code>info/title</code> entry in swagger file. - * <ol> + * </ol> * <p> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). * <p> @@ -126,7 +126,7 @@ public @interface HtmlDoc { * <li><code>summary</code> entry in swagger file for method. * <li><code>{servletClass}.description</code> resource bundle value. * <li><code>info/description</code> entry in swagger file. - * <ol> + * </ol> * <p> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). * <p> @@ -174,7 +174,7 @@ public @interface HtmlDoc { * <p class='bcode'> * <ja>@RestResource</ja>( * htmldoc=<ja>@HtmlDoc</ja>( - * header=<js>"<p>This is my REST interface</p>"</js> + * header=<js>"<p>This is my REST interface</p>"</js> * ) * ) * </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/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 4ebab09..97624d3 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 @@ -55,7 +55,7 @@ public @interface RestMethod { * <br>Otherwise, defaults to <js>"GET"</js>. * <li><js>"PROXY"</js> - Remote-proxy interface. * <br>This denotes a Java method that returns an object (usually an interface, often annotated with the {@link Remoteable @Remoteable} annotation) - * to be used as a remote proxy using <code>RestClient.getRemoteableProxy(Class<T> interfaceClass, String url)</code>. + * to be used as a remote proxy using <code>RestClient.getRemoteableProxy(Class<T> interfaceClass, String url)</code>. * <br>This allows you to construct client-side interface proxies using REST as a transport medium. * <br>Conceptually, this is simply a fancy <code>POST</code> against the url <js>"/{path}/{javaMethodName}"</js> where the arguments * are marshalled from the client to the server as an HTTP body containing an array of objects, @@ -486,7 +486,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 compatibility. * <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>) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/542fb486/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 ac82330..3c53010 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 @@ -540,8 +540,8 @@ public @interface RestResource { * Non-<code>RestServlet</code> classes can also add the following two methods to get access to the * {@link RestConfig} and {@link RestContext} objects: * <ul> - * <li><jk>public void</jk> init(RestConfig);</code> - * <li><jk>public void</jk> init(RestContext);</code> + * <li><code><jk>public void</jk> init(RestConfig);</code> + * <li><code><jk>public void</jk> init(RestContext);</code> * </ul> * <p> * Subclasses can be used to provide customized resolution of REST resource class instances.
