juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [03/32] juneau git commit: Javadoc updates.
Date Sun, 14 Jan 2018 16:02:31 GMT
http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
index c68b563..e762d8d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
@@ -18,47 +18,48 @@ import org.apache.juneau.rest.annotation.*;
 
 /**
  * REST method guard.
- *
- * <h5 class='section'>Description:</h5>
- *
+ * 
+ * 
+ * <h5 class='topic'>Description</h5>
+ * 
  * Implements a guard mechanism for REST method calls that allows requests to be rejected before invocation of the REST
  * method.
  * For example, guards can be used to ensure that only administrators can call certain methods.
- *
+ * 
  * <p>
  * Guards are applied to REST methods declaratively through the {@link RestResource#guards() @RestResource.guards()} or
  * {@link RestMethod#guards() @RestMethod.guards()} annotations.
- *
+ * 
  * <p>
  * If multiple guards are specified, ALL guards must pass in order for the request to proceed.
- *
+ * 
  * <h6 class='topic'>How to implement</h6>
- *
+ * 
  * Typically, guards will be used for permissions checking on the user making the request, but it can also be used for
  * other purposes like pre-call validation of a request.
- *
+ * 
  * <p>
  * Implementers should simply throw a {@link RestException} from the {@link #guard(RestRequest, RestResponse)}
  * method to abort processing on the current request.
- *
+ * 
  * <p>
  * Guards must implement a no-args constructor.
- *
+ * 
  * <h6 class='topic'>Example usage:</h6>
  * <p class='bcode'>
  * 	<jk>public</jk> MyResource <jk>extends</jk> RestServlet {
- *
+ * 
  * 		<jc>// Delete method with guard that only allows Billy to call it.</jc>
  * 		<ja>@RestMethod</ja>(name=<jsf>DELETE</jsf>, guards=BillyGuard.<jk>class</jk>)
  * 		<jk>public</jk> doDelete(RestRequest req, RestResponse res) <jk>throws</jk> Exception {...}
  * 	}
  * </p>
- *
+ * 
  * <h6 class='topic'>Example implementation:</h6>
  * <p class='bcode'>
  * 	<jc>// Define a guard that only lets Billy make a request</jc>
  * 	<jk>public</jk> BillyGuard <jk>extends</jk> RestGuard {
- *
+ * 
  * 		<ja>@Override</ja>
  * 		<jk>public boolean</jk> isRequestAllowed(RestRequest req) {
  * 			return req.getUserPrincipal().getName().contains(<js>"Billy"</js>);
@@ -70,14 +71,14 @@ public abstract class RestGuard {
 
 	/**
 	 * Checks the current HTTP request and throws a {@link RestException} if the guard does not permit the request.
-	 *
+	 * 
 	 * <p>
 	 * By default, throws an <jsf>SC_FORBIDDEN</jsf> exception if {@link #isRequestAllowed(RestRequest)} returns
 	 * <jk>false</jk>.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses are free to override this method to tailor the behavior of how to handle unauthorized requests.
-	 *
+	 * 
 	 * @param req The servlet request.
 	 * @param res The servlet response.
 	 * @throws RestException Thrown to abort processing on current request.
@@ -93,7 +94,7 @@ public abstract class RestGuard {
 
 	/**
 	 * Returns <jk>true</jk> if the specified request can pass through this guard.
-	 *
+	 * 
 	 * @param req The servlet request.
 	 * @return <jk>true</jk> if the specified request can pass through this guard.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
index 5bef97b..d1f14a1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
@@ -28,11 +28,11 @@ import org.apache.juneau.svl.*;
 
 /**
  * Class that provides documentation and other related information about a REST resource.
- *
+ * 
  * <p>
  * Subclasses can override these methods to tailor how HTTP REST resources are documented.
  * Subclasses MUST implement a public constructor that takes in a {@link RestContext} object.
- *
+ * 
  * <p>
  * RestInfoProviders are associated with servlets/resources in one of the following ways:
  * <ul>
@@ -57,7 +57,7 @@ public class RestInfoProvider {
 
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param context The resource context.
 	 */
 	public RestInfoProvider(RestContext context) {
@@ -117,7 +117,7 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized swagger for this REST resource.
-	 *
+	 * 
 	 * @param req The incoming HTTP request.
 	 * @return A new Swagger instance.
 	 * @throws RestException
@@ -161,14 +161,14 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized Swagger from the file system.
-	 *
+	 * 
 	 * <p>
 	 * Looks for a file called <js>"{ServletClass}_{locale}.json"</js> in the same package as this servlet and returns
 	 * it as a parsed {@link Swagger} object.
-	 *
+	 * 
 	 * <p>
 	 * Returned objects are cached for later quick-lookup.
-	 *
+	 * 
 	 * @param locale The locale of the swagger.
 	 * @return The parsed swagger object, or <jk>null</jk> if the swagger file could not be found.
 	 * @throws RestException
@@ -188,10 +188,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized summary of the specified java method on this servlet.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own summary.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the summary from the following locations (whichever matches first):
 	 * <ol>
@@ -201,7 +201,7 @@ public class RestInfoProvider {
 	 * 	<li><ck>[javaMethodName].summary</ck> property in resource bundle identified by
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * </ol>
-	 *
+	 * 
 	 * @param javaMethodName The name of the Java method whose description we're retrieving.
 	 * @param req The current request.
 	 * @return The localized summary of the method, or a blank string if no summary was found.
@@ -215,10 +215,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized summary of the java method invoked on the specified request.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own summary.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the summary from the following locations (whichever matches first):
 	 * <ol>
@@ -228,7 +228,7 @@ public class RestInfoProvider {
 	 * 	<li><ck>[javaMethodName].summary</ck> property in resource bundle identified by
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return The localized summary of the method, or a blank string if no summary was found.
 	 */
@@ -238,10 +238,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized description of the specified java method on this servlet.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own description.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the description from the following locations (whichever matches first):
 	 * <ol>
@@ -251,7 +251,7 @@ public class RestInfoProvider {
 	 * 	<li><ck>[javaMethodName].description</ck> property in resource bundle identified by
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * </ol>
-	 *
+	 * 
 	 * @param javaMethodName The name of the Java method whose description we're retrieving.
 	 * @param req The current request.
 	 * @return The localized description of the method, or a blank string if no description was found.
@@ -265,10 +265,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized description of the invoked java method on the specified request.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own description.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the description from the following locations (whichever matches first):
 	 * <ol>
@@ -278,7 +278,7 @@ public class RestInfoProvider {
 	 * 	<li><ck>[javaMethodName].description</ck> property in resource bundle identified by
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return The localized description of the method, or a blank string if no description was found.
 	 */
@@ -288,10 +288,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized site name of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own site name.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the description from the following locations (whichever matches first):
 	 * <ol>
@@ -302,7 +302,7 @@ public class RestInfoProvider {
 	 * 	<li><ck>siteName</ck> in resource bundle identified by {@link RestResource#messages() @RestResource.messages()}
 	 * 		annotation for this class, then any parent classes.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return The localized description of this REST resource, or <jk>null</jk> if no resource description was found.
 	 */
@@ -318,10 +318,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized title of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own title.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the description from the following locations (whichever matches first):
 	 * <ol>
@@ -333,7 +333,7 @@ public class RestInfoProvider {
 	 * 		annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/title</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return The localized description of this REST resource, or <jk>null</jk> if no resource description was found.
 	 */
@@ -352,10 +352,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized description of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own description.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the description from the following locations (whichever matches first):
 	 * <ol>
@@ -367,7 +367,7 @@ public class RestInfoProvider {
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/description</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return The localized description of this REST resource, or <jk>null</jk> if no resource description was found.
 	 */
@@ -386,10 +386,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized contact information of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own contact information.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the contact information from the following locations (whichever matches first):
 	 * <ol>
@@ -401,7 +401,7 @@ public class RestInfoProvider {
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/contact</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return
 	 * 	The localized contact information of this REST resource, or <jk>null</jk> if no contact information was found.
@@ -426,10 +426,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the localized license information of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own license information.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the license information from the following locations (whichever matches first):
 	 * <ol>
@@ -441,7 +441,7 @@ public class RestInfoProvider {
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/license</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return
 	 * 	The localized contact information of this REST resource, or <jk>null</jk> if no contact information was found.
@@ -466,10 +466,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the terms-of-service information of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own terms-of-service information.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the terms-of-service information from the following locations (whichever
 	 * matches first):
@@ -482,7 +482,7 @@ public class RestInfoProvider {
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/termsOfService</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return
 	 * 	The localized contact information of this REST resource, or <jk>null</jk> if no contact information was found.
@@ -502,10 +502,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the version information of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own version information.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the version information from the following locations (whichever matches first):
 	 * <ol>
@@ -517,7 +517,7 @@ public class RestInfoProvider {
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/version</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return
 	 * 	The localized contact information of this REST resource, or <jk>null</jk> if no contact information was found.
@@ -537,10 +537,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the version information of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own version information.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the version information from the following locations (whichever matches first):
 	 * <ol>
@@ -552,7 +552,7 @@ public class RestInfoProvider {
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/version</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return
 	 * 	The localized contact information of this REST resource, or <jk>null</jk> if no contact information was found.
@@ -577,10 +577,10 @@ public class RestInfoProvider {
 
 	/**
 	 * Returns the version information of this REST resource.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own version information.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation returns the version information from the following locations (whichever matches first):
 	 * <ol>
@@ -592,7 +592,7 @@ public class RestInfoProvider {
 	 * 		{@link RestResource#messages() @RestResource.messages()} annotation for this class, then any parent classes.
 	 * 	<li><ck>/info/version</ck> entry in swagger file.
 	 * </ol>
-	 *
+	 * 
 	 * @param req The current request.
 	 * @return
 	 * 	The localized contact information of this REST resource, or <jk>null</jk> if no contact information was found.

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
index 660f770..0ef6f63 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestJavaMethod.java
@@ -780,7 +780,7 @@ public class RestJavaMethod implements Comparable<RestJavaMethod>  {
 
 	/**
 	 * Workhorse method.
-	 *
+	 * 
 	 * @param pathInfo The value of {@link HttpServletRequest#getPathInfo()} (sorta)
 	 * @return The HTTP response code.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
index 1952210..6e1ec6c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
@@ -26,11 +26,11 @@ import org.apache.juneau.rest.annotation.*;
 
 /**
  * Logging utility class.
- *
+ * 
  * <p>
  * Subclasses can override these methods to tailor logging of HTTP requests.
  * Subclasses MUST implement a no-arg public constructor.
- *
+ * 
  * <p>
  * RestLoggers are associated with servlets/resources in one of the following ways:
  * <ul>
@@ -42,22 +42,22 @@ public abstract class RestLogger {
 
 	/**
 	 * Returns the Java logger used for logging.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can provide their own logger.
 	 * The default implementation returns the logger created using <code>Logger.getLogger(getClass())</code>.
-	 *
+	 * 
 	 * @return The logger used for logging.
 	 */
 	protected abstract Logger getLogger();
 
 	/**
 	 * Log a message to the logger.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method if they wish to log messages using a library other than Java Logging
 	 * (e.g. Apache Commons Logging).
-	 *
+	 * 
 	 * @param level The log level.
 	 * @param cause The cause.
 	 * @param msg The message to log.
@@ -67,10 +67,10 @@ public abstract class RestLogger {
 
 	/**
 	 * Log a message.
-	 *
+	 * 
 	 * <p>
 	 * Equivalent to calling <code>log(level, <jk>null</jk>, msg, args);</code>
-	 *
+	 * 
 	 * @param level The log level.
 	 * @param msg The message to log.
 	 * @param args Optional {@link MessageFormat}-style arguments.
@@ -81,16 +81,16 @@ public abstract class RestLogger {
 
 	/**
 	 * Same as {@link #log(Level, String, Object...)} excepts runs the arguments through {@link JsonSerializer#DEFAULT_LAX_READABLE}.
-	 *
+	 * 
 	 * <p>
 	 * Serialization of arguments do not occur if message is not logged, so it's safe to use this method from within
 	 * debug log statements.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	logObjects(<jsf>DEBUG</jsf>, <js>"Pojo contents:\n{0}"</js>, myPojo);
 	 * </p>
-	 *
+	 * 
 	 * @param level The log level.
 	 * @param msg The message to log.
 	 * @param args Optional {@link MessageFormat}-style arguments.
@@ -103,13 +103,13 @@ public abstract class RestLogger {
 
 	/**
 	 * Callback method for logging errors during HTTP requests.
-	 *
+	 * 
 	 * <p>
 	 * Typically, subclasses will override this method and log errors themselves.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation simply logs errors to the <code>RestServlet</code> logger.
-	 *
+	 * 
 	 * <p>
 	 * Here's a typical implementation showing how stack trace hashing can be used to reduce log file sizes...
 	 * <p class='bcode'>
@@ -117,23 +117,23 @@ public abstract class RestLogger {
 	 * 		String qs = req.getQueryString();
 	 * 		String msg = <js>"HTTP "</js> + req.getMethod() + <js>" "</js> + e.getStatus() + <js>" "</js> + req.getRequestURI() + (qs == <jk>null</jk> ? <js>""</js> : <js>"?"</js> + qs);
 	 * 		<jk>int</jk> c = e.getOccurrence();
-	 *
+	 * 
 	 * 		<jc>// REST_useStackTraceHashes is disabled, so we have to log the exception every time.</jc>
 	 * 		<jk>if</jk> (c == 0)
 	 * 			myLogger.log(Level.<jsf>WARNING</jsf>, <jsm>format</jsm>(<js>"[%s] %s"</js>, e.getStatus(), msg), e);
-	 *
+	 * 
 	 * 		<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 &amp;&amp; ! 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.
 	 * 		// Only log the message, not the stack trace.</jc>
 	 * 		<jk>else</jk>
 	 * 			myLogger.log(Level.<jsf>WARNING</jsf>, <jsm>format</jsm>(<js>"[%h.%s.%s] %s, %s"</js>, e.hashCode(), e.getStatus(), c, msg, e.getLocalizedMessage()));
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * @param req The servlet request object.
 	 * @param res The servlet response object.
 	 * @param e Exception indicating what error occurred.
@@ -155,14 +155,14 @@ public abstract class RestLogger {
 
 	/**
 	 * Returns <jk>true</jk> if the specified exception should be logged.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own logic for determining when exceptions are logged.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation will return <jk>false</jk> if <js>"noTrace=true"</js> is passed in the query string
 	 * or <code>No-Trace: true</code> is specified in the header.
-	 *
+	 * 
 	 * @param req The HTTP request.
 	 * @param res The HTTP response.
 	 * @param e The exception.
@@ -176,10 +176,10 @@ public abstract class RestLogger {
 
 	/**
 	 * Returns <jk>true</jk> if a stack trace should be logged for this exception.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own logic for determining when stack traces are logged.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation will only log a stack trace if {@link RestException#getOccurrence()} returns
 	 * <code>1</code> and the exception is not one of the following:
@@ -188,7 +188,7 @@ public abstract class RestLogger {
 	 * 	<li>{@link HttpServletResponse#SC_FORBIDDEN}
 	 * 	<li>{@link HttpServletResponse#SC_NOT_FOUND}
 	 * </ul>
-	 *
+	 * 
 	 * @param req The HTTP request.
 	 * @param res The HTTP response.
 	 * @param e The exception.
@@ -216,10 +216,10 @@ public abstract class RestLogger {
 
 	/**
 	 * NO-OP logger.
-	 *
+	 * 
 	 * <p>
 	 * Disables all logging.
-	 *
+	 * 
 	 * @author James Bognar (james.bognar@salesforce.com)
 	 */
 	public static class NoOp extends RestLogger {
@@ -235,7 +235,7 @@ public abstract class RestLogger {
 
 	/**
 	 * Default logger.
-	 *
+	 * 
 	 * <p>
 	 * Logs all messages to the logger returned by <code>Logger.<jsm>getLogger</jsm>(getClass().getName())</code>
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
index 3e1daf0..5bf108d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
@@ -16,37 +16,37 @@ import org.apache.juneau.rest.annotation.*;
 
 /**
  * Class used for defining method-level matchers using the {@link RestMethod#matchers() @RestMethod.matchers()} annotation.
- *
+ * 
  * <p>
  * Matchers are used to allow multiple Java methods to handle requests assigned to the same URL path pattern, but
  * differing based on some request attribute, such as a specific header value.
  * For example, matchers can be used to provide two different methods for handling requests from two different client
  * versions.
- *
+ * 
  * <p>
  * Java methods with matchers associated with them are always attempted before Java methods without matchers.
  * This allows a 'default' method to be defined to handle requests where no matchers match.
- *
+ * 
  * <p>
  * When multiple matchers are specified on a method, only one matcher is required to match.
  * This is opposite from the {@link RestMethod#guards() @RestMethod.guards()} annotation, where all guards are required to match in order to
  * execute the method.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
- *
+ * 
  * 		<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo"</js>, matchers=IsDNT.<jk>class</jk>)
  * 		<jk>public</jk> Object doGetWithDNT() {
  * 			<jc>// Handle request with Do-Not-Track specified</jc>
  * 		}
- *
+ * 
  * 		<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo"</js>)
  * 		<jk>public</jk> Object doGetWithoutDNT() {
  * 			<jc>// Handle request without Do-Not-Track specified</jc>
  * 		}
  * 	}
- *
+ * 
  * 	<jk>public class</jk> IsDNT <jk>extends</jk> RestMatcher {
  * 		<ja>@Override</ja>
  * 		<jk>public boolean</jk> matches(RestRequest req) {
@@ -67,7 +67,7 @@ public abstract class RestMatcher {
 
 	/**
 	 * Returns <jk>true</jk> if the specified request matches this matcher.
-	 *
+	 * 
 	 * @param req The servlet request.
 	 * @return <jk>true</jk> if the specified request matches this matcher.
 	 */
@@ -75,10 +75,10 @@ public abstract class RestMatcher {
 
 	/**
 	 * Returns <jk>true</jk> if this matcher is required to match in order for the method to be invoked.
-	 *
+	 * 
 	 * <p>
 	 * If <jk>false</jk>, then only one of the matchers must match.
-	 *
+	 * 
 	 * @return <jk>true</jk> if this matcher is required to match in order for the method to be invoked.
 	 */
 	public boolean mustMatch() {

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java
index 95b6c27..c95a6da 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java
@@ -18,10 +18,10 @@ import org.apache.juneau.rest.annotation.*;
 
 /**
  * REST java method parameter resolver.
- *
+ * 
  * <p>
  * Used to resolve instances of classes being passed to Java REST methods.
- *
+ * 
  * <p>
  * This class is associated with REST classes via the {@link RestResource#paramResolvers() @RestResource.paramResolvers()} annotation and
  * {@link RestContextBuilder#paramResolvers(Class...)} method.
@@ -34,7 +34,7 @@ public abstract class RestParam {
 
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param paramType The Swagger parameter type.
 	 * @param name
 	 * 	The parameter name.
@@ -49,7 +49,7 @@ public abstract class RestParam {
 
 	/**
 	 * Resolves the parameter object.
-	 *
+	 * 
 	 * @param req The rest request.
 	 * @param res The rest response.
 	 * @return The resolved object.
@@ -59,7 +59,7 @@ public abstract class RestParam {
 
 	/**
 	 * Returns the parameter class type that this parameter resolver is meant for.
-	 *
+	 * 
 	 * @return The parameter class type, or <jk>null</jk> if the type passed in isn't an instance of {@link Class}.
 	 */
 	protected Class<?> forClass() {
@@ -70,7 +70,7 @@ public abstract class RestParam {
 
 	/**
 	 * Returns the swagger parameter type for this parameter as shown in the Swagger doc.
-	 *
+	 * 
 	 * @return the swagger parameter type for this parameter.
 	 */
 	protected RestParamType getParamType() {
@@ -79,7 +79,7 @@ public abstract class RestParam {
 
 	/**
 	 * Returns the parameter name for this parameter as shown in the Swagger doc.
-	 *
+	 * 
 	 * @return the parameter name for this parameter.
 	 */
 	protected String getName() {
@@ -88,7 +88,7 @@ public abstract class RestParam {
 
 	/**
 	 * Returns the parameter class type.
-	 *
+	 * 
 	 * @return the parameter class type.
 	 */
 	public Type getType() {

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 2723e3d..c36e432 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -43,10 +43,10 @@ import org.apache.juneau.utils.*;
 
 /**
  * Represents an HTTP request for a REST resource.
- *
+ * 
  * <p>
  * Equivalent to {@link HttpServletRequest} except with some additional convenience methods.
- *
+ * 
  * <p>
  * For reference, given the URL <js>"http://localhost:9080/contextRoot/servletPath/foo?bar=baz#qux"</js>, the
  * following methods return the following values....
@@ -60,7 +60,7 @@ import org.apache.juneau.utils.*;
  * 	<tr><td>{@code getRequestURL()}</td><td>{@code http://localhost:9080/contextRoot/servletPath/foo}</td></tr>
  * 	<tr><td>{@code getServletPath()}</td><td>{@code /servletPath}</td></tr>
  * </table>
- *
+ * 
  * <p>
  * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this
  * class.
@@ -195,7 +195,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns a string of the form <js>"HTTP method-name full-url"</js>
-	 *
+	 * 
 	 * @return A description of the request.
 	 */
 	public String getDescription() {
@@ -205,7 +205,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Same as {@link #getAttribute(String)} but returns a default value if not found.
-	 *
+	 * 
 	 * @param name The request attribute name.
 	 * @param def The default value if the attribute doesn't exist.
 	 * @return The request attribute value.
@@ -217,7 +217,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shorthand method for calling {@link #setAttribute(String, Object)} fluently.
-	 *
+	 * 
 	 * @param name The request attribute name.
 	 * @param value The request attribute value.
 	 * @return This object (for method chaining).
@@ -234,10 +234,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Retrieve the properties active for this request.
-	 *
+	 * 
 	 * <p>
 	 * These properties can be modified by the request.
-	 *
+	 * 
 	 * @return The properties active for this request.
 	 */
 	public ObjectMap getProperties() {
@@ -246,7 +246,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shortcut for calling <code>getProperties().append(name, value);</code> fluently.
-	 *
+	 * 
 	 * @param name The property name.
 	 * @param value The property value.
 	 * @return This object (for method chaining).
@@ -263,7 +263,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the headers on this request.
-	 *
+	 * 
 	 * @return The headers on this request.  Never <jk>null</jk>.
 	 */
 	public RequestHeaders getHeaders() {
@@ -285,7 +285,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the media types that are valid for <code>Accept</code> headers on the request.
-	 *
+	 * 
 	 * @return The set of media types registered in the serializer group of this request.
 	 */
 	public List<MediaType> getSupportedAcceptTypes() {
@@ -294,7 +294,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the media types that are valid for <code>Content-Type</code> headers on the request.
-	 *
+	 * 
 	 * @return The set of media types registered in the parser group of this request.
 	 */
 	public List<MediaType> getSupportedContentTypes() {
@@ -365,14 +365,14 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Equivalent to {@link #getParameterMap()}, but only looks for query parameters in the URL, not form posts.
-	 *
+	 * 
 	 * <p>
 	 * This method can be used to retrieve query parameters without triggering the underlying servlet API to load and
 	 * parse the request body.
-	 *
+	 * 
 	 * <p>
 	 * This object is modifiable.
-	 *
+	 * 
 	 * @return The query parameters as a modifiable map.
 	 */
 	public RequestQuery getQuery() {
@@ -381,7 +381,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shortcut for calling <code>getQuery().getString(name)</code>.
-	 *
+	 * 
 	 * @param name The query parameter name.
 	 * @return The query parameter value, or <jk>null<jk> if not found.
 	 */
@@ -396,7 +396,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Retrieves the URL-encoded form data from the request if the body has already been cached locally.
-	 *
+	 * 
 	 * @return The URL-encoded form data from the request.
 	 */
 	public RequestFormData getFormData() {
@@ -423,7 +423,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shortcut for calling <code>getFormData().getString(name)</code>.
-	 *
+	 * 
 	 * @param name The form data parameter name.
 	 * @return The form data parameter value, or <jk>null<jk> if not found.
 	 */
@@ -438,7 +438,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Retrieves the URL-encoded form data from the request if the body has already been cached locally.
-	 *
+	 * 
 	 * @return The URL-encoded form data from the request.
 	 */
 	public RequestPathMatch getPathMatch() {
@@ -447,7 +447,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shortcut for calling <code>getPathMatch().get(name)</code>.
-	 *
+	 * 
 	 * @param name The path variable name.
 	 * @return The path variable value, or <jk>null<jk> if not found.
 	 */
@@ -461,7 +461,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the body of this HTTP request.
-	 *
+	 * 
 	 * @return The body of this HTTP request.
 	 */
 	public RequestBody getBody() {
@@ -470,11 +470,11 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the HTTP body content as a {@link Reader}.
-	 *
+	 * 
 	 * <p>
 	 * If {@code allowHeaderParams} init parameter is true, then first looks for {@code &body=xxx} in the URL query
 	 * string.
-	 *
+	 * 
 	 * <p>
 	 * Automatically handles GZipped input streams.
 	 */
@@ -485,10 +485,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the HTTP body content as an {@link InputStream}.
-	 *
+	 * 
 	 * <p>
 	 * Automatically handles GZipped input streams.
-	 *
+	 * 
 	 * @return The negotiated input stream.
 	 * @throws IOException If any error occurred while trying to get the input stream or wrap it in the GZIP wrapper.
 	 */
@@ -521,11 +521,11 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the URI context of the request.
-	 *
+	 * 
 	 * <p>
 	 * The URI context contains all the information about the URI of the request, such as the servlet URI, context
 	 * path, etc...
-	 *
+	 * 
 	 * @return The URI context of the request.
 	 */
 	public UriContext getUriContext() {
@@ -542,7 +542,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns a URI resolver that can be used to convert URIs to absolute or root-relative form.
-	 *
+	 * 
 	 * @param resolution The URI resolution rule.
 	 * @param relativity The relative URI relativity rule.
 	 * @return The URI resolver for this request.
@@ -554,7 +554,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 	/**
 	 * Shortcut for calling {@link #getUriResolver()} using {@link UriResolution#ROOT_RELATIVE} and
 	 * {@link UriRelativity#RESOURCE}
-	 *
+	 * 
 	 * @return The URI resolver for this request.
 	 */
 	public UriResolver getUriResolver() {
@@ -563,12 +563,12 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the URI for this request.
-	 *
+	 * 
 	 * <p>
 	 * Similar to {@link #getRequestURI()} but returns the value as a {@link URI}.
 	 * It also gives you the capability to override the query parameters (e.g. add new query parameters to the existing
 	 * URI).
-	 *
+	 * 
 	 * @param includeQuery If <jk>true</jk> include the query parameters on the request.
 	 * @param addQueryParams Augment the request URI with the specified query parameters.
 	 * @return A new URI.
@@ -608,10 +608,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 	
 	/**
 	 * Returns the localized site name.
-	 *
+	 * 
 	 * <p>
 	 * The site name is intended to be a title that can be applied to the entire site.
-	 *
+	 * 
 	 * <p>
 	 * One possible use is if you want to add the same title to the top of all pages by defining a header on a
 	 * common parent class like so:
@@ -623,10 +623,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 	 * 		}
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * Equivalent to calling {@link RestInfoProvider#getSiteName(RestRequest)} with this object.
-	 *
+	 * 
 	 * @return The localized servlet label.
 	 */
 	public String getSiteName() {
@@ -635,10 +635,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the localized servlet title.
-	 *
+	 * 
 	 * <p>
 	 * Equivalent to calling {@link RestInfoProvider#getTitle(RestRequest)} with this object.
-	 *
+	 * 
 	 * @return The localized servlet label.
 	 */
 	public String getServletTitle() {
@@ -647,10 +647,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the localized servlet description.
-	 *
+	 * 
 	 * <p>
 	 * Equivalent to calling {@link RestInfoProvider#getDescription(RestRequest)} with this object.
-	 *
+	 * 
 	 * @return The localized servlet description.
 	 */
 	public String getServletDescription() {
@@ -659,10 +659,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the localized method summary.
-	 *
+	 * 
 	 * <p>
 	 * Equivalent to calling {@link RestInfoProvider#getMethodSummary(String, RestRequest)} with this object.
-	 *
+	 * 
 	 * @return The localized method description.
 	 */
 	public String getMethodSummary() {
@@ -671,10 +671,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the localized method description.
-	 *
+	 * 
 	 * <p>
 	 * Equivalent to calling {@link RestInfoProvider#getMethodDescription(String, RestRequest)} with this object.
-	 *
+	 * 
 	 * @return The localized method description.
 	 */
 	public String getMethodDescription() {
@@ -687,7 +687,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the serializers associated with this request.
-	 *
+	 * 
 	 * @return The serializers associated with this request.
 	 */
 	public SerializerGroup getSerializerGroup() {
@@ -696,7 +696,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the parsers associated with this request.
-	 *
+	 * 
 	 * @return The parsers associated with this request.
 	 */
 	public ParserGroup getParserGroup() {
@@ -706,7 +706,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>&amp;method=xxx</code> in the URL query string.
@@ -718,10 +718,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the HTTP 1.1 method name of the request as an enum.
-	 *
+	 * 
 	 * <p>
 	 * Note that non-RFC2616 method names resolve as {@link HttpMethod#OTHER}.
-	 *
+	 * 
 	 * @return The HTTP method.
 	 */
 	public HttpMethod getHttpMethod() {
@@ -739,14 +739,14 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns <jk>true</jk> if <code>&amp;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 &amp;plainText=true} was specified as a URL parameter
 	 */
 	public boolean isPlainText() {
@@ -755,7 +755,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shortcut method for calling {@link MessageBundle#getString(Locale, String, Object...)} based on the request locale.
-	 *
+	 * 
 	 * @param key The message key.
 	 * @param args Optional {@link MessageFormat}-style arguments.
 	 * @return The localized message.
@@ -766,7 +766,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the resource bundle for the request locale.
-	 *
+	 * 
 	 * @return The resource bundle.  Never <jk>null</jk>.
 	 */
 	public MessageBundle getResourceBundle() {
@@ -775,11 +775,11 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the servlet handling the request.
-	 *
+	 * 
 	 * <p>
 	 * Can be used to access servlet-init parameters or annotations during requests, such as in calls to
 	 * {@link RestGuard#guard(RestRequest, RestResponse)}..
-	 *
+	 * 
 	 * @return The servlet handling the request.
 	 */
 	public RestContext getContext() {
@@ -788,17 +788,17 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the java method handling the request.
-	 *
+	 * 
 	 * <p>
 	 * Can be used to access the method name or method annotations during requests, such as in calls to
 	 * {@link RestGuard#guard(RestRequest, RestResponse)}.
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
 	 * 	<li>This returns null when evaluating servlet-level guards since the method has not been resolved at that
 	 * 		point of execution.
 	 * </ul>
-	 *
+	 * 
 	 * @return The Java method handling the request, or <code>null</code> if the method has not yet been resolved.
 	 */
 	public Method getJavaMethod() {
@@ -807,7 +807,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the {@link BeanSession} associated with this request.
-	 *
+	 * 
 	 * @return The request bean session.
 	 */
 	public BeanSession getBeanSession() {
@@ -817,10 +817,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
 	/**
 	 * Returns the variable resolver session for this request using session objects created by
 	 * {@link RestCallHandler#getSessionObjects(RestRequest)}.
-	 *
+	 * 
 	 * <p>
 	 * See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * @return The variable resolver for this request.
 	 */
 	public VarResolverSession getVarResolverSession() {
@@ -831,7 +831,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shortcut for calling <code>getVarResolverSession().resolve(input)</code>.
-	 *
+	 * 
 	 * @param input The input string to resolve variables in.
 	 * @return The string with variables resolved, or <jk>null</jk> if input is null.
 	 */
@@ -841,7 +841,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Shortcut for calling {@link #resolveVars(String[])} on all elements in the array.
-	 *
+	 * 
 	 * @param input The input strings to resolve variables in.
 	 * @return A copy of the array with variables resolved.
 	 */
@@ -852,7 +852,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 	/**
 	 * Returns an instance of a {@link ReaderResource} that represents the contents of a resource text file from the
 	 * classpath.
-	 *
+	 * 
 	 * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.
 	 * @param resolveVars
 	 * 	If <jk>true</jk>, any {@link org.apache.juneau.rest.annotation.Parameter @Parameter} variables will be
@@ -875,7 +875,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 	/**
 	 * Same as {@link #getClasspathReaderResource(String, boolean, MediaType)} except uses the resource mime-type map
 	 * constructed using {@link RestContextBuilder#mimeTypes(String...)} to determine the media type.
-	 *
+	 * 
 	 * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.
 	 * @param resolveVars
 	 * 	If <jk>true</jk>, any {@link org.apache.juneau.rest.annotation.Parameter @Parameter} variables will be
@@ -890,7 +890,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Same as {@link #getClasspathReaderResource(String, boolean)} with <code>resolveVars == <jk>false</jk></code>
-	 *
+	 * 
 	 * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.
 	 * @return A new reader resource, or <jk>null</jk> if resource could not be found.
 	 * @throws IOException
@@ -901,7 +901,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the config file associated with the servlet.
-	 *
+	 * 
 	 * @return
 	 * 	The config file associated with the servlet, or <jk>null</jk> if servlet does not have a config file
 	 * 	associated with it.
@@ -914,7 +914,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the localized swagger associated with the servlet.
-	 *
+	 * 
 	 * @return
 	 * 	The swagger associated with the servlet.
 	 * 	Never <jk>null</jk>.
@@ -927,7 +927,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the widgets used for resolving <js>"$W{...}"</js> string variables.
-	 *
+	 * 
 	 * @return
 	 * 	The widgets used for resolving <js>"$W{...}"</js> string variables.
 	 * 	Never <jk>null</jk>.
@@ -938,14 +938,14 @@ public final class RestRequest extends HttpServletRequestWrapper {
 
 	/**
 	 * Returns the localized Swagger from the file system.
-	 *
+	 * 
 	 * <p>
 	 * Looks for a file called <js>"{ServletClass}_{locale}.json"</js> in the same package as this servlet and returns
 	 * it as a parsed {@link Swagger} object.
-	 *
+	 * 
 	 * <p>
 	 * Returned objects are cached for later quick-lookup.
-	 *
+	 * 
 	 * @return The parsed swagger object, or <jk>null</jk> if the swagger file could not be found.
 	 */
 	protected Swagger getSwaggerFromFile() {

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
index ce256c6..893ef7d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
@@ -16,10 +16,10 @@ import org.apache.juneau.rest.annotation.*;
 
 /**
  * Class used to resolve {@link Class} objects to instances.
- *
+ * 
  * <p>
  * Used to convert classes defined via {@link RestResource#children() @RestResource.children()} into child instances.
- *
+ * 
  * <p>
  * Subclasses can be created to provide customized resource resolution.
  * These can be associated with REST resources in one of the following ways:
@@ -39,10 +39,10 @@ public interface RestResourceResolver {
 
 	/**
 	 * Resolves the specified class to a resource object.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can override this method to provide their own custom resolution.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation simply creates a new class instance using {@link Class#newInstance()}.
 	 * 

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java
index 0121558..3d63597 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverSimple.java
@@ -16,13 +16,13 @@ import org.apache.juneau.internal.*;
 
 /**
  * Denotes the default resolver for child resources.
- *
+ * 
  * The default implementation simply instantiates the class using one of the following constructors:
  * <ul>
  * 	<li><code><jk>public</jk> T(RestContextBuilder)</code>
  * 	<li><code><jk>public</jk> T()</code>
  * </ul>
- *
+ * 
  * <p>
  * The former constructor can be used to get access to the {@link RestContextBuilder} object to get access to the
  * config file and initialization information or make programmatic modifications to the resource before
@@ -30,14 +30,14 @@ import org.apache.juneau.internal.*;
  * 
  * <p>
  * Child classes can also be defined as inner-classes of the parent resource class.
- *
+ * 
  * <p>
  * Non-<code>RestServlet</code> classes can also add the following method to get access to the {@link RestContextBuilder} 
  * object:
  * <ul>
  * 	<li><code><jk>public void</jk> init(RestContextBuilder);</code>
  * </ul>
- *
+ * 
  */
 public class RestResourceResolverSimple implements RestResourceResolver {
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index 15d58da..0b5c6ae 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -28,15 +28,15 @@ import org.apache.juneau.serializer.*;
 
 /**
  * Represents an HTTP response for a REST resource.
- *
+ * 
  * <p>
  * Essentially an extended {@link HttpServletResponse} with some special convenience methods that allow you to easily
  * output POJOs as responses.
- *
+ * 
  * <p>
  * Since this class extends {@link HttpServletResponse}, developers are free to use these convenience methods, or
  * revert to using lower level methods like any other servlet response.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
@@ -45,7 +45,7 @@ import org.apache.juneau.serializer.*;
  * 			.setOutput(<js>"Simple string response"</js>);
  * 	}
  * </p>
- *
+ * 
  * <p>
  * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this
  * class.
@@ -115,7 +115,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Gets the serializer group for the response.
-	 *
+	 * 
 	 * @return The serializer group for the response.
 	 */
 	public SerializerGroup getSerializerGroup() {
@@ -124,7 +124,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns the media types that are valid for <code>Accept</code> headers on the request.
-	 *
+	 * 
 	 * @return The set of media types registered in the parser group of this request.
 	 */
 	public List<MediaType> getSupportedMediaTypes() {
@@ -134,7 +134,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 	/**
 	 * Returns the codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on
 	 * the request.
-	 *
+	 * 
 	 * @return The set of media types registered in the parser group of this request.
 	 * @throws RestServletException
 	 */
@@ -144,10 +144,10 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Sets the HTTP output on the response.
-	 *
+	 * 
 	 * <p>
 	 * Calling this method is functionally equivalent to returning the object in the REST Java method.
-	 *
+	 * 
 	 * <p>
 	 * Can be of any of the following types:
 	 * <ul>
@@ -156,11 +156,11 @@ public final class RestResponse extends HttpServletResponseWrapper {
 	 * 	<li> Any serializable type defined in <a class="doclink"
 	 * 		href="../../../../overview-summary.html#juneau-marshall.PojoCategories">POJO Categories</a>
 	 * </ul>
-	 *
+	 * 
 	 * <p>
 	 * If it's an {@link InputStream} or {@link Reader}, you must also specify the <code>Content-Type</code> using the
 	 * {@link #setContentType(String)} method.
-	 *
+	 * 
 	 * @param output The output to serialize to the connection.
 	 * @return This object (for method chaining).
 	 */
@@ -172,7 +172,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns a programmatic interface for setting properties for the HTML doc view.
-	 *
+	 * 
 	 * @return A new programmatic interface for setting properties for the HTML doc view.
 	 */
 	public HtmlDocBuilder getHtmlDocBuilder() {
@@ -183,10 +183,10 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Add a serializer property to send to the serializers to override a default value.
-	 *
+	 * 
 	 * <p>
 	 * Can be any value specified on any of the serializers or parsers.
-	 *
+	 * 
 	 * @param key The setting name.
 	 * @param value The setting value.
 	 * @return This object (for method chaining).
@@ -198,7 +198,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns the properties set via {@link #setProperty(String, Object)}.
-	 *
+	 * 
 	 * @return A map of all the property values set.
 	 */
 	public ObjectMap getProperties() {
@@ -207,16 +207,16 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Shortcut method that allows you to use var-args to simplify setting array output.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<jc>// Instead of...</jc>
 	 * 	response.setOutput(<jk>new</jk> Object[]{x,y,z});
-	 *
+	 * 
 	 * 	<jc>// ...call this...</jc>
 	 * 	response.setOutput(x,y,z);
 	 * </p>
-	 *
+	 * 
 	 * @param output The output to serialize to the connection.
 	 * @return This object (for method chaining).
 	 */
@@ -227,7 +227,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns the output that was set by calling {@link #setOutput(Object)}.
-	 *
+	 * 
 	 * @return The output object.
 	 */
 	public Object getOutput() {
@@ -236,7 +236,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns <jk>true</jk> if this response has any output associated with it.
-	 *
+	 * 
 	 * @return <jk>true</jk> if {@code setInput()} has been called.
 	 */
 	public boolean hasOutput() {
@@ -245,7 +245,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Sets the output to a plain-text message regardless of the content type.
-	 *
+	 * 
 	 * @param text The output text to send.
 	 * @return This object (for method chaining).
 	 * @throws IOException If a problem occurred trying to write to the writer.
@@ -259,7 +259,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 	/**
 	 * Equivalent to {@link HttpServletResponse#getOutputStream()}, except wraps the output stream if an {@link Encoder}
 	 * was found that matched the <code>Accept-Encoding</code> header.
-	 *
+	 * 
 	 * @return A negotiated output stream.
 	 * @throws IOException
 	 */
@@ -332,7 +332,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns <jk>true</jk> if {@link #getOutputStream()} has been called.
-	 *
+	 * 
 	 * @return <jk>true</jk> if {@link #getOutputStream()} has been called.
 	 */
 	public boolean getOutputStreamCalled() {
@@ -341,7 +341,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns the writer to the response body.
-	 *
+	 * 
 	 * <p>
 	 * This methods bypasses any specified encoders and returns a regular unbuffered writer.
 	 * Use the {@link #getNegotiatedWriter()} method if you want to use the matched encoder (if any).
@@ -353,11 +353,11 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Convenience method meant to be used when rendering directly to a browser with no buffering.
-	 *
+	 * 
 	 * <p>
 	 * Sets the header <js>"x-content-type-options=nosniff"</js> so that output is rendered immediately on IE and Chrome
 	 * without any buffering for content-type sniffing.
-	 *
+	 * 
 	 * @param contentType The value to set as the <code>Content-Type</code> on the response.
 	 * @return The raw writer.
 	 * @throws IOException
@@ -372,7 +372,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 	 * Equivalent to {@link HttpServletResponse#getWriter()}, except wraps the output stream if an {@link Encoder} was
 	 * found that matched the <code>Accept-Encoding</code> header and sets the <code>Content-Encoding</code>
 	 * header to the appropriate value.
-	 *
+	 * 
 	 * @return The negotiated writer.
 	 * @throws IOException
 	 */
@@ -401,7 +401,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns the <code>Content-Type</code> header stripped of the charset attribute if present.
-	 *
+	 * 
 	 * @return The <code>media-type</code> portion of the <code>Content-Type</code> header.
 	 */
 	public MediaType getMediaType() {
@@ -410,7 +410,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Redirects to the specified URI.
-	 *
+	 * 
 	 * <p>
 	 * Relative URIs are always interpreted as relative to the context root.
 	 * This is similar to how WAS handles redirect requests, and is different from how Tomcat handles redirect requests.
@@ -425,7 +425,7 @@ public final class RestResponse extends HttpServletResponseWrapper {
 
 	/**
 	 * Returns the HTTP-part serializer associated with this response.
-	 *
+	 * 
 	 * @return The HTTP-part serializer associated with this response.
 	 */
 	public HttpPartSerializer getPartSerializer() {

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index e30ea16..b1b26bd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -28,7 +28,7 @@ import org.apache.juneau.utils.*;
 
 /**
  * Servlet implementation of a REST resource.
- *
+ * 
  * <p>
  * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this
  * class.
@@ -101,18 +101,18 @@ public abstract class RestServlet extends HttpServlet {
 
 	/**
 	 * Returns the read-only context object that contains all the configuration information about this resource.
-	 *
+	 * 
 	 * <p>
 	 * This object is <jk>null</jk> during the call to {@link #init(ServletConfig)} but is populated by the time
 	 * {@link #init()} is called.
-	 *
+	 * 
 	 * <p>
 	 * Resource classes that don't extend from {@link RestServlet} can add the following method to their class to get
 	 * access to this context object:
 	 * <p class='bcode'>
 	 * 	<jk>public void</jk> init(RestServletContext context) <jk>throws</jk> Exception;
 	 * </p>
-	 *
+	 * 
 	 * @return The context information on this servlet.
 	 */
 	protected synchronized RestContext getContext() {
@@ -122,13 +122,13 @@ public abstract class RestServlet extends HttpServlet {
 	/**
 	 * Convenience method if you want to perform initialization on your resource after all configuration settings
 	 * have been made.
-	 *
+	 * 
 	 * <p>
 	 * This allows you to get access to the {@link RestContext} object during initialization.
-	 *
+	 * 
 	 * <p>
 	 * The default implementation does nothing.
-	 *
+	 * 
 	 * @param context The servlet context containing all the set-in-stone configurations for this resource.
 	 * @throws Exception Any exception can be thrown to signal an initialization failure.
 	 */
@@ -141,7 +141,7 @@ public abstract class RestServlet extends HttpServlet {
 
 	/**
 	 * The main service method.
-	 *
+	 * 
 	 * <p>
 	 * Subclasses can optionally override this method if they want to tailor the behavior of requests.
 	 */
@@ -169,7 +169,7 @@ public abstract class RestServlet extends HttpServlet {
 
 	/**
 	 * Convenience method for calling <code>getContext().getLogger().log(level, msg, args);</code>
-	 *
+	 * 
 	 * @param level The log level.
 	 * @param msg The message to log.
 	 * @param args Optional {@link MessageFormat}-style arguments.
@@ -181,7 +181,7 @@ public abstract class RestServlet extends HttpServlet {
 
 	/**
 	 * Convenience method for calling <code>getContext().getLogger().log(level, cause, msg, args);</code>
-	 *
+	 * 
 	 * @param level The log level.
 	 * @param cause The cause.
 	 * @param msg The message to log.
@@ -207,7 +207,7 @@ public abstract class RestServlet extends HttpServlet {
 
 	/**
 	 * Convenience method for calling <code>getContext().getMessages();</code>
-	 *
+	 * 
 	 * @return The resource bundle for this resource.  Never <jk>null</jk>.
 	 * @see RestContext#getProperties()
 	 */
@@ -217,7 +217,7 @@ public abstract class RestServlet extends HttpServlet {
 
 	/**
 	 * Convenience method for calling <code>getContext().getProperties();</code>
-	 *
+	 * 
 	 * @return The resource properties as an {@link ObjectMap}.
 	 * @see RestContext#getProperties()
 	 */
@@ -227,7 +227,7 @@ public abstract class RestServlet extends HttpServlet {
 
 	/**
 	 * Convenience method for calling <code>getContext().getBeanContext();</code>
-	 *
+	 * 
 	 * @return The bean context used for parsing path variables and header values.
 	 * @see RestContext#getBeanContext()
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
index 900ac77..f0afb45 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
@@ -29,7 +29,7 @@ import org.apache.juneau.xml.*;
 
 /**
  * Subclass of {@link RestServlet} with default serializers and parsers defined.
- *
+ * 
  * <p>
  * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:
  * <table class='styled'>
@@ -127,25 +127,25 @@ import org.apache.juneau.xml.*;
  * 		<td>{@link PlainTextParser}</td>
  * 	</tr>
  * </table>
- *
+ * 
  * <p>
  * It should be noted that we do NOT add {@link JsoParser} to the list of parsers since this could cause security
  * issues.
  * Use caution when using this particular parser as it could inadvertently cause code execution security holes.
- *
+ * 
  * <p>
  * The list of serializers and parsers can be appended to using the
  * {@link RestResource#serializers() @RestResource.serializers()} and
  * {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.
- *
+ * 
  * <p>
  * This subclass also provides a default OPTIONS page by implementing a {@link #getOptions(RestRequest)} that returns a
  * POJO consisting of beans describing the class.
  * <img class='bordered' src='doc-files/OptionsPage.png'>
- *
+ * 
  * <p>
  * The OPTIONS page can be modified or augmented by overriding this method and providing your own data.
- *
+ * 
  * <h6 class='topic'>Other Notes</h6>
  * <ul class='spaced-list'>
  * 	<li>
@@ -209,7 +209,7 @@ public abstract class RestServletDefault extends RestServlet {
 
 	/**
 	 * [OPTIONS /*] - Show resource options.
-	 *
+	 * 
 	 * @param req The HTTP request.
 	 * @return A bean containing the contents for the OPTIONS page.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletException.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletException.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletException.java
index 7e9735d..6e39551 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletException.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletException.java
@@ -27,7 +27,7 @@ public class RestServletException extends ServletException {
 
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param message The detailed message.
 	 * @param args Optional {@link MessageFormat}-style arguments.
 	 */
@@ -37,7 +37,7 @@ public class RestServletException extends ServletException {
 
 	/**
 	 * Sets the inner cause for this exception.
-	 *
+	 * 
 	 * @param cause The inner cause.
 	 * @return This object (for method chaining).
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
index 86efd72..b0d7fda 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
@@ -19,11 +19,11 @@ import org.apache.juneau.rest.labels.*;
 
 /**
  * Specialized subclass of {@link RestServletDefault} for showing "group" pages.
- *
+ * 
  * <p>
  * Group pages consist of simple lists of child resource URLs and their labels.
  * They're meant to be used as jumping-off points for child resources.
- *
+ * 
  * <p>
  * Child resources are specified using the {@link RestResource#children() @RestResource.children()} annotation.
  */
@@ -33,7 +33,7 @@ public abstract class RestServletGroupDefault extends RestServletDefault {
 
 	/**
 	 * [GET /] - Get child resources.
-	 *
+	 * 
 	 * @param req The HTTP request.
 	 * @return The bean containing links to the child resources.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestUtils.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestUtils.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestUtils.java
index 3932b4e..cfc2351 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestUtils.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestUtils.java
@@ -32,7 +32,7 @@ public final class RestUtils {
 
 	/**
 	 * Returns readable text for an HTTP response code.
-	 *
+	 * 
 	 * @param rc The HTTP response code.
 	 * @return Readable text for an HTTP response code, or <jk>null</jk> if it's an invalid code.
 	 */
@@ -81,7 +81,7 @@ public final class RestUtils {
 
 	/**
 	 * Identical to {@link HttpServletRequest#getPathInfo()} but doesn't decode encoded characters.
-	 *
+	 * 
 	 * @param req The HTTP request
 	 * @return The un-decoded path info.
 	 */
@@ -97,10 +97,10 @@ public final class RestUtils {
 
 	/**
 	 * Efficiently trims the path info part from a request URI.
-	 *
+	 * 
 	 * <p>
 	 * The result is the URI of the servlet itself.
-	 *
+	 * 
 	 * @param requestURI The value returned by {@link HttpServletRequest#getRequestURL()}
 	 * @param contextPath The value returned by {@link HttpServletRequest#getContextPath()}
 	 * @param servletPath The value returned by {@link HttpServletRequest#getServletPath()}

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
index 84fd164..e769d1f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
@@ -50,7 +50,8 @@ import org.apache.juneau.utils.*;
  * 	<li><l>[working-dir]/docs</l> directory.
  * </ol>
  * 
- * <h5 class='section'>Notes:</h5>
+ * 
+ * <h5 class='topic'>Notes</h5>
  * <ul class='spaced-list'>
  * 	<li>
  * 		Mappings are cumulative from parent to child.  Child resources can override mappings made on parent resources.

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java
index bb76623..bbe29c7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java
@@ -24,12 +24,12 @@ import org.apache.juneau.rest.response.*;
 
 /**
  * Represents the contents of a byte stream file with convenience methods for adding HTTP response headers.
- *
+ * 
  * <p>
  * The purpose of this class is to maintain an in-memory reusable byte array of a streamed resource for the fastest
  * possible streaming.
  * Therefore, this object is designed to be reused and thread-safe.
- *
+ * 
  * <p>
  * This class is handled special by the {@link StreamableHandler} class.
  * This allows these objects to be returned as responses by REST methods.
@@ -42,7 +42,7 @@ public class StreamResource implements Streamable {
 
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param mediaType The resource media type.
 	 * @param contents
 	 * 	The resource contents.
@@ -63,7 +63,7 @@ public class StreamResource implements Streamable {
 
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param mediaType The resource media type.
 	 * @param headers The HTTP response headers for this streamed resource.
 	 * @param contents
@@ -118,7 +118,7 @@ public class StreamResource implements Streamable {
 
 		/**
 		 * Specifies the resource media type string.
-		 *
+		 * 
 		 * @param mediaType The resource media type string.
 		 * @return This object (for method chaining).
 		 */
@@ -129,7 +129,7 @@ public class StreamResource implements Streamable {
 
 		/**
 		 * Specifies the resource media type string.
-		 *
+		 * 
 		 * @param mediaType The resource media type string.
 		 * @return This object (for method chaining).
 		 */
@@ -140,10 +140,10 @@ public class StreamResource implements Streamable {
 
 		/**
 		 * Specifies the contents for this resource.
-		 *
+		 * 
 		 * <p>
 		 * This method can be called multiple times to add more content.
-		 *
+		 * 
 		 * @param contents
 		 * 	The resource contents.
 		 * 	<br>If multiple contents are specified, the results will be concatenated.
@@ -164,7 +164,7 @@ public class StreamResource implements Streamable {
 
 		/**
 		 * Specifies an HTTP response header value.
-		 *
+		 * 
 		 * @param name The HTTP header name.
 		 * @param value The HTTP header value.  Will be converted to a <code>String</code> using {@link Object#toString()}.
 		 * @return This object (for method chaining).
@@ -176,7 +176,7 @@ public class StreamResource implements Streamable {
 
 		/**
 		 * Specifies HTTP response header values.
-		 *
+		 * 
 		 * @param headers The HTTP headers.  Values will be converted to <code>Strings</code> using {@link Object#toString()}.
 		 * @return This object (for method chaining).
 		 */
@@ -188,7 +188,7 @@ public class StreamResource implements Streamable {
 
 		/**
 		 * Create a new {@link StreamResource} using values in this builder.
-		 *
+		 * 
 		 * @return A new immutable {@link StreamResource} object.
 		 * @throws IOException
 		 */
@@ -199,7 +199,7 @@ public class StreamResource implements Streamable {
 
 	/**
 	 * Get the HTTP response headers.
-	 *
+	 * 
 	 * @return The HTTP response headers.  An unmodifiable map.  Never <jk>null</jk>.
 	 */
 	public Map<String,String> getHeaders() {

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/UrlPathPattern.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/UrlPathPattern.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/UrlPathPattern.java
index a362f67..01b7cca 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/UrlPathPattern.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/UrlPathPattern.java
@@ -21,7 +21,7 @@ import org.apache.juneau.rest.annotation.*;
 
 /**
  * A parsed path pattern constructed from a {@link RestMethod#path() @RestMethod.path()} value.
- *
+ * 
  * <p>
  * Handles aspects of matching and precedence ordering.
  */
@@ -34,7 +34,7 @@ public final class UrlPathPattern implements Comparable<UrlPathPattern> {
 
 	/**
 	 * Constructor.
-	 *
+	 * 
 	 * @param patternString The raw pattern string from the {@link RestMethod#path() @RestMethod.path()} annotation.
 	 */
 	public UrlPathPattern(String patternString) {
@@ -75,7 +75,7 @@ public final class UrlPathPattern implements Comparable<UrlPathPattern> {
 
 	/**
 	 * Returns a non-<jk>null</jk> value if the specified path matches this pattern.
-	 *
+	 * 
 	 * @param path The path to match against.
 	 * @return
 	 * 	An array of values matched against <js>"{var}"</js> variable in the pattern, or an empty array if the
@@ -117,7 +117,7 @@ public final class UrlPathPattern implements Comparable<UrlPathPattern> {
 
 	/**
 	 * Comparator for this object.
-	 *
+	 * 
 	 * <p>
 	 * The comparator is designed to order URL pattern from most-specific to least-specific.
 	 * For example, the following patterns would be ordered as follows:
@@ -169,10 +169,10 @@ public final class UrlPathPattern implements Comparable<UrlPathPattern> {
 
 	/**
 	 * Returns this path pattern as the compiled regular expression.
-	 *
+	 * 
 	 * <p>
 	 * Useful for debugging.
-	 *
+	 * 
 	 * @return The path pattern.
 	 */
 	public String toRegEx() {
@@ -181,7 +181,7 @@ public final class UrlPathPattern implements Comparable<UrlPathPattern> {
 
 	/**
 	 * Bean property getter:  <property>vars</property>.
-	 *
+	 * 
 	 * @return The value of the <property>vars</property> property on this bean, or <jk>null</jk> if it is not set.
 	 */
 	public String[] getVars() {
@@ -190,7 +190,7 @@ public final class UrlPathPattern implements Comparable<UrlPathPattern> {
 
 	/**
 	 * Bean property getter:  <property>patternString</property>.
-	 *
+	 * 
 	 * @return The value of the <property>patternString</property> property on this bean, or <jk>null</jk> if it is not set.
 	 */
 	public String getPatternString() {

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java
index 3276c8c..33f3c61 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java
@@ -21,7 +21,7 @@ import java.lang.annotation.*;
 /**
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify it as the HTTP
  * request body converted to a POJO.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
@@ -29,7 +29,7 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>
@@ -39,7 +39,7 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * {@link Reader Readers} and {@link InputStream InputStreams} can also be specified as content parameters.
  * When specified, any registered parsers are bypassed.

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java
index 4548d4b..dadbf85 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java
@@ -23,7 +23,7 @@ import org.apache.juneau.rest.*;
 /**
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify it as a form post
  * entry converted to a POJO.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
@@ -32,7 +32,7 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>
@@ -44,13 +44,13 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <h6 class='topic'>Important note concerning FORM posts</h6>
- *
+ * 
  * This annotation should not be combined with the {@link Body @Body} annotation or {@link RestRequest#getBody()} method
  * for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet
  * API to parse the body content as key-value pairs resulting in empty content.
- *
+ * 
  * <p>
  * The {@link Query @Query} annotation can be used to retrieve a URL parameter in the URL string without triggering the
  * servlet to drain the body content.
@@ -68,13 +68,13 @@ public @interface FormData {
 
 	/**
 	 * Specify <jk>true</jk> if using multi-part parameters to represent collections and arrays.
-	 *
+	 * 
 	 * <p>
 	 * Normally, we expect single parameters to be specified in UON notation for representing collections of values
 	 * (e.g. <js>"key=(1,2,3)"</js>.
 	 * This annotation allows the use of multi-part parameters to represent collections (e.g.
 	 * <js>"key=1&amp;key=2&amp;key=3"</js>.
-	 *
+	 * 
 	 * <p>
 	 * This setting should only be applied to Java parameters of type array or Collection.
 	 */
@@ -87,7 +87,7 @@ public @interface FormData {
 
 	/**
 	 * Specifies the {@link HttpPartParser} class used for parsing values from strings.
-	 *
+	 * 
 	 * <p>
 	 * The default value for this parser is inherited from the servlet/method which defaults to {@link UonPartParser}.
 	 * <br>You can use {@link SimplePartParser} to parse POJOs that are directly convertible from <code>Strings</code>.
@@ -96,7 +96,7 @@ public @interface FormData {
 
 	/**
 	 * A synonym for {@link #name()}.
-	 *
+	 * 
 	 * <p>
 	 * Allows you to use shortened notation if you're only specifying the name.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
index 6e2846a..021d189 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
@@ -22,10 +22,10 @@ import org.apache.juneau.rest.*;
 /**
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify whether or not
  * the request has the specified multipart form POST parameter.
- *
+ * 
  * <p>
  * Note that this can be used to detect the existence of a parameter when it's not set to a particular value.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
@@ -33,7 +33,7 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>
@@ -43,7 +43,7 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * The following table shows the behavioral differences between <code>@HasFormData</code> and <code>@FormData</code>...
  * <table class='styled'>
@@ -73,13 +73,13 @@ import org.apache.juneau.rest.*;
  * 		<td><jk>null</jk></td>
  * 	</tr>
  * </table>
- *
+ * 
  * <h6 class='topic'>Important note concerning FORM posts</h6>
- *
+ * 
  * This annotation should not be combined with the {@link Body @Body} annotation or {@link RestRequest#getBody()} method
  * for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet API to
  * parse the body content as key-value pairs, resulting in empty content.
- *
+ * 
  * <p>
  * The {@link HasQuery @HasQuery} annotation can be used to check for the existing of a URL parameter in the URL string
  * without triggering the servlet to drain the body content.
@@ -97,7 +97,7 @@ public @interface HasFormData {
 
 	/**
 	 * A synonym for {@link #name()}.
-	 *
+	 * 
 	 * <p>
 	 * Allows you to use shortened notation if you're only specifying the name.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
index d7dc349..98b724e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
@@ -22,13 +22,13 @@ import org.apache.juneau.rest.*;
 /**
  * Identical to {@link HasFormData @HasFormData}, but only checks the existing of the parameter in the URL string, not
  * URL-encoded form posts.
- *
+ * 
  * <p>
  * Unlike {@link HasFormData @HasFormData}, using this annotation does not result in the servlet reading the contents
  * of URL-encoded form posts.
  * Therefore, this annotation can be used in conjunction with the {@link Body @Body} annotation or
  * {@link RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> calls.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
@@ -36,7 +36,7 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>
@@ -60,7 +60,7 @@ public @interface HasQuery {
 
 	/**
 	 * A synonym for {@link #name()}.
-	 *
+	 * 
 	 * <p>
 	 * Allows you to use shortened notation if you're only specifying the name.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java
index 0ee9a8b..936fd1a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java
@@ -22,7 +22,7 @@ import org.apache.juneau.httppart.*;
 /**
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify it as a HTTP
  * request header converted to a POJO.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
@@ -30,7 +30,7 @@ import org.apache.juneau.httppart.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>
@@ -59,7 +59,7 @@ public @interface Header {
 
 	/**
 	 * Specifies the {@link HttpPartParser} class used for parsing values from strings.
-	 *
+	 * 
 	 * <p>
 	 * The default value for this parser is inherited from the servlet/method which defaults to {@link UonPartParser}.
 	 * <br>You can use {@link SimplePartParser} to parse POJOs that are directly convertible from <code>Strings</code>.
@@ -68,7 +68,7 @@ public @interface Header {
 
 	/**
 	 * A synonym for {@link #name()}.
-	 *
+	 * 
 	 * <p>
 	 * Allows you to use shortened notation if you're only specifying the name.
 	 */


Mime
View raw message