You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/01/14 16:02:30 UTC

[02/32] juneau git commit: Javadoc updates.

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
index dd6146e..7051963 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
@@ -36,10 +36,10 @@ public enum HookEvent {
 	/**
 	 * Identifies a method that should be called immediately after the <code>HttpServlet.service(HttpServletRequest, HttpServletResponse)</code>
 	 * method is called.
-	 *
+	 * 
 	 * <p>
 	 * Note that you only have access to the raw request and response objects at this point.
-	 *
+	 * 
 	 * <p>
 	 * The list of valid parameter types are as follows:
 	 * <ul>
@@ -49,12 +49,12 @@ public enum HookEvent {
 	 * 			<li>{@link HttpServletResponse}
 	 * 		</ul>
 	 * </ul>
-	 *
+	 * 
 	 * <h6 class='figure'>Example:</h6>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(...)
 	 * 	<jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {
-	 *
+	 * 
 	 * 		<jc>// Add a request attribute to all incoming requests.</jc>
 	 * 		<ja>@RestHook</ja>(<jsf>START_CALL</jsf>)
 	 * 		<jk>public void</jk> onStartCall(HttpServletRequest req) {
@@ -62,7 +62,7 @@ public enum HookEvent {
 	 * 		}
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.
@@ -83,11 +83,11 @@ public enum HookEvent {
 
 	/**
 	 * Identifies a method that gets called immediately before the <ja>@RestMethod</ja> annotated method gets called.
-	 *
+	 * 
 	 * <p>
 	 * At this point, the {@link RestRequest} object has been fully initialized, and all {@link RestGuard} and
 	 * {@link RestMatcher} objects have been called.
-	 *
+	 * 
 	 * <p>
 	 * The list of valid parameter types are as follows:
 	 * <ul>
@@ -160,12 +160,12 @@ public enum HookEvent {
 	 * 			<li>{@link UriResolver}
 	 * 		</ul>
 	 * </ul>
-	 *
+	 * 
 	 * <h6 class='figure'>Example:</h6>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(...)
 	 * 	<jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {
-	 *
+	 * 
 	 * 		<jc>// Log the incoming request.</jc>
 	 * 		<ja>@RestHook</ja>(<jsf>PRE_CALL</jsf>)
 	 * 		<jk>public void</jk> onPreCall(Accept accept, Logger logger) {
@@ -173,7 +173,7 @@ public enum HookEvent {
 	 * 		}
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.
@@ -196,19 +196,19 @@ public enum HookEvent {
 
 	/**
 	 * Identifies a method that gets called immediately after the <ja>@RestMethod</ja> annotated method gets called.
-	 *
+	 * 
 	 * <p>
 	 * At this point, the output object returned by the method call has been set on the response, but
 	 * {@link RestConverter RestConverters} have not yet been executed and the response has not yet been written.
-	 *
+	 * 
 	 * <p>
 	 * The list of valid parameter types are the same as {@link #PRE_CALL}.
-	 *
+	 * 
 	 * <h6 class='figure'>Example:</h6>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(...)
 	 * 	<jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {
-	 *
+	 * 
 	 * 		<jc>// Log the result of the request.</jc>
 	 * 		<ja>@RestHook</ja>(<jsf>POST_CALL</jsf>)
 	 * 		<jk>public void</jk> onPostCall(RestResponse res, Logger logger) {
@@ -216,7 +216,7 @@ public enum HookEvent {
 	 * 		}
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.
@@ -235,10 +235,10 @@ public enum HookEvent {
 
 	/**
 	 * Identifies a method that gets called right before we exit the servlet service method.
-	 *
+	 * 
 	 * <p>
 	 * At this point, the output has been written and flushed.
-	 *
+	 * 
 	 * <p>
 	 * The list of valid parameter types are as follows:
 	 * <ul>
@@ -248,19 +248,19 @@ public enum HookEvent {
 	 * 			<li>{@link HttpServletResponse}
 	 * 		</ul>
 	 * </ul>
-	 *
+	 * 
 	 * <p>
 	 * The following attributes are set on the {@link HttpServletRequest} object that can be useful for logging purposes:
 	 * <ul>
 	 * 	<li><js>"Exception"</js> - Any exceptions thrown during the request.
 	 * 	<li><js>"ExecTime"</js> - Execution time of the request.
 	 * </ul>
-	 *
+	 * 
 	 * <h6 class='figure'>Example:</h6>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(...)
 	 * 	<jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {
-	 *
+	 * 
 	 * 		<jc>// Log the time it took to execute the request.</jc>
 	 * 		<ja>@RestHook</ja>(<jsf>END_CALL</jsf>)
 	 * 		<jk>public void</jk> onEndCall(HttpServletRequest req, Logger logger) {
@@ -273,7 +273,7 @@ public enum HookEvent {
 	 * 		}
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.
@@ -292,27 +292,27 @@ public enum HookEvent {
 
 	/**
 	 * Identifies a method that gets called during servlet initialization.
-	 *
+	 * 
 	 * <p>
 	 * This method is called from within the {@link Servlet#init(ServletConfig)} method after the {@link RestContextBuilder}
 	 * object has been created and initialized with the annotations defined on the class, but before the
 	 * {@link RestContext} object has been created.
-	 *
+	 * 
 	 * <p>
 	 * The only valid parameter type for this method is {@link RestContextBuilder} which can be used to configure the servlet.
-	 *
+	 * 
 	 * <p>
 	 * An example of this is the <code>PetStoreResource</code> class that uses an init method to perform initialization
 	 * of an internal data structure.
-	 *
+	 * 
 	 * <h6 class='figure'>Example:</h6>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(...)
 	 * 	<jk>public class</jk> PetStoreResource <jk>extends</jk> ResourceJena {
-	 *
+	 * 
 	 * 		<jc>// Our database.</jc>
 	 * 		<jk>private</jk> Map<Integer,Pet> <jf>petDB</jf>;
-	 *
+	 * 
 	 * 		<ja>@RestHook</ja>(<jsf>INIT</jsf>)
 	 * 		<jk>public void</jk> onInit(RestContextBuilder builder) <jk>throws</jk> Exception {
 	 * 			<jc>// Load our database from a local JSON file.</jc>
@@ -320,7 +320,7 @@ public enum HookEvent {
 	 * 		}
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.
@@ -339,15 +339,15 @@ public enum HookEvent {
 
 	/**
 	 * Identifies a method that gets called immediately after servlet initialization.
-	 *
+	 * 
 	 * <p>
 	 * This method is called from within the {@link Servlet#init(ServletConfig)} method after the {@link RestContext}
 	 * object has been created.
-	 *
+	 * 
 	 * <p>
 	 * The only valid parameter type for this method is {@link RestContext} which can be used to retrieve information
 	 * about the servlet.
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.
@@ -366,18 +366,18 @@ public enum HookEvent {
 
 	/**
 	 * Identical to {@link #POST_INIT} except the order of execution is child-resources first.
-	 *
+	 * 
 	 * <p>
 	 * Use this annotation if you need to perform any kind of initialization on child resources before the parent resource.
-	 *
+	 * 
 	 * <p>
 	 * This method is called from within the {@link Servlet#init(ServletConfig)} method after the {@link RestContext}
 	 * object has been created and after the {@link #POST_INIT} methods have been called.
-	 *
+	 * 
 	 * <p>
 	 * The only valid parameter type for this method is {@link RestContext} which can be used to retrieve information
 	 * about the servlet.
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.
@@ -393,29 +393,29 @@ public enum HookEvent {
 
 	/**
 	 * Identifies a method that gets called during servlet destroy.
-	 *
+	 * 
 	 * <p>
 	 * This method is called from within the {@link Servlet#destroy()}.
-	 *
+	 * 
 	 * <p>
 	 * The only valid parameter type for this method is {@link RestContext}, although typically no arguments will
 	 * be specified.
-	 *
+	 * 
 	 * <h6 class='figure'>Example:</h6>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(...)
 	 * 	<jk>public class</jk> PetStoreResource <jk>extends</jk> ResourceJena {
-	 *
+	 * 
 	 * 		<jc>// Our database.</jc>
 	 * 		<jk>private</jk> Map<Integer,Pet> <jf>petDB</jf>;
-	 *
+	 * 
 	 * 		<ja>@RestHook</ja>(<jsf>DESTROY</jsf>)
 	 * 		<jk>public void</jk> onDestroy() {
 	 * 			<jf>petDB</jf> = <jk>null</jk>;
 	 * 		}
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>The method should return <jk>void</jk> although if it does return any value, the value will be ignored.

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
index 587ea5a..bd4e47c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
@@ -19,15 +19,15 @@ import org.apache.juneau.rest.widget.*;
 
 /**
  * Contains all the configurable annotations for the {@link HtmlDocSerializer}.
- *
+ * 
  * <p>
  * Used with {@link RestResource#htmldoc() @RestResource.htmldoc()} and {@link RestMethod#htmldoc() @RestMethod.htmldoc()} 
  * to customize the HTML view of serialized POJOs.
- *
+ * 
  * <p>
  * All annotations specified here have no effect on any serializers other than {@link HtmlDocSerializer} and is
  * provided as a shorthand method of for specifying configuration properties.
- *
+ * 
  * <p>
  * For example, the following two methods for defining the HTML document title are considered equivalent:
  * <p class='bcode'>
@@ -36,14 +36,14 @@ import org.apache.juneau.rest.widget.*;
  * 			<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"My Resource Page"</js>)
  * 		}
  * 	)
- *
+ * 
  * 	<ja>@RestResource</ja>(
  * 		htmldoc=<ja>@HtmlDoc</ja>(
  * 			title=<js>"My Resource Page"</js>
  * 		)
  * 	)
  * </p>
- *
+ * 
  * <p>
  * The purpose of these annotation is to populate the HTML document view which by default consists of the following
  * structure:
@@ -78,13 +78,13 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the HTML aside section contents.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is HTML.
-	 *
+	 * 
 	 * <p>
 	 * The aside section typically floats on the right side of the page.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -95,7 +95,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -120,13 +120,13 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the HTML footer section contents.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is HTML.
-	 *
+	 * 
 	 * <p>
 	 * The footer section typically floats on the bottom of the page.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -137,7 +137,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -162,10 +162,10 @@ public @interface HtmlDoc {
 
 	/**
 	 * Adds arbitrary content to the HTML <xt>&lt;head&gt;</xt> element on the page.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is HTML.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -173,14 +173,14 @@ public @interface HtmlDoc {
 	 * 			head={
 	 * 				<jc>// Add a shortcut link in the browser tab</jc>
 	 * 				<js>"<link rel='icon' href='$U{servlet:/htdocs/mypageicon.ico}'>"</js>,
-	 *
+	 * 
 	 * 				<jc>// Reload the page every 5 seconds </jc>
 	 * 				<js>"<meta http-equiv='refresh' content='5'>"</js>
 	 * 			}
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -203,14 +203,14 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the HTML header section contents.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is HTML.
-	 *
+	 * 
 	 * <p>
 	 * The page header normally contains the title and description, but this value can be used to override the contents
 	 * to be whatever you want.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -221,7 +221,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -246,16 +246,16 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the HTML nav section contents.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is HTML.
-	 *
+	 * 
 	 * <p>
 	 * The nav section of the page contains the links.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is HTML.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -266,7 +266,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -293,7 +293,7 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the links in the HTML nav section.
-	 *
+	 * 
 	 * <p>
 	 * The value is an array of strings with two possible values:
 	 * <ul>
@@ -301,10 +301,10 @@ public @interface HtmlDoc {
 	 * 		<br><js>"google: http://google.com"</js>
 	 * 	<li>Arbitrary HTML.
 	 * </ul>
-	 *
+	 * 
 	 * <p>
 	 * The page links are positioned immediately under the title and text.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -316,7 +316,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -348,7 +348,7 @@ public @interface HtmlDoc {
 
 	/**
 	 * Shorthand method for forcing the rendered HTML content to be no-wrap.
-	 *
+	 * 
 	 * <p>
 	 * This only applies to the rendered data portion of the page.
 	 */
@@ -356,10 +356,10 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the HTML script section contents.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is Javascript.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -370,7 +370,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -395,10 +395,10 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the HTML CSS style section contents.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is CSS.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -410,7 +410,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -435,16 +435,16 @@ public @interface HtmlDoc {
 
 	/**
 	 * Sets the CSS URL in the HTML CSS style section.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is a URL.
-	 *
+	 * 
 	 * <p>
 	 * Specifies the URL to the stylesheet to add as a link in the style tag in the header.
-	 *
+	 * 
 	 * <p>
 	 * The format of this value is CSS.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -453,7 +453,7 @@ public @interface HtmlDoc {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -473,11 +473,11 @@ public @interface HtmlDoc {
 
 	/**
 	 * Specifies the template class to use for rendering the HTML page.
-	 *
+	 * 
 	 * <p>
 	 * By default, uses {@link HtmlDocTemplateBasic} to render the contents, although you can provide your own custom
 	 * renderer or subclasses from the basic class to have full control over how the page is rendered.
-	 *
+	 * 
 	 * <h6 class='topic'>Other Notes</h6>
 	 * <ul class='spaced-list'>
 	 * 	<li>
@@ -493,7 +493,7 @@ public @interface HtmlDoc {
 
 	/**
 	 * Configuration property:  HTML Widgets. 
-	 *
+	 * 
 	 * <p>
 	 * Defines widgets that can be used in conjunction with string variables of the form <js>"$W{name}"</js>to quickly
 	 * generate arbitrary replacement text.
@@ -508,11 +508,11 @@ public @interface HtmlDoc {
 	 * 		<br>The styles contents are automatically inserted into the <xt>&lt;head/style&gt;</xt> section
 	 * 			 in the HTML page.
 	 * </ul>
-	 *
+	 * 
 	 * <p>
 	 * The following examples shows how to associate a widget with a REST method and then have it rendered in the links
 	 * and aside section of the page:
-	 *
+	 * 
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
 	 * 		widgets={

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Messages.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Messages.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Messages.java
index 413ccdf..6bf6043 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Messages.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Messages.java
@@ -23,10 +23,10 @@ import org.apache.juneau.utils.*;
 /**
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify it as the
  * resource bundle for the request locale.
- *
+ * 
  * <p>
  * Parameter type must be either {@link ResourceBundle} or {@link MessageBundle}.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
@@ -34,7 +34,7 @@ import org.apache.juneau.utils.*;
  * 		<jk>return</jk> messages.getString(<js>"myLocalizedMessage"</js>);
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
index 06effcd..75b4702 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
@@ -20,10 +20,10 @@ 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
  * method.
- *
+ * 
  * <p>
  * Typically used for HTTP method handlers of type <js>"*"</js> (i.e. handle all requests).
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<js>"*"</js>)
@@ -31,7 +31,7 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
index 19fb015..e495760 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
@@ -21,15 +21,15 @@ public @interface MethodSwagger {
 
 	/**
 	 * Optional deprecated flag for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * Used to populate the Swagger deprecated field.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>(className.?)[javaMethodName].deprecated</code> entry in
 	 * the servlet resource bundle.
 	 * (e.g. <js>"MyClass.myMethod.deprecated = true"</js> or <js>"myMethod.deprecated = foo,bar"</js>).
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
@@ -38,11 +38,11 @@ public @interface MethodSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/paths/{path}/{method}/deprecated</code>.
 	 */
@@ -50,10 +50,10 @@ public @interface MethodSwagger {
 
 	/**
 	 * Optional external documentation information for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * Used to populate the Swagger external documentation field.
-	 *
+	 * 
 	 * <p>
 	 * A simplified JSON string with the following fields:
 	 * <p class='bcode'>
@@ -62,13 +62,13 @@ public @interface MethodSwagger {
 	 * 		url: string
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>(className.?)[javaMethodName].externalDocs</code> entry in
 	 * the servlet resource bundle.
 	 * (e.g. <js>"MyClass.myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js> or
 	 * <js>"myMethod.externalDocs = {url:'http://juneau.apache.org'}"</js>).
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
@@ -77,11 +77,11 @@ public @interface MethodSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/paths/{path}/{method}/externalDocs</code>.
 	 */
@@ -89,11 +89,11 @@ public @interface MethodSwagger {
 
 	/**
 	 * Optional parameter descriptions.
-	 *
+	 * 
 	 * <p>
 	 * This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js>
 	 * column on the Swagger page.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
@@ -109,7 +109,7 @@ public @interface MethodSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in
 	 * this case the strings are internationalized.
@@ -120,15 +120,15 @@ public @interface MethodSwagger {
 	 * 	<jk>MyClass.myMethod.req.body.description</jk> = <js>The HTTP content</js>
 	 * 	<jk>MyClass.myMethod.req.header.d.description</jk> = <js>The 'D' header</js>
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support
 	 * English), and use resource bundles if you need to support localization.
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/paths/{path}/{method}/parameters</code>.
 	 */
@@ -136,11 +136,11 @@ public @interface MethodSwagger {
 
 	/**
 	 * Optional output description.
-	 *
+	 * 
 	 * <p>
 	 * This annotation is provided for documentation purposes and is used to populate the method <js>"responses"</js>
 	 * column on the Swagger page.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
@@ -159,7 +159,7 @@ public @interface MethodSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This is functionally equivalent to specifying the following keys in the resource bundle for the class, except in
 	 * this case the strings are internationalized.
@@ -168,11 +168,11 @@ public @interface MethodSwagger {
 	 * 	<jk>MyClass.myMethod.res.302.description</jk> = <js>Thing wasn't found here</js>
 	 * 	<jk>MyClass.myMethod.res.302.header.Location.description</jk> = <js>The place to find the thing</js>
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * As a general rule, use annotations when you don't care about internationalization (i.e. you only want to support
 	 * English), and use resource bundles if you need to support localization.
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
@@ -181,19 +181,19 @@ public @interface MethodSwagger {
 
 	/**
 	 * Optional tagging information for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * Used to populate the Swagger tags field.
-	 *
+	 * 
 	 * <p>
 	 * A comma-delimited list of tags for API documentation control.
 	 * Tags can be used for logical grouping of operations by resources or any other qualifier.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>(className.?)[javaMethodName].tags</code> entry in the
 	 * servlet resource bundle.
 	 * (e.g. <js>"MyClass.myMethod.tags = foo,bar"</js> or <js>"myMethod.tags = foo,bar"</js>).
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
@@ -202,11 +202,11 @@ public @interface MethodSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/paths/{path}/{method}/tags</code>.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
index 80ab366..ed8cdb0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
@@ -20,7 +20,7 @@ import java.lang.annotation.*;
 /**
  * Annotation used in conjunction with {@link MethodSwagger#parameters() @MethodSwagger.parameters()} to identify 
  * content and header descriptions on specific method requests.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(
@@ -44,7 +44,7 @@ public @interface Parameter {
 
 	/**
 	 * Declares the value of the parameter that the server will use if none is provided.
-	 *
+	 * 
 	 * <p>
 	 * For example a "count" to control the number of results per page might default to 100 if not supplied by the
 	 * client in the request.
@@ -57,7 +57,7 @@ public @interface Parameter {
 
 	/**
 	 * Sets the ability to pass empty-valued parameters.
-	 *
+	 * 
 	 * <p>
 	 * This is valid only for either <code>query</code> or <code>formData</code> parameters and allows you to send a
 	 * parameter with a name only or an empty value.
@@ -67,7 +67,7 @@ public @interface Parameter {
 
 	/**
 	 * Determines the format of the array if type array is used.
-	 *
+	 * 
 	 * <p>
 	 * Possible values are:
 	 * <ul>
@@ -85,13 +85,13 @@ public @interface Parameter {
 
 	/**
 	 * Parameter description (e.g. <js>"Indicates the range returned when Range header is present in the request"</js>).
-	 *
+	 * 
 	 * <p>
 	 * A brief description of the parameter.
 	 * This could contain examples of use.
 	 * <a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used
 	 * for rich text representation.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>description</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"myMethod.res.[code].[category].[name] = foo"</js> or
@@ -101,7 +101,7 @@ public @interface Parameter {
 
 	/**
 	 * The extending format for the previously mentioned <code>type</code>.
-	 *
+	 * 
 	 * <p>
 	 * See <a class="doclink" href="http://swagger.io/specification/#dataTypeFormat">Data Type Formats</a> for further
 	 * details.
@@ -110,7 +110,7 @@ public @interface Parameter {
 
 	/**
 	 * The location of the parameter.
-	 *
+	 * 
 	 * <p>
 	 * Possible values are:
 	 * <ul>
@@ -125,10 +125,10 @@ public @interface Parameter {
 
 	/**
 	 * Required if <code>type</code> is <js>"array"</js>.
-	 *
+	 * 
 	 * <p>
 	 * Describes the type of items in the array.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
@@ -142,7 +142,7 @@ public @interface Parameter {
 	 * 	)
 	 * 	<jk>public void</jk> doAnything() {
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * See <a class="doclink" href="http://swagger.io/specification/#itemsObject">Items Object</a> for further details.
 	 */
@@ -150,7 +150,7 @@ public @interface Parameter {
 
 	/**
 	 * The name of the parameter (e.g. <js>"Content-Range"</js>).
-	 *
+	 * 
 	 * <p>
 	 * Parameter names are case sensitive.
 	 * If <code>in</code> is <js>"path"</js>, the name field MUST correspond to the associated path segment from the
@@ -164,7 +164,7 @@ public @interface Parameter {
 
 	/**
 	 * Determines whether this parameter is mandatory.
-	 *
+	 * 
 	 * <p>
 	 * If the parameter is <code>in</code> <js>"path"</js>, this property is required and its value MUST be <jk>true</jk>.
 	 * Otherwise, the property MAY be included and its default value is <jk>false</jk>.
@@ -173,13 +173,13 @@ public @interface Parameter {
 
 	/**
 	 * The schema defining the type used for the body parameter.
-	 *
+	 * 
 	 * <p>
 	 * Only applicable for <code>in</code> of type <js>"body"</js>.
-	 *
+	 * 
 	 * <p>
 	 * The schema is a JSON object specified <a class="doclink" href="http://swagger.io/specification/#schemaObject">here</a>.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(
@@ -197,7 +197,7 @@ public @interface Parameter {
 
 	/**
 	 * The type of the parameter.
-	 *
+	 * 
 	 * <p>
 	 * The value MUST be one of <js>"string"</js>, <js>"number"</js>, <js>"integer"</js>, <js>"boolean"</js>,
 	 * <js>"array"</js> or <js>"file"</js>.

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java
index b3dc143..da72d23 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.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 variable
  * in a URL path pattern converted to a POJO.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
@@ -31,7 +31,7 @@ import org.apache.juneau.httppart.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * The <ja>@Path</ja> annotation is optional if the parameters are specified immediately following the
  * <code>RestRequest</code> and <code>RestResponse</code> parameters, and are specified in the same order as the
@@ -44,7 +44,7 @@ import org.apache.juneau.httppart.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * If the order of parameters is not the default order shown above, the attribute names must be specified (since
  * parameter names are lost during compilation).
@@ -57,7 +57,7 @@ import org.apache.juneau.httppart.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * You can also use <code>{#}</code> notation to specify path parameters without specifying names.
  * <p class='bcode'>
@@ -76,7 +76,7 @@ public @interface Path {
 
 	/**
 	 * URL path variable name.
-	 *
+	 * 
 	 * <p>
 	 * Optional if the attributes are specified in the same order as in the URL path pattern.
 	 */
@@ -84,7 +84,7 @@ public @interface Path {
 	
 	/**
 	 * 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>.
@@ -93,7 +93,7 @@ public @interface Path {
 
 	/**
 	 * 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/PathRemainder.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
index 377c166..375cb75 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
@@ -20,7 +20,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 URL
  * parameter remainder after a path pattern match.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo/*"</js>)
@@ -28,7 +28,7 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Properties.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Properties.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Properties.java
index 018d5fe..92d5049 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Properties.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Properties.java
@@ -22,7 +22,7 @@ import org.apache.juneau.*;
 /**
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify the
  * request-duration properties object for the current request.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
@@ -31,7 +31,7 @@ import org.apache.juneau.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>
@@ -42,7 +42,7 @@ import org.apache.juneau.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * ...or this...
  * <p class='bcode'>
@@ -52,7 +52,7 @@ import org.apache.juneau.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * The parameter type can be one of the following:
  * <ul>

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
index 8c4e150..7f49fbc 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
@@ -19,14 +19,14 @@ import java.lang.annotation.*;
 
 /**
  * Property name/value pair used in the {@link RestResource#properties() @RestResource.properties()} annotation.
- *
+ * 
  * <p>
  * Any of the properties defined on any of the serializers or parsers can be defined.
- *
+ * 
  * <p>
  * Property values types that are not <code>Strings</code> will automatically be converted to the correct type
  * (e.g. <code>Boolean</code>, etc...).
- *
+ * 
  * <p>
  * See {@link RestResource#properties} for more information.
  */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java
index 3f10875..a210030 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java
@@ -23,13 +23,13 @@ import org.apache.juneau.rest.*;
 /**
  * Identical to {@link FormData @FormData}, but only retrieves the parameter from the URL string, not URL-encoded form
  * posts.
- *
+ * 
  * <p>
  * Unlike {@link FormData @FormData}, 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>)
@@ -38,7 +38,7 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
- *
+ * 
  * <p>
  * This is functionally equivalent to the following code...
  * <p class='bcode'>
@@ -64,13 +64,13 @@ public @interface Query {
 
 	/**
 	 * Specify <jk>true</jk> if using multi-part parameters to represent collections and arrays.
-	 *
+	 * 
 	 * <p>
 	 * Normally, we expect single parameters to be specified in UON notation for representing collections of values
 	 * (e.g. <js>"&amp;key=(1,2,3)"</js>.
 	 * This annotation allows the use of multi-part parameters to represent collections
 	 * (e.g. <js>"&amp;key=1&amp;key=2&amp;key=3"</js>.
-	 *
+	 * 
 	 * <p>
 	 * This setting should only be applied to Java parameters of type array or Collection.
 	 */
@@ -83,7 +83,7 @@ public @interface Query {
 
 	/**
 	 * 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>.
@@ -92,7 +92,7 @@ public @interface Query {
 
 	/**
 	 * 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/ResourceSwagger.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
index f536ba2..0709af4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
@@ -21,10 +21,10 @@ public @interface ResourceSwagger {
 
 	/**
 	 * Optional contact information for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger contact field and to display on HTML pages.
-	 *
+	 * 
 	 * <p>
 	 * A simplified JSON string with the following fields:
 	 * <p class='bcode'>
@@ -34,12 +34,12 @@ public @interface ResourceSwagger {
 	 * 		email: string
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>contact</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js> or
 	 * <js>"MyServlet.contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js>).
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -48,14 +48,14 @@ public @interface ResourceSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/info/contact</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getContact(RestRequest)} method.
 	 */
@@ -63,10 +63,10 @@ public @interface ResourceSwagger {
 
 	/**
 	 * Optional external documentation information for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger external documentation field and to display on HTML pages.
-	 *
+	 * 
 	 * <p>
 	 * A simplified JSON string with the following fields:
 	 * <p class='bcode'>
@@ -75,12 +75,12 @@ public @interface ResourceSwagger {
 	 * 		url: string
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>externalDocs</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"externalDocs = {url:'http://juneau.apache.org'}"</js> or
 	 * <js>"MyServlet.externalDocs = {url:'http://juneau.apache.org'}"</js>).
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -89,14 +89,14 @@ public @interface ResourceSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/tags</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getExternalDocs(RestRequest)}
 	 * method.
@@ -105,10 +105,10 @@ public @interface ResourceSwagger {
 
 	/**
 	 * Optional license information for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger license field and to display on HTML pages.
-	 *
+	 * 
 	 * <p>
 	 * A simplified JSON string with the following fields:
 	 * <p class='bcode'>
@@ -117,12 +117,12 @@ public @interface ResourceSwagger {
 	 * 		url: string
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>license</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js> or
 	 * <js>"MyServlet.license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>).
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -131,14 +131,14 @@ public @interface ResourceSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/info/license</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getLicense(RestRequest)} method.
 	 */
@@ -146,10 +146,10 @@ public @interface ResourceSwagger {
 
 	/**
 	 * Optional tagging information for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger tags field and to display on HTML pages.
-	 *
+	 * 
 	 * <p>
 	 * A simplified JSON string with the following fields:
 	 * <p class='bcode'>
@@ -164,12 +164,12 @@ public @interface ResourceSwagger {
 	 * 		}
 	 * 	]
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>tags</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"tags = [{name:'Foo',description:'Foobar'}]"</js> or
 	 * <js>"MyServlet.tags = [{name:'Foo',description:'Foobar'}]"</js>).
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
@@ -178,14 +178,14 @@ public @interface ResourceSwagger {
 	 * 		)
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/tags</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getTags(RestRequest)} method.
 	 */
@@ -193,21 +193,21 @@ public @interface ResourceSwagger {
 	
 	/**
 	 * Optional servlet terms-of-service for this API.
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger terms-of-service field.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>termsOfService</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"termsOfService = foo"</js> or <js>"MyServlet.termsOfService = foo"</js>).
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/info/termsOfService</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getTermsOfService(RestRequest)}
 	 * method.
@@ -216,21 +216,21 @@ public @interface ResourceSwagger {
 
 	/**
 	 * Provides the version of the application API (not to be confused with the specification version).
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger version field and to display on HTML pages.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>version</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"version = 2.0"</js> or <js>"MyServlet.version = 2.0"</js>).
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>).
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/info/version</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getVersion(RestRequest)} method.
 	 */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java
index 9ef71ad..e9dd934 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java
@@ -21,7 +21,7 @@ import org.apache.juneau.rest.*;
 
 /**
  * Annotation used in conjunction with {@link MethodSwagger#responses() @MethodSwagger.responses()} to identify possible responses by the method.
- *
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(
@@ -47,16 +47,16 @@ public @interface Response {
 
 	/**
 	 * Optional description.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>description</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"myMethod.res.[code].description = foo"</js> or
 	 * <js>"MyServlet.myMethod.res.[code].description = foo"</js>).
-	 *
+	 * 
 	 * <p>
 	 * This field can contain variables (e.g. "$L{my.localized.variable}").
 	 * <br>See {@link RestContext#getVarResolver()} for the list of supported variables.
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/paths/{path}/{method}/responses/{code}/description</code>.
 	 */
@@ -64,7 +64,7 @@ public @interface Response {
 
 	/**
 	 * Optional response headers.
-	 *
+	 * 
 	 * <p>
 	 * Response variables can also be defined in the servlet resource bundle.
 	 * (e.g. <js>"myMethod.res.[code].[category].[name] = foo"</js> or
@@ -74,14 +74,14 @@ public @interface Response {
 
 	/**
 	 * A definition of the response structure.
-	 *
+	 * 
 	 * <p>
 	 * It can be a primitive, an array or an object.
 	 * If this field does not exist, it means no content is returned as part of the response.
 	 * As an extension to the <a class="doclink" href="http://swagger.io/specification/#schemaObject">Schema Object</a>,
 	 * its root type value may also be <js>"file"</js>.
 	 * This SHOULD be accompanied by a relevant produces mime-type.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
index c3bb713..b1556cd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
@@ -20,29 +20,29 @@ import java.lang.annotation.*;
 /**
  * Identifies Java methods on a resource/servlet class that get invoked during particular lifecycle events of
  * the servlet or REST call.
- *
+ * 
  * <p>
  * For example, if you want to add an initialization method to your resource:
  * <p class='bcode'>
  * 	<ja>@RestResource</ja>(...)
  * 	<jk>public class</jk> MyResource  {
- *
+ * 
  * 		<jc>// Our database.</jc>
  * 		<jk>private</jk> Map&lt;Integer,Object&gt; <jf>myDatabase</jf>;
- *
+ * 
  * 		<ja>@RestHook</ja>(<jsf>INIT</jsf>)
  * 		<jk>public void</jk> initMyDatabase(RestContextBuilder builder) <jk>throws</jk> Exception {
  * 			<jf>myDatabase</jf> = <jk>new</jk> LinkedHashMap&lt;&gt;();
  * 		}
  * 	}
  * </p>
- *
+ * 
  * <p>
  * Or if you want to intercept REST calls:
  * <p class='bcode'>
  * 	<ja>@RestResource</ja>(...)
  * 	<jk>public class</jk> MyResource {
- *
+ * 
  * 		<jc>// Add a request attribute to all incoming requests.</jc>
  * 		<ja>@RestHook</ja>(<jsf>PRE_CALL</jsf>)
  * 		<jk>public void</jk> onPreCall(RestRequest req) {
@@ -50,7 +50,7 @@ import java.lang.annotation.*;
  * 		}
  * 	}
  * </p>
- *
+ * 
  * <p>
  * The hook events can be broken down into two categories:
  * <ul class='spaced-list'>
@@ -69,7 +69,7 @@ import java.lang.annotation.*;
  * 			<li>{@link HookEvent#END_CALL END_CALL} - At the end of the REST call after the response has been flushed.
  * 		</ul>
  * </ul>
- *
+ * 
  * <p>
  * See the {@link HookEvent} class for information about individual event types.
  */

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index c933f68..d1b35bb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -50,41 +50,41 @@ public @interface RestMethod {
 
 	/**
 	 * Shortcut for specifying the {@link BeanContext#BEAN_includeProperties} property on all serializers.
-	 *
+	 * 
 	 * <p>
 	 * The typical use case is when you're rendering summary and details views of the same bean in a resource and
 	 * you want to expose or hide specific properties depending on the level of detail you want.
-	 *
+	 * 
 	 * <p>
 	 * In the example below, our 'summary' view is a list of beans where we only want to show the ID property,
 	 * and our detail view is a single bean where we want to expose different fields:
 	 * <p class='bcode'>
 	 * <jc>// Our bean</jc>
 	 * 	<jk>public class</jk> MyBean {
-	 *
+	 * 
 	 * 		<jc>// Summary properties</jc>
 	 * 		<ja>@Html</ja>(link=<js>"servlet:/mybeans/{id}"</js>)
 	 * 		<jk>public</jk> String <jf>id</jf>;
-	 *
+	 * 
 	 * 		<jc>// Detail properties</jc>
 	 * 		<jk>public</jk> String <jf>a</jf>, <jf>b</jf>;
 	 * 	}
-	 *
+	 * 
 	 * <jc>// Only render "id" property.</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/mybeans"</js>, bpi=<js>"MyBean: id"</js>)
 	 * 	<jk>public</jk> List&lt;MyBean&gt; getBeanSummary();
-	 *
+	 * 
 	 * <jc>// Only render "a" and "b" properties.</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/mybeans/{id}"</js>, bpi=<js>"MyBean: a,b"</js>)
 	 * 	<jk>public</jk> MyBean getBeanDetails(<ja>@Path</ja> String id);
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * The format of each value is: <js>"Key: comma-delimited-tokens"</js>.
 	 * <br>Keys can be fully-qualified or short class names or <js>"*"</js> to represent all classes.
 	 * <br>Values are comma-delimited lists of bean property names.
 	 * <br>Properties apply to specified class and all subclasses.
-	 *
+	 * 
 	 * <p>
 	 * Semicolons can be used as an additional separator for multiple values:
 	 * <p class='bcode'>
@@ -102,40 +102,40 @@ public @interface RestMethod {
 
 	/**
 	 * Shortcut for specifying the {@link BeanContext#BEAN_excludeProperties} property on all serializers.
-	 *
+	 * 
 	 * <p>
 	 * Same as {@link #bpi()} except you specify a list of bean property names that you want to exclude from
 	 * serialization.
-	 *
+	 * 
 	 * <p>
 	 * In the example below, our 'summary' view is a list of beans where we want to exclude some properties:
 	 * <p class='bcode'>
 	 * <jc>// Our bean</jc>
 	 * 	<jk>public class</jk> MyBean {
-	 *
+	 * 
 	 * 		<jc>// Summary properties</jc>
 	 * 		<ja>@Html</ja>(link=<js>"servlet:/mybeans/{id}"</js>)
 	 * 		<jk>public</jk> String <jf>id</jf>;
-	 *
+	 * 
 	 * 		<jc>// Detail properties</jc>
 	 * 		<jk>public</jk> String <jf>a</jf>, <jf>b</jf>;
 	 * 	}
-	 *
+	 * 
 	 * <jc>// Don't show "a" and "b" properties.</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/mybeans"</js>, bpx=<js>"MyBean: a,b"</js>)
 	 * 	<jk>public</jk> List&lt;MyBean&gt; getBeanSummary();
-	 *
+	 * 
 	 * <jc>// Render all properties.</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/mybeans/{id}"</js>)
 	 * 	<jk>public</jk> MyBean getBeanDetails(<ja>@Path</ja> String id);
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * The format of each value is: <js>"Key: comma-delimited-tokens"</js>.
 	 * <br>Keys can be fully-qualified or short class names or <js>"*"</js> to represent all classes.
 	 * <br>Values are comma-delimited lists of bean property names.
 	 * <br>Properties apply to specified class and all subclasses.
-	 *
+	 * 
 	 * <p>
 	 * Semicolons can be used as an additional separator for multiple values:
 	 * <p class='bcode'>
@@ -153,18 +153,18 @@ public @interface RestMethod {
 
 	/**
 	 * Specifies whether this method can be called based on the client version.
-	 *
+	 * 
 	 * <p>
 	 * The client version is identified via the HTTP request header identified by
 	 * {@link RestResource#clientVersionHeader() @RestResource.clientVersionHeader()} which by default is <js>"X-Client-Version"</js>.
-	 *
+	 * 
 	 * <p>
 	 * This is a specialized kind of {@link RestMatcher} that allows you to invoke different Java methods for the same
 	 * method/path based on the client version.
-	 *
+	 * 
 	 * <p>
 	 * The format of the client version range is similar to that of OSGi versions.
-	 *
+	 * 
 	 * <p>
 	 * In the following example, the Java methods are mapped to the same HTTP method and URL <js>"/foobar"</js>.
 	 * <p class='bcode'>
@@ -174,20 +174,20 @@ public @interface RestMethod {
 	 * 	<jk>public</jk> Object method1() {
 	 * 		...
 	 * 	}
-	 *
+	 * 
 	 * 	<jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
 	 * 	<jk>public</jk> Object method2() {
 	 * 		...
 	 * 	}
-	 *
+	 * 
 	 * 	<jc>// Call this method if X-Client-Version is less than 1.1.</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
 	 * 	<jk>public</jk> Object method3() {
 	 * 		...
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * It's common to combine the client version with transforms that will convert new POJOs into older POJOs for
 	 * backwards compatibility.
@@ -197,13 +197,13 @@ public @interface RestMethod {
 	 * 	<jk>public</jk> NewPojo newMethod() {
 	 * 		...
 	 * 	}
-	 *
+	 * 
 	 * 	<jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>, transforms={NewToOldPojoSwap.<jk>class</jk>})
 	 * 	<jk>public</jk> NewPojo oldMethod() {
 	 * 		<jk>return</jk> newMethod()
 	 * 	}
-	 *
+	 * 
 	 * <p>
 	 * Note that in the previous example, we're returning the exact same POJO, but using a transform to convert it into
 	 * an older form.
@@ -219,7 +219,7 @@ public @interface RestMethod {
 
 	/**
 	 * Class-level response converters.
-	 *
+	 * 
 	 * <p>
 	 * Associates one or more {@link RestConverter converters} with this method.
 	 * 
@@ -235,7 +235,7 @@ public @interface RestMethod {
 	 * 
 	 * <p>
 	 * The default character encoding for the request and response if not specified on the request.
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -255,14 +255,14 @@ public @interface RestMethod {
 
 	/**
 	 * Specifies default values for form-data parameters.
-	 *
+	 * 
 	 * <p>
 	 * Strings are of the format <js>"name=value"</js>.
-	 *
+	 * 
 	 * <p>
 	 * Affects values returned by {@link RestRequest#getFormData(String)} when the parameter is not present on the
 	 * request.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/*"</js>, defaultFormData={<js>"foo=bar"</js>})
@@ -270,7 +270,7 @@ public @interface RestMethod {
 	 * 		...
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * You can use either <js>':'</js> or <js>'='</js> as the key/value delimiter.
 	 * Key and value is trimmed of whitespace.
@@ -289,13 +289,13 @@ public @interface RestMethod {
 
 	/**
 	 * Specifies default values for query parameters.
-	 *
+	 * 
 	 * <p>
 	 * Strings are of the format <js>"name=value"</js>.
-	 *
+	 * 
 	 * <p>
 	 * Affects values returned by {@link RestRequest#getQuery(String)} when the parameter is not present on the request.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, defaultQuery={<js>"foo=bar"</js>})
@@ -303,7 +303,7 @@ public @interface RestMethod {
 	 * 		...
 	 * 	}
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * You can use either <js>':'</js> or <js>'='</js> as the key/value delimiter.
 	 * Key and value is trimmed of whitespace.
@@ -325,7 +325,7 @@ public @interface RestMethod {
 	 * 
 	 * <p>
 	 * Specifies default values for request headers.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<jc>// Assume "text/json" Accept value when Accept not specified</jc>
@@ -356,7 +356,7 @@ public @interface RestMethod {
 
 	/**
 	 * Optional description for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * This description is used in the following locations:
 	 * <ul class='spaced-list'>
@@ -367,12 +367,12 @@ public @interface RestMethod {
 	 * 	<li>
 	 * 		The description of the method in the Swagger page.
 	 * </ul>
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>(className.?)[javaMethodName].description</code> entry in
 	 * the servlet resource bundle. (e.g. <js>"MyClass.myMethod.description = foo"</js> or
 	 * <js>"myMethod.description = foo"</js>).
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -403,7 +403,7 @@ public @interface RestMethod {
 
 	/**
 	 * Compression encoders. 
-	 *
+	 * 
 	 * <p>
 	 * Use this annotation when the list of encoders assigned to a method differs from the list of encoders assigned at
 	 * the servlet level.
@@ -423,7 +423,7 @@ public @interface RestMethod {
 
 	/**
 	 * Shortcut for setting {@link #properties()} of simple boolean types.
-	 *
+	 * 
 	 * <p>
 	 * Setting a flag is equivalent to setting the same property to <js>"true"</js>.
 	 */
@@ -431,7 +431,7 @@ public @interface RestMethod {
 
 	/**
 	 * Method-level guards.
-	 *
+	 * 
 	 * <p>
 	 * Associates one or more {@link RestGuard RestGuards} with this method.
 	 * 
@@ -444,7 +444,7 @@ public @interface RestMethod {
 
 	/**
 	 * Provides HTML-doc-specific metadata on this method.
-	 *
+	 * 
 	 * <p>
 	 * Information provided here overrides information provided in the servlet-level annotation.
 	 */
@@ -463,7 +463,7 @@ public @interface RestMethod {
 	 * 	<li>"ENCODERS" - Inherit class-level encoders.
 	 * 	<li>"*" - Inherit everything.
 	 * </ul>
-	 *
+	 * 
 	 * <p>
 	 * For example, to inherit all parsers, properties, and transforms from the servlet class:
 	 * <p class='bcode'>
@@ -478,14 +478,14 @@ public @interface RestMethod {
 	
 	/**
 	 * Method matchers.
-	 *
+	 * 
 	 * <p>
 	 * Associates one more more {@link RestMatcher RestMatchers} with this method.
-	 *
+	 * 
 	 * <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.
-	 *
+	 * 
 	 * <p>
 	 * See {@link RestMatcher} for more information.
 	 */
@@ -493,7 +493,7 @@ public @interface RestMethod {
 
 	/**
 	 * The maximum allowed input size (in bytes) on HTTP requests.
-	 *
+	 * 
 	 * <p>
 	 * Useful for alleviating DoS attacks by throwing an exception when too much input is received instead of resulting
 	 * in out-of-memory errors which could affect system stability.
@@ -524,16 +524,16 @@ public @interface RestMethod {
 
 	/**
 	 * REST method name.
-	 *
+	 * 
 	 * <p>
 	 * Typically <js>"GET"</js>, <js>"PUT"</js>, <js>"POST"</js>, <js>"DELETE"</js>, or <js>"OPTIONS"</js>.
-	 *
+	 * 
 	 * <p>
 	 * Method names are case-insensitive (always folded to upper-case).
-	 *
+	 * 
 	 * <p>
 	 * Note that you can use {@link org.apache.juneau.http.HttpMethodName} for constant values.
-	 *
+	 * 
 	 * <p>
 	 * Besides the standard HTTP method names, the following can also be specified:
 	 * <ul class='spaced-list'>
@@ -570,20 +570,20 @@ public @interface RestMethod {
 
 	/**
 	 * Parsers. 
-	 *
+	 * 
 	 * <p>
 	 * Overrides the list of parsers assigned at the method level.
-	 *
+	 * 
 	 * <p>
 	 * Use this annotation when the list of parsers assigned to a method differs from the list of parsers assigned at
 	 * the servlet level.
-	 *
+	 * 
 	 * <p>
 	 * To append to the list of parsers assigned at the servlet level, use <code>inherit=<js>"PARSERS"</js></code>.
-	 *
+	 * 
 	 * <p class='bcode'>
 	 * 	<jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
-	 *
+	 * 
 	 * 		<ja>@RestMethod</ja>(
 	 * 			name=<jsf>PUT</jsf>,
 	 * 			path=<js>"/foo"</js>,
@@ -605,22 +605,22 @@ public @interface RestMethod {
 
 	/**
 	 * Optional path pattern for the specified method.
-	 *
+	 * 
 	 * <p>
 	 * Appending <js>"/*"</js> to the end of the path pattern will make it match any remainder too.
 	 * <br>Not appending <js>"/*"</js> to the end of the pattern will cause a 404 (Not found) error to occur if the exact
 	 * pattern is not found.
-	 *
+	 * 
 	 * <p>
 	 * The path can contain variables that get resolved to {@link Path @Path} parameters:
 	 * <p class='bcode'>
 	 * 	<jc>// Example 1</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
-	 *
+	 * 
 	 * 	<jc>// Example 2</jc>
 	 * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * Refer to {@link Path @Path} on how path variables get resolved.
 	 */
@@ -638,10 +638,10 @@ public @interface RestMethod {
 
 	/**
 	 * URL path pattern priority.
-	 *
+	 * 
 	 * <p>
 	 * To force path patterns to be checked before other path patterns, use a higher priority number.
-	 *
+	 * 
 	 * <p>
 	 * By default, it's <code>0</code>, which means it will use an internal heuristic to determine a best match.
 	 */
@@ -649,7 +649,7 @@ public @interface RestMethod {
 
 	/**
 	 * Same as {@link RestResource#properties() @RestResource.properties()}, except defines property values by default when this method is called.
-	 *
+	 * 
 	 * <p>
 	 * This is equivalent to simply calling <code>res.addProperties()</code> in the Java method, but is provided for
 	 * convenience.
@@ -658,21 +658,21 @@ public @interface RestMethod {
 
 	/**
 	 * Serializers. 
-	 *
+	 * 
 	 * <p>
 	 * Overrides the list of serializers assigned at the method level.
-	 *
+	 * 
 	 * <p>
 	 * Use this annotation when the list of serializers assigned to a method differs from the list of serializers
 	 * assigned at the servlet level.
 	 * 
 	 * <p>
 	 * To append to the list of serializers assigned at the servlet level, use <code>inherit=<js>"SERIALIZERS"</js></code>.
-	 *
+	 * 
 	 * <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>,
@@ -694,7 +694,7 @@ public @interface RestMethod {
 
 	/**
 	 * Optional summary for the exposed API.
-	 *
+	 * 
 	 * <p>
 	 * This summary is used in the following locations:
 	 * <ul class='spaced-list'>
@@ -705,11 +705,11 @@ public @interface RestMethod {
 	 * 	<li>
 	 * 		The summary of the method in the Swagger page.
 	 * </ul>
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>(className.?)[javaMethodName].summary</code> entry in the
 	 * servlet resource bundle. (e.g. <js>"MyClass.myMethod.summary = foo"</js> or <js>"myMethod.summary = foo"</js>).
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -732,7 +732,7 @@ public @interface RestMethod {
 	 * {@link UrlVar $U}
 	 * {@link UrlEncodeVar $UE}
 	 * {@link WidgetVar $W}
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/paths/{path}/{method}/summary</code>.
 	 */
@@ -740,7 +740,7 @@ public @interface RestMethod {
 
 	/**
 	 * Supported accept media types.
-	 *
+	 * 
 	 * <p>
 	 * Overrides the media types inferred from the serializers that identify what media types can be produced by the resource.
 	 * 
@@ -763,7 +763,7 @@ public @interface RestMethod {
 	
 	/**
 	 * Supported content media types.
-	 *
+	 * 
 	 * <p>
 	 * Overrides the media types inferred from the parsers that identify what media types can be consumed by the resource.
 	 * 

http://git-wip-us.apache.org/repos/asf/juneau/blob/5686b8d6/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
index c127d2b..6b829a9 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
@@ -30,11 +30,11 @@ import org.apache.juneau.utils.*;
 
 /**
  * Used to denote that a class is a REST resource and to associate metadata on it.
- *
+ * 
  * <p>
  * Usually used on a subclass of {@link RestServlet}, but can be used to annotate any class that you want to expose as
  * a REST resource.
- *
+ * 
  * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on
  * using this class.
  */
@@ -46,7 +46,7 @@ public @interface RestResource {
 
 	/**
 	 * Allow body URL parameter.
-	 *
+	 * 
 	 * <p>
 	 * When enabled, the HTTP body content on PUT and POST requests can be passed in as text using the <js>"body"</js>
 	 * URL parameter.
@@ -72,13 +72,13 @@ public @interface RestResource {
 
 	/**
 	 * Allowed method parameters.
-	 *
+	 * 
 	 * <p>
 	 * When specified, the HTTP method can be overridden by passing in a <js>"method"</js> URL parameter on a regular
 	 * GET request.
 	 * <br>
 	 * For example:  <js>"?method=OPTIONS"</js>
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -98,7 +98,7 @@ public @interface RestResource {
 
 	/**
 	 * Allow header URL parameters.
-	 *
+	 * 
 	 * <p>
 	 * When enabled, headers such as <js>"Accept"</js> and <js>"Content-Type"</js> to be passed in as URL query
 	 * parameters.
@@ -123,7 +123,7 @@ public @interface RestResource {
 
 	/**
 	 * Class-level bean filters.
-	 *
+	 * 
 	 * <p>
 	 * Shortcut to add bean filters to the bean contexts of the objects returned by the following methods:
 	 * <ul>
@@ -131,7 +131,7 @@ public @interface RestResource {
 	 * 	<li>{@link RestContext#getSerializers()}
 	 * 	<li>{@link RestContext#getParsers()}
 	 * </ul>
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link BeanContext#BEAN_beanFilters}
@@ -141,7 +141,7 @@ public @interface RestResource {
 
 	/**
 	 * REST call handler.
-	 *
+	 * 
 	 * <p>
 	 * This class handles the basic lifecycle of an HTTP REST call.
 	 * 
@@ -154,10 +154,10 @@ public @interface RestResource {
 
 	/**
 	 * Children.
-	 *
+	 * 
 	 * <p>
 	 * Defines children of this resource.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_children}
@@ -167,7 +167,7 @@ public @interface RestResource {
 
 	/**
 	 * Classpath resource finder. 
-	 *
+	 * 
 	 * <p>
 	 * Used to retrieve localized files from the classpath.
 	 * 
@@ -180,7 +180,7 @@ public @interface RestResource {
 
 	/**
 	 * Client version header.
-	 *
+	 * 
 	 * <p>
 	 * Specifies the name of the header used to denote the client version on HTTP requests.
 	 * 
@@ -193,7 +193,7 @@ public @interface RestResource {
 	 * {@link IfVar $IF}
 	 * {@link SystemPropertiesVar $S}
 	 * {@link SwitchVar $SW}
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_clientVersionHeader}
@@ -203,10 +203,10 @@ public @interface RestResource {
 
 	/**
 	 * Optional location of configuration file for this servlet.
-	 *
+	 * 
 	 * <p>
 	 * The configuration file .
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -216,7 +216,7 @@ public @interface RestResource {
 	 * {@link IfVar $IF}
 	 * {@link SystemPropertiesVar $S}
 	 * {@link SwitchVar $SW}
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestContextBuilder#configFile(ConfigFile)} method.
 	 */
@@ -247,12 +247,12 @@ public @interface RestResource {
 
 	/**
 	 * Class-level response converters.
-	 *
+	 * 
 	 * <p>
 	 * Associates one or more {@link RestConverter converters} with a resource class.
 	 * These converters get called immediately after execution of the REST method in the same order specified in the
 	 * annotation.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_converters}
@@ -275,7 +275,7 @@ public @interface RestResource {
 	 * {@link IfVar $IF}
 	 * {@link SystemPropertiesVar $S}
 	 * {@link SwitchVar $SW}
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_defaultCharset}
@@ -288,7 +288,7 @@ public @interface RestResource {
 	 * 
 	 * <p>
 	 * Specifies default values for request headers.
-	 *
+	 * 
 	 * <p>
 	 * Values can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -308,10 +308,10 @@ public @interface RestResource {
 
 	/**
 	 * Default response headers.
-	 *
+	 * 
 	 * <p>
 	 * Specifies default values for response headers.
-	 *
+	 * 
 	 * <p>
 	 * Values can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -331,15 +331,15 @@ public @interface RestResource {
 
 	/**
 	 * Optional servlet description.
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger description field.
 	 * This value can be retrieved programmatically through the {@link RestRequest#getServletDescription()} method.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the description from the <code>description</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"description = foo"</js> or <js>"MyServlet.description = foo"</js>).
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -362,10 +362,10 @@ public @interface RestResource {
 	 * {@link UrlVar $U}
 	 * {@link UrlEncodeVar $UE}
 	 * {@link WidgetVar $W}
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/info/description</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getDescription(RestRequest)} method.
 	 */
@@ -373,10 +373,10 @@ public @interface RestResource {
 
 	/**
 	 * Compression encoders. 
-	 *
+	 * 
 	 * <p>
 	 * These can be used to enable various kinds of compression (e.g. <js>"gzip"</js>) on requests and responses.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_encoders}
@@ -386,7 +386,7 @@ public @interface RestResource {
 
 	/**
 	 * Shortcut for setting {@link #properties()} of simple boolean types.
-	 *
+	 * 
 	 * <p>
 	 * Values can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -404,11 +404,11 @@ public @interface RestResource {
 
 	/**
 	 * Class-level guards.
-	 *
+	 * 
 	 * <p>
 	 * Associates one or more {@link RestGuard RestGuards} with all REST methods defined in this class.
 	 * These guards get called immediately before execution of any REST method in this class.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_guards}
@@ -418,13 +418,13 @@ public @interface RestResource {
 
 	/**
 	 * Provides HTML-doc-specific metadata on this method.
-	 *
+	 * 
 	 * <p>
 	 * Used to customize the output from the HTML Doc serializer.
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
 	 * 		path=<js>"/addressBook"</js>,
-	 *
+	 * 
 	 * 		<jc>// Links on the HTML rendition page.
 	 * 		// "request:/..." URIs are relative to the request URI.
 	 * 		// "servlet:/..." URIs are relative to the servlet URI.
@@ -465,7 +465,7 @@ public @interface RestResource {
 	 * 
 	 * <p>
 	 * Class used to retrieve title/description/swagger information about a resource.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_infoProvider}
@@ -478,7 +478,7 @@ public @interface RestResource {
 	 * 
 	 * <p>
 	 * Specifies the logger to use for logging.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_logger}
@@ -488,7 +488,7 @@ public @interface RestResource {
 
 	/**
 	 * The maximum allowed input size (in bytes) on HTTP requests.
-	 *
+	 * 
 	 * <p>
 	 * Useful for alleviating DoS attacks by throwing an exception when too much input is received instead of resulting
 	 * in out-of-memory errors which could affect system stability.
@@ -514,7 +514,7 @@ public @interface RestResource {
 	 * Messages. 
 	 * 
 	 * Identifies the location of the resource bundle for this class.
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -534,7 +534,7 @@ public @interface RestResource {
 
 	/**
 	 * Configuration property:  MIME types. 
-	 *
+	 * 
 	 * <p>
 	 * Defines MIME-type file type mappings.
 	 * 
@@ -557,12 +557,12 @@ public @interface RestResource {
 
 	/**
 	 * Java method parameter resolvers.
-	 *
+	 * 
 	 * <p>
 	 * By default, the Juneau framework will automatically Java method parameters of various types (e.g.
 	 * <code>RestRequest</code>, <code>Accept</code>, <code>Reader</code>).
 	 * This setting allows you to provide your own resolvers for your own class types that you want resolved.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_paramResolvers}
@@ -575,7 +575,7 @@ public @interface RestResource {
 	 * 
 	 * <p>
 	 * Specifies the parser listener class to use for listening to non-fatal parsing errors.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link Parser#PARSER_listener}
@@ -585,7 +585,7 @@ public @interface RestResource {
 
 	/**
 	 * Parsers. 
-	 *
+	 * 
 	 * <p>
 	 * Adds class-level parsers to this resource.
 	 * 
@@ -598,7 +598,7 @@ public @interface RestResource {
 
 	/**
 	 * HTTP part parser. 
-	 *
+	 * 
 	 * <p>
 	 * Specifies the {@link HttpPartParser} to use for parsing headers, query/form parameters, and URI parts.
 	 * 
@@ -611,10 +611,10 @@ public @interface RestResource {
 
 	/**
 	 * HTTP part serializer. 
-	 *
+	 * 
 	 * <p>
 	 * Specifies the {@link HttpPartSerializer} to use for serializing headers, query/form parameters, and URI parts.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_partSerializer}
@@ -624,10 +624,10 @@ public @interface RestResource {
 	
 	/**
 	 * Resource path.   
-	 *
+	 * 
 	 * <p>
 	 * Identifies the URL subpath relative to the parent resource.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_path}
@@ -637,7 +637,7 @@ public @interface RestResource {
 
 	/**
 	 * Class-level POJO swaps.
-	 *
+	 * 
 	 * <p>
 	 * Shortcut to add POJO swaps to the bean contexts of the objects returned by the following methods:
 	 * <ul>
@@ -645,7 +645,7 @@ public @interface RestResource {
 	 * 	<li>{@link RestContext#getSerializers()}
 	 * 	<li>{@link RestContext#getParsers()}
 	 * </ul>
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link BeanContext#BEAN_pojoSwaps}
@@ -655,7 +655,7 @@ public @interface RestResource {
 
 	/**
 	 * Class-level properties.
-	 *
+	 * 
 	 * <p>
 	 * Shortcut for specifying class-level properties on this servlet to the objects returned by the following methods:
 	 * <ul>
@@ -665,15 +665,15 @@ public @interface RestResource {
 	 * </ul>
 	 * <p>
 	 * Any of the properties defined on {@link RestContext} or any of the serializers and parsers can be specified.
-	 *
+	 * 
 	 * <p>
 	 * Property values will be converted to the appropriate type.
-	 *
+	 * 
 	 * <p>
 	 * In some cases, properties can be overridden at runtime through the
 	 * {@link RestResponse#setProperty(String, Object)} method or through a {@link Properties @Properties} annotated
 	 * method parameter.
-	 *
+	 * 
 	 * <p>
 	 * Values can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -692,7 +692,7 @@ public @interface RestResource {
 
 	/**
 	 * Render response stack traces in responses.
-	 *
+	 * 
 	 * <p>
 	 * Render stack traces in HTTP response bodies when errors occur.
 	 * 
@@ -705,7 +705,7 @@ public @interface RestResource {
 	 * {@link IfVar $IF}
 	 * {@link SystemPropertiesVar $S}
 	 * {@link SwitchVar $SW}
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_renderResponseStackTraces}
@@ -728,11 +728,11 @@ public @interface RestResource {
 
 	/**
 	 * Response handlers.
-	 *
+	 * 
 	 * <p>
 	 * Specifies a list of {@link ResponseHandler} classes that know how to convert POJOs returned by REST methods or
 	 * set via {@link RestResponse#setOutput(Object)} into appropriate HTTP responses.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_responseHandlers}
@@ -745,7 +745,7 @@ public @interface RestResource {
 	 * 
 	 * <p>
 	 * Specifies the serializer listener class to use for listening to non-fatal serialization errors.
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link Serializer#SERIALIZER_listener}
@@ -755,7 +755,7 @@ public @interface RestResource {
 
 	/**
 	 * Serializers. 
-	 *
+	 * 
 	 * <p>
 	 * Adds class-level serializers to this resource.
 	 * 
@@ -768,13 +768,13 @@ public @interface RestResource {
 
 	/**
 	 * Optional site name.
-	 *
+	 * 
 	 * <p>
 	 * The site name is intended to be a title that can be applied to the entire site.
-	 *
+	 * 
 	 * <p>
 	 * This value can be retrieved programmatically through the {@link RestRequest#getSiteName()} method.
-	 *
+	 * 
 	 * <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:
@@ -786,7 +786,7 @@ public @interface RestResource {
 	 * 		}
 	 * 	)
 	 * </p>
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -817,7 +817,7 @@ public @interface RestResource {
 
 	/**
 	 * Static file response headers. 
-	 *
+	 * 
 	 * <p>
 	 * Used to customize the headers on responses returned for statically-served files.
 	 * 
@@ -840,7 +840,7 @@ public @interface RestResource {
 	
 	/**
 	 * Static file mappings. 
-	 *
+	 * 
 	 * <p>
 	 * Used to define paths and locations of statically-served files such as images or HTML documents.
 	 * 
@@ -863,7 +863,7 @@ public @interface RestResource {
 	
 	/**
 	 * Supported accept media types.
-	 *
+	 * 
 	 * <p>
 	 * Overrides the media types inferred from the serializers that identify what media types can be produced by the resource.
 	 * 
@@ -886,10 +886,10 @@ public @interface RestResource {
 	
 	/**
 	 * Supported content media types.
-	 *
+	 * 
 	 * <p>
 	 * Overrides the media types inferred from the parsers that identify what media types can be consumed by the resource.
-	 *
+	 * 
 	 * <p>
 	 * Values can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -909,15 +909,15 @@ public @interface RestResource {
 	
 	/**
 	 * Provides swagger-specific metadata on this resource.
-	 *
+	 * 
 	 * <p>
 	 * Used to populate the auto-generated OPTIONS swagger documentation.
-	 *
+	 * 
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
 	 * 		path=<js>"/addressBook"</js>,
-	 *
+	 * 
 	 * 		<jc>// Swagger info.</jc>
 	 * 		swagger=<ja>@ResourceSwagger</ja>(
 	 * 			contact=<js>"{name:'John Smith',email:'john@smith.com'}"</js>,
@@ -934,15 +934,15 @@ public @interface RestResource {
 
 	/**
 	 * Optional servlet title.
-	 *
+	 * 
 	 * <p>
 	 * It is used to populate the Swagger title field.
 	 * This value can be retrieved programmatically through the {@link RestRequest#getServletTitle()} method.
-	 *
+	 * 
 	 * <p>
 	 * The default value pulls the label from the <code>label</code> entry in the servlet resource bundle.
 	 * (e.g. <js>"title = foo"</js> or <js>"MyServlet.title = foo"</js>).
-	 *
+	 * 
 	 * <p>
 	 * Value can contain any of the following variables:  
 	 * {@link ConfigFileVar $C} 
@@ -965,10 +965,10 @@ public @interface RestResource {
 	 * {@link UrlVar $U}
 	 * {@link UrlEncodeVar $UE}
 	 * {@link WidgetVar $W}
-	 *
+	 * 
 	 * <p>
 	 * Corresponds to the swagger field <code>/info/title</code>.
-	 *
+	 * 
 	 * <p>
 	 * The programmatic equivalent to this annotation is the {@link RestInfoProvider#getTitle(RestRequest)} method.
 	 */
@@ -976,7 +976,7 @@ public @interface RestResource {
 
 	/**
 	 * Configuration property:  Use classpath resource caching. 
-	 *
+	 * 
 	 * <p>
 	 * When enabled, resources retrieved via {@link RestRequest#getClasspathReaderResource(String, boolean)} (and related 
 	 * methods) will be cached in memory to speed subsequent lookups.
@@ -1000,7 +1000,7 @@ public @interface RestResource {
 	
 	/**
 	 * Use stack trace hashes.
-	 *
+	 * 
 	 * <p>
 	 * When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,
 	 * made available through the {@link RestException#getOccurrence()} method.
@@ -1014,7 +1014,7 @@ public @interface RestResource {
 	 * {@link IfVar $IF}
 	 * {@link SystemPropertiesVar $S}
 	 * {@link SwitchVar $SW}
-	 *
+	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
 	 * 	<li class='jf'>{@link RestContext#REST_useStackTraceHashes}