Repository: incubator-juneau Updated Branches: refs/heads/master 30dd3b936 -> 68dffad1d
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/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 29a2dfd..7269178 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 @@ -153,6 +153,7 @@ public final class RestRequest extends HttpServletRequestWrapper { return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs); } + //-------------------------------------------------------------------------------- // Properties //-------------------------------------------------------------------------------- @@ -176,6 +177,7 @@ public final class RestRequest extends HttpServletRequestWrapper { return this.properties; } + //-------------------------------------------------------------------------------- // Headers //-------------------------------------------------------------------------------- @@ -425,6 +427,7 @@ public final class RestRequest extends HttpServletRequestWrapper { return super.getLocales(); } + //-------------------------------------------------------------------------------- // Query parameters //-------------------------------------------------------------------------------- @@ -542,7 +545,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * Listt<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>); + * Listt<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>); @@ -730,6 +733,7 @@ public final class RestRequest extends HttpServletRequestWrapper { throw new ParseException("Invalid call to getQueryParameters(String, ClassMeta). Class type must be a Collection or array."); } + //-------------------------------------------------------------------------------- // Form data parameters //-------------------------------------------------------------------------------- @@ -872,7 +876,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * Listt<String> myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); * * <jc>// Parse into a linked-list of linked-lists of strings.</jc> - * Listt<List<String>> myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); + * Listt<List<String>> myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); * * <jc>// Parse into a map of string keys/values.</jc> * Map<String,String> myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>); @@ -968,6 +972,7 @@ public final class RestRequest extends HttpServletRequestWrapper { throw new ParseException("Invalid call to getParameters(String, ClassMeta). Class type must be a Collection or array."); } + //-------------------------------------------------------------------------------- // Path parameters //-------------------------------------------------------------------------------- @@ -1044,7 +1049,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * Listt<String> myparam = req.getPathParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); * * <jc>// Parse into a linked-list of linked-lists of strings.</jc> - * Listt<List<String>> myparam = req.getPathParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); + * Listt<List<String>> myparam = req.getPathParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>); * * <jc>// Parse into a map of string keys/values.</jc> * Map<String,String> myparam = req.getPathParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>); @@ -1078,6 +1083,7 @@ public final class RestRequest extends HttpServletRequestWrapper { return t; } + //-------------------------------------------------------------------------------- // Body methods //-------------------------------------------------------------------------------- @@ -1311,6 +1317,7 @@ public final class RestRequest extends HttpServletRequestWrapper { } } + //-------------------------------------------------------------------------------- // URI-related methods //-------------------------------------------------------------------------------- @@ -1552,6 +1559,7 @@ public final class RestRequest extends HttpServletRequestWrapper { return RestUtils.trimPathInfo(getRequestURL(), getContextPath(), getServletPath()); } + //-------------------------------------------------------------------------------- // Labels //-------------------------------------------------------------------------------- @@ -1600,6 +1608,7 @@ public final class RestRequest extends HttpServletRequestWrapper { return servlet.getMethodDescription(javaMethod.getName(), this); } + //-------------------------------------------------------------------------------- // Other methods //-------------------------------------------------------------------------------- @@ -1883,6 +1892,7 @@ public final class RestRequest extends HttpServletRequestWrapper { return sb.toString(); } + //-------------------------------------------------------------------------------- // Utility methods //-------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/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 b7b9321..d09c79d 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 @@ -286,6 +286,7 @@ public abstract class RestServlet extends HttpServlet { } } + //-------------------------------------------------------------------------------- // Initialization methods //-------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/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 83eac97..b8a3797 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 @@ -31,53 +31,6 @@ import org.apache.juneau.serializer.*; * These distinctions are noted below. * <p> * See {@link ContextFactory} for more information about context properties. - * - * <h6 class='topic' id='ConfigProperties'>Configurable properties on the REST servlet</h6> - * <table class='styled' style='border-collapse: collapse;'> - * <tr><th>Setting name</th><th>Description</th><th>Data type</th><th>Default value</th></tr> - * <tr> - * <td>{@link #REST_allowHeaderParams}</td> - * <td>Enable header URL parameters.</td> - * <td><code>Boolean</code></td> - * <td><jk>true</jk></td> - * </tr> - * <tr> - * <td>{@link #REST_allowMethodParam}</td> - * <td>Enable <js>"method"</js> URL parameter for specific HTTP methods.</td> - * <td><code>String</code></td> - * <td><js>""</js></td> - * </tr> - * <tr> - * <td>{@link #REST_allowBodyParam}</td> - * <td>Enable <js>"body"</js> URL parameter.</td> - * <td><code>Boolean</code></td> - * <td><jk>true</jk></td> - * </tr> - * <tr> - * <td>{@link #REST_renderResponseStackTraces}</td> - * <td>Render stack traces in HTTP response bodies when errors occur.</td> - * <td><code>Boolean</code></td> - * <td><jk>false</jk></td> - * </tr> - * <tr> - * <td>{@link #REST_useStackTraceHashes}</td> - * <td>Use stack trace hashes.</td> - * <td><code>Boolean</code></td> - * <td><jk>false</jk></td> - * </tr> - * <tr> - * <td>{@link #REST_defaultCharset}</td> - * <td>Default character encoding.</td> - * <td><code>String</code></td> - * <td><js>"utf-8"</js></td> - * </tr> - * <tr> - * <td>{@link #REST_paramFormat}</td> - * <td>Expected format of request parameters.</td> - * <td><code>String</code></td> - * <td><js>"UON"</js></td> - * </tr> - * </table> */ public final class RestServletContext extends Context { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java b/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java index bdd9409..611cc65 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java @@ -120,6 +120,7 @@ public abstract class RemoteableServlet extends RestServletDefault { return m.invoke(service, params); } + //-------------------------------------------------------------------------------- // Other methods //--------------------------------------------------------------------------------
