http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 10fdcb7..0d60f43 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 @@ -28,7 +28,7 @@ import org.apache.juneau.rest.*; * Therefore, this annotation can be used in conjunction with the {@link Body @Body} annotation * or {@link RestRequest#getBody(Class)} method for <code>application/x-www-form-urlencoded POST</code> calls. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"GET"</js>) * <jk>public void</jk> doPost(<ja>@HasQuery</ja>(<js>"p1"</js>) <jk>boolean</jk> p1, <ja>@Body</ja> Bean myBean) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 6cdbbf0..bc4cdb5 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 @@ -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 a HTTP request header converted to a POJO. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"GET"</js>) * <jk>public void</jk> doGet(RestRequest req, RestResponse res, <ja>@Header</ja>(<js>"ETag"</js>) UUID etag) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 5e1bb2a..ae396a3 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 @@ -26,7 +26,7 @@ import org.apache.juneau.utils.*; * <p> * Parameter type must be either {@link ResourceBundle} or {@link MessageBundle}. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"GET"</js>) * <jk>public</jk> String doGet(<ja>@Messages</ja> ResourceBundle messages) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 a1e2495..fbdbe66 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 @@ -23,7 +23,7 @@ import java.lang.annotation.*; * <p> * Typically used for HTTP method handlers of type <js>"*"</js> (i.e. handle all requests). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"*"</js>) * <jk>public void</jk> doAnything(RestRequest req, RestResponse res, <ja>@Method</ja> String method) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 77a9c23..668638a 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 @@ -21,7 +21,7 @@ import java.lang.annotation.*; * Annotation used in conjunction with {@link RestMethod#parameters()} to identify content and header descriptions * on specific method requests. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>( * name=<js>"*"</js>, @@ -58,8 +58,9 @@ public @interface Parameter { * The name of the parameter (e.g. <js>"Content-Range"</js>). * <p> * Parameter names are case sensitive. - * If <code>in</code> is <js>"path"</js>, the name field MUST correspond to the associated path segment from the <code>path</code> field in the <a href='http://swagger.io/specification/#pathsObject'>Paths Object</a>. - * See <a href='http://swagger.io/specification/#pathTemplating'>Path Templating</a> for further information. + * If <code>in</code> is <js>"path"</js>, the name field MUST correspond to the associated path segment from the <code>path</code> field in + * the <a class="doclink" href="http://swagger.io/specification/#pathsObject";>Paths Object</a>. + * See <a class="doclink" href="http://swagger.io/specification/#pathTemplating";>Path Templating</a> for further information. * For all other cases, the name corresponds to the parameter name used based on the <code>in</code> property. */ String name() default ""; @@ -69,7 +70,7 @@ public @interface Parameter { * <p> * A brief description of the parameter. * This could contain examples of use. - * <a href='https://help.github.com/articles/github-flavored-markdown'>GFM syntax</a> can be used for rich text representation. + * <a class="doclink" href="https://help.github.com/articles/github-flavored-markdown";>GFM syntax</a> can be used for rich text representation. * <p> * The default value pulls the description from the <code>description</code> entry in the servlet resource bundle. * (e.g. <js>"myMethod.res.[code].[category].[name] = foo"</js> or <js>"MyServlet.myMethod.res.[code].[category].[name] = foo"</js>). @@ -89,9 +90,9 @@ public @interface Parameter { * <p> * Only applicable for <code>in</code> of type <js>"body"</js>. * <p> - * The schema is a JSON object specified <a 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>. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>( * parameters={ @@ -117,7 +118,7 @@ public @interface Parameter { /** * The extending format for the previously mentioned <code>type</code>. * <p> - * See <a href='http://swagger.io/specification/#dataTypeFormat'>Data Type Formats</a> for further details. + * See <a class="doclink" href="http://swagger.io/specification/#dataTypeFormat";>Data Type Formats</a> for further details. */ String format() default ""; @@ -134,7 +135,7 @@ public @interface Parameter { * <p> * Describes the type of items in the array. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>( * parameters={ @@ -148,7 +149,7 @@ public @interface Parameter { * <jk>public void</jk> doAnything() { * </p> * <p> - * See <a href='http://swagger.io/specification/#itemsObject'>Items Object</a> for further details. + * See <a class="doclink" href="http://swagger.io/specification/#itemsObject";>Items Object</a> for further details. */ String items() default ""; @@ -173,7 +174,7 @@ public @interface Parameter { * <p> * For example a "count" to control the number of results per page might default to 100 if not supplied by the client in the request. * (Note: "default" has no meaning for required parameters.) - * See <a href='http://json-schema.org/latest/json-schema-validation.html#anchor101'>http://json-schema.org/latest/json-schema-validation.html#anchor101</a>. + * See <a class="doclink" href="http://json-schema.org/latest/json-schema-validation.html#anchor101";>http://json-schema.org/latest/json-schema-validation.html#anchor101</a>. * Unlike JSON Schema this value MUST conform to the defined <code>type</code> for this parameter. */ String _default() default ""; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 e64ccf3..1333656 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 @@ -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 a variable in a URL path pattern converted to a POJO. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>) * <jk>public void</jk> doGet(RestRequest req, RestResponse res, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 728fde0..ea93705 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 @@ -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 URL parameter remainder after a path pattern match. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo/*"</js>) * <jk>public void</jk> doGet(RestRequest req, RestResponse res, <ja>@PathRemainder</ja> String remainder) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 a70e908..4957c1d 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 @@ -23,7 +23,7 @@ import org.apache.juneau.*; * Annotation that can be applied to a parameter of a {@link RestMethod} annotated method * to identify the request-duration properties object for the current request. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"GET"</js>) * <jk>public Person</jk> doGetPerson(<ja>@Properties</ja> ObjectMap properties) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 a08113a..649b7cd 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 @@ -28,7 +28,7 @@ import org.apache.juneau.rest.*; * Therefore, this annotation can be used in conjunction with the {@link Body @Body} annotation * or {@link RestRequest#getBody(Class)} method for <code>application/x-www-form-urlencoded POST</code> calls. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(name=<js>"GET"</js>) * <jk>public void</jk> doGet(RestRequest req, RestResponse res, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Response.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Response.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Response.java index 6cc7860..3b72a74 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Response.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/Response.java @@ -20,7 +20,7 @@ import java.lang.annotation.*; /** * Annotation used in conjunction with {@link RestMethod#responses()} to identify possible responses by the method. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>( * name=<js>"*"</js>, @@ -63,10 +63,10 @@ public @interface Response { * <p> * It can be a primitive, an array or an object. * If this field does not exist, it means no content is returned as part of the response. - * As an extension to the <a href='http://swagger.io/specification/#schemaObject'>Schema Object</a>, its root type value may also be <js>"file"</js>. + * As an extension to the <a class="doclink" href="http://swagger.io/specification/#schemaObject";>Schema Object</a>, its root type value may also be <js>"file"</js>. * This SHOULD be accompanied by a relevant produces mime-type. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>( * name=<js>"*"</js>, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 1dc75e9..530f563 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 @@ -255,7 +255,7 @@ public @interface RestMethod { * <p> * Header values specified at the method level override header values specified at the servlet level. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jc>// Assume "text/json" Accept value when Accept not specified</jc> * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/*"</js>, defaultRequestHeaders={<js>"Accept: text/json"</js>}) @@ -320,7 +320,7 @@ public @interface RestMethod { * 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>). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>) * </p> @@ -342,7 +342,7 @@ public @interface RestMethod { * 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>). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(tags=<js>"foo,bar"</js>) * </p> @@ -361,7 +361,7 @@ public @interface RestMethod { * 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>). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>(deprecated=<jk>true</jk>) * </p> @@ -378,7 +378,7 @@ public @interface RestMethod { * This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js> column * on the Swagger page. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>( * name=<js>"POST"</js>, path=<js>"/{a}"</js>, @@ -415,7 +415,7 @@ public @interface RestMethod { * This annotation is provided for documentation purposes and is used to populate the method <js>"responses"</js> column * on the Swagger page. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestMethod</ja>( * name=<js>"GET"</js>, path=<js>"/"</js>, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 1948ce0..f41bd53 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 @@ -177,7 +177,7 @@ public @interface RestResource { * <p> * This annotation can only be used on {@link Encoder} classes that have no-arg constructors. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jc>// Servlet with automated support for GZIP compression</jc> * <ja>@RestResource</ja>(encoders={GzipEncoder.<jk>class</jk>}) @@ -200,7 +200,7 @@ public @interface RestResource { * <p> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jc>// Assume "text/json" Accept value when Accept not specified</jc> * <ja>@RestResource</ja>(defaultRequestHeaders={<js>"Accept: text/json"</js>}) @@ -222,7 +222,7 @@ public @interface RestResource { * <p> * Only one header value can be specified per entry (i.e. it's not a delimited list of header entries). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jc>// Add a version header attribute to all responses</jc> * <ja>@RestResource</ja>(defaultResponseHeaders={<js>"X-Version: 1.0"</js>}) @@ -347,7 +347,7 @@ public @interface RestResource { * 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:'[email protected]'}"</js> or <js>"MyServlet.contact = {name:'John Smith',email:'[email protected]'}"</js>). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestResource</ja>(contact=<js>"{name:'John Smith',email:'[email protected]'}"</js>) * </p> @@ -375,7 +375,7 @@ public @interface RestResource { * 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>). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestResource</ja>(license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>) * </p> @@ -424,7 +424,7 @@ public @interface RestResource { * 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>). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestResource</ja>(tags=<js>"[{name:'Foo',description:'Foobar'}]"</js>) * </p> @@ -452,7 +452,7 @@ public @interface RestResource { * 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>). * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <ja>@RestResource</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>) * </p> @@ -495,7 +495,7 @@ public @interface RestResource { * <p> * If the file cannot be located, the request to <js>"[servletpath]/style.css"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jk>package</jk> com.foo.mypackage; * @@ -525,7 +525,7 @@ public @interface RestResource { * <p> * If the file cannot be located, the request to <js>"[servletpath]/favicon.ico"</js> will return {@link HttpServletResponse#SC_NOT_FOUND}. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jk>package</jk> com.foo.mypackage; * @@ -557,7 +557,7 @@ public @interface RestResource { * <p> * The media type on the response is determined by the {@link RestServlet#getMimetypesFileTypeMap()} method. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jk>package</jk> com.foo.mypackage; * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 297097f..911b0b4 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 @@ -71,18 +71,15 @@ public final class Queryable implements RestConverter { if (o instanceof Collection || o.getClass().isArray()) { ObjectMap query = req.getQueryParameter("q", ObjectMap.class); - ClassMeta<List<String>> cm1 = session.getCollectionClassMeta(List.class, String.class); - List<String> view = req.getQueryParameter("v", cm1); - ClassMeta<List<Object>> cm2 = session.getCollectionClassMeta(List.class, String.class); - List sort = req.getQueryParameter("s", cm2); - boolean ignoreCase = req.getQueryParameter("i", Boolean.class, false); - int pos = req.getQueryParameter("p", Integer.class, 0); - int limit = req.getQueryParameter("l", Integer.class, 0); + List<String> view = req.getQueryParameter("v", List.class, String.class); + List sort = req.getQueryParameter("s", List.class, String.class); + boolean ignoreCase = req.getQueryParameter("i", false, Boolean.class); + int pos = req.getQueryParameter("p", 0, Integer.class); + int limit = req.getQueryParameter("l", 0, Integer.class); o = f.filterCollection(query, view, sort, pos, limit, ignoreCase); } else { - ClassMeta<List<String>> cm2 = session.getCollectionClassMeta(List.class, String.class); - List<String> view = req.getQueryParameter("v", cm2); + List<String> view = req.getQueryParameter("v", List.class, String.class); o = f.filterMap(view); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/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 f99c3c9..29ea2e9 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 @@ -18,7 +18,7 @@ import org.apache.juneau.rest.*; /** * Shortcut label for child resources. Typically used in router resources. * - * <h6 class='topic'>Example:</h6> + * <h5 class='section'>Example:</h5> * <p class='bcode'> * <jc>// Instead of this...</jc> * <jk>new</jk> NameDescription(<jk>new</jk> Link(<js>"httpTool"</js>, uri + <js>"/httpTool"</js>), <js>"HTTP request test client"</js>); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30dd3b93/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceLink.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceLink.java b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceLink.java index 4c3e234..2325fdd 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceLink.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/labels/ResourceLink.java @@ -27,7 +27,7 @@ public class ResourceLink extends Link { * * @param req The HTTP request from the parent resource. * @param childPath The child resource path. - * @param args Optional {@link MessageFormat}-style arguments in the child path. + * @param args Optional {@link MessageFormat}-style arguments. */ public ResourceLink(RestRequest req, String childPath, Object...args) { super(getName(getPath(childPath,args)), getHref(req, getPath(childPath,args))); @@ -39,7 +39,7 @@ public class ResourceLink extends Link { * @param label The label for the link. * @param req The HTTP request from the parent resource. * @param childPath The child resource path. - * @param args Optional {@link MessageFormat}-style arguments in the child path. + * @param args Optional {@link MessageFormat}-style arguments. */ public ResourceLink(String label, RestRequest req, String childPath, Object...args) { super(label, getHref(req, getPath(childPath,args)));
