juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau-website] branch asf-site updated: Update Javadocs.
Date Thu, 08 Mar 2018 02:38:46 GMT
This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/juneau-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new aa64482  Update Javadocs.
aa64482 is described below

commit aa64482986852a21b946c64df47ef1618780b939
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Wed Mar 7 21:38:36 2018 -0500

    Update Javadocs.
---
 content/rest-server.html                           |   32 +-
 content/site/apidocs/allclasses-frame.html         |    4 -
 content/site/apidocs/allclasses-noframe.html       |    4 -
 content/site/apidocs/doc-files/Example_HTML.png    |  Bin 35528 -> 0 bytes
 content/site/apidocs/doc-files/Example_JSON.png    |  Bin 26954 -> 0 bytes
 .../site/apidocs/doc-files/Example_JSONSchema.png  |  Bin 34114 -> 0 bytes
 .../site/apidocs/doc-files/Example_JSONSimple.png  |  Bin 30920 -> 0 bytes
 content/site/apidocs/doc-files/Example_N3.png      |  Bin 37430 -> 0 bytes
 content/site/apidocs/doc-files/Example_NTriple.png |  Bin 48413 -> 0 bytes
 content/site/apidocs/doc-files/Example_RDFXML.png  |  Bin 30486 -> 0 bytes
 .../apidocs/doc-files/Example_RDFXMLABBREV.png     |  Bin 30356 -> 0 bytes
 content/site/apidocs/doc-files/Example_Turtle.png  |  Bin 35328 -> 0 bytes
 content/site/apidocs/doc-files/Example_XML.png     |  Bin 32865 -> 0 bytes
 .../site/apidocs/doc-files/Example_XMLSchema.png   |  Bin 45685 -> 0 bytes
 .../site/apidocs/doc-files/Example_XMLSimple.png   |  Bin 34372 -> 0 bytes
 .../site/apidocs/doc-files/HTML_DESCRIPTION.png    |  Bin 3644 -> 0 bytes
 content/site/apidocs/doc-files/HTML_LINKS.png      |  Bin 593 -> 0 bytes
 content/site/apidocs/doc-files/HTML_TITLE.png      |  Bin 2435 -> 0 bytes
 content/site/apidocs/doc-files/HtmlRender_1.png    |  Bin 60161 -> 0 bytes
 content/site/apidocs/index-all.html                |   91 +-
 .../org/apache/juneau/dto/swagger/Operation.html   |   18 +-
 .../microservice/resources/ConfigResource.html     |   52 +-
 .../resources/LogsResource.FileResource.html       |   22 +-
 .../microservice/resources/LogsResource.html       |  100 +-
 .../apache/juneau/rest/BasicRestInfoProvider.html  | 1135 +----------
 .../org/apache/juneau/rest/RestRequest.html        |    4 +-
 .../org/apache/juneau/rest/annotation/Method.html  |    4 +-
 .../juneau/rest/annotation/MethodSwagger.html      |  474 -----
 .../apache/juneau/rest/annotation/Parameter.html   |  582 ------
 .../org/apache/juneau/rest/annotation/Path.html    |    4 +-
 .../org/apache/juneau/rest/annotation/Query.html   |    4 +-
 .../juneau/rest/annotation/ResourceSwagger.html    |  613 ------
 .../apache/juneau/rest/annotation/Response.html    |  360 ----
 .../apache/juneau/rest/annotation/RestHook.html    |    4 +-
 .../apache/juneau/rest/annotation/RestMethod.html  |   44 +-
 .../juneau/rest/annotation/RestResource.html       |   32 +-
 .../juneau/rest/annotation/package-frame.html      |    4 -
 .../juneau/rest/annotation/package-summary.html    |   25 -
 .../juneau/rest/annotation/package-tree.html       |    4 -
 content/site/apidocs/overview-summary.html         |  238 +--
 content/site/apidocs/overview-tree.html            |    4 -
 .../org/apache/juneau/dto/swagger/Operation.html   |   12 +-
 .../microservice/resources/ConfigResource.html     |   68 +-
 .../resources/LogsResource.FileResource.html       |  483 ++---
 .../microservice/resources/LogsResource.html       |  483 ++---
 .../apache/juneau/rest/BasicRestInfoProvider.html  | 1990 ++++++--------------
 .../org/apache/juneau/rest/RestRequest.html        |    4 +-
 .../juneau/rest/annotation/MethodSwagger.html      |  282 ---
 .../apache/juneau/rest/annotation/Parameter.html   |  285 ---
 .../juneau/rest/annotation/ResourceSwagger.html    |  405 ----
 .../apache/juneau/rest/annotation/Response.html    |  179 --
 .../apache/juneau/rest/annotation/RestMethod.html  |   41 +-
 .../juneau/rest/annotation/RestResource.html       |  176 +-
 53 files changed, 1603 insertions(+), 6663 deletions(-)

diff --git a/content/rest-server.html b/content/rest-server.html
index a4502cd..a85bd6a 100644
--- a/content/rest-server.html
+++ b/content/rest-server.html
@@ -158,14 +158,14 @@
 		encoders=GzipEncoder.<jk>class</jk>,
 		
 		<jc>// Augment generated Swagger information.</jc>
-		swagger=<ja>@ResourceSwagger</ja>(
-			contact=<js>"{name:'John Smith',email:'john@smith.com'}"</js>,
-			license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>,
-			version=<js>"2.0"</js>,
-			termsOfService=<js>"You're on your own."</js>,
-			tags=<js>"[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}]"</js>,
-			externalDocs=<js>"{description:'Home page',url:'http://juneau.apache.org'}"</js>
-		)
+		swagger={
+			<js>"contact:{name:'John Smith',email:'john@smith.com'},"</js>,
+			<js>"license:{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'},"</js>,
+			<js>"version:'2.0',"</js>,
+			<js>"termsOfService:'You are on your own.',"</js>,
+			<js>"tags:[{name:'Java',description:'Java utility'}],"</js>,
+			<js>"externalDocs:{description:'Home page',url:'http://juneau.apache.org'}"</js>
+		}
 	)
 	<jk>public class</jk> SystemPropertiesResource <jk>extends</jk> RestServlet {
 	
@@ -175,14 +175,14 @@
 			description=<js>"Returns all system properties defined in the JVM."</js>,
 			
 			<jc>// Augment generated Swagger information.</jc>
-			swagger=<ja>@MethodSwagger</ja>(
-				parameters={
-					<ja>@Parameter</ja>(in=<js>"query"</js>, name=<js>"sort"</js>, description=<js>"Sort results alphabetically."</js>, _default=<js>"false"</js>)
-				},
-				responses={
-					<ja>@Response</ja>(value=200, description=<js>"Returns a map of key/value pairs."</js>)
-				}
-			)
+			swagger={
+				<js>"parameters:["</js>,
+					<js>"{name:'sort',in:'query',description:'Sort results alphabetically',default:'false'}"</js>,
+				<js>"],"</js>,
+				<js>"responses:{"</js>,
+					<js>"200: {description:'Returns a map of key/value pairs.'}"</js>,
+				<js>"}"</js>
+			}
 		)
 		<jk>public</jk> Map getSystemProperties(<ja>@Query</ja>(<js>"sort"</js>) <jk>boolean</jk> sort) <jk>throws</jk> Throwable {
 			<jk>if</jk> (sort)
diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index b9e6229..ee03060 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -445,7 +445,6 @@
 <li><a href="org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils" target="classFrame">MetadataMap</a></li>
 <li><a href="org/apache/juneau/dto/html5/Meter.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Meter</a></li>
 <li><a href="org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Method</a></li>
-<li><a href="org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">MethodSwagger</a></li>
 <li><a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice" target="classFrame">Microservice</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackInputStream.html" title="class in org.apache.juneau.msgpack" target="classFrame">MsgPackInputStream</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackOutputStream.html" title="class in org.apache.juneau.msgpack" target="classFrame">MsgPackOutputStream</a></li>
@@ -485,7 +484,6 @@
 <li><a href="org/apache/juneau/dto/html5/P.html" title="class in org.apache.juneau.dto.html5" target="classFrame">P</a></li>
 <li><a href="org/apache/juneau/internal/Pair.html" title="class in org.apache.juneau.internal" target="classFrame">Pair</a></li>
 <li><a href="org/apache/juneau/dto/html5/Param.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Param</a></li>
-<li><a href="org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Parameter</a></li>
 <li><a href="org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">ParameterInfo</a></li>
 <li><a href="org/apache/juneau/uon/ParamFormat.html" title="enum in org.apache.juneau.uon" target="classFrame">ParamFormat</a></li>
 <li><a href="org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation" target="classFrame">ParentProperty</a></li>
@@ -608,8 +606,6 @@
 <li><a href="org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars" target="classFrame">RequestVar</a></li>
 <li><a href="org/apache/juneau/svl/ResolvingObjectMap.html" title="class in org.apache.juneau.svl" target="classFrame">ResolvingObjectMap</a></li>
 <li><a href="org/apache/juneau/rest/labels/ResourceDescription.html" title="class in org.apache.juneau.rest.labels" target="classFrame">ResourceDescription</a></li>
-<li><a href="org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">ResourceSwagger</a></li>
-<li><a href="org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Response</a></li>
 <li><a href="org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest" target="classFrame"><span class="interfaceName">ResponseHandler</span></a></li>
 <li><a href="org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger" target="classFrame">ResponseInfo</a></li>
 <li><a href="org/apache/juneau/rest/client/ResponsePattern.html" title="class in org.apache.juneau.rest.client" target="classFrame">ResponsePattern</a></li>
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index e4d2d02..30c25c5 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -445,7 +445,6 @@
 <li><a href="org/apache/juneau/utils/MetadataMap.html" title="class in org.apache.juneau.utils">MetadataMap</a></li>
 <li><a href="org/apache/juneau/dto/html5/Meter.html" title="class in org.apache.juneau.dto.html5">Meter</a></li>
 <li><a href="org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation">Method</a></li>
-<li><a href="org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation">MethodSwagger</a></li>
 <li><a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice">Microservice</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackInputStream.html" title="class in org.apache.juneau.msgpack">MsgPackInputStream</a></li>
 <li><a href="org/apache/juneau/msgpack/MsgPackOutputStream.html" title="class in org.apache.juneau.msgpack">MsgPackOutputStream</a></li>
@@ -485,7 +484,6 @@
 <li><a href="org/apache/juneau/dto/html5/P.html" title="class in org.apache.juneau.dto.html5">P</a></li>
 <li><a href="org/apache/juneau/internal/Pair.html" title="class in org.apache.juneau.internal">Pair</a></li>
 <li><a href="org/apache/juneau/dto/html5/Param.html" title="class in org.apache.juneau.dto.html5">Param</a></li>
-<li><a href="org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a></li>
 <li><a href="org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a></li>
 <li><a href="org/apache/juneau/uon/ParamFormat.html" title="enum in org.apache.juneau.uon">ParamFormat</a></li>
 <li><a href="org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation">ParentProperty</a></li>
@@ -608,8 +606,6 @@
 <li><a href="org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars">RequestVar</a></li>
 <li><a href="org/apache/juneau/svl/ResolvingObjectMap.html" title="class in org.apache.juneau.svl">ResolvingObjectMap</a></li>
 <li><a href="org/apache/juneau/rest/labels/ResourceDescription.html" title="class in org.apache.juneau.rest.labels">ResourceDescription</a></li>
-<li><a href="org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a></li>
-<li><a href="org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">Response</a></li>
 <li><a href="org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest"><span class="interfaceName">ResponseHandler</span></a></li>
 <li><a href="org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a></li>
 <li><a href="org/apache/juneau/rest/client/ResponsePattern.html" title="class in org.apache.juneau.rest.client">ResponsePattern</a></li>
diff --git a/content/site/apidocs/doc-files/Example_HTML.png b/content/site/apidocs/doc-files/Example_HTML.png
deleted file mode 100644
index b4a3576..0000000
Binary files a/content/site/apidocs/doc-files/Example_HTML.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_JSON.png b/content/site/apidocs/doc-files/Example_JSON.png
deleted file mode 100644
index 13b5c22..0000000
Binary files a/content/site/apidocs/doc-files/Example_JSON.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_JSONSchema.png b/content/site/apidocs/doc-files/Example_JSONSchema.png
deleted file mode 100644
index bf1cdc6..0000000
Binary files a/content/site/apidocs/doc-files/Example_JSONSchema.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_JSONSimple.png b/content/site/apidocs/doc-files/Example_JSONSimple.png
deleted file mode 100644
index 935e8a9..0000000
Binary files a/content/site/apidocs/doc-files/Example_JSONSimple.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_N3.png b/content/site/apidocs/doc-files/Example_N3.png
deleted file mode 100644
index 16613a4..0000000
Binary files a/content/site/apidocs/doc-files/Example_N3.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_NTriple.png b/content/site/apidocs/doc-files/Example_NTriple.png
deleted file mode 100644
index 9da3ffa..0000000
Binary files a/content/site/apidocs/doc-files/Example_NTriple.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_RDFXML.png b/content/site/apidocs/doc-files/Example_RDFXML.png
deleted file mode 100644
index 13f2b43..0000000
Binary files a/content/site/apidocs/doc-files/Example_RDFXML.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_RDFXMLABBREV.png b/content/site/apidocs/doc-files/Example_RDFXMLABBREV.png
deleted file mode 100644
index e1ffa09..0000000
Binary files a/content/site/apidocs/doc-files/Example_RDFXMLABBREV.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_Turtle.png b/content/site/apidocs/doc-files/Example_Turtle.png
deleted file mode 100644
index 0fd2b36..0000000
Binary files a/content/site/apidocs/doc-files/Example_Turtle.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_XML.png b/content/site/apidocs/doc-files/Example_XML.png
deleted file mode 100644
index bfced84..0000000
Binary files a/content/site/apidocs/doc-files/Example_XML.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_XMLSchema.png b/content/site/apidocs/doc-files/Example_XMLSchema.png
deleted file mode 100644
index 8a64e89..0000000
Binary files a/content/site/apidocs/doc-files/Example_XMLSchema.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/Example_XMLSimple.png b/content/site/apidocs/doc-files/Example_XMLSimple.png
deleted file mode 100644
index 7acba29..0000000
Binary files a/content/site/apidocs/doc-files/Example_XMLSimple.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/HTML_DESCRIPTION.png b/content/site/apidocs/doc-files/HTML_DESCRIPTION.png
deleted file mode 100644
index 621721b..0000000
Binary files a/content/site/apidocs/doc-files/HTML_DESCRIPTION.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/HTML_LINKS.png b/content/site/apidocs/doc-files/HTML_LINKS.png
deleted file mode 100644
index 3c07fe6..0000000
Binary files a/content/site/apidocs/doc-files/HTML_LINKS.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/HTML_TITLE.png b/content/site/apidocs/doc-files/HTML_TITLE.png
deleted file mode 100644
index 5365735..0000000
Binary files a/content/site/apidocs/doc-files/HTML_TITLE.png and /dev/null differ
diff --git a/content/site/apidocs/doc-files/HtmlRender_1.png b/content/site/apidocs/doc-files/HtmlRender_1.png
deleted file mode 100644
index f070aea..0000000
Binary files a/content/site/apidocs/doc-files/HtmlRender_1.png and /dev/null differ
diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html
index a2e3ee7..f5d9257 100644
--- a/content/site/apidocs/index-all.html
+++ b/content/site/apidocs/index-all.html
@@ -659,7 +659,7 @@
 <dd>
 <div class="block">Bean property appender:  <property>required</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#addResponses-java.util.Map-">addResponses(Map&lt;Integer, ResponseInfo&gt;)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#addResponses-java.util.Map-">addResponses(Map&lt;String, ResponseInfo&gt;)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
 <dd>
 <div class="block">Adds one or more values to the <property>responses</property> property.</div>
 </dd>
@@ -10818,10 +10818,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>consumes</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getConsumes-org.apache.juneau.rest.RestRequest-">getConsumes(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the supported <code>Content-Type</code> request headers for the REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.html#getConsumes--">getConsumes()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a></dt>
 <dd>
 <div class="block">Returns the explicit list of supported content types for this resource.</div>
@@ -10834,10 +10830,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>contact</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getContact-org.apache.juneau.rest.RestRequest-">getContact(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized contact information of this REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/atom/Entry.html#getContent--">getContent()</a></span> - Method in class org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a></dt>
 <dd>
 <div class="block">Returns the content of this entry.</div>
@@ -11282,10 +11274,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>externalDocs</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getExternalDocs-org.apache.juneau.rest.RestRequest-">getExternalDocs(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the version information of this REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/SwaggerElement.html#getExtraProperties--">getExtraProperties()</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/SwaggerElement.html" title="class in org.apache.juneau.dto.swagger">SwaggerElement</a></dt>
 <dd>
 <div class="block">The map used to store 'extra' properties on the swagger element.</div>
@@ -11880,10 +11868,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>license</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getLicense-org.apache.juneau.rest.RestRequest-">getLicense(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized license information of this REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/SearchArgs.html#getLimit--">getLimit()</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></dt>
 <dd>
 <div class="block">The number of rows to return.</div>
@@ -12284,10 +12268,6 @@
 <dd>
 <div class="block">Returns the specified annotation on the specified method.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodConsumes-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodConsumes(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the supported <code>Content-Type</code> types the specified Java method.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodDescription-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodDescription(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
 <dd>
 <div class="block">Returns the localized description of the specified java method on this servlet.</div>
@@ -12300,10 +12280,6 @@
 <dd>
 <div class="block">Returns the localized method description.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodExternalDocs-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodExternalDocs(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized external documentation of the specified java method on this servlet.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/ClassUtils.html#getMethodInfo-java.lang.reflect.Method-">getMethodInfo(Method)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/ClassUtils.html" title="class in org.apache.juneau.internal">ClassUtils</a></dt>
 <dd>
 <div class="block">Returns a <a href="org/apache/juneau/internal/ClassUtils.MethodInfo.html" title="class in org.apache.juneau.internal"><code>ClassUtils.MethodInfo</code></a> bean that describes the specified method.</div>
@@ -12316,28 +12292,12 @@
 <dd>
 <div class="block">Returns the metadata about the specified method on this interface proxy.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodOperationId-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodOperationId(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized operation ID of the specified java method.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodParameters-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodParameters(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized parameter info for the specified java method.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodProduces-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodProduces(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the supported <code>Accept</code> types the specified Java method.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/jaxrs/BaseProvider.html#getMethodProperties-java.lang.annotation.Annotation:A-">getMethodProperties(Annotation[])</a></span> - Method in class org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs">BaseProvider</a></dt>
 <dd>
 <div class="block">Returns properties defined on the specified method through the <a href="org/apache/juneau/rest/annotation/RestMethod.html#properties--"><code>@RestMethod.properties()</code></a>
  annotation specified on the method and the <a href="org/apache/juneau/rest/jaxrs/JuneauProvider.html#properties--"><code>JuneauProvider.properties()</code></a> annotation specified on the 
  provider class.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodResponses-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodResponses(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized response info for the specified java method.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/ClassUtils.html#getMethodSignature-java.lang.reflect.Method-">getMethodSignature(Method)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/ClassUtils.html" title="class in org.apache.juneau.internal">ClassUtils</a></dt>
 <dd>
 <div class="block">Returns the signature of the specified method.</div>
@@ -12354,10 +12314,6 @@
 <dd>
 <div class="block">Returns the localized method summary.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodTags-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodTags(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized Swagger tags for this Java method.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/dto/jsonschema/Schema.html#getMinimum--">getMinimum()</a></span> - Method in class org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/Schema.html" title="class in org.apache.juneau.dto.jsonschema">Schema</a></dt>
 <dd>
 <div class="block">Bean property getter:  <property>minimum</property>.</div>
@@ -12981,10 +12937,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>produces</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getProduces-org.apache.juneau.rest.RestRequest-">getProduces(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the supported <code>Accept</code> request headers for the REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestContext.html#getProduces--">getProduces()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a></dt>
 <dd>
 <div class="block">Returns the explicit list of supported accept types for this resource.</div>
@@ -13938,10 +13890,6 @@
 <dd>
 <div class="block">Returns the localized swagger associated with the resource.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getSwaggerFromFile-org.apache.juneau.rest.RestRequest-">getSwaggerFromFile(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the localized Swagger from the file system.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass()</a></span> - Method in class org.apache.juneau.transform.<a href="org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a></dt>
 <dd>
 <div class="block">Returns the G class, the generalized form of the class.</div>
@@ -13969,10 +13917,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>tags</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getTags-org.apache.juneau.rest.RestRequest-">getTags(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the version information of this REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#getTE--">getTE()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
 <dd>
 <div class="block">Returns the <code>TE</code> header on the request.</div>
@@ -13987,10 +13931,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>termsOfService</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getTermsOfService-org.apache.juneau.rest.RestRequest-">getTermsOfService(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the terms-of-service information of this REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanMeta.html#getterProps">getterProps</a></span> - Variable in class org.apache.juneau.<a href="org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a></dt>
 <dd>
 <div class="block">The getter properties on the target class.</div>
@@ -14333,10 +14273,6 @@
 <dd>
 <div class="block">Bean property getter:  <property>version</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getVersion-org.apache.juneau.rest.RestRequest-">getVersion(RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns the version information of this REST resource.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlReader.html#getVersion--">getVersion()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlReader.html" title="class in org.apache.juneau.xml">XmlReader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#getVia--">getVia()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
@@ -17265,10 +17201,6 @@
 <div class="block">Returns <jk>true</jk> if this class implements <a href="org/apache/juneau/Delegate.html" title="interface in org.apache.juneau"><code>Delegate</code></a>, meaning it's a representation of some other
  object.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#isDeprecated-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">isDeprecated(Method, RestRequest)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest">BasicRestInfoProvider</a></dt>
-<dd>
-<div class="block">Returns whether the specified method is deprecated</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/SerializerSession.html#isDetectRecursions--">isDetectRecursions()</a></span> - Method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a></dt>
 <dd>
 <div class="block">Returns the <a href="org/apache/juneau/serializer/Serializer.html#SERIALIZER_detectRecursions"><code>Serializer.SERIALIZER_detectRecursions</code></a> setting value for this session.</div>
@@ -19353,10 +19285,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/Setter.MethodSetter.html#MethodSetter-java.lang.reflect.Method-">MethodSetter(Method)</a></span> - Constructor for class org.apache.juneau.<a href="org/apache/juneau/Setter.MethodSetter.html" title="class in org.apache.juneau">Setter.MethodSetter</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">MethodSwagger</span></a> - Annotation Type in <a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></dt>
-<dd>
-<div class="block">Extended annotation for <a href="org/apache/juneau/rest/annotation/RestMethod.html#swagger--"><code>RestMethod.swagger()</code></a>.</div>
-</dd>
 <dt><a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">Microservice</span></a> - Class in <a href="org/apache/juneau/microservice/package-summary.html">org.apache.juneau.microservice</a></dt>
 <dd>
 <div class="block">Parent class for all microservices.</div>
@@ -21628,11 +21556,6 @@
 <dd>
 <div class="block">Adds a single value to the <property>parameter</property> property.</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Parameter</span></a> - Annotation Type in <a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></dt>
-<dd>
-<div class="block">Annotation used in conjunction with <a href="org/apache/juneau/rest/annotation/MethodSwagger.html#parameters--"><code>@MethodSwagger.parameters()</code></a> to identify 
- content and header descriptions on specific method requests.</div>
-</dd>
 <dt><a href="org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger"><span class="typeNameLink">ParameterInfo</span></a> - Class in <a href="org/apache/juneau/dto/swagger/package-summary.html">org.apache.juneau.dto.swagger</a></dt>
 <dd>
 <div class="block">Describes a single operation parameter.</div>
@@ -24296,11 +24219,7 @@
 <dd>
 <div class="block">REST resource resolver.</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">ResourceSwagger</span></a> - Annotation Type in <a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></dt>
-<dd>
-<div class="block">Extended annotation for <a href="org/apache/juneau/rest/annotation/RestResource.html#swagger--"><code>@RestResource.swagger()</code></a>.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#response-java.lang.Integer-org.apache.juneau.dto.swagger.ResponseInfo-">response(Integer, ResponseInfo)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#response-java.lang.String-org.apache.juneau.dto.swagger.ResponseInfo-">response(String, ResponseInfo)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
 <dd>
 <div class="block">Adds a single value to the <property>responses</property> property.</div>
 </dd>
@@ -24308,10 +24227,6 @@
 <dd>
 <div class="block">Adds a single value to the <property>responses</property> property.</div>
 </dd>
-<dt><a href="org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Response</span></a> - Annotation Type in <a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></dt>
-<dd>
-<div class="block">Annotation used in conjunction with <a href="org/apache/juneau/rest/annotation/MethodSwagger.html#responses--"><code>@MethodSwagger.responses()</code></a> to identify possible responses by the method.</div>
-</dd>
 <dt><a href="org/apache/juneau/rest/ResponseHandler.html" title="interface in org.apache.juneau.rest"><span class="typeNameLink">ResponseHandler</span></a> - Interface in <a href="org/apache/juneau/rest/package-summary.html">org.apache.juneau.rest</a></dt>
 <dd>
 <div class="block">Defines the interface for handlers that convert POJOs to appropriate HTTP responses.</div>
@@ -26847,7 +26762,7 @@
 <dd>
 <div class="block">Bean property setter:  <property>required</property>.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#setResponses-java.util.Map-">setResponses(Map&lt;Integer, ResponseInfo&gt;)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/swagger/Operation.html#setResponses-java.util.Map-">setResponses(Map&lt;String, ResponseInfo&gt;)</a></span> - Method in class org.apache.juneau.dto.swagger.<a href="org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></dt>
 <dd>
 <div class="block">Bean property setter:  <property>responses</property>.</div>
 </dd>
diff --git a/content/site/apidocs/org/apache/juneau/dto/swagger/Operation.html b/content/site/apidocs/org/apache/juneau/dto/swagger/Operation.html
index e75dc7e..e8092e9 100644
--- a/content/site/apidocs/org/apache/juneau/dto/swagger/Operation.html
+++ b/content/site/apidocs/org/apache/juneau/dto/swagger/Operation.html
@@ -275,7 +275,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html#addResponses-java.util.Map-">addResponses</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../../org/apache [...]
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html#addResponses-java.util.Map-">addResponses</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/j [...]
 <div class="block">Adds one or more values to the <property>responses</property> property.</div>
 </td>
 </tr>
@@ -371,7 +371,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 </td>
 </tr>
 <tr id="i19" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&gt;</code></td>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html#getResponses--">getResponses</a></span>()</code>
 <div class="block">Bean property getter:  <property>responses</property>.</div>
 </td>
@@ -420,7 +420,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 </tr>
 <tr id="i27" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html#response-java.lang.Integer-org.apache.juneau.dto.swagger.ResponseInfo-">response</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;statusCode,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html#response-java.lang.String-org.apache.juneau.dto.swagger.ResponseInfo-">response</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;statusCode,
         <a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&nbsp;response)</code>
 <div class="block">Adds a single value to the <property>responses</property> property.</div>
 </td>
@@ -501,7 +501,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 </tr>
 <tr id="i40" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html#setResponses-java.util.Map-">setResponses</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../../org/apache [...]
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/dto/swagger/Operation.html#setResponses-java.util.Map-">setResponses</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/j [...]
 <div class="block">Bean property setter:  <property>responses</property>.</div>
 </td>
 </tr>
@@ -1263,7 +1263,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>getResponses</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/june [...]
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/juneau [...]
 <div class="block">Bean property getter:  <property>responses</property>.
  
  <p>
@@ -1280,7 +1280,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>setResponses</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/dto/swagger/Operation.html#line.715">setResponses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title [...]
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/dto/swagger/Operation.html#line.715">setResponses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title= [...]
 <div class="block">Bean property setter:  <property>responses</property>.
  
  <p>
@@ -1300,7 +1300,7 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>addResponses</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/dto/swagger/Operation.html#line.731">addResponses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title [...]
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/dto/swagger/Operation.html#line.731">addResponses</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title= [...]
 <div class="block">Adds one or more values to the <property>responses</property> property.
  
  <p>
@@ -1314,13 +1314,13 @@ extends <a href="../../../../../org/apache/juneau/dto/swagger/SwaggerElement.htm
 </dl>
 </li>
 </ul>
-<a name="response-java.lang.Integer-org.apache.juneau.dto.swagger.ResponseInfo-">
+<a name="response-java.lang.String-org.apache.juneau.dto.swagger.ResponseInfo-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>response</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/dto/swagger/Operation.html#line.743">response</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;statusCode,
+<pre>public&nbsp;<a href="../../../../../org/apache/juneau/dto/swagger/Operation.html" title="class in org.apache.juneau.dto.swagger">Operation</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/dto/swagger/Operation.html#line.743">response</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;statusCode,
                           <a href="../../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&nbsp;response)</pre>
 <div class="block">Adds a single value to the <property>responses</property> property.</div>
 <dl>
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
index 1b1a24c..f4282c7 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/ConfigResource.html
@@ -348,10 +348,10 @@ public&nbsp;<a href="../../../../../org/apache/juneau/dto/html5/Form.html" title
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Show config file section.",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"parameters:[","{name:\'section\',in:\'path\',description:\'Section name.\'}","]"})
 public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.95">getConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
-                                                                                                                                                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section)
-                                                                                                                                                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+                                                                                                                                                                                                                                                       <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section)
+                                                                                                                                                                                                                                                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[GET /{section}] - Show config file section.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -372,12 +372,12 @@ public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="cla
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}/{key}",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Show config file entry.",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"parameters:[","{name:\'section\',in:\'path\',description:\'Section name.\'},","{name:\'key\',in:\'path\',description:\'Entry name.\'}","]"})
 public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.116">getConfigEntry</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--" [...]
-                                                                                                                                                                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
-                                                                                                                                                                   <a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="key")
-                                                                                                                                                                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)
-                                                                                                                                                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+                                                                                                                                                                                                                                                                                                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
+                                                                                                                                                                                                                                                                                                                <a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annota [...]
+                                                                                                                                                                                                                                                                                                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)
+                                                                                                                                                                                                                                                                                                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[GET /{section}/{key}] - Show config file entry.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -399,10 +399,10 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="POST",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Sets contents of config file from a FORM post.",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"parameters:[","{name:\'contents\',in:\'formData\',description:\'New contents in INI file format.\'}","]"})
 public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.135">setConfigContentsFormPost</a>(<a href="../../../../../org/apache/juneau/rest/annotation/FormData.html" title="annotation in org.apache.juneau.rest.annotation">@FormData</a>(<a href="../../../../../org/apache/juneau/rest/annotation/FormData.html#value--">value</a>= [...]
-                                                                                                                                                                                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;contents)
-                                                                                                                                                                                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+                                                                                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;contents)
+                                                                                                                                                                                                                                                                                              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[POST /] - Sets contents of config file from a FORM post.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -423,10 +423,10 @@ public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="cla
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="PUT",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Sets contents of config file.",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"parameters:[","{in:\'body\',description:\'New contents in INI file format.\'}","]"})
 public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.154">setConfigContents</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation">@Body</a>
-                                                                                                                                                                <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;contents)
-                                                                                                                                                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+                                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;contents)
+                                                                                                                                                                                                                                              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[PUT /] - Sets contents of config file.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -447,12 +447,12 @@ public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="cla
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="PUT",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Add or overwrite a config file section.",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"parameters:[","{name:\'section\',in:\'path\',description:\'Section name.\'}","{in:\'body\',description:\'New contents for section as a simple map with string keys and values.\'}","]"})
 public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.175">setConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="section")
-                                                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
-                                                                                                                                                                                  <a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation">@Body</a>
-                                                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/jav [...]
-                                                                                                                                                                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+                                                                                                                                                                                                                                                                                                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang" [...]
+                                                                                                                                                                                                                                                                                                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation">@Body</a>
+                                                                                                                                                                                                                                                                                                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Ma [...]
+                                                                                                                                                                                                                                                                                                                                                                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.la [...]
 <div class="block">[PUT /{section}] - Add or overwrite a config file section.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -474,14 +474,14 @@ public&nbsp;<a href="../../../../../org/apache/juneau/ObjectMap.html" title="cla
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="PUT",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{section}/{key}",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#description--">description</a>="Add or overwrite a config file entry.",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"parameters:[","{name:\'section\',in:\'path\',description:\'Section name.\'}","{name:\'key\',in:\'path\',description:\'Entry name.\'}","{in:\'body\',description:\'New value as a string.\'}","]"})
 public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/ConfigResource.html#line.199">setConfigSection</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value- [...]
-                                                                                                                                                                                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;section,
-                                                                                                                                                                                   <a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="key")
-                                                                                                                                                                                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key,
-                                                                                                                                                                                   <a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation">@Body</a>
-                                                                                                                                                                                   <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)
-                                                                                                                                                                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+                                                                                                                                                                                                                                                                                                                                                                                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in [...]
+                                                                                                                                                                                                                                                                                                                                                                                      <a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annot [...]
+                                                                                                                                                                                                                                                                                                                                                                                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in [...]
+                                                                                                                                                                                                                                                                                                                                                                                      <a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annot [...]
+                                                                                                                                                                                                                                                                                                                                                                                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in [...]
+                                                                                                                                                                                                                                                                                                                                                                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface [...]
 <div class="block">[PUT /{section}/{key}] - Add or overwrite a config file entry.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
index 8317ac8..a94ac68 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
@@ -106,7 +106,7 @@
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.290">LogsResource.FileResource</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.305">LogsResource.FileResource</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">File bean.</div>
 </li>
@@ -217,7 +217,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>type</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.292">type</a></pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.307">type</a></pre>
 </li>
 </ul>
 <a name="name">
@@ -226,7 +226,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>name</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.293">name</a></pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.308">name</a></pre>
 </li>
 </ul>
 <a name="size">
@@ -235,7 +235,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>size</h4>
-<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.294">size</a></pre>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.309">size</a></pre>
 </li>
 </ul>
 <a name="lastModified">
@@ -245,7 +245,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <li class="blockList">
 <h4>lastModified</h4>
 <pre><a href="../../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation">@Swap</a>(<a href="../../../../../org/apache/juneau/annotation/Swap.html#value--">value</a>=<a href="../../../../../org/apache/juneau/transforms/DateSwap.DateTimeMedium.html" title="class in org.apache.juneau.transforms">DateSwap.DateTimeMedium.class</a>)
-public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.295">lastModified</a></pre>
+public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.310">lastModified</a></pre>
 </li>
 </ul>
 <a name="view">
@@ -254,7 +254,7 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>view</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.296">view</a></pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.311">view</a></pre>
 </li>
 </ul>
 <a name="highlighted">
@@ -263,7 +263,7 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>highlighted</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.296">highlighted</a></pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.311">highlighted</a></pre>
 </li>
 </ul>
 <a name="parsed">
@@ -272,7 +272,7 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>parsed</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.296">parsed</a></pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.311">parsed</a></pre>
 </li>
 </ul>
 <a name="download">
@@ -281,7 +281,7 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>download</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.296">download</a></pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.311">download</a></pre>
 </li>
 </ul>
 <a name="delete">
@@ -290,7 +290,7 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
 <ul class="blockListLast">
 <li class="blockList">
 <h4>delete</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.296">delete</a></pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.311">delete</a></pre>
 </li>
 </ul>
 </li>
@@ -307,7 +307,7 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.htm
 <ul class="blockListLast">
 <li class="blockList">
 <h4>FileResource</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.298">FileResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;f,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html#line.313">FileResource</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;f,
                     <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a>&nbsp;uri)
              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
diff --git a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html
index a928347..fa05f91 100644
--- a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html
+++ b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.html
@@ -349,13 +349,13 @@ public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microse
 <h4>getFileOrDirectory</h4>
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="GET",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
-public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.98">getFileOrDirectory</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
-                                                                                                      <a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a>&nbsp;res,
-                                                                                                      <a href="../../../../../org/apache/juneau/rest/RequestProperties.html" title="class in org.apache.juneau.rest">RequestProperties</a>&nbsp;properties,
-                                                                                                      <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
-                                                                                                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
-                                                                                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"responses:{","200: {description:\'OK\'},","404: {description:\'Not Found\'}","}"})
+public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.101">getFileOrDirectory</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
+                                                                                                                                                                                         <a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a>&nbsp;res,
+                                                                                                                                                                                         <a href="../../../../../org/apache/juneau/rest/RequestProperties.html" title="class in org.apache.juneau.rest">RequestProperties</a>&nbsp;properties,
+                                                                                                                                                                                         <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
+                                                                                                                                                                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
+                                                                                                                                                                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[GET /*] - Get file details or directory listing.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -378,25 +378,25 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.h
 <h4>viewFile</h4>
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="VIEW",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
-public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.139">viewFile</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a>&nbsp;res,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
-                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/RequestProperties.html" title="class in org.apache.juneau.rest">RequestProperties</a>&nbsp;properties,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="highlight")
-                                                                                           boolean&nbsp;highlight,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="start")
-                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;start,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="end")
-                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;end,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="thread")
-                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;thread,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="loggers")
-                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;loggers,
-                                                                                           <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="severity")
-                                                                                           <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;severity)
-                                                                                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"responses:{","200: {description:\'OK\'},","404: {description:\'Not Found\'}","}"})
+public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.145">viewFile</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a>&nbsp;res,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
+                                                                                                                                                                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/RequestProperties.html" title="class in org.apache.juneau.rest">RequestProperties</a>&nbsp;properties,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="highlight")
+                                                                                                                                                                              boolean&nbsp;highlight,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="start")
+                                                                                                                                                                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;start,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="end")
+                                                                                                                                                                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;end,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="thread")
+                                                                                                                                                                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;thread,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="loggers")
+                                                                                                                                                                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;loggers,
+                                                                                                                                                                              <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="severity")
+                                                                                                                                                                              <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;severity)
+                                                                                                                                                                       throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[VIEW /*] - Retrieve the contents of a log file.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -424,21 +424,21 @@ public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/juneau/microse
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="PARSE",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#converters--">converters</a>=<a href="../../../../../org/apache/juneau/rest/converters/Queryable.html" title="class in org.apache.juneau.rest.converters">Queryable.class</a>,
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
-public&nbsp;<a href="../../../../../org/apache/juneau/microservice/resources/LogParser.html" title="class in org.apache.juneau.microservice.resources">LogParser</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.207">viewParsedEntries</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
-                                                                                                                                                  <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
-                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
-                                                                                                                                                  <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="start")
-                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;start,
-                                                                                                                                                  <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="end")
-                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;end,
-                                                                                                                                                  <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="thread")
-                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;thread,
-                                                                                                                                                  <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="loggers")
-                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;loggers,
-                                                                                                                                                  <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="severity")
-                                                                                                                                                  <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;severity)
-                                                                                                                                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"responses:{","200: {description:\'OK\'},","404: {description:\'Not Found\'}","}"})
+public&nbsp;<a href="../../../../../org/apache/juneau/microservice/resources/LogParser.html" title="class in org.apache.juneau.microservice.resources">LogParser</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.216">viewParsedEntries</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
+                                                                                                                                                                                                                                     <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
+                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path,
+                                                                                                                                                                                                                                     <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="start")
+                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;start,
+                                                                                                                                                                                                                                     <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="end")
+                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;end,
+                                                                                                                                                                                                                                     <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="thread")
+                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;thread,
+                                                                                                                                                                                                                                     <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="loggers")
+                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;loggers,
+                                                                                                                                                                                                                                     <a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation">@Query</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Query.html#value--">value</a>="severity")
+                                                                                                                                                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;severity)
+                                                                                                                                                                                                                              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[VIEW /*] - Retrieve the contents of a log file as parsed entries.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -464,11 +464,11 @@ public&nbsp;<a href="../../../../../org/apache/juneau/microservice/resources/Log
 <h4>downloadFile</h4>
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="DOWNLOAD",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
-public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.233">downloadFile</a>(<a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a>&nbsp;res,
-                                                                                                     <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
-                                                                                                     <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
-                                                                                              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"responses:{","200: {description:\'OK\'},","404: {description:\'Not Found\'}","}"})
+public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.245">downloadFile</a>(<a href="../../../../../org/apache/juneau/rest/RestResponse.html" title="class in org.apache.juneau.rest">RestResponse</a>&nbsp;res,
+                                                                                                                                                                                        <a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
+                                                                                                                                                                                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
+                                                                                                                                                                                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[DOWNLOAD /*] - Download file.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -489,10 +489,10 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.h
 <h4>deleteFile</h4>
 <pre><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation">@RestMethod</a>(<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#name--">name</a>="DELETE",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/*",
-            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>=)
-public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.259">deleteFile</a>(<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
-                                                                                                 <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
-                                                                                          throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a>={"responses:{","200: {description:\'OK\'},","404: {description:\'Not Found\'}","}"})
+public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/microservice/resources/LogsResource.html#line.274">deleteFile</a>(<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation">@PathRemainder</a>
+                                                                                                                                                                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;path)
+                                                                                                                                                                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">[DELETE /*] - Delete a file.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/content/site/apidocs/org/apache/juneau/rest/BasicRestInfoProvider.html b/content/site/apidocs/org/apache/juneau/rest/BasicRestInfoProvider.html
index 972a68a..91e7cab 100644
--- a/content/site/apidocs/org/apache/juneau/rest/BasicRestInfoProvider.html
+++ b/content/site/apidocs/org/apache/juneau/rest/BasicRestInfoProvider.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.43">BasicRestInfoProvider</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.44">BasicRestInfoProvider</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a></pre>
 <div class="block">Default implementation of <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest"><code>RestInfoProvider</code></a>.
@@ -178,153 +178,43 @@ implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" ti
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getConsumes-org.apache.juneau.rest.RestRequest-">getConsumes</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the supported <code>Content-Type</code> request headers for the REST resource.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/dto/swagger/Contact.html" title="class in org.apache.juneau.dto.swagger">Contact</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getContact-org.apache.juneau.rest.RestRequest-">getContact</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized contact information of this REST resource.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getDescription-org.apache.juneau.rest.RestRequest-">getDescription</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
 <div class="block">Returns the localized description of this REST resource.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getExternalDocs-org.apache.juneau.rest.RestRequest-">getExternalDocs</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the version information of this REST resource.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/dto/swagger/License.html" title="class in org.apache.juneau.dto.swagger">License</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getLicense-org.apache.juneau.rest.RestRequest-">getLicense</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized license information of this REST resource.</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodConsumes-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodConsumes</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                 <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the supported <code>Content-Type</code> types the specified Java method.</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodDescription-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodDescription</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
                     <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
 <div class="block">Returns the localized description of the specified java method on this servlet.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodExternalDocs-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodExternalDocs</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                     <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized external documentation of the specified java method on this servlet.</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodOperationId-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodOperationId</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                    <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized operation ID of the specified java method.</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodParameters-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodParameters</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                   <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized parameter info for the specified java method.</div>
-</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodProduces-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodProduces</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                 <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the supported <code>Accept</code> types the specified Java method.</div>
-</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodResponses-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodResponses</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                  <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized response info for the specified java method.</div>
-</td>
-</tr>
-<tr id="i12" class="altColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodSummary-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodSummary</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
                 <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
 <div class="block">Returns the localized summary of the specified java method on this servlet.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodTags-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">getMethodTags</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-             <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized Swagger tags for this Java method.</div>
-</td>
-</tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getProduces-org.apache.juneau.rest.RestRequest-">getProduces</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the supported <code>Accept</code> request headers for the REST resource.</div>
-</td>
-</tr>
-<tr id="i15" class="rowColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getSiteName-org.apache.juneau.rest.RestRequest-">getSiteName</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
 <div class="block">Returns the localized site name of this REST resource.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getSwagger-org.apache.juneau.rest.RestRequest-">getSwagger</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
 <div class="block">Returns the localized swagger for this REST resource.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getSwaggerFromFile-org.apache.juneau.rest.RestRequest-">getSwaggerFromFile</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the localized Swagger from the file system.</div>
-</td>
-</tr>
-<tr id="i18" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getTags-org.apache.juneau.rest.RestRequest-">getTags</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the version information of this REST resource.</div>
-</td>
-</tr>
-<tr id="i19" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getTermsOfService-org.apache.juneau.rest.RestRequest-">getTermsOfService</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the terms-of-service information of this REST resource.</div>
-</td>
-</tr>
-<tr id="i20" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getTitle-org.apache.juneau.rest.RestRequest-">getTitle</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
 <div class="block">Returns the localized title of this REST resource.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getVersion-org.apache.juneau.rest.RestRequest-">getVersion</a></span>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns the version information of this REST resource.</div>
-</td>
-</tr>
-<tr id="i22" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#isDeprecated-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">isDeprecated</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-            <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)</code>
-<div class="block">Returns whether the specified method is deprecated</div>
-</td>
-</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -353,7 +243,7 @@ implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>BasicRestInfoProvider</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.63">BasicRestInfoProvider</a>(<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>&nbsp;context)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.58">BasicRestInfoProvider</a>(<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>&nbsp;context)</pre>
 <div class="block">Constructor.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -369,39 +259,13 @@ implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" ti
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getSwaggerFromFile-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getSwaggerFromFile</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.133">getSwaggerFromFile</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 <a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger"><code>Swagger</code></a> object.
- 
- <p>
- Returned objects are cached per-locale for later quick-lookup.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The incoming HTTP request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The parsed swagger object, or <jk>null</jk> if none could be found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code> - If swagger file was not valid JSON.</dd>
-</dl>
-</li>
-</ul>
 <a name="getSwagger-org.apache.juneau.rest.RestRequest-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSwagger</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.156">getSwagger</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Swagger.html" title="class in org.apache.juneau.dto.swagger">Swagger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.101">getSwagger</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Returns the localized swagger for this REST resource.
  
@@ -420,40 +284,13 @@ implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" ti
 </dl>
 </li>
 </ul>
-<a name="getMethodOperationId-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMethodOperationId</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.218">getMethodOperationId</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                                   <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the localized operation ID of the specified java method.
- 
- <p>
- Subclasses can override this method to provide their own operation ID.
- 
- <p>
- The default implementation simply returns the Java method name.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized operation ID of the method, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
 <a name="getMethodSummary-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMethodSummary</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.265">getMethodSummary</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.350">getMethodSummary</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
                                <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Returns the localized summary of the specified java method on this servlet.
@@ -510,7 +347,7 @@ implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>getMethodDescription</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.321">getMethodDescription</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.406">getMethodDescription</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
                                    <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Returns the localized description of the specified java method on this servlet.
@@ -561,556 +398,164 @@ implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" ti
 </dl>
 </li>
 </ul>
-<a name="getMethodTags-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMethodTags</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.384">getMethodTags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.ht [...]
-                                  <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the localized Swagger tags for this Java method.
- 
- <p>
- Subclasses can override this method to provide their own tags.
- 
- <p>
- The default implementation returns the value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#tags--"><code>@MethodSwagger.tags()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(tags=<js>"foo,bar,baz"</js>)
-   )
-   <jk>public</jk> Object myMethod() {...}
-   
-   <cc>// Pulled from some other location</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(tags=<js>"$L{myLocalizedTags}"</js>)
-   )
-   <jk>public</jk> Object myMethod() {...}
-      </p>
-   <li>Localized string from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].[javaMethodName].tags</ck>
-         <li><ck>[javaMethodName].tags</ck>
-      </ol>
-      <br>Value can be a comma-delimited list or JSON array.
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#tags--"><code>@MethodSwagger.tags()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Comma-delimited list</cc>
-   <ck>MyClass.myMethod.tags</ck> = <cv>foo, bar, baz</cv>
-   
-   <cc>// JSON array</cc>
-   <ck>MyClass.myMethod.tags</ck> = <cv>["foo", "bar", "baz"]</cv>
- 
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.myMethod.description</ck> = <cv>$C{MyStrings/MyClass.myMethod.tags}</cv>
-      </p>
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized tags of the method, or <jk>null</jk> if none were found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getMethodExternalDocs-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
+<a name="getSiteName-org.apache.juneau.rest.RestRequest-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getMethodExternalDocs</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.449">getMethodExternalDocs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                                                   <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the localized external documentation of the specified java method on this servlet.
+<h4>getSiteName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.461">getSiteName</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<div class="block">Returns the localized site name of this REST resource.
  
  <p>
- Subclasses can override this method to provide their own external documentation.
+ Subclasses can override this method to provide their own site name.
  
  <p>
  The default implementation returns the value from the following locations (whichever matches first):
  <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#externalDocs--"><code>@MethodSwagger.externalDocs()</code></a> annotation.
+   <li><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#siteName--"><code>@RestResource.siteName()</code></a> annotation on this class, and then any parent classes.
       <h5 class='figure'>Examples:</h5>
       <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(externalDocs=<js>"{description:'Find more info here',url:'https://swagger.io'}"</js>)
-   )
-   <jk>public</jk> Object myMethod() {...}
+   <jc>// Direct value</jc>
+   <ja>@RestResource</ja>(siteName=<js>"My Site"</js>)
+   <jk>public class</jk> MyResource {...}
    
-   <cc>// Pulled from some other location</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(externalDocs=<js>"$L{myLocalizedExternalDocs}"</js>)
-   )
-   <jk>public</jk> Object myMethod() {...}
+   <jc>// Pulled from some other location</jc>
+   <ja>@RestResource</ja>(siteName=<js>"$L{myLocalizedSiteName}"</js>)
+   <jk>public class</jk> MyResource {...}
       </p>
-   <li>Localized string from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
+   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
       on the resource class, then any parent classes.
       <ol>
-         <li><ck>[ClassName].[javaMethodName].externalDocs</ck>
-         <li><ck>[javaMethodName].externalDocs</ck>
+         <li><ck>[ClassName].siteName</ck>
+         <li><ck>siteName</ck>
       </ol>
-      <br>Value is a JSON representation of a <a href="../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger"><code>ExternalDocumentation</code></a> object.
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#externalDocs--"><code>@MethodSwagger.externalDocs()</code></a> annotation.
+      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#siteName--"><code>@RestResource.siteName()</code></a> annotation.
       <h5 class='figure'>Examples:</h5>
       <p class='bcode'>
    <cc>// Direct value</cc>
-   <ck>MyClass.myMethod.externalDocs</ck> = <cv>{description:"Find more info here",url:"https://swagger.io"}</js>
+   <ck>MyClass.siteName</ck> = <cv>My Site</cv>
    
    <cc>// Pulled from some other location</cc>
-   <ck>MyClass.myMethod.externalDocs</ck> = <cv>$C{MyStrings/MyClass.myMethod.externalDocs}</cv>
+   <ck>MyClass.siteName</ck> = <cv>$C{MyStrings/MyClass.siteName}</cv>
       </p>
  </ol></div>
 <dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getSiteName-org.apache.juneau.rest.RestRequest-">getSiteName</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
 <dd><code>req</code> - The current request.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized external documentation of the method, or <jk>null</jk> if none was found.</dd>
+<dd>The localized site name of this REST resource, or <jk>null</jk> if none was found.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="getMethodParameters-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
+<a name="getTitle-org.apache.juneau.rest.RestRequest-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getMethodParameters</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger">ParameterInfo</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.520">getMethodParameters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.h [...]
-                                               <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the localized parameter info for the specified java method.
+<h4>getTitle</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.514">getTitle</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<div class="block">Returns the localized title of this REST resource.
  
  <p>
- Subclasses can override this method to provide their own parameter info.
+ Subclasses can override this method to provide their own title.
  
  <p>
  The default implementation returns the value from the following locations (whichever matches first):
  <ol class='spaced-list'>
-   <li>Operation information from swagger file.
-   <li><a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#parameters--"><code>@MethodSwagger.parameters()</code></a> annotation.
+   <li><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#title--"><code>@RestResource.siteName()</code></a> annotation on this class, and then any parent classes.
       <h5 class='figure'>Examples:</h5>
       <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         parameters={
-            <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"a"</js>, description=<js>"The 'a' attribute"</js>)
-         }
-      )
-   )
-   <jk>public</jk> Object myMethod() {...}
+   <jc>// Direct value</jc>
+   <ja>@RestResource</ja>(title=<js>"My Resource"</js>)
+   <jk>public class</jk> MyResource {...}
    
-   <cc>// Pulled from some other location</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         parameters={
-            <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"a"</js>, description=<js>"$L{myLocalizedParamADescription}"</js>)
-         }
-      )
-   )
-   <jk>public</jk> Object myMethod() {...}
+   <jc>// Pulled from some other location</jc>
+   <ja>@RestResource</ja>(title=<js>"$L{myLocalizedTitle}"</js>)
+   <jk>public class</jk> MyResource {...}
       </p>
    <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
       on the resource class, then any parent classes.
       <ol>
-         <li><ck>[ClassName].[javaMethodName].parameters</ck>
-         <li><ck>[javaMethodName].parameters</ck>
+         <li><ck>[ClassName].title</ck>
+         <li><ck>title</ck>
       </ol>
-      <br>Value is a JSON representation of a <code><a href="../../../../org/apache/juneau/dto/swagger/ParameterInfo.html" title="class in org.apache.juneau.dto.swagger"><code>ParameterInfo</code></a>[]</code> object.
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#parameters--"><code>@MethodSwagger.parameters()</code></a> annotation.
+      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#title--"><code>@RestResource.title()</code></a> annotation.
       <h5 class='figure'>Examples:</h5>
       <p class='bcode'>
    <cc>// Direct value</cc>
-   <ck>MyClass.myMethod.parameters</ck> = <cv>[{name:"a",in:"path",description:"The ''a'' attribute"}]</cv>
+   <ck>MyClass.title</ck> = <cv>My Resource</cv>
    
    <cc>// Pulled from some other location</cc>
-   <ck>MyClass.myMethod.parameters</ck> = <cv>$C{MyStrings/MyClass.myMethod.parameters}</cv>
+   <ck>MyClass.title</ck> = <cv>$C{MyStrings/MyClass.title}</cv>
       </p>
-   <li>Information gathered directly from the parameters on the Java method.
+   <li><ck>/info/title</ck> entry in swagger file.
  </ol></div>
 <dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getTitle-org.apache.juneau.rest.RestRequest-">getTitle</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
 <dd><code>req</code> - The current request.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized parameter info of the method, or <jk>null</jk> if none was found.</dd>
+<dd>The localized title of this REST resource, or <jk>null</jk> if none was found.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="getMethodResponses-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
+<a name="getDescription-org.apache.juneau.rest.RestRequest-">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
-<h4>getMethodResponses</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger">ResponseInfo</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/res [...]
-                                                    <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the localized response info for the specified java method.
+<h4>getDescription</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.570">getDescription</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
+                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<div class="block">Returns the localized description of this REST resource.
  
  <p>
- Subclasses can override this method to provide their own parameter info.
+ Subclasses can override this method to provide their own description.
  
  <p>
  The default implementation returns the value from the following locations (whichever matches first):
  <ol class='spaced-list'>
-   <li>Operation information from swagger file.
-   <li><a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#responses--"><code>@MethodSwagger.responses()</code></a> annotation.
+   <li><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#description--"><code>@RestResource.description()</code></a> annotation on this class, and then any parent classes.
       <h5 class='figure'>Examples:</h5>
       <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         responses={
-            <ja>@Response</ja>(
-               value=302,
-               description=<js>"Thing wasn't found here"</js>,
-               headers={
-                  <ja>@Parameter</ja>(name=<js>"Location"</js>, description=<js>"The place to find the thing"</js>)
-               }
-            )
-         }
-      )
-   )
-   <jk>public</jk> Object myMethod() {...}
+   <jc>// Direct value</jc>
+   <ja>@RestResource</ja>(description=<js>"My Resource"</js>)
+   <jk>public class</jk> MyResource {...}
    
-   <cc>// Pulled from some other location</cc>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         responses={
-            <ja>@Response</ja>(
-               value=302,
-               description=<js>"Thing wasn't found here"</js>,
-               headers={
-                  <ja>@Parameter</ja>(name=<js>"Location"</js>, description=<js>"$L{myLocalizedResponseDescription}"</js>)
-               }
-            )
-         }
-      )
-   )
-   <jk>public</jk> Object myMethod() {...}
+   <jc>// Pulled from some other location</jc>
+   <ja>@RestResource</ja>(description=<js>"$L{myLocalizedDescription}"</js>)
+   <jk>public class</jk> MyResource {...}
       </p>
    <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
       on the resource class, then any parent classes.
       <ol>
-         <li><ck>[ClassName].[javaMethodName].responses</ck>
-         <li><ck>[javaMethodName].responses</ck>
+         <li><ck>[ClassName].description</ck>
+         <li><ck>description</ck>
       </ol>
-      <br>Value is a JSON representation of a <code>Map&lt;Integer,<a href="../../../../org/apache/juneau/dto/swagger/ResponseInfo.html" title="class in org.apache.juneau.dto.swagger"><code>ResponseInfo</code></a>&gt;</code> object.
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#responses--"><code>@MethodSwagger.responses()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.myMethod.responses</ck> = <cv>{302:{description:'Thing wasn''t found here',headers={Location:{description:"The place to find the thing"}}}</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.myMethod.responses</ck> = <cv>$C{MyStrings/MyClass.myMethod.responses}</cv>
-      </p>
-   <li>Information gathered directly from the parameters on the Java method.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized response info of the method, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getMethodProduces-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMethodProduces</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.742">getMethodProduces</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" ti [...]
-                                         <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the supported <code>Accept</code> types the specified Java method.
- 
- <p>
- Subclasses can override this method to provide their own produces info.
- 
- <p>
- The default implementation returns the value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#produces--"><code>@RestMethod.supportedAcceptTypes()</code></a> annotation.
+      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#description--"><code>@RestResource.description()</code></a> annotation.
       <h5 class='figure'>Examples:</h5>
       <p class='bcode'>
    <cc>// Direct value</cc>
-   <ja>@RestMethod</ja>(supportedAcceptTypes={<js>"text/json"</js>})
-   <jk>public</jk> Object myMethod() {...}
+   <ck>MyClass.description</ck> = <cv>My Resource</cv>
    
    <cc>// Pulled from some other location</cc>
-   <ja>@RestMethod</ja>(supportedAcceptTypes={<js>"$C{mySupportedProduces}"</js>})
-   <jk>public</jk> Object myMethod() {...}
+   <ck>MyClass.description</ck> = <cv>$C{MyStrings/MyClass.description}</cv>
       </p>
-   <li>Media types defined on the parsers associated with the method.
+   <li><ck>/info/description</ck> entry in swagger file.
  </ol></div>
 <dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The supported <code>Accept</code> types of the method, or <jk>null</jk> if none was found 
-   or the list of media types match those of the parent resource class.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getMethodConsumes-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMethodConsumes</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.777">getMethodConsumes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" ti [...]
-                                         <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the supported <code>Content-Type</code> types the specified Java method.
- 
- <p>
- The default implementation returns the value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html#consumes--"><code>@RestMethod.supportedContentTypes()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ja>@RestMethod</ja>(supportedContentTypes={<js>"text/json"</js>})
-   <jk>public</jk> Object myMethod() {...}
-   
-   <cc>// Pulled from some other location</cc>
-   <ja>@RestMethod</ja>(supportedContentTypes={<js>"$C{mySupportedConsumes}"</js>})
-   <jk>public</jk> Object myMethod() {...}
-      </p>
-   <li>Media types defined on the serializers associated with the method.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The supported <code>Content-Type</code> types of the method, or <jk>null</jk> if none was found 
-   or the list of media types match those of the parent resource class.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="isDeprecated-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isDeprecated</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.809">isDeprecated</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;method,
-                            <a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns whether the specified method is deprecated
- 
- <p>
- The default implementation returns the value from the following location:
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#deprecated--"><code>@MethodSwagger.deprecated()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         deprecated=<jk>true</jk>
-      )
-   )
-   <jk>public</jk> Object myMethod() {...}
-      </p>
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>method</code> - The Java method annotated with <a href="../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a>.</dd>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><jk>true</jk> if the method is deprecated.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getSiteName-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getSiteName</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.855">getSiteName</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#siteName--"><code>@RestResource.siteName()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(siteName=<js>"My Site"</js>)
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(siteName=<js>"$L{myLocalizedSiteName}"</js>)
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].siteName</ck>
-         <li><ck>siteName</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#siteName--"><code>@RestResource.siteName()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.siteName</ck> = <cv>My Site</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.siteName</ck> = <cv>$C{MyStrings/MyClass.siteName}</cv>
-      </p>
- </ol></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getSiteName-org.apache.juneau.rest.RestRequest-">getSiteName</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized site name of this REST resource, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getTitle-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTitle</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.908">getTitle</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#title--"><code>@RestResource.siteName()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(title=<js>"My Resource"</js>)
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(title=<js>"$L{myLocalizedTitle}"</js>)
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].title</ck>
-         <li><ck>title</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#title--"><code>@RestResource.title()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.title</ck> = <cv>My Resource</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.title</ck> = <cv>$C{MyStrings/MyClass.title}</cv>
-      </p>
-   <li><ck>/info/title</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getTitle-org.apache.juneau.rest.RestRequest-">getTitle</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized title of this REST resource, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getDescription-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getDescription</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.964">getDescription</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#description--"><code>@RestResource.description()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(description=<js>"My Resource"</js>)
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(description=<js>"$L{myLocalizedDescription}"</js>)
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].description</ck>
-         <li><ck>description</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#description--"><code>@RestResource.description()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.description</ck> = <cv>My Resource</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.description</ck> = <cv>$C{MyStrings/MyClass.description}</cv>
-      </p>
-   <li><ck>/info/description</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getDescription-org.apache.juneau.rest.RestRequest-">getDescription</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html#getDescription-org.apache.juneau.rest.RestRequest-">getDescription</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>req</code> - The current request.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1120,432 +565,6 @@ implements <a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" ti
 </dl>
 </li>
 </ul>
-<a name="getContact-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getContact</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/Contact.html" title="class in org.apache.juneau.dto.swagger">Contact</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1024">getContact</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#contact--"><code>@ResourceSwagger.contact()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(contact=<js>"{name:'John Smith',email:'john.smith@foo.bar'}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(contact=<js>"$C{MyStrings/MyClass.myContactInfo}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].contact</ck>
-         <li><ck>contact</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#contact--"><code>@ResourceSwagger.contact()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.contact</ck> = <cv>{name:"John Smith",email:"john.smith@foo.bar"}</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.contact</ck> = <cv>$C{MyStrings/MyClass.myContactInfo}</cv>
-      </p>
-   <li><ck>/info/contact</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized contact information of this REST resource, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getLicense-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLicense</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/License.html" title="class in org.apache.juneau.dto.swagger">License</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1089">getLicense</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#license--"><code>@ResourceSwagger.license()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(license=<js>"$C{MyStrings/MyClass.myLicenseInfo}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].license</ck>
-         <li><ck>license</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#license--"><code>@ResourceSwagger.license()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.license</ck> = <cv>{name:"Apache 2.0",url:"http://www.apache.org/licenses/LICENSE-2.0.html"}</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.license</ck> = <cv>$C{MyStrings/MyClass.myLicenseInfo}</cv>
-      </p>
-   <li><ck>/info/license</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized license information of this REST resource, or <jk>null</jk> if none was found found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getTermsOfService-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTermsOfService</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1154">getTermsOfService</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#termsOfService--"><code>@ResourceSwagger.termsOfService()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(termsOfService=<js>"You're on your own"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(termsOfService=<js>"$C{MyStrings/MyClass.myTermsOfService}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].termsOfService</ck>
-         <li><ck>termsOfService</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#termsOfService--"><code>@ResourceSwagger.termsOfService()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.termsOfService</ck> = <cv>You''re on your own</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.termsOfService</ck> = <cv>$C{MyStrings/MyClass.myTermsOfService}</cv>
-      </p>
-   <li><ck>/info/termsOfService</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized terms-of-service of this REST resource, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getVersion-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getVersion</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1214">getVersion</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#version--"><code>@ResourceSwagger.version()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(version=<js>"2.0"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(version=<js>"$C{MyStrings/MyClass.myVersion}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].version</ck>
-         <li><ck>version</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#version--"><code>@ResourceSwagger.version()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.version</ck> = <cv>2.0</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.version</ck> = <cv>$C{MyStrings/MyClass.myVersion}</cv>
-      </p>
-   <li><ck>/info/version</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized version of this REST resource, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getConsumes-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getConsumes</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1270">getConsumes</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">Res [...]
-                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the supported <code>Content-Type</code> request headers for the REST resource.
- <p>
- The default implementation returns the value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#version--"><code>@ResourceSwagger.version()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(version=<js>"2.0"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(version=<js>"$C{MyStrings/MyClass.myVersion}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].version</ck>
-         <li><ck>version</ck>
-      </ol>
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#version--"><code>@ResourceSwagger.version()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.version</ck> = <cv>2.0</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.version</ck> = <cv>$C{MyStrings/MyClass.myVersion}</cv>
-      </p>
-   <li><ck>/info/version</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The supported <code>Content-Type</code> request headers of the REST resource, or <jk>null</jk> if none were found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getProduces-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getProduces</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1283">getProduces</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">Res [...]
-                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">Returns the supported <code>Accept</code> request headers for the REST resource.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The supported <code>Accept</code> request headers of the REST resource, or <jk>null</jk> if none were found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getTags-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTags</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/juneau/dto/swagger/Tag.html" title="class in org.apache.juneau.dto.swagger">Tag</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1339">getTags</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestR [...]
-                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#tags--"><code>@ResourceSwagger.tags()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(tags=<js>"foo,bar,baz"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(tags=<js>"$C{MyStrings/MyClass.myTags}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].tags</ck>
-         <li><ck>tags</ck>
-      </ol>
-      <br>Value is either a comma-delimited list or a JSON array.
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#tags--"><code>@ResourceSwagger.tags()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Comma-delimited list</cc>
-   <ck>MyClass.tags</ck> = <cv>foo,bar,baz</cv>
-   
-   <cc>// JSON array</cc>
-   <ck>MyClass.tags</ck> = <cv>["foo","bar","baz"]</cv>
- 
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.tags</ck> = <cv>$C{MyStrings/MyClass.myTags}</cv>
-      </p>
-   <li><ck>tags</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized tags of this REST resource, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getExternalDocs-org.apache.juneau.rest.RestRequest-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getExternalDocs</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger">ExternalDocumentation</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/BasicRestInfoProvider.html#line.1405">getExternalDocs</a>(<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req)
-                                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<div class="block">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 value from the following locations (whichever matches first):
- <ol class='spaced-list'>
-   <li><a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#externalDocs--"><code>@ResourceSwagger.externalDocs()</code></a> annotation on this class, and then any parent classes.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <jc>// Direct value</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-   
-   <jc>// Pulled from some other location</jc>
-   <ja>@RestResource</ja>(
-      swagger=<ja>@ResourceSwagger</ja>(externalDocs=<js>"$C{MyStrings/MyClass.myExternalDocs}"</js>)
-   )
-   <jk>public class</jk> MyResource {...}
-      </p>
-   <li>Localized strings from resource bundle identified by <a href="../../../../org/apache/juneau/rest/annotation/RestResource.html#messages--"><code>@RestResource.messages()</code></a>
-      on the resource class, then any parent classes.
-      <ol>
-         <li><ck>[ClassName].externalDocs</ck>
-         <li><ck>externalDocs</ck>
-      </ol>
-      <br>Value is a JSON objec representation of a <a href="../../../../org/apache/juneau/dto/swagger/ExternalDocumentation.html" title="class in org.apache.juneau.dto.swagger"><code>ExternalDocumentation</code></a> object.
-      <br>Value can contain any SVL variables defined on the <a href="../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#externalDocs--"><code>@ResourceSwagger.externalDocs()</code></a> annotation.
-      <h5 class='figure'>Examples:</h5>
-      <p class='bcode'>
-   <cc>// Direct value</cc>
-   <ck>MyClass.externalDocs</ck> = <cv>{url:"http://juneau.apache.org"}</cv>
-   
-   <cc>// Pulled from some other location</cc>
-   <ck>MyClass.externalDocs</ck> = <cv>$C{MyStrings/MyClass.myExternalDocs}</cv>
-      </p>
-   <li><ck>externalDocs</ck> entry in swagger file.
- </ol></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>req</code> - The current request.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The localized external documentation of this REST resource, or <jk>null</jk> if none was found.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
-</dl>
-</li>
-</ul>
 </li>
 </ul>
 </li>
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestRequest.html b/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
index 857c98a..af51356 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
@@ -1742,7 +1742,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - The name of the resource (i.e. the value normally passed to <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true#getResourceAsStream-java.lang.String-" title="class or interface in java.lang"><code>Class.getResourceAsStream(String)</code></a>.</dd>
-<dd><code>resolveVars</code> - If <jk>true</jk>, any <a href="../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><code>@Parameter</code></a> variables will be
+<dd><code>resolveVars</code> - If <jk>true</jk>, any SVL variables will be
    resolved by the variable resolver returned by <a href="../../../../org/apache/juneau/rest/RestRequest.html#getVarResolverSession--"><code>getVarResolverSession()</code></a>.
    <br>See <a href="../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> for the list of supported variables.</dd>
 <dd><code>mediaType</code> - The value to set as the <js>"Content-Type"</js> header for this object.</dd>
@@ -1767,7 +1767,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - The name of the resource (i.e. the value normally passed to <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true#getResourceAsStream-java.lang.String-" title="class or interface in java.lang"><code>Class.getResourceAsStream(String)</code></a>.</dd>
-<dd><code>resolveVars</code> - If <jk>true</jk>, any <a href="../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><code>@Parameter</code></a> variables will be
+<dd><code>resolveVars</code> - If <jk>true</jk>, any SVL variables will be
    resolved by the variable resolver returned by <a href="../../../../org/apache/juneau/rest/RestRequest.html#getVarResolverSession--"><code>getVarResolverSession()</code></a>.
    <br>See <a href="../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> for the list of supported variables.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html
index 1682008..f12c42f 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Method.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Method.html" target="_top">Frames</a></li>
@@ -151,7 +151,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Method.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html b/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html
deleted file mode 100644
index 3c8258c..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/MethodSwagger.html
+++ /dev/null
@@ -1,474 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MethodSwagger (Apache Juneau 7.1.1-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MethodSwagger (Apache Juneau 7.1.1-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/MethodSwagger.html" target="_top">Frames</a></li>
-<li><a href="MethodSwagger.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.rest.annotation</div>
-<h2 title="Annotation Type MethodSwagger" class="title">Annotation Type MethodSwagger</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/MethodSwagger.html#line.25">MethodSwagger</a></pre>
-<div class="block">Extended annotation for <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--"><code>RestMethod.swagger()</code></a>.
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; juneau-rest-server &gt; OPTIONS Pages</a>
- </ul></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
-<!--   -->
-</a>
-<h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
-<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Optional Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#deprecated--">deprecated</a></span></code>
-<div class="block">Optional deprecated flag for the exposed API.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#externalDocs--">externalDocs</a></span></code>
-<div class="block">Optional external documentation information for the exposed API.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#parameters--">parameters</a></span></code>
-<div class="block">Optional parameter descriptions.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">Response</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#responses--">responses</a></span></code>
-<div class="block">Optional output description.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#tags--">tags</a></span></code>
-<div class="block">Optional tagging information for the exposed API.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
-<!--   -->
-</a>
-<h3>Element Detail</h3>
-<a name="deprecated--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>deprecated</h4>
-<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/MethodSwagger.html#line.53">deprecated</a></pre>
-<div class="block">Optional deprecated flag for the exposed API.
- 
- <p>
- Used to populate the Swagger deprecated field.
- 
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         deprecated=<jk>true</jk>
-      )
-   )
- </p>
- 
- <h5 class='section'>Notes:</h5>
- <ul class='spaced-list'>
-   <li>
-      Corresponds to the swagger field <code>/paths/{path}/{method}/deprecated</code>.
- </ul>
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='jm'><a href="../../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#isDeprecated-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>BasicRestInfoProvider.isDeprecated(Method,RestRequest)</code></a>
- </ul></div>
-<dl>
-<dt>Default:</dt>
-<dd>false</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="externalDocs--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>externalDocs</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/MethodSwagger.html#line.93">externalDocs</a></pre>
-<div class="block">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'>
-   {
-      description: string,
-      url: string
-   }
- </p>
- 
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         <js>"{url:'http://juneau.apache.org'}"</js>
-      )
-   )
- </p>
- 
- <h5 class='section'>Notes:</h5>
- <ul class='spaced-list'>
-   <li>
-      Supports <a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables">initialization-time and request-time variables</a> 
-      (e.g. <js>"$L{my.localized.variable}"</js>).
-   <li>
-      Corresponds to the swagger field <code>/paths/{path}/{method}/externalDocs</code>.
- </ul>
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='jm'><a href="../../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodExternalDocs-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>BasicRestInfoProvider.getMethodExternalDocs(Method,RestRequest)</code></a>
- </ul></div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="parameters--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>parameters</h4>
-<pre>public abstract&nbsp;<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/MethodSwagger.html#line.132">parameters</a></pre>
-<div class="block">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>(
-      name=<jsf>POST</jsf>, path=<js>"/{a}"</js>,
-      description=<js>"This is my method."</js>,
-      swagger=<ja>@MethodSwagger</ja>(
-         parameters={
-            <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"a"</js>, description=<js>"The 'a' attribute"</js>),
-            <ja>@Parameter</ja>(in=<js>"query"</js>, name=<js>"b"</js>, description=<js>"The 'b' parameter"</js>, required=<jk>true</jk>),
-            <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"The HTTP content"</js>),
-            <ja>@Parameter</ja>(in=<js>"header"</js>, name=<js>"D"</js>, description=<js>"The 'D' header"</js>),
-         }
-      )
-   )
- </p>
- 
- <h5 class='section'>Notes:</h5>
- <ul class='spaced-list'>
-   <li>
-      Supports <a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables">initialization-time and request-time variables</a> 
-      (e.g. <js>"$L{my.localized.variable}"</js>).
-   <li>
-      Corresponds to the swagger field <code>/paths/{path}/{method}/parameters</code>.
- </ul>
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='jm'><a href="../../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodParameters-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>BasicRestInfoProvider.getMethodParameters(Method,RestRequest)</code></a>
- </ul></div>
-<dl>
-<dt>Default:</dt>
-<dd>{}</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="responses--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>responses</h4>
-<pre>public abstract&nbsp;<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">Response</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/MethodSwagger.html#line.174">responses</a></pre>
-<div class="block">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>(
-      name=<jsf>GET</jsf>, path=<js>"/"</js>,
-      swagger=<ja>@MethodSwagger</ja>(
-         responses={
-            <ja>@Response</ja>(200),
-            <ja>@Response</ja>(
-               value=302,
-               description=<js>"Thing wasn't found here"</js>,
-               headers={
-                  <ja>@Parameter</ja>(name=<js>"Location"</js>, description=<js>"The place to find the thing"</js>)
-               }
-            )
-         }
-      )
-   )
- </p>
- 
- <h5 class='section'>Notes:</h5>
- <ul class='spaced-list'>
-   <li>
-      Supports <a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables">initialization-time and request-time variables</a> 
-      (e.g. <js>"$L{my.localized.variable}"</js>).
-   <li>
-      Corresponds to the swagger field <code>/paths/{path}/{method}/responses</code>.
- </ul>
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='jm'><a href="../../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodResponses-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>BasicRestInfoProvider.getMethodResponses(Method,RestRequest)</code></a>
- </ul></div>
-<dl>
-<dt>Default:</dt>
-<dd>{}</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="tags--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>tags</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/MethodSwagger.html#line.209">tags</a></pre>
-<div class="block">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.
- <br>Tags can be used for logical grouping of operations by resources or any other qualifier.
- 
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(
-         tags=<js>"foo,bar"</js>
-      )
-   )
- </p>
- 
- <h5 class='section'>Notes:</h5>
- <ul class='spaced-list'>
-   <li>
-      Supports <a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables">initialization-time and request-time variables</a> 
-      (e.g. <js>"$L{my.localized.variable}"</js>).
-   <li>
-      Corresponds to the swagger field <code>/paths/{path}/{method}/tags</code>.
- </ul>
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='jm'><a href="../../../../../org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodTags-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>BasicRestInfoProvider.getMethodTags(Method,RestRequest)</code></a>
- </ul></div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/MethodSwagger.html" target="_top">Frames</a></li>
-<li><a href="MethodSwagger.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html
deleted file mode 100644
index 2c7ca85..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Parameter.html
+++ /dev/null
@@ -1,582 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Parameter (Apache Juneau 7.1.1-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Parameter (Apache Juneau 7.1.1-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Parameter.html" target="_top">Frames</a></li>
-<li><a href="Parameter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.rest.annotation</div>
-<h2 title="Annotation Type Parameter" class="title">Annotation Type Parameter</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Documented.html?is-external=true" title="class or interface in java.lang.annotation">@Documented</a>
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.an [...]
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in j [...]
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.48">Parameter</a></pre>
-<div class="block">Annotation used in conjunction with <a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#parameters--"><code>@MethodSwagger.parameters()</code></a> to identify 
- content and header descriptions on specific method requests.
- 
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <ja>@RestMethod</ja>(
-      name=<js>"*"</js>,
-      swagger=@MethodSwagger(
-         parameters={
-            <ja>@Parameter</ja>(in=<js>"header"</js>, name=<js>"Range"</js>, description=<js>"$L{ContentRange.description}"</js>)
-         }
-      )
-   )
-   <jk>public void</jk> doAnything(RestRequest req, RestResponse res, <ja>@Method</ja> String method) {
-      ...
-   }
- </p>
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; juneau-rest-server &gt; OPTIONS Pages</a>
- </ul></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
-<!--   -->
-</a>
-<h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
-<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Optional Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#Z:Z_default--">_default</a></span></code>
-<div class="block">Declares the value of the parameter that the server will use if none is provided.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#allowEmptyValue--">allowEmptyValue</a></span></code>
-<div class="block">Sets the ability to pass empty-valued parameters.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#collectionFormat--">collectionFormat</a></span></code>
-<div class="block">Determines the format of the array if type array is used.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#description--">description</a></span></code>
-<div class="block">Parameter description (e.g.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#format--">format</a></span></code>
-<div class="block">The extending format for the previously mentioned <code>type</code>.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#in--">in</a></span></code>
-<div class="block">The location of the parameter.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#items--">items</a></span></code>
-<div class="block">Required if <code>type</code> is <js>"array"</js>.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#name--">name</a></span></code>
-<div class="block">The name of the parameter (e.g.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#required--">required</a></span></code>
-<div class="block">Determines whether this parameter is mandatory.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#schema--">schema</a></span></code>
-<div class="block">The schema defining the type used for the body parameter.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html#type--">type</a></span></code>
-<div class="block">The type of the parameter.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
-<!--   -->
-</a>
-<h3>Element Detail</h3>
-<a name="Z:Z_default--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>_default</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.61">_default</a></pre>
-<div class="block">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.
- (Note: "default" has no meaning for required parameters.)
- See <a class="doclink" href="http://json-schema.org/latest/json-schema-validation.html#anchor101">
- http://json-schema.org/latest/json-schema-validation.html#anchor101</a>.
- Unlike JSON Schema this value MUST conform to the defined <code>type</code> for this parameter.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="allowEmptyValue--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>allowEmptyValue</h4>
-<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.71">allowEmptyValue</a></pre>
-<div class="block">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.
- Default value is <jk>false</jk>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>false</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="collectionFormat--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>collectionFormat</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.89">collectionFormat</a></pre>
-<div class="block">Determines the format of the array if type array is used.
- 
- <p>
- Possible values are:
- <ul>
-   <li><js>"csv"</js> - comma separated values <js>"foo,bar"</js>.
-   <li><js>"ssv"</js> - space separated values <js>"foo bar"</js>.
-   <li><js>"tsv"</js> - tab separated values <js>"foo\tbar"</js>.
-   <li><js>"pipes"</js> - pipe separated values <js>"foo|bar"</js>.
-   <li><js>"multi"</js> - corresponds to multiple parameter instances instead of multiple values for a single
-      instance <js>"foo=bar&amp;foo=baz"</js>.
-      This is valid only for parameters <code>in</code> <js>"query"</js> or <js>"formData"</js>.
- </ul>
- Default value is <js>"csv"</js>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="description--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>description</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.105">description</a></pre>
-<div class="block">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
- <js>"MyServlet.myMethod.res.[code].[category].[name] = foo"</js>).</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="format--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>format</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.114">format</a></pre>
-<div class="block">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.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="in--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>in</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.129">in</a></pre>
-<div class="block">The location of the parameter.
- 
- <p>
- Possible values are:
- <ul>
-   <li><js>"query"</js>
-   <li><js>"header"</js>
-   <li><js>"path"</js>
-   <li><js>"formData"</js>
-   <li><js>"body"</js>
- </ul></div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="items--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>items</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.154">items</a></pre>
-<div class="block">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>(
-      parameters={
-         <ja>@Parameter</ja>(
-            in=<js>"header"</js>,
-            name=<js>"Foo"</js>,
-            type=<js>"array"</js>,
-            items=<js>"{type:'string',collectionFormat:'csv'}"</js>)
-      }
-   )
-   <jk>public void</jk> doAnything() {
- </p>
- 
- <p>
- See <a class="doclink" href="http://swagger.io/specification/#itemsObject">Items Object</a> for further details.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="name--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>name</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.168">name</a></pre>
-<div class="block">The name of the parameter (e.g. <js>"Content-Range"</js>).
- 
- <p>
- Parameter names are case sensitive.
- If <code>in</code> is <js>"path"</js>, the name field MUST correspond to the associated path segment from the
- <code>path</code> field in the <a class="doclink"
- href="http://swagger.io/specification/#pathsObject">Paths Object</a>.
- See <a class="doclink" href="http://swagger.io/specification/#pathTemplating">Path Templating</a> for further
- information.
- For all other cases, the name corresponds to the parameter name used based on the <code>in</code> property.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="required--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>required</h4>
-<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.177">required</a></pre>
-<div class="block">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>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>false</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="schema--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>schema</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.201">schema</a></pre>
-<div class="block">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>(
-      parameters={
-         <ja>@Parameter</ja>(
-            in=<js>"header"</js>,
-            name=<js>"Foo"</js>,
-            schema=<js>"{format:'string',title:'Foo header',description:'Header that contains the Foo value.'}"</js>)
-      }
-   )
-   <jk>public void</jk> doAnything() {
- </p></div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="type--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>type</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Parameter.html#line.212">type</a></pre>
-<div class="block">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>.
- If type is <js>"file"</js>, the consumes MUST be either <js>"multipart/form-data"</js>,
- <js>"application/x-www-form-urlencoded"</js> or both and the parameter MUST be in <js>"formData"</js>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>"string"</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Parameter.html" target="_top">Frames</a></li>
-<li><a href="Parameter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
index de582e5..f96446f 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Path.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -285,7 +285,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
index f83ba18..d9dbaa0 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/Query.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Query.html" target="_top">Frames</a></li>
@@ -320,7 +320,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Query.html" target="_top">Frames</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html b/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
deleted file mode 100644
index 6d075c2..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/ResourceSwagger.html
+++ /dev/null
@@ -1,613 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ResourceSwagger (Apache Juneau 7.1.1-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ResourceSwagger (Apache Juneau 7.1.1-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/ResourceSwagger.html" target="_top">Frames</a></li>
-<li><a href="ResourceSwagger.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.rest.annotation</div>
-<h2 title="Annotation Type ResourceSwagger" class="title">Annotation Type ResourceSwagger</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html#line.27">ResourceSwagger</a></pre>
-<div class="block">Extended annotation for <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#swagger--"><code>@RestResource.swagger()</code></a>.
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; juneau-rest-server &gt; OPTIONS pages</a>
- </ul></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
-<!--   -->
-</a>
-<h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
-<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Optional Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#contact--">contact</a></span></code>
-<div class="block">Optional contact information for the exposed API.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#externalDocs--">externalDocs</a></span></code>
-<div class="block">Optional external documentation information for the exposed API.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#license--">license</a></span></code>
-<div class="block">Optional license information for the exposed API.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#tags--">tags</a></span></code>
-<div class="block">Optional tagging information for the exposed API.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#termsOfService--">termsOfService</a></span></code>
-<div class="block">Optional servlet terms-of-service for this API.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html#version--">version</a></span></code>
-<div class="block">Provides the version of the application API (not to be confused with the specification version).</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
-<!--   -->
-</a>
-<h3>Element Detail</h3>
-<a name="contact--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>contact</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html#line.84">contact</a></pre>
-<div class="block">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'>
-   {
-      name: string,
-      url: string,
-      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>(
-      swagger=<ja>@MethodSwagger</ja>(
-         contact=<js>"{name:'John Smith',email:'john.smith@foo.bar'}"</js>
-      )
-   )
- </p>
- 
- <p>
- Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/config/vars/ConfigVar.html" title="class in org.apache.juneau.config.vars"><code>$C</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>$F</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>$I</code></a>,
- <a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>$IF</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>$L</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>$RA</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>$RF</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>$RH</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>$RP</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>$RQ</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>$R</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>$S</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>$SA</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>$SW</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>$U</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>$UE</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>$W</code></a>
- 
- <p>
- Corresponds to the swagger field <code>/info/contact</code>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="externalDocs--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>externalDocs</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html#line.140">externalDocs</a></pre>
-<div class="block">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'>
-   {
-      description: string,
-      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>(
-      swagger=<ja>@MethodSwagger</ja>(
-         externalDocs=<js>"{url:'http://juneau.apache.org'}"</js>
-      )
-   )
- </p>
- 
- <p>
- Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/config/vars/ConfigVar.html" title="class in org.apache.juneau.config.vars"><code>$C</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>$F</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>$I</code></a>,
- <a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>$IF</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>$L</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>$RA</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>$RF</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>$RH</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>$RP</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>$RQ</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>$R</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>$S</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>$SA</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>$SW</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>$U</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>$UE</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>$W</code></a>
- 
- <p>
- Corresponds to the swagger field <code>/tags</code>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="license--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>license</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html#line.196">license</a></pre>
-<div class="block">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'>
-   {
-      name: string,
-      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>(
-      swagger=<ja>@MethodSwagger</ja>(
-         license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>
-      )
-   )
- </p>
- 
- <p>
- Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/config/vars/ConfigVar.html" title="class in org.apache.juneau.config.vars"><code>$C</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>$F</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>$I</code></a>,
- <a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>$IF</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>$L</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>$RA</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>$RF</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>$RH</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>$RP</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>$RQ</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>$R</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>$S</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>$SA</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>$SW</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>$U</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>$UE</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>$W</code></a>
- 
- <p>
- Corresponds to the swagger field <code>/info/license</code>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="tags--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>tags</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html#line.258">tags</a></pre>
-<div class="block">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'>
-   [
-      {
-         name: string,
-         description: string,
-         externalDocs: {
-            description: string,
-            url: string
-         }
-      }
-   ]
- </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>(
-      swagger=<ja>@MethodSwagger</ja>(
-         tags=<js>"[{name:'Foo',description:'Foobar'}]"</js>
-      )
-   )
- </p>
- 
- <p>
- Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/config/vars/ConfigVar.html" title="class in org.apache.juneau.config.vars"><code>$C</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>$F</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>$I</code></a>,
- <a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>$IF</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>$L</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>$RA</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>$RF</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>$RH</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>$RP</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>$RQ</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>$R</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>$S</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>$SA</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>$SW</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>$U</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>$UE</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>$W</code></a>
- 
- <p>
- Corresponds to the swagger field <code>/tags</code>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="termsOfService--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>termsOfService</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html#line.295">termsOfService</a></pre>
-<div class="block">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>
- Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/config/vars/ConfigVar.html" title="class in org.apache.juneau.config.vars"><code>$C</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>$F</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>$I</code></a>,
- <a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>$IF</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>$L</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>$RA</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>$RF</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>$RH</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>$RP</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>$RQ</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>$R</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>$S</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>$SA</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>$SW</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>$U</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>$UE</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>$W</code></a>
- 
- <p>
- Corresponds to the swagger field <code>/info/termsOfService</code>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="version--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>version</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html#line.332">version</a></pre>
-<div class="block">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>
- Value can contain any of the following variables:  
- <a href="../../../../../org/apache/juneau/config/vars/ConfigVar.html" title="class in org.apache.juneau.config.vars"><code>$C</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/CoalesceVar.html" title="class in org.apache.juneau.svl.vars"><code>$CO</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><code>$E</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><code>$F</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/ServletInitParamVar.html" title="class in org.apache.juneau.rest.vars"><code>$I</code></a>,
- <a href="../../../../../org/apache/juneau/svl/vars/IfVar.html" title="class in org.apache.juneau.svl.vars"><code>$IF</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/LocalizationVar.html" title="class in org.apache.juneau.rest.vars"><code>$L</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/RequestAttributeVar.html" title="class in org.apache.juneau.rest.vars"><code>$RA</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestFormDataVar.html" title="class in org.apache.juneau.rest.vars"><code>$RF</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestHeaderVar.html" title="class in org.apache.juneau.rest.vars"><code>$RH</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestPathVar.html" title="class in org.apache.juneau.rest.vars"><code>$RP</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestQueryVar.html" title="class in org.apache.juneau.rest.vars"><code>$RQ</code></a> 
- <a href="../../../../../org/apache/juneau/rest/vars/RequestVar.html" title="class in org.apache.juneau.rest.vars"><code>$R</code></a> 
- <a href="../../../../../org/apache/juneau/svl/vars/SystemPropertiesVar.html" title="class in org.apache.juneau.svl.vars"><code>$S</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/SerializedRequestAttrVar.html" title="class in org.apache.juneau.rest.vars"><code>$SA</code></a>
- <a href="../../../../../org/apache/juneau/svl/vars/SwitchVar.html" title="class in org.apache.juneau.svl.vars"><code>$SW</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlVar.html" title="class in org.apache.juneau.rest.vars"><code>$U</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><code>$UE</code></a>
- <a href="../../../../../org/apache/juneau/rest/vars/WidgetVar.html" title="class in org.apache.juneau.rest.vars"><code>$W</code></a>
- 
- <p>
- Corresponds to the swagger field <code>/info/version</code>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/ResourceSwagger.html" target="_top">Frames</a></li>
-<li><a href="ResourceSwagger.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html b/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html
deleted file mode 100644
index 6b5eaa4..0000000
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/Response.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Response (Apache Juneau 7.1.1-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Response (Apache Juneau 7.1.1-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Response.html" target="_top">Frames</a></li>
-<li><a href="Response.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.rest.annotation</div>
-<h2 title="Annotation Type Response" class="title">Annotation Type Response</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Documented.html?is-external=true" title="class or interface in java.lang.annotation">@Documented</a>
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.an [...]
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in j [...]
- <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annotation/Response.html#line.51">Response</a></pre>
-<div class="block">Annotation used in conjunction with <a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#responses--"><code>@MethodSwagger.responses()</code></a> to identify possible responses by the method.
- 
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-   <ja>@RestMethod</ja>(
-      name=<js>"*"</js>,
-      swagger=@ResourceSwagger(
-         responses={
-            <ja>@Response</ja>(value=200,description=<js>"Everything was great."</js>),
-            <ja>@Response</ja>(value=404,description=<js>"File was not found."</js>)
-            <ja>@Response</ja>(500),
-         }
-      )
-   )
-   <jk>public void</jk> doAnything(RestRequest req, RestResponse res, <ja>@Method</ja> String method) {
-      ...
-   }
- </p>
- 
- <h5 class='section'>See Also:</h5>
- <ul>
-   <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; juneau-rest-server &gt; OPTIONS pages</a>
- </ul></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.required.element.summary">
-<!--   -->
-</a>
-<h3>Required Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
-<caption><span>Required Elements</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Required Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Response.html#value--">value</a></span></code>
-<div class="block">HTTP response code.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
-<!--   -->
-</a>
-<h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
-<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Optional Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Response.html#description--">description</a></span></code>
-<div class="block">Optional description.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Response.html#headers--">headers</a></span></code>
-<div class="block">Optional response headers.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/Response.html#schema--">schema</a></span></code>
-<div class="block">A definition of the response structure.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
-<!--   -->
-</a>
-<h3>Element Detail</h3>
-<a name="value--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>value</h4>
-<pre>public abstract&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Response.html#line.106">value</a></pre>
-<div class="block">HTTP response code.</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="description--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>description</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Response.html#line.68">description</a></pre>
-<div class="block">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 <a href="../../../../../org/apache/juneau/rest/RestContext.html#getVarResolver--"><code>RestContext.getVarResolver()</code></a> for the list of supported variables.
- 
- <p>
- Corresponds to the swagger field <code>/paths/{path}/{method}/responses/{code}/description</code>.</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="headers--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>headers</h4>
-<pre>public abstract&nbsp;<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Response.html#line.78">headers</a></pre>
-<div class="block">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
- <js>"MyServlet.myMethod.res.[code].[category].[name] = foo"</js>).</div>
-<dl>
-<dt>Default:</dt>
-<dd>{}</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="schema--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>schema</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/Response.html#line.101">schema</a></pre>
-<div class="block">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>(
-      name=<js>"*"</js>,
-      swagger=@MethodSwagger(
-         responses={
-            <ja>@Response</ja>(value=200,schema=<js>"{type:'string',description:'A serialized Person bean.'}"</js>),
-         }
-      )
- </p></div>
-<dl>
-<dt>Default:</dt>
-<dd>""</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/juneau/rest/annotation/Response.html" target="_top">Frames</a></li>
-<li><a href="Response.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html b/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html
index 696000b..e68f3f7 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestHook.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -229,7 +229,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html b/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
index ea94d40..5ba1901 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestMethod.html
@@ -284,9 +284,10 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation">MethodSwagger</a></code></td>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--">swagger</a></span></code>
-<div class="block">Provides swagger-specific metadata on this method.</div>
+<div class="block">/**
+ Provides swagger-specific metadata on this method.</div>
 </td>
 </tr>
 </table>
@@ -1332,11 +1333,44 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 <ul class="blockListLast">
 <li class="blockList">
 <h4>swagger</h4>
-<pre>public abstract&nbsp;<a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation">MethodSwagger</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.742">swagger</a></pre>
-<div class="block">Provides swagger-specific metadata on this method.</div>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestMethod.html#line.775">swagger</a></pre>
+<div class="block">/**
+ Provides swagger-specific metadata on this method.
+ 
+ <p>
+ Used to populate the auto-generated OPTIONS swagger documentation.
+ 
+ <p>
+ The format of this annotation is JSON when all individual parts are concatenated.
+ <br>The starting and ending <js>'{'</js>/<js>'}'</js> characters around the entire value are optional.
+ 
+ <h5 class='section'>Example:</h5>
+ <p class='bcode'>
+   <ja>@RestMethod</ja>(
+      name=<jsf>PUT</jsf>, 
+      path=<js>"/{propertyName}"</js>,
+ 
+      <jc>// Swagger info.</jc>
+      swagger={
+         <js>"parameters:["</js>,
+            <js>"{name:'propertyName',in:'path',description:'The system property name.'},"</js>,
+            <js>"{in:'body',description:'The new system property value.'}"</js>,
+         <js>"],"</js>,
+         <js>"responses:{"</js>,
+            <js>"302: {headers:{Location:{description:'The root URL of this resource.'}}},"</js>,
+            <js>"403: {description:'User is not an admin.'}"</js>,
+         <js>"}"</js>
+      }
+   )
+ </p>
+ 
+ <h5 class='section'>See Also:</h5>
+ <ul>
+   <li class='jm'><a href="../../../../../org/apache/juneau/rest/RestInfoProvider.html#getSwagger-org.apache.juneau.rest.RestRequest-"><code>RestInfoProvider.getSwagger(RestRequest)</code></a>
+ </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>@org.apache.juneau.rest.annotation.MethodSwagger</dd>
+<dd>{}</dd>
 </dl>
 </li>
 </ul>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html b/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
index 9f17d96..428a9f8 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/RestResource.html
@@ -378,7 +378,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a></code></td>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#swagger--">swagger</a></span></code>
 <div class="block">Provides swagger-specific metadata on this resource.</div>
 </td>
@@ -1715,26 +1715,30 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 <ul class="blockList">
 <li class="blockList">
 <h4>swagger</h4>
-<pre>public abstract&nbsp;<a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.864">swagger</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.868">swagger</a></pre>
 <div class="block">Provides swagger-specific metadata on this resource.
  
  <p>
  Used to populate the auto-generated OPTIONS swagger documentation.
  
+ <p>
+ The format of this annotation is JSON when all individual parts are concatenated.
+ <br>The starting and ending <js>'{'</js>/<js>'}'</js> characters around the entire value are optional.
+ 
  <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>,
-         license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>,
-         version=<js>"2.0"</js>,
-         termsOfService=<js>"You're on your own."</js>,
-         tags=<js>"[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}]"</js>,
-         externalDocs=<js>"{description:'Home page',url:'http://juneau.apache.org'}"</js>
-      )
+      swagger={
+         <js>"contact:{name:'John Smith',email:'john@smith.com'},"</js>,
+         <js>"license:{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'},"</js>,
+         <js>"version:'2.0',</js>,
+         <js>"termsOfService:'You are on your own.',"</js>,
+         <js>"tags:[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}],"</js>,
+         <js>"externalDocs:{description:'Home page',url:'http://juneau.apache.org'}"</js>
+      }
    )
  </p>
  
@@ -1744,7 +1748,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
  </ul></div>
 <dl>
 <dt>Default:</dt>
-<dd>@org.apache.juneau.rest.annotation.ResourceSwagger</dd>
+<dd>{}</dd>
 </dl>
 </li>
 </ul>
@@ -1757,7 +1761,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 <ul class="blockList">
 <li class="blockList">
 <h4>title</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.887">title</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.891">title</a></pre>
 <div class="block">Optional servlet title.
  
  <p>
@@ -1792,7 +1796,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 <ul class="blockList">
 <li class="blockList">
 <h4>useClasspathResourceCaching</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.908">useClasspathResourceCaching</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.912">useClasspathResourceCaching</a></pre>
 <div class="block">Configuration property:  Use classpath resource caching. 
  
  <p>
@@ -1825,7 +1829,7 @@ public @interface <a href="../../../../../src-html/org/apache/juneau/rest/annota
 <ul class="blockListLast">
 <li class="blockList">
 <h4>useStackTraceHashes</h4>
-<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.929">useStackTraceHashes</a></pre>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/annotation/RestResource.html#line.933">useStackTraceHashes</a></pre>
 <div class="block">Use stack trace hashes.
  
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/package-frame.html b/content/site/apidocs/org/apache/juneau/rest/annotation/package-frame.html
index 5da6ade..af4c52d 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/package-frame.html
@@ -24,14 +24,10 @@
 <li><a href="Header.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Header</a></li>
 <li><a href="HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">HtmlDoc</a></li>
 <li><a href="Method.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Method</a></li>
-<li><a href="MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">MethodSwagger</a></li>
-<li><a href="Parameter.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Parameter</a></li>
 <li><a href="Path.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Path</a></li>
 <li><a href="PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">PathRemainder</a></li>
 <li><a href="Property.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Property</a></li>
 <li><a href="Query.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Query</a></li>
-<li><a href="ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">ResourceSwagger</a></li>
-<li><a href="Response.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Response</a></li>
 <li><a href="RestHook.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">RestHook</a></li>
 <li><a href="RestMethod.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">RestMethod</a></li>
 <li><a href="RestResource.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">RestResource</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/annotation/package-summary.html
index c335b91..2c5eddb 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/package-summary.html
@@ -152,19 +152,6 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation">MethodSwagger</a></td>
-<td class="colLast">
-<div class="block">Extended annotation for <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#swagger--"><code>RestMethod.swagger()</code></a>.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation">Parameter</a></td>
-<td class="colLast">
-<div class="block">Annotation used in conjunction with <a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#parameters--"><code>@MethodSwagger.parameters()</code></a> to identify 
- content and header descriptions on specific method requests.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">Path</a></td>
 <td class="colLast">
 <div class="block">Annotation that can be applied to a parameter of a <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestMethod</code></a> annotated method to identify it as a variable
@@ -192,18 +179,6 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation">ResourceSwagger</a></td>
-<td class="colLast">
-<div class="block">Extended annotation for <a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html#swagger--"><code>@RestResource.swagger()</code></a>.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation">Response</a></td>
-<td class="colLast">
-<div class="block">Annotation used in conjunction with <a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html#responses--"><code>@MethodSwagger.responses()</code></a> to identify possible responses by the method.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation">RestHook</a></td>
 <td class="colLast">
 <div class="block">Identifies Java methods on a resource/servlet class that get invoked during particular lifecycle events of
diff --git a/content/site/apidocs/org/apache/juneau/rest/annotation/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/annotation/package-tree.html
index 4054efa..4d76dc4 100644
--- a/content/site/apidocs/org/apache/juneau/rest/annotation/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/rest/annotation/package-tree.html
@@ -80,20 +80,16 @@
 <ul>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestHook</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">PathRemainder</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">ResourceSwagger</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Body</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestMethod</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/HasQuery.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">HasQuery</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/HasFormData.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">HasFormData</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">MethodSwagger</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/FormData.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">FormData</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Path</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">HtmlDoc</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Header.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Header</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Response</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Method</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestResource</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Parameter</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Property</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="../../../../../org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Query</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 </ul>
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index 976a13c..f26f982 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -14112,31 +14112,6 @@
             certain aspects.
          </p>
          <p>
-            In addition to the methods defined on the <l>RestInfoProvider</l> interface, it also includes the following methods:
-         </p>
-         <ul class='doctree'>
-            <li class='jc'><code><a href="org/apache/juneau/rest/BasicRestInfoProvider.html" title="class in org.apache.juneau.rest"><code>BasicRestInfoProvider</code></a> <jk>implements</jk> <a href="org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest"><code>RestInfoProvider</code></a></code>
-            <ul>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getVersion-org.apache.juneau.rest.RestRequest-"><code>getVersion(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getContact-org.apache.juneau.rest.RestRequest-"><code>getContact(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getConsumes-org.apache.juneau.rest.RestRequest-"><code>getConsumes(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getProduces-org.apache.juneau.rest.RestRequest-"><code>getProduces(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getLicense-org.apache.juneau.rest.RestRequest-"><code>getLicense(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getTags-org.apache.juneau.rest.RestRequest-"><code>getTags(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getTermsOfService-org.apache.juneau.rest.RestRequest-"><code>getTermsOfService(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getExternalDocs-org.apache.juneau.rest.RestRequest-"><code>getExternalDocs(RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodSummary-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodSummary(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodDescription-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodDescription(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodOperationId-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodOperationId(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodConsumes-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodConsumes(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodProduces-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodProduces(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodParameters-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodParameters(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodResponses-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodResponses(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getMethodTags-java.lang.reflect.Method-org.apache.juneau.rest.RestRequest-"><code>getMethodTags(Method,RestRequest)</code></a>
-               <li class='jm'><a href="org/apache/juneau/rest/BasicRestInfoProvider.html#getSwaggerFromFile-org.apache.juneau.rest.RestRequest-"><code>getSwaggerFromFile(RestRequest)</code></a>
-            </ul>
-         </ul>
-         <p>
             The default provider provides several options for defining Swagger documentation on your resource:
          </p>
          <ul class='spaced-list'>
@@ -14150,12 +14125,12 @@
    MyResource_ja_JP.json
                </p>
             <li>
-               Use <a href="org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><code>@ResourceSwagger</code></a> and <a href="org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><code>@MethodSwagger</code></a>
+               Use <a href="org/apache/juneau/rest/annotation/RestResource.html#swagger--"><code>@RestResource(swagger)</code></a> and <a href="org/apache/juneau/rest/annotation/RestMethod.html#swagger--"><code>@RestMethod(swagger)</code></a>
                annotations on your resource classes and methods.
                <br><h5 class='figure'>Example:</h5>
                <p class='bcode w800'>
    <ja>@RestMethod</ja>(
-      swagger=<ja>@MethodSwagger</ja>(tags=<js>"foo,bar,baz"</js>)
+      swagger=<js>"{tags:'foo,bar,baz'}</js>
    )
    <jk>public</jk> Object myMethod() {...}
                </p>
@@ -18069,14 +18044,14 @@
       <jc>// Support GZIP encoding on Accept-Encoding header.</jc>
       encoders=GzipEncoder.<jk>class</jk>,
    
-      swagger=<ja>@ResourceSwagger</ja>(
-         contact=<js>"{name:'John Smith',email:'john@smith.com'}"</js>,
-         license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>,
-         version=<js>"2.0"</js>,
-         termsOfService=<js>"You're on your own."</js>,
-         tags=<js>"[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}]"</js>,
-         externalDocs=<js>"{description:'Home page',url:'http://juneau.apache.org'}"</js>
-      ) 
+      swagger={
+         <js>"contact:{name:'John Smith',email:'john@smith.com'},"</js>,
+         <js>"license:{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'},"</js>,
+         <js>"version:'2.0',"</js>,
+         <js>"termsOfService:'You are on your own.',"</js>,
+         <js>"tags:[{name:'Java',description:'Java utility'}],"</js>,
+         <js>"externalDocs:{description:'Home page',url:'http://juneau.apache.org'}"</js>
+      }
    )
    <jk>public class</jk> SystemPropertiesResource <jk>extends</jk> BasicRestServlet {
    
@@ -18084,14 +18059,14 @@
          name=<jsf>GET</jsf>, path=<js>"/"</js>,
          summary=<js>"Show all system properties"</js>,
          description=<js>"Returns all system properties defined in the JVM."</js>,
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={
-               <ja>@Parameter</ja>(in=<js>"query"</js>, name=<js>"sort"</js>, description=<js>"Sort results alphabetically."</js>, _default=<js>"false"</js>)
-            },
-            responses={
-               <ja>@Response</ja>(value=200, description=<js>"Returns a map of key/value pairs."</js>)
-            }
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'sort',in:'query',description:'Sort results alphabetically',default:'false'}"</js>,
+            <js>"],"</js>,
+            <js>"responses:{"</js>,
+               <js>"200: {description:'Returns a map of key/value pairs.'}"</js>,
+            <js>"}"</js>
+         }
       )
       <jk>public</jk> Map getSystemProperties(<ja>@Query</ja>(<js>"sort"</js>) <jk>boolean</jk> sort) <jk>throws</jk> Throwable {
          <jk>if</jk> (sort)
@@ -18103,14 +18078,14 @@
          name=<jsf>GET</jsf>, path=<js>"/{propertyName}"</js>,
          summary=<js>"Get system property"</js>,
          description=<js>"Returns the value of the specified system property."</js>,
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"propertyName"</js>, description=<js>"The system property name."</js>)
-            },
-            responses={
-               <ja>@Response</ja>(value=200, description=<js>"The system property value, or null if not found."</js>)
-            }
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'propertyName',in:'path',description:'The system property name.'}"</js>,
+            <js>"],"</js>,
+            <js>"responses:{"</js>,
+               <js>"200: {description:'The system property value, or null if not found.'}"</js>,
+            <js>"}"</js>
+         }
       )
       <jk>public</jk> String getSystemProperty(<ja>@Path</ja> String propertyName) <jk>throws</jk> Throwable {
          <jk>return</jk> System.<jsm>getProperty</jsm>(propertyName);
@@ -18121,20 +18096,16 @@
          summary=<js>"Replace system property"</js>,
          description=<js>"Sets a new value for the specified system property."</js>,
          guards=AdminGuard.<jk>class</jk>,
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"propertyName"</js>, description=<js>"The system property name."</js>),
-               <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"The new system property value."</js>),
-            },
-            responses={
-               <ja>@Response</ja>(value=302,
-                  headers={
-                     <ja>@Parameter</ja>(name=<js>"Location"</js>, description=<js>"The root URL of this resource."</js>)
-                  }
-               ),
-               <ja>@Response</ja>(value=403, description=<js>"User is not an admin."</js>)
-            }
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'propertyName',in:'path',description:'The system property name.'},"</js>,
+               <js>"{in:'body',description:'The new system property value.'}"</js>,
+            <js>"],"</js>,
+            <js>"responses:{"</js>,
+               <js>"302: {headers:{Location:{description:'The root URL of this resource.'}}},"</js>,
+               <js>"403: {description:'User is not an admin.'}"</js>,
+            <js>"}"</js>
+         }
       )
       <jk>public</jk> Redirect setSystemProperty(<ja>@Path</ja> String propertyName, <ja>@Body</ja> String value) {
          System.<jsm>setProperty</jsm>(propertyName, value);
@@ -18146,20 +18117,16 @@
          summary=<js>"Add an entire set of system properties"</js>,
          description=<js>"Takes in a map of key/value pairs and creates a set of new system properties."</js>,
          guards=AdminGuard.<jk>class</jk>,
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"propertyName"</js>, description=<js>"The system property key."</js>),
-               <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"The new system property values."</js>, schema=<js>"{example:{key1:'val1',key2:123}}"</js>),
-            },
-            responses={
-               <ja>@Response</ja>(value=302,
-                  headers={
-                     <ja>@Parameter</ja>(name=<js>"Location"</js>, description=<js>"The root URL of this resource."</js>)
-                  }
-               ),
-               <ja>@Response</ja>(value=403, description=<js>"Unauthorized:  User is not an admin."</js>)
-            }
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'propertyName',in:'path',description:'The system property name.'},"</js>,
+               <js>"{in:'body',description:'The new system property values.',schema:{example:{key1:'val1',key2:123}}}"</js>,
+            <js>"],"</js>,
+            <js>"responses:{"</js>,
+               <js>"302: {headers:{Location:{description:'The root URL of this resource.'}}},"</js>,
+               <js>"403: {description:'User is not an admin.'}"</js>,
+            <js>"}"</js>
+         }
       )
       <jk>public</jk> Redirect setSystemProperties(<ja>@Body</ja> java.util.Properties newProperties) {
          System.<jsm>setProperties</jsm>(newProperties);
@@ -18171,19 +18138,15 @@
          summary=<js>"Delete system property"</js>,
          description=<js>"Deletes the specified system property."</js>,
          guards=AdminGuard.<jk>class</jk>,
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"propertyName"</js>, description=<js>"The system property name."</js>),
-            },
-            responses={
-               <ja>@Response</ja>(value=302,
-                  headers={
-                     <ja>@Parameter</ja>(name=<js>"Location"</js>, description=<js>"The root URL of this resource."</js>)
-                  }
-               ),
-               <ja>@Response</ja>(value=403, description=<js>"Unauthorized:  User is not an admin"</js>)
-            }
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'propertyName',in:'path',description:'The system property name.'}"</js>,
+            <js>"],"</js>,
+            <js>"responses:{"</js>,
+               <js>"302: {headers:{Location:{description:'The root URL of this resource.'}}},"</js>,
+               <js>"403: {description:'User is not an admin.'}"</js>,
+            <js>"}"</js>
+         }
       )
       <jk>public</jk> Redirect deleteSystemProperty(<ja>@Path</ja> String propertyName) {
          System.<jsm>clearProperty</jsm>(propertyName);
@@ -19333,14 +19296,14 @@
       encoders=GzipEncoder.<jk>class</jk>,
    
       <jc>// Swagger info.</jc>
-      swagger=<ja>@ResourceSwagger</ja>(
-         contact=<js>"{name:'John Smith',email:'john@smith.com'}"</js>,
-         license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>,
-         version=<js>"2.0"</js>,
-         termsOfService=<js>"You're on your own."</js>,
-         tags=<js>"[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}]"</js>,
-         externalDocs=<js>"{description:'Home page',url:'http://juneau.apache.org'}"</js>
-      )
+      swagger= {
+         <js>"contact:{name:'John Smith',email:'john@smith.com'},"</js>,
+         <js>"license:{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'},"</js>,
+         <js>"version:'2.0',"</js>,
+         <js>"termsOfService:'You're on your own.',"</js>,
+         <js>"tags:[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}],"</js>,
+         <js>"externalDocs:{description:'Home page',url:'http://juneau.apache.org'}"</js>
+      }
    ) 
    <jk>public class</jk> AddressBookResource <jk>extends</jk> BasicRestServletJena { 
       
@@ -21089,11 +21052,11 @@
       
       <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{section}"</js>, 
          description=<js>"Show config file section."</js>, 
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"section"</js>, description=<js>"Section name."</js>)
-            }
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'section',in:'path',description:'Section name.'}"</js>,
+            <js>"]"</js>
+         }
       ) 
       <jk>public</jk> ObjectMap getConfigSection(<ja>@Path</ja>(<js>"section"</js>) String section) <jk>throws</jk> Exception { 
          <jk>return</jk> getSection(section); 
@@ -21101,12 +21064,12 @@
       
       <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{section}/{key}"</js>, 
          description=<js>"Show config file entry."</js>, 
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={ 
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"section"</js>, description=<js>"Section name."</js>), 
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"key"</js>, description=<js>"Entry name."</js>) 
-            } 
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'section',in:'path',description:'Section name.'},"</js>,
+               <js>"{name:'key',in:'path',description:'Entry name.'}"</js>,
+            <js>"]"</js>
+         }
       ) 
       <jk>public</jk> String getConfigEntry(<ja>@Path</ja>(<js>"section"</js>) String section, <ja>@Path</ja>(<js>"key"</js>) String key) <jk>throws</jk> Exception { 
          <jk>return</jk> getSection(section).getString(key); 
@@ -21114,11 +21077,11 @@
       
       <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/"</js>, 
          description=<js>"Sets contents of config file from a FORM post."</js>, 
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={ 
-               <ja>@Parameter</ja>(in=<js>"formData"</js>, name=<js>"contents"</js>, description=<js>"New contents in INI file format."</js>) 
-            }
-         ) 
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'contents',in:'formData',description:'New contents in INI file format.'}"</js>,
+            <js>"]"</js>
+         }
       ) 
       <jk>public</jk> Config setConfigContentsFormPost(<ja>@FormData</ja>(<js>"contents"</js>) String contents) <jk>throws</jk> Exception { 
          <jk>return</jk> setConfigContents(<jk>new</jk> StringReader(contents)); 
@@ -21126,11 +21089,11 @@
       
       <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/"</js>, 
          description=<js>"Sets contents of config file."</js>, 
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={ 
-               <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"New contents in INI file format."</js>) 
-            } 
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{in:'body',description:'New contents in INI file format.'}"</js>,
+            <js>"]"</js>
+         }
       ) 
       <jk>public</jk> Config setConfigContents(<ja>@Body</ja> Reader contents) <jk>throws</jk> Exception { 
          <jk>return</jk> getServletConfig().getConfig().load(contents, <jk>true</jk>).asMap();
@@ -21138,12 +21101,12 @@
       
       <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/{section}"</js>, 
          description=<js>"Add or overwrite a config file section."</js>, 
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={ 
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"section"</js>, description=<js>"Section name."</js>), 
-               <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"New contents for section as a simple map with string keys and values."</js>) 
-            } 
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'section',in:'path',description:'Section name.'}"</js>,
+               <js>"{in:'body',description:'New contents for section as a simple map with string keys and values.'}"</js>,
+            <js>"]"</js>
+         }
       ) 
       <jk>public</jk> ObjectMap setConfigSection(<ja>@Path</ja>(<js>"section"</js>) String section, <ja>@Body</ja> Map&lt;String,String&gt; contents) <jk>throws</jk> Exception { 
          getServletConfig().getConfig().setSection(section, contents); 
@@ -21152,13 +21115,13 @@
       
       <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/{section}/{key}"</js>, 
          description=<js>"Add or overwrite a config file entry."</js>, 
-         swagger=<ja>@MethodSwagger</ja>(
-            parameters={ 
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"section"</js>, description=<js>"Section name."</js>), 
-               <ja>@Parameter</ja>(in=<js>"path"</js>, name=<js>"key"</js>, description=<js>"Entry name."</js>), 
-               <ja>@Parameter</ja>(in=<js>"body"</js>, description=<js>"New value as a string."</js>) 
-            } 
-         )
+         swagger={
+            <js>"parameters:["</js>,
+               <js>"{name:'section',in:'path',description:'Section name.'}"</js>,
+               <js>"{name:'key',in:'path',description:'Entry name.'}"</js>,
+               <js>"{in:'body',description:'New value as a string.'}"</js>,
+            <js>"]"</js>
+         }
       ) 
       <jk>public</jk> String setConfigSection(<ja>@Path</ja>(<js>"section"</js>) String section, <ja>@Path</ja>(<js>"key"</js>) String key, <ja>@Body</ja> String value) <jk>throws</jk> Exception { 
          getServletConfig().getConfig().put(section, key, value, <jk>false</jk>); 
@@ -21203,11 +21166,11 @@
          <li>
             Summary and detail views of the same beans providing different levels of information.
          <li>
-            The use of the <code>@HtmlRender</code> annotation.
+            The use of the <a href="org/apache/juneau/html/HtmlRender.html" title="class in org.apache.juneau.html"><code>HtmlRender</code></a> class.
          <li>
             The use of the <a href="org/apache/juneau/annotation/BeanProperty.html#format--"><code>@BeanProperty(format)</code></a> annotation.
          <li>
-            The use of the <code>org.apache.juneau.rest.converters.Querable</code> interface.
+            The use of the <a href="org/apache/juneau/rest/converters/Queryable.html" title="class in org.apache.juneau.rest.converters"><code>Queryable</code></a> interface.
       </ul>
       
       <h5 class='figure'>PetStoreResource.java</h5>
@@ -21689,6 +21652,9 @@
       <h5 class='topic w800'>juneau-server</h5>
       <ul class='spaced-list'>
          <li>
+            Simplified <a href="org/apache/juneau/rest/annotation/RestResource.html#swagger--"><code>@RestResource(swagger)</code></a>
+            and <a href="org/apache/juneau/rest/annotation/RestMethod.html#swagger--"><code>@RestMethod(swagger)</code></a> annotations.
+         <li>
             Fixed bug in <code>UriResolver</code> when request path info had special characters.
          <li>
             Fixed bug where incorrect media type was being set on responses (e.g. <code>text/html+schema</code> instead of <code>text/html</code> for schema documents).
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index b02f775..2f739cf 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -1532,20 +1532,16 @@
 <li type="circle">org.apache.juneau.jena.annotation.<a href="org/apache/juneau/jena/annotation/RdfSchema.html" title="annotation in org.apache.juneau.jena.annotation"><span class="typeNameLink">RdfSchema</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestHook</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/PathRemainder.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">PathRemainder</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">ResourceSwagger</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Body.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Body</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestMethod</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/HasQuery.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">HasQuery</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/HasFormData.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">HasFormData</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/MethodSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">MethodSwagger</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/FormData.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">FormData</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Path</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">HtmlDoc</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Header.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Header</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Response</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Method.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Method</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestResource</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Parameter.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Parameter</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Property</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Query</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/JuneauProvider.html" title="annotation in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">JuneauProvider</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Operation.html b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Operation.html
index d11a4cc..8c1bfbb 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Operation.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/swagger/Operation.html
@@ -149,7 +149,7 @@
 <span class="sourceLineNo">141</span>      produces;<a name="line.141"></a>
 <span class="sourceLineNo">142</span>   private List&lt;ParameterInfo&gt; parameters;<a name="line.142"></a>
 <span class="sourceLineNo">143</span>   private List&lt;Map&lt;String,List&lt;String&gt;&gt;&gt; security;<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   private Map&lt;Integer,ResponseInfo&gt; responses;<a name="line.144"></a>
+<span class="sourceLineNo">144</span>   private Map&lt;String,ResponseInfo&gt; responses;<a name="line.144"></a>
 <span class="sourceLineNo">145</span><a name="line.145"></a>
 <span class="sourceLineNo">146</span>   /**<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    * Bean property getter:  &lt;property&gt;tags&lt;/property&gt;.<a name="line.147"></a>
@@ -705,7 +705,7 @@
 <span class="sourceLineNo">697</span>    * <a name="line.697"></a>
 <span class="sourceLineNo">698</span>    * @return The property value, or &lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.698"></a>
 <span class="sourceLineNo">699</span>    */<a name="line.699"></a>
-<span class="sourceLineNo">700</span>   public Map&lt;Integer,ResponseInfo&gt; getResponses() {<a name="line.700"></a>
+<span class="sourceLineNo">700</span>   public Map&lt;String,ResponseInfo&gt; getResponses() {<a name="line.700"></a>
 <span class="sourceLineNo">701</span>      return responses;<a name="line.701"></a>
 <span class="sourceLineNo">702</span>   }<a name="line.702"></a>
 <span class="sourceLineNo">703</span><a name="line.703"></a>
@@ -720,7 +720,7 @@
 <span class="sourceLineNo">712</span>    *    &lt;br&gt;Property value is required.<a name="line.712"></a>
 <span class="sourceLineNo">713</span>    * @return This object (for method chaining).<a name="line.713"></a>
 <span class="sourceLineNo">714</span>    */<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   public Operation setResponses(Map&lt;Integer,ResponseInfo&gt; value) {<a name="line.715"></a>
+<span class="sourceLineNo">715</span>   public Operation setResponses(Map&lt;String,ResponseInfo&gt; value) {<a name="line.715"></a>
 <span class="sourceLineNo">716</span>      responses = newMap(value);<a name="line.716"></a>
 <span class="sourceLineNo">717</span>      return this;<a name="line.717"></a>
 <span class="sourceLineNo">718</span>   }<a name="line.718"></a>
@@ -736,7 +736,7 @@
 <span class="sourceLineNo">728</span>    *    &lt;br&gt;Ignored if &lt;jk&gt;null&lt;/jk&gt;.<a name="line.728"></a>
 <span class="sourceLineNo">729</span>    * @return This object (for method chaining).<a name="line.729"></a>
 <span class="sourceLineNo">730</span>    */<a name="line.730"></a>
-<span class="sourceLineNo">731</span>   public Operation addResponses(Map&lt;Integer,ResponseInfo&gt; values) {<a name="line.731"></a>
+<span class="sourceLineNo">731</span>   public Operation addResponses(Map&lt;String,ResponseInfo&gt; values) {<a name="line.731"></a>
 <span class="sourceLineNo">732</span>      responses = addToMap(responses, values);<a name="line.732"></a>
 <span class="sourceLineNo">733</span>      return this;<a name="line.733"></a>
 <span class="sourceLineNo">734</span>   }<a name="line.734"></a>
@@ -748,7 +748,7 @@
 <span class="sourceLineNo">740</span>    * @param response The response description.<a name="line.740"></a>
 <span class="sourceLineNo">741</span>    * @return This object (for method chaining).<a name="line.741"></a>
 <span class="sourceLineNo">742</span>    */<a name="line.742"></a>
-<span class="sourceLineNo">743</span>   public Operation response(Integer statusCode, ResponseInfo response) {<a name="line.743"></a>
+<span class="sourceLineNo">743</span>   public Operation response(String statusCode, ResponseInfo response) {<a name="line.743"></a>
 <span class="sourceLineNo">744</span>      return addResponses(Collections.singletonMap(statusCode, response));<a name="line.744"></a>
 <span class="sourceLineNo">745</span>   }<a name="line.745"></a>
 <span class="sourceLineNo">746</span><a name="line.746"></a>
@@ -769,7 +769,7 @@
 <span class="sourceLineNo">761</span>    * @return This object (for method chaining).<a name="line.761"></a>
 <span class="sourceLineNo">762</span>    */<a name="line.762"></a>
 <span class="sourceLineNo">763</span>   public Operation responses(Object...value) {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      responses = addToMap(responses, value, Integer.class, ResponseInfo.class);<a name="line.764"></a>
+<span class="sourceLineNo">764</span>      responses = addToMap(responses, value, String.class, ResponseInfo.class);<a name="line.764"></a>
 <span class="sourceLineNo">765</span>      return this;<a name="line.765"></a>
 <span class="sourceLineNo">766</span>   }<a name="line.766"></a>
 <span class="sourceLineNo">767</span><a name="line.767"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html
index b949b48..57504c9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/ConfigResource.html
@@ -94,11 +94,11 @@
 <span class="sourceLineNo">086</span>    */<a name="line.86"></a>
 <span class="sourceLineNo">087</span>   @RestMethod(name=GET, path="/{section}",<a name="line.87"></a>
 <span class="sourceLineNo">088</span>      description="Show config file section.",<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      swagger=@MethodSwagger(<a name="line.89"></a>
-<span class="sourceLineNo">090</span>         parameters={<a name="line.90"></a>
-<span class="sourceLineNo">091</span>            @Parameter(in="path", name="section", description="Section name.")<a name="line.91"></a>
-<span class="sourceLineNo">092</span>         }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      )<a name="line.93"></a>
+<span class="sourceLineNo">089</span>      swagger={<a name="line.89"></a>
+<span class="sourceLineNo">090</span>         "parameters:[",<a name="line.90"></a>
+<span class="sourceLineNo">091</span>            "{name:'section',in:'path',description:'Section name.'}",<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         "]"<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      }<a name="line.93"></a>
 <span class="sourceLineNo">094</span>   )<a name="line.94"></a>
 <span class="sourceLineNo">095</span>   public ObjectMap getConfigSection(@Path("section") String section) throws Exception {<a name="line.95"></a>
 <span class="sourceLineNo">096</span>      return getSection(section);<a name="line.96"></a>
@@ -114,12 +114,12 @@
 <span class="sourceLineNo">106</span>    */<a name="line.106"></a>
 <span class="sourceLineNo">107</span>   @RestMethod(name=GET, path="/{section}/{key}",<a name="line.107"></a>
 <span class="sourceLineNo">108</span>      description="Show config file entry.",<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      swagger=@MethodSwagger(<a name="line.109"></a>
-<span class="sourceLineNo">110</span>         parameters={<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            @Parameter(in="path", name="section", description="Section name."),<a name="line.111"></a>
-<span class="sourceLineNo">112</span>            @Parameter(in="path", name="key", description="Entry name.")<a name="line.112"></a>
-<span class="sourceLineNo">113</span>         }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      )<a name="line.114"></a>
+<span class="sourceLineNo">109</span>      swagger={<a name="line.109"></a>
+<span class="sourceLineNo">110</span>         "parameters:[",<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            "{name:'section',in:'path',description:'Section name.'},",<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            "{name:'key',in:'path',description:'Entry name.'}",<a name="line.112"></a>
+<span class="sourceLineNo">113</span>         "]"<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      }<a name="line.114"></a>
 <span class="sourceLineNo">115</span>   )<a name="line.115"></a>
 <span class="sourceLineNo">116</span>   public String getConfigEntry(@Path("section") String section, @Path("key") String key) throws Exception {<a name="line.116"></a>
 <span class="sourceLineNo">117</span>      return getSection(section).getString(key);<a name="line.117"></a>
@@ -134,11 +134,11 @@
 <span class="sourceLineNo">126</span>    */<a name="line.126"></a>
 <span class="sourceLineNo">127</span>   @RestMethod(name=POST, path="/",<a name="line.127"></a>
 <span class="sourceLineNo">128</span>      description="Sets contents of config file from a FORM post.",<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      swagger=@MethodSwagger(<a name="line.129"></a>
-<span class="sourceLineNo">130</span>         parameters={<a name="line.130"></a>
-<span class="sourceLineNo">131</span>            @Parameter(in="formData", name="contents", description="New contents in INI file format.")<a name="line.131"></a>
-<span class="sourceLineNo">132</span>         }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      )<a name="line.133"></a>
+<span class="sourceLineNo">129</span>      swagger={<a name="line.129"></a>
+<span class="sourceLineNo">130</span>         "parameters:[",<a name="line.130"></a>
+<span class="sourceLineNo">131</span>            "{name:'contents',in:'formData',description:'New contents in INI file format.'}",<a name="line.131"></a>
+<span class="sourceLineNo">132</span>         "]"<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      }<a name="line.133"></a>
 <span class="sourceLineNo">134</span>   )<a name="line.134"></a>
 <span class="sourceLineNo">135</span>   public ObjectMap setConfigContentsFormPost(@FormData("contents") String contents) throws Exception {<a name="line.135"></a>
 <span class="sourceLineNo">136</span>      return setConfigContents(new StringReader(contents));<a name="line.136"></a>
@@ -153,11 +153,11 @@
 <span class="sourceLineNo">145</span>    */<a name="line.145"></a>
 <span class="sourceLineNo">146</span>   @RestMethod(name=PUT, path="/",<a name="line.146"></a>
 <span class="sourceLineNo">147</span>      description="Sets contents of config file.",<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      swagger=@MethodSwagger(<a name="line.148"></a>
-<span class="sourceLineNo">149</span>         parameters={<a name="line.149"></a>
-<span class="sourceLineNo">150</span>            @Parameter(in="body", description="New contents in INI file format.")<a name="line.150"></a>
-<span class="sourceLineNo">151</span>         }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      )<a name="line.152"></a>
+<span class="sourceLineNo">148</span>      swagger={<a name="line.148"></a>
+<span class="sourceLineNo">149</span>         "parameters:[",<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            "{in:'body',description:'New contents in INI file format.'}",<a name="line.150"></a>
+<span class="sourceLineNo">151</span>         "]"<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      }<a name="line.152"></a>
 <span class="sourceLineNo">153</span>   )<a name="line.153"></a>
 <span class="sourceLineNo">154</span>   public ObjectMap setConfigContents(@Body Reader contents) throws Exception {<a name="line.154"></a>
 <span class="sourceLineNo">155</span>      return getServletConfig().getConfig().load(contents, true).asMap();<a name="line.155"></a>
@@ -173,12 +173,12 @@
 <span class="sourceLineNo">165</span>    */<a name="line.165"></a>
 <span class="sourceLineNo">166</span>   @RestMethod(name=PUT, path="/{section}",<a name="line.166"></a>
 <span class="sourceLineNo">167</span>      description="Add or overwrite a config file section.",<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      swagger=@MethodSwagger(<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         parameters={<a name="line.169"></a>
-<span class="sourceLineNo">170</span>            @Parameter(in="path", name="section", description="Section name."),<a name="line.170"></a>
-<span class="sourceLineNo">171</span>            @Parameter(in="body", description="New contents for section as a simple map with string keys and values.")<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      )<a name="line.173"></a>
+<span class="sourceLineNo">168</span>      swagger={<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         "parameters:[",<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            "{name:'section',in:'path',description:'Section name.'}",<a name="line.170"></a>
+<span class="sourceLineNo">171</span>            "{in:'body',description:'New contents for section as a simple map with string keys and values.'}",<a name="line.171"></a>
+<span class="sourceLineNo">172</span>         "]"<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      }<a name="line.173"></a>
 <span class="sourceLineNo">174</span>   )<a name="line.174"></a>
 <span class="sourceLineNo">175</span>   public ObjectMap setConfigSection(@Path("section") String section, @Body Map&lt;String,Object&gt; contents) throws Exception {<a name="line.175"></a>
 <span class="sourceLineNo">176</span>      getServletConfig().getConfig().setSection(section, null, contents);<a name="line.176"></a>
@@ -196,13 +196,13 @@
 <span class="sourceLineNo">188</span>    */<a name="line.188"></a>
 <span class="sourceLineNo">189</span>   @RestMethod(name=PUT, path="/{section}/{key}",<a name="line.189"></a>
 <span class="sourceLineNo">190</span>      description="Add or overwrite a config file entry.",<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      swagger=@MethodSwagger(<a name="line.191"></a>
-<span class="sourceLineNo">192</span>         parameters={<a name="line.192"></a>
-<span class="sourceLineNo">193</span>            @Parameter(in="path", name="section", description="Section name."),<a name="line.193"></a>
-<span class="sourceLineNo">194</span>            @Parameter(in="path", name="key", description="Entry name."),<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            @Parameter(in="body", description="New value as a string.")<a name="line.195"></a>
-<span class="sourceLineNo">196</span>         }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      )<a name="line.197"></a>
+<span class="sourceLineNo">191</span>      swagger={<a name="line.191"></a>
+<span class="sourceLineNo">192</span>         "parameters:[",<a name="line.192"></a>
+<span class="sourceLineNo">193</span>            "{name:'section',in:'path',description:'Section name.'}",<a name="line.193"></a>
+<span class="sourceLineNo">194</span>            "{name:'key',in:'path',description:'Entry name.'}",<a name="line.194"></a>
+<span class="sourceLineNo">195</span>            "{in:'body',description:'New value as a string.'}",<a name="line.195"></a>
+<span class="sourceLineNo">196</span>         "]"<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      }<a name="line.197"></a>
 <span class="sourceLineNo">198</span>   )<a name="line.198"></a>
 <span class="sourceLineNo">199</span>   public String setConfigSection(@Path("section") String section, @Path("key") String key, @Body String value) throws Exception {<a name="line.199"></a>
 <span class="sourceLineNo">200</span>      getServletConfig().getConfig().set(section + '/' + key, value);<a name="line.200"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
index 3c94b10..537ed31 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
@@ -99,245 +99,260 @@
 <span class="sourceLineNo">091</span>   @RestMethod(<a name="line.91"></a>
 <span class="sourceLineNo">092</span>      name=GET,<a name="line.92"></a>
 <span class="sourceLineNo">093</span>      path="/*",<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      swagger=@MethodSwagger(<a name="line.94"></a>
-<span class="sourceLineNo">095</span>         responses={@Response(200),@Response(404)}<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      )<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   )<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   public Object getFileOrDirectory(RestRequest req, RestResponse res, RequestProperties properties, @PathRemainder String path) throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>      File f = getFile(path);<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>      if (f.isDirectory()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>         Set&lt;FileResource&gt; l = new TreeSet&lt;&gt;(new FileResourceComparator());<a name="line.103"></a>
-<span class="sourceLineNo">104</span>         File[] files = f.listFiles(filter);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>         if (files != null) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            for (File fc : files) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>               URI fUrl = new URI("servlet:/" + fc.getName());<a name="line.107"></a>
-<span class="sourceLineNo">108</span>               l.add(new FileResource(fc, fUrl));<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            }<a name="line.109"></a>
-<span class="sourceLineNo">110</span>         }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>         return l;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>      return new FileResource(f, new URI("servlet:/"));<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   }<a name="line.115"></a>
+<span class="sourceLineNo">094</span>      swagger= {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>         "responses:{",<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            "200: {description:'OK'},",<a name="line.96"></a>
+<span class="sourceLineNo">097</span>            "404: {description:'Not Found'}",<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         "}"<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      }<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   )<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   public Object getFileOrDirectory(RestRequest req, RestResponse res, RequestProperties properties, @PathRemainder String path) throws Exception {<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>      File f = getFile(path);<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>      if (f.isDirectory()) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>         Set&lt;FileResource&gt; l = new TreeSet&lt;&gt;(new FileResourceComparator());<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         File[] files = f.listFiles(filter);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>         if (files != null) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            for (File fc : files) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>               URI fUrl = new URI("servlet:/" + fc.getName());<a name="line.110"></a>
+<span class="sourceLineNo">111</span>               l.add(new FileResource(fc, fUrl));<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>         }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>         return l;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      }<a name="line.115"></a>
 <span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>   /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * [VIEW /*] - Retrieve the contents of a log file.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * <a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * @param req The HTTP request.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * @param res The HTTP response.<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * @param path The log file path.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * @param properties The writable properties for setting the descriptions.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * @param highlight If &lt;code&gt;true&lt;/code&gt;, add color highlighting based on severity.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    * @throws Exception<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    */<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   @RestMethod(<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      name="VIEW",<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      path="/*",<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      swagger=@MethodSwagger(<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         responses={@Response(200),@Response(404)}<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      )<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   )<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, RequestProperties properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>      File f = getFile(path);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      if (f.isDirectory())<a name="line.142"></a>
-<span class="sourceLineNo">143</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.145"></a>
+<span class="sourceLineNo">117</span>      return new FileResource(f, new URI("servlet:/"));<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>   /**<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    * [VIEW /*] - Retrieve the contents of a log file.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    * <a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * @param req The HTTP request.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * @param res The HTTP response.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    * @param path The log file path.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    * @param properties The writable properties for setting the descriptions.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * @param highlight If &lt;code&gt;true&lt;/code&gt;, add color highlighting based on severity.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * @throws Exception<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    */<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   @RestMethod(<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      name="VIEW",<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      path="/*",<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      swagger= {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         "responses:{",<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            "200: {description:'OK'},",<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            "404: {description:'Not Found'}",<a name="line.141"></a>
+<span class="sourceLineNo">142</span>         "}"<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   )<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, RequestProperties properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.145"></a>
 <span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>      if (! highlight) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>         Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>         res.setContentType("text/plain");<a name="line.149"></a>
-<span class="sourceLineNo">150</span>         if (o instanceof Reader)<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            res.setOutput(o);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>         else {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>            try (LogParser p = (LogParser)o; Writer w = res.getNegotiatedWriter()) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>               p.writeTo(w);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>            }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>         }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>         return;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>      res.setContentType("text/html");<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      try (PrintWriter w = res.getNegotiatedWriter()) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>         w.println("&lt;html&gt;&lt;body style='font-family:monospace;font-size:8pt;white-space:pre;'&gt;");<a name="line.162"></a>
-<span class="sourceLineNo">163</span>         try (LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity)) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>            if (! lp.hasNext())<a name="line.164"></a>
-<span class="sourceLineNo">165</span>               w.append("&lt;span style='color:gray'&gt;[EMPTY]&lt;/span&gt;");<a name="line.165"></a>
-<span class="sourceLineNo">166</span>            else for (LogParser.Entry le : lp) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>               char s = le.severity.charAt(0);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>               String color = "black";<a name="line.168"></a>
-<span class="sourceLineNo">169</span>               //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.169"></a>
-<span class="sourceLineNo">170</span>               if (s == 'I')<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                  color = "#006400";<a name="line.171"></a>
-<span class="sourceLineNo">172</span>               else if (s == 'W')<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                  color = "#CC8400";<a name="line.173"></a>
-<span class="sourceLineNo">174</span>               else if (s == 'E' || s == 'S')<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                  color = "#DD0000";<a name="line.175"></a>
-<span class="sourceLineNo">176</span>               else if (s == 'D' || s == 'F' || s == 'T')<a name="line.176"></a>
-<span class="sourceLineNo">177</span>                  color = "#000064";<a name="line.177"></a>
-<span class="sourceLineNo">178</span>               w.append("&lt;span style='color:").append(color).append("'&gt;");<a name="line.178"></a>
-<span class="sourceLineNo">179</span>               le.appendHtml(w).append("&lt;/span&gt;");<a name="line.179"></a>
-<span class="sourceLineNo">180</span>            }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>            w.append("&lt;/body&gt;&lt;/html&gt;");<a name="line.181"></a>
-<span class="sourceLineNo">182</span>         }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>   /**<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    * <a name="line.188"></a>
-<span class="sourceLineNo">189</span>    * @param req The HTTP request.<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    * @param path The log file path.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    * @return The parsed contents of the log file.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    * @throws Exception<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    */<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   @RestMethod(<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      name="PARSE",<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      path="/*",<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      converters=Queryable.class,<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      swagger=@MethodSwagger(<a name="line.203"></a>
-<span class="sourceLineNo">204</span>         responses={@Response(200),@Response(404)}<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      )<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   )<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>      File f = getFile(path);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>      if (f.isDirectory())<a name="line.212"></a>
-<span class="sourceLineNo">213</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>      return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   }<a name="line.216"></a>
+<span class="sourceLineNo">147</span>      File f = getFile(path);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      if (f.isDirectory())<a name="line.148"></a>
+<span class="sourceLineNo">149</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>      if (! highlight) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>         Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>         res.setContentType("text/plain");<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         if (o instanceof Reader)<a name="line.156"></a>
+<span class="sourceLineNo">157</span>            res.setOutput(o);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>         else {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>            try (LogParser p = (LogParser)o; Writer w = res.getNegotiatedWriter()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>               p.writeTo(w);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>         }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>         return;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      res.setContentType("text/html");<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      try (PrintWriter w = res.getNegotiatedWriter()) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>         w.println("&lt;html&gt;&lt;body style='font-family:monospace;font-size:8pt;white-space:pre;'&gt;");<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         try (LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity)) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            if (! lp.hasNext())<a name="line.170"></a>
+<span class="sourceLineNo">171</span>               w.append("&lt;span style='color:gray'&gt;[EMPTY]&lt;/span&gt;");<a name="line.171"></a>
+<span class="sourceLineNo">172</span>            else for (LogParser.Entry le : lp) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>               char s = le.severity.charAt(0);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>               String color = "black";<a name="line.174"></a>
+<span class="sourceLineNo">175</span>               //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.175"></a>
+<span class="sourceLineNo">176</span>               if (s == 'I')<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                  color = "#006400";<a name="line.177"></a>
+<span class="sourceLineNo">178</span>               else if (s == 'W')<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                  color = "#CC8400";<a name="line.179"></a>
+<span class="sourceLineNo">180</span>               else if (s == 'E' || s == 'S')<a name="line.180"></a>
+<span class="sourceLineNo">181</span>                  color = "#DD0000";<a name="line.181"></a>
+<span class="sourceLineNo">182</span>               else if (s == 'D' || s == 'F' || s == 'T')<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                  color = "#000064";<a name="line.183"></a>
+<span class="sourceLineNo">184</span>               w.append("&lt;span style='color:").append(color).append("'&gt;");<a name="line.184"></a>
+<span class="sourceLineNo">185</span>               le.appendHtml(w).append("&lt;/span&gt;");<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>            w.append("&lt;/body&gt;&lt;/html&gt;");<a name="line.187"></a>
+<span class="sourceLineNo">188</span>         }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>   /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    * <a name="line.194"></a>
+<span class="sourceLineNo">195</span>    * @param req The HTTP request.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    * @param path The log file path.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    * @return The parsed contents of the log file.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    * @throws Exception<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   @RestMethod(<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      name="PARSE",<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      path="/*",<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      converters=Queryable.class,<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      swagger= {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>         "responses:{",<a name="line.210"></a>
+<span class="sourceLineNo">211</span>            "200: {description:'OK'},",<a name="line.211"></a>
+<span class="sourceLineNo">212</span>            "404: {description:'Not Found'}",<a name="line.212"></a>
+<span class="sourceLineNo">213</span>         "}"<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      }<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   )<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.216"></a>
 <span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>   /**<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    * [DOWNLOAD /*] - Download file.<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * <a name="line.220"></a>
-<span class="sourceLineNo">221</span>    * @param res The HTTP response.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    * @param path The log file path.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * @return The contents of the log file.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    * @throws Exception<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   @RestMethod(<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      name="DOWNLOAD",<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      path="/*",<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      swagger=@MethodSwagger(<a name="line.229"></a>
-<span class="sourceLineNo">230</span>         responses={@Response(200),@Response(404)}<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      )<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   )<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>      File f = getFile(path);<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>      if (f.isDirectory())<a name="line.237"></a>
-<span class="sourceLineNo">238</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span>      res.setContentType("application/octet-stream");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      res.setContentLength((int)f.length());<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return new FileInputStream(f);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>   /**<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    * [DELETE /*] - Delete a file.<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * <a name="line.247"></a>
-<span class="sourceLineNo">248</span>    * @param path The log file path.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    * @return A redirect object to the root.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    * @throws Exception<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   @RestMethod(<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      name=DELETE,<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      path="/*",<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      swagger=@MethodSwagger(<a name="line.255"></a>
-<span class="sourceLineNo">256</span>         responses={@Response(200),@Response(404)}<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      )<a name="line.257"></a>
-<span class="sourceLineNo">258</span>   )<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>      File f = getFile(path);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>      if (f.isDirectory())<a name="line.263"></a>
-<span class="sourceLineNo">264</span>         throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>      if (f.canWrite())<a name="line.266"></a>
-<span class="sourceLineNo">267</span>         if (! f.delete())<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>      return new Redirect(path + "/..");<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>   private static BufferedReader getReader(File f) throws IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span>   private File getFile(String path) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      if (path != null &amp;&amp; path.indexOf("..") != -1)<a name="line.278"></a>
-<span class="sourceLineNo">279</span>         throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      if (filter.accept(f))<a name="line.281"></a>
-<span class="sourceLineNo">282</span>         return f;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span>   /**<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * File bean.<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    */<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   @SuppressWarnings("javadoc")<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   public static class FileResource {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      final File f;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      public final String type;<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      public final Object name;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      public final Long size;<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      @Swap(DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      public URI view, highlighted, parsed, download, delete;<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>      public FileResource(File f, URI uri) throws Exception {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>         this.f = f;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>         this.type = (f.isDirectory() ? "dir" : "file");<a name="line.300"></a>
-<span class="sourceLineNo">301</span>         this.name = f.isDirectory() ? new LinkString(f.getName(), uri.toString()) : f.getName();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>         this.size = f.isDirectory() ? null : f.length();<a name="line.302"></a>
-<span class="sourceLineNo">303</span>         this.lastModified = new Date(f.lastModified());<a name="line.303"></a>
-<span class="sourceLineNo">304</span>         if (f.canRead() &amp;&amp; ! f.isDirectory()) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>            this.view = new URI(uri + "?method=VIEW");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>            this.highlighted = new URI(uri + "?method=VIEW&amp;highlight=true");<a name="line.306"></a>
-<span class="sourceLineNo">307</span>            this.parsed = new URI(uri + "?method=PARSE");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>            this.download = new URI(uri + "?method=DOWNLOAD");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>            this.delete = new URI(uri + "?method=DELETE");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>         }<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>   static final class FileResourceComparator implements Comparator&lt;FileResource&gt;, Serializable {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      private static final long serialVersionUID = 1L;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      @Override /* Comparator */<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      public int compare(FileResource o1, FileResource o2) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>         int c = o1.type.compareTo(o2.type);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>         return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      }<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>   private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      if (start == null &amp;&amp; end == null &amp;&amp; thread == null &amp;&amp; loggers == null)<a name="line.324"></a>
-<span class="sourceLineNo">325</span>         return getReader(f);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      return getLogParser(f, start, end, thread, loggers, severity);<a name="line.326"></a>
+<span class="sourceLineNo">218</span>      File f = getFile(path);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>      if (f.isDirectory())<a name="line.221"></a>
+<span class="sourceLineNo">222</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>   /**<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    * [DOWNLOAD /*] - Download file.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    * <a name="line.229"></a>
+<span class="sourceLineNo">230</span>    * @param res The HTTP response.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * @param path The log file path.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    * @return The contents of the log file.<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    * @throws Exception<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    */<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   @RestMethod(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      name="DOWNLOAD",<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      path="/*",<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      swagger= {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>         "responses:{",<a name="line.239"></a>
+<span class="sourceLineNo">240</span>            "200: {description:'OK'},",<a name="line.240"></a>
+<span class="sourceLineNo">241</span>            "404: {description:'Not Found'}",<a name="line.241"></a>
+<span class="sourceLineNo">242</span>         "}"<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   )<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>      File f = getFile(path);<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>      if (f.isDirectory())<a name="line.249"></a>
+<span class="sourceLineNo">250</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>      res.setContentType("application/octet-stream");<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      res.setContentLength((int)f.length());<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      return new FileInputStream(f);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>   /**<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    * [DELETE /*] - Delete a file.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    * <a name="line.259"></a>
+<span class="sourceLineNo">260</span>    * @param path The log file path.<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    * @return A redirect object to the root.<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    * @throws Exception<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    */<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   @RestMethod(<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      name=DELETE,<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      path="/*",<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      swagger= {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>         "responses:{",<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            "200: {description:'OK'},",<a name="line.269"></a>
+<span class="sourceLineNo">270</span>            "404: {description:'Not Found'}",<a name="line.270"></a>
+<span class="sourceLineNo">271</span>         "}"<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   )<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>      File f = getFile(path);<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (f.isDirectory())<a name="line.278"></a>
+<span class="sourceLineNo">279</span>         throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (f.canWrite())<a name="line.281"></a>
+<span class="sourceLineNo">282</span>         if (! f.delete())<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>      return new Redirect(path + "/..");<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span>   private static BufferedReader getReader(File f) throws IOException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>   private File getFile(String path) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      if (path != null &amp;&amp; path.indexOf("..") != -1)<a name="line.293"></a>
+<span class="sourceLineNo">294</span>         throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (filter.accept(f))<a name="line.296"></a>
+<span class="sourceLineNo">297</span>         return f;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.298"></a>
+<span class="sourceLineNo">299</span>   }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>   /**<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    * File bean.<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    */<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   @SuppressWarnings("javadoc")<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   public static class FileResource {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      final File f;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      public final String type;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      public final Object name;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      public final Long size;<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      @Swap(DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      public URI view, highlighted, parsed, download, delete;<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>      public FileResource(File f, URI uri) throws Exception {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>         this.f = f;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>         this.type = (f.isDirectory() ? "dir" : "file");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>         this.name = f.isDirectory() ? new LinkString(f.getName(), uri.toString()) : f.getName();<a name="line.316"></a>
+<span class="sourceLineNo">317</span>         this.size = f.isDirectory() ? null : f.length();<a name="line.317"></a>
+<span class="sourceLineNo">318</span>         this.lastModified = new Date(f.lastModified());<a name="line.318"></a>
+<span class="sourceLineNo">319</span>         if (f.canRead() &amp;&amp; ! f.isDirectory()) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>            this.view = new URI(uri + "?method=VIEW");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>            this.highlighted = new URI(uri + "?method=VIEW&amp;highlight=true");<a name="line.321"></a>
+<span class="sourceLineNo">322</span>            this.parsed = new URI(uri + "?method=PARSE");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>            this.download = new URI(uri + "?method=DOWNLOAD");<a name="line.323"></a>
+<span class="sourceLineNo">324</span>            this.delete = new URI(uri + "?method=DELETE");<a name="line.324"></a>
+<span class="sourceLineNo">325</span>         }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
 <span class="sourceLineNo">327</span>   }<a name="line.327"></a>
 <span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>   private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>}<a name="line.332"></a>
+<span class="sourceLineNo">329</span>   static final class FileResourceComparator implements Comparator&lt;FileResource&gt;, Serializable {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      private static final long serialVersionUID = 1L;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      @Override /* Comparator */<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      public int compare(FileResource o1, FileResource o2) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>         int c = o1.type.compareTo(o2.type);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>         return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      }<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>   private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      if (start == null &amp;&amp; end == null &amp;&amp; thread == null &amp;&amp; loggers == null)<a name="line.339"></a>
+<span class="sourceLineNo">340</span>         return getReader(f);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      return getLogParser(f, start, end, thread, loggers, severity);<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>   private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   }<a name="line.346"></a>
+<span class="sourceLineNo">347</span>}<a name="line.347"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
index 3c94b10..537ed31 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
@@ -99,245 +99,260 @@
 <span class="sourceLineNo">091</span>   @RestMethod(<a name="line.91"></a>
 <span class="sourceLineNo">092</span>      name=GET,<a name="line.92"></a>
 <span class="sourceLineNo">093</span>      path="/*",<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      swagger=@MethodSwagger(<a name="line.94"></a>
-<span class="sourceLineNo">095</span>         responses={@Response(200),@Response(404)}<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      )<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   )<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   public Object getFileOrDirectory(RestRequest req, RestResponse res, RequestProperties properties, @PathRemainder String path) throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>      File f = getFile(path);<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>      if (f.isDirectory()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>         Set&lt;FileResource&gt; l = new TreeSet&lt;&gt;(new FileResourceComparator());<a name="line.103"></a>
-<span class="sourceLineNo">104</span>         File[] files = f.listFiles(filter);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>         if (files != null) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            for (File fc : files) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>               URI fUrl = new URI("servlet:/" + fc.getName());<a name="line.107"></a>
-<span class="sourceLineNo">108</span>               l.add(new FileResource(fc, fUrl));<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            }<a name="line.109"></a>
-<span class="sourceLineNo">110</span>         }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>         return l;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>      return new FileResource(f, new URI("servlet:/"));<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   }<a name="line.115"></a>
+<span class="sourceLineNo">094</span>      swagger= {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>         "responses:{",<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            "200: {description:'OK'},",<a name="line.96"></a>
+<span class="sourceLineNo">097</span>            "404: {description:'Not Found'}",<a name="line.97"></a>
+<span class="sourceLineNo">098</span>         "}"<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      }<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   )<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   public Object getFileOrDirectory(RestRequest req, RestResponse res, RequestProperties properties, @PathRemainder String path) throws Exception {<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>      File f = getFile(path);<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>      if (f.isDirectory()) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>         Set&lt;FileResource&gt; l = new TreeSet&lt;&gt;(new FileResourceComparator());<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         File[] files = f.listFiles(filter);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>         if (files != null) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            for (File fc : files) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>               URI fUrl = new URI("servlet:/" + fc.getName());<a name="line.110"></a>
+<span class="sourceLineNo">111</span>               l.add(new FileResource(fc, fUrl));<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>         }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>         return l;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      }<a name="line.115"></a>
 <span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>   /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * [VIEW /*] - Retrieve the contents of a log file.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * <a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * @param req The HTTP request.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * @param res The HTTP response.<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * @param path The log file path.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * @param properties The writable properties for setting the descriptions.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * @param highlight If &lt;code&gt;true&lt;/code&gt;, add color highlighting based on severity.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    * @throws Exception<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    */<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   @RestMethod(<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      name="VIEW",<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      path="/*",<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      swagger=@MethodSwagger(<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         responses={@Response(200),@Response(404)}<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      )<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   )<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, RequestProperties properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>      File f = getFile(path);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      if (f.isDirectory())<a name="line.142"></a>
-<span class="sourceLineNo">143</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.145"></a>
+<span class="sourceLineNo">117</span>      return new FileResource(f, new URI("servlet:/"));<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>   /**<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    * [VIEW /*] - Retrieve the contents of a log file.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    * <a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * @param req The HTTP request.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    * @param res The HTTP response.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    * @param path The log file path.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    * @param properties The writable properties for setting the descriptions.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    * @param highlight If &lt;code&gt;true&lt;/code&gt;, add color highlighting based on severity.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * @throws Exception<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    */<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   @RestMethod(<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      name="VIEW",<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      path="/*",<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      swagger= {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         "responses:{",<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            "200: {description:'OK'},",<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            "404: {description:'Not Found'}",<a name="line.141"></a>
+<span class="sourceLineNo">142</span>         "}"<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   )<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   public void viewFile(RestRequest req, RestResponse res, @PathRemainder String path, RequestProperties properties, @Query("highlight") boolean highlight, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.145"></a>
 <span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>      if (! highlight) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>         Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>         res.setContentType("text/plain");<a name="line.149"></a>
-<span class="sourceLineNo">150</span>         if (o instanceof Reader)<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            res.setOutput(o);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>         else {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>            try (LogParser p = (LogParser)o; Writer w = res.getNegotiatedWriter()) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>               p.writeTo(w);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>            }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>         }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>         return;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>      res.setContentType("text/html");<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      try (PrintWriter w = res.getNegotiatedWriter()) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>         w.println("&lt;html&gt;&lt;body style='font-family:monospace;font-size:8pt;white-space:pre;'&gt;");<a name="line.162"></a>
-<span class="sourceLineNo">163</span>         try (LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity)) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>            if (! lp.hasNext())<a name="line.164"></a>
-<span class="sourceLineNo">165</span>               w.append("&lt;span style='color:gray'&gt;[EMPTY]&lt;/span&gt;");<a name="line.165"></a>
-<span class="sourceLineNo">166</span>            else for (LogParser.Entry le : lp) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>               char s = le.severity.charAt(0);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>               String color = "black";<a name="line.168"></a>
-<span class="sourceLineNo">169</span>               //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.169"></a>
-<span class="sourceLineNo">170</span>               if (s == 'I')<a name="line.170"></a>
-<span class="sourceLineNo">171</span>                  color = "#006400";<a name="line.171"></a>
-<span class="sourceLineNo">172</span>               else if (s == 'W')<a name="line.172"></a>
-<span class="sourceLineNo">173</span>                  color = "#CC8400";<a name="line.173"></a>
-<span class="sourceLineNo">174</span>               else if (s == 'E' || s == 'S')<a name="line.174"></a>
-<span class="sourceLineNo">175</span>                  color = "#DD0000";<a name="line.175"></a>
-<span class="sourceLineNo">176</span>               else if (s == 'D' || s == 'F' || s == 'T')<a name="line.176"></a>
-<span class="sourceLineNo">177</span>                  color = "#000064";<a name="line.177"></a>
-<span class="sourceLineNo">178</span>               w.append("&lt;span style='color:").append(color).append("'&gt;");<a name="line.178"></a>
-<span class="sourceLineNo">179</span>               le.appendHtml(w).append("&lt;/span&gt;");<a name="line.179"></a>
-<span class="sourceLineNo">180</span>            }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>            w.append("&lt;/body&gt;&lt;/html&gt;");<a name="line.181"></a>
-<span class="sourceLineNo">182</span>         }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>   /**<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    * <a name="line.188"></a>
-<span class="sourceLineNo">189</span>    * @param req The HTTP request.<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    * @param path The log file path.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    * @return The parsed contents of the log file.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    * @throws Exception<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    */<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   @RestMethod(<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      name="PARSE",<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      path="/*",<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      converters=Queryable.class,<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      swagger=@MethodSwagger(<a name="line.203"></a>
-<span class="sourceLineNo">204</span>         responses={@Response(200),@Response(404)}<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      )<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   )<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>      File f = getFile(path);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>      if (f.isDirectory())<a name="line.212"></a>
-<span class="sourceLineNo">213</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>      return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   }<a name="line.216"></a>
+<span class="sourceLineNo">147</span>      File f = getFile(path);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      if (f.isDirectory())<a name="line.148"></a>
+<span class="sourceLineNo">149</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>      if (! highlight) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>         Object o = getReader(f, startDate, endDate, thread, loggers, severity);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>         res.setContentType("text/plain");<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         if (o instanceof Reader)<a name="line.156"></a>
+<span class="sourceLineNo">157</span>            res.setOutput(o);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>         else {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>            try (LogParser p = (LogParser)o; Writer w = res.getNegotiatedWriter()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>               p.writeTo(w);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>         }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>         return;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      res.setContentType("text/html");<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      try (PrintWriter w = res.getNegotiatedWriter()) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>         w.println("&lt;html&gt;&lt;body style='font-family:monospace;font-size:8pt;white-space:pre;'&gt;");<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         try (LogParser lp = getLogParser(f, startDate, endDate, thread, loggers, severity)) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            if (! lp.hasNext())<a name="line.170"></a>
+<span class="sourceLineNo">171</span>               w.append("&lt;span style='color:gray'&gt;[EMPTY]&lt;/span&gt;");<a name="line.171"></a>
+<span class="sourceLineNo">172</span>            else for (LogParser.Entry le : lp) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>               char s = le.severity.charAt(0);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>               String color = "black";<a name="line.174"></a>
+<span class="sourceLineNo">175</span>               //SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST<a name="line.175"></a>
+<span class="sourceLineNo">176</span>               if (s == 'I')<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                  color = "#006400";<a name="line.177"></a>
+<span class="sourceLineNo">178</span>               else if (s == 'W')<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                  color = "#CC8400";<a name="line.179"></a>
+<span class="sourceLineNo">180</span>               else if (s == 'E' || s == 'S')<a name="line.180"></a>
+<span class="sourceLineNo">181</span>                  color = "#DD0000";<a name="line.181"></a>
+<span class="sourceLineNo">182</span>               else if (s == 'D' || s == 'F' || s == 'T')<a name="line.182"></a>
+<span class="sourceLineNo">183</span>                  color = "#000064";<a name="line.183"></a>
+<span class="sourceLineNo">184</span>               w.append("&lt;span style='color:").append(color).append("'&gt;");<a name="line.184"></a>
+<span class="sourceLineNo">185</span>               le.appendHtml(w).append("&lt;/span&gt;");<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>            w.append("&lt;/body&gt;&lt;/html&gt;");<a name="line.187"></a>
+<span class="sourceLineNo">188</span>         }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>   /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    * [VIEW /*] - Retrieve the contents of a log file as parsed entries.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    * <a name="line.194"></a>
+<span class="sourceLineNo">195</span>    * @param req The HTTP request.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    * @param path The log file path.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    * @param start Optional start timestamp.  Don't print lines logged before the specified timestamp.  Example:  "&amp;amp;start=2014-01-23 11:25:47".<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    * @param end Optional end timestamp.  Don't print lines logged after the specified timestamp.  Example:  "&amp;amp;end=2014-01-23 11:25:47".<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    * @param thread Optional thread name filter.  Only show log entries with the specified thread name.  Example: "&amp;amp;thread=pool-33-thread-1".<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    * @param loggers Optional logger filter.  Only show log entries if they were produced by one of the specified loggers (simple class name).  Example: "&amp;amp;loggers=(LinkIndexService,LinkIndexRestService)".<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    * @param severity Optional severity filter.  Only show log entries with the specified severity.  Example: "&amp;amp;severity=(ERROR,WARN)".<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    * @return The parsed contents of the log file.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    * @throws Exception<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   @RestMethod(<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      name="PARSE",<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      path="/*",<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      converters=Queryable.class,<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      swagger= {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>         "responses:{",<a name="line.210"></a>
+<span class="sourceLineNo">211</span>            "200: {description:'OK'},",<a name="line.211"></a>
+<span class="sourceLineNo">212</span>            "404: {description:'Not Found'}",<a name="line.212"></a>
+<span class="sourceLineNo">213</span>         "}"<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      }<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   )<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   public LogParser viewParsedEntries(RestRequest req, @PathRemainder String path, @Query("start") String start, @Query("end") String end, @Query("thread") String thread, @Query("loggers") String[] loggers, @Query("severity") String[] severity) throws Exception {<a name="line.216"></a>
 <span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>   /**<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    * [DOWNLOAD /*] - Download file.<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * <a name="line.220"></a>
-<span class="sourceLineNo">221</span>    * @param res The HTTP response.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    * @param path The log file path.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * @return The contents of the log file.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    * @throws Exception<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   @RestMethod(<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      name="DOWNLOAD",<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      path="/*",<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      swagger=@MethodSwagger(<a name="line.229"></a>
-<span class="sourceLineNo">230</span>         responses={@Response(200),@Response(404)}<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      )<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   )<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>      File f = getFile(path);<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>      if (f.isDirectory())<a name="line.237"></a>
-<span class="sourceLineNo">238</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span>      res.setContentType("application/octet-stream");<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      res.setContentLength((int)f.length());<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      return new FileInputStream(f);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>   /**<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    * [DELETE /*] - Delete a file.<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * <a name="line.247"></a>
-<span class="sourceLineNo">248</span>    * @param path The log file path.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    * @return A redirect object to the root.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    * @throws Exception<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   @RestMethod(<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      name=DELETE,<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      path="/*",<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      swagger=@MethodSwagger(<a name="line.255"></a>
-<span class="sourceLineNo">256</span>         responses={@Response(200),@Response(404)}<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      )<a name="line.257"></a>
-<span class="sourceLineNo">258</span>   )<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>      File f = getFile(path);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>      if (f.isDirectory())<a name="line.263"></a>
-<span class="sourceLineNo">264</span>         throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>      if (f.canWrite())<a name="line.266"></a>
-<span class="sourceLineNo">267</span>         if (! f.delete())<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>      return new Redirect(path + "/..");<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>   private static BufferedReader getReader(File f) throws IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span>   private File getFile(String path) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      if (path != null &amp;&amp; path.indexOf("..") != -1)<a name="line.278"></a>
-<span class="sourceLineNo">279</span>         throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      if (filter.accept(f))<a name="line.281"></a>
-<span class="sourceLineNo">282</span>         return f;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.283"></a>
-<span class="sourceLineNo">284</span>   }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span>   /**<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * File bean.<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    */<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   @SuppressWarnings("javadoc")<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   public static class FileResource {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      final File f;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      public final String type;<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      public final Object name;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      public final Long size;<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      @Swap(DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      public URI view, highlighted, parsed, download, delete;<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>      public FileResource(File f, URI uri) throws Exception {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>         this.f = f;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>         this.type = (f.isDirectory() ? "dir" : "file");<a name="line.300"></a>
-<span class="sourceLineNo">301</span>         this.name = f.isDirectory() ? new LinkString(f.getName(), uri.toString()) : f.getName();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>         this.size = f.isDirectory() ? null : f.length();<a name="line.302"></a>
-<span class="sourceLineNo">303</span>         this.lastModified = new Date(f.lastModified());<a name="line.303"></a>
-<span class="sourceLineNo">304</span>         if (f.canRead() &amp;&amp; ! f.isDirectory()) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>            this.view = new URI(uri + "?method=VIEW");<a name="line.305"></a>
-<span class="sourceLineNo">306</span>            this.highlighted = new URI(uri + "?method=VIEW&amp;highlight=true");<a name="line.306"></a>
-<span class="sourceLineNo">307</span>            this.parsed = new URI(uri + "?method=PARSE");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>            this.download = new URI(uri + "?method=DOWNLOAD");<a name="line.308"></a>
-<span class="sourceLineNo">309</span>            this.delete = new URI(uri + "?method=DELETE");<a name="line.309"></a>
-<span class="sourceLineNo">310</span>         }<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>   static final class FileResourceComparator implements Comparator&lt;FileResource&gt;, Serializable {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      private static final long serialVersionUID = 1L;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      @Override /* Comparator */<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      public int compare(FileResource o1, FileResource o2) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>         int c = o1.type.compareTo(o2.type);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>         return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      }<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>   private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      if (start == null &amp;&amp; end == null &amp;&amp; thread == null &amp;&amp; loggers == null)<a name="line.324"></a>
-<span class="sourceLineNo">325</span>         return getReader(f);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      return getLogParser(f, start, end, thread, loggers, severity);<a name="line.326"></a>
+<span class="sourceLineNo">218</span>      File f = getFile(path);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      Date startDate = parseISO8601Date(start), endDate = parseISO8601Date(end);<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>      if (f.isDirectory())<a name="line.221"></a>
+<span class="sourceLineNo">222</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "View not available on directories");<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>      return getLogParser(f, startDate, endDate, thread, loggers, severity);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>   /**<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    * [DOWNLOAD /*] - Download file.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    * <a name="line.229"></a>
+<span class="sourceLineNo">230</span>    * @param res The HTTP response.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * @param path The log file path.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    * @return The contents of the log file.<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    * @throws Exception<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    */<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   @RestMethod(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      name="DOWNLOAD",<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      path="/*",<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      swagger= {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>         "responses:{",<a name="line.239"></a>
+<span class="sourceLineNo">240</span>            "200: {description:'OK'},",<a name="line.240"></a>
+<span class="sourceLineNo">241</span>            "404: {description:'Not Found'}",<a name="line.241"></a>
+<span class="sourceLineNo">242</span>         "}"<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   )<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   public Object downloadFile(RestResponse res, @PathRemainder String path) throws Exception {<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>      File f = getFile(path);<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>      if (f.isDirectory())<a name="line.249"></a>
+<span class="sourceLineNo">250</span>         throw new RestException(SC_METHOD_NOT_ALLOWED, "Download not available on directories");<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>      res.setContentType("application/octet-stream");<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      res.setContentLength((int)f.length());<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      return new FileInputStream(f);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>   /**<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    * [DELETE /*] - Delete a file.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    * <a name="line.259"></a>
+<span class="sourceLineNo">260</span>    * @param path The log file path.<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    * @return A redirect object to the root.<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    * @throws Exception<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    */<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   @RestMethod(<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      name=DELETE,<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      path="/*",<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      swagger= {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>         "responses:{",<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            "200: {description:'OK'},",<a name="line.269"></a>
+<span class="sourceLineNo">270</span>            "404: {description:'Not Found'}",<a name="line.270"></a>
+<span class="sourceLineNo">271</span>         "}"<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   )<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   public Object deleteFile(@PathRemainder String path) throws Exception {<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>      File f = getFile(path);<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>      if (f.isDirectory())<a name="line.278"></a>
+<span class="sourceLineNo">279</span>         throw new RestException(SC_BAD_REQUEST, "Delete not available on directories.");<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>      if (f.canWrite())<a name="line.281"></a>
+<span class="sourceLineNo">282</span>         if (! f.delete())<a name="line.282"></a>
+<span class="sourceLineNo">283</span>            throw new RestException(SC_FORBIDDEN, "Could not delete file.");<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>      return new Redirect(path + "/..");<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span>   private static BufferedReader getReader(File f) throws IOException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      return new BufferedReader(new InputStreamReader(new FileInputStream(f), Charset.defaultCharset()));<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>   private File getFile(String path) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      if (path != null &amp;&amp; path.indexOf("..") != -1)<a name="line.293"></a>
+<span class="sourceLineNo">294</span>         throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      File f = (path == null ? logDir : new File(logDir.getAbsolutePath() + '/' + path));<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (filter.accept(f))<a name="line.296"></a>
+<span class="sourceLineNo">297</span>         return f;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      throw new RestException(SC_NOT_FOUND, "File not found.");<a name="line.298"></a>
+<span class="sourceLineNo">299</span>   }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>   /**<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    * File bean.<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    */<a name="line.303"></a>
+<span class="sourceLineNo">304</span>   @SuppressWarnings("javadoc")<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   public static class FileResource {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      final File f;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      public final String type;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      public final Object name;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      public final Long size;<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      @Swap(DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      public URI view, highlighted, parsed, download, delete;<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>      public FileResource(File f, URI uri) throws Exception {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>         this.f = f;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>         this.type = (f.isDirectory() ? "dir" : "file");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>         this.name = f.isDirectory() ? new LinkString(f.getName(), uri.toString()) : f.getName();<a name="line.316"></a>
+<span class="sourceLineNo">317</span>         this.size = f.isDirectory() ? null : f.length();<a name="line.317"></a>
+<span class="sourceLineNo">318</span>         this.lastModified = new Date(f.lastModified());<a name="line.318"></a>
+<span class="sourceLineNo">319</span>         if (f.canRead() &amp;&amp; ! f.isDirectory()) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>            this.view = new URI(uri + "?method=VIEW");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>            this.highlighted = new URI(uri + "?method=VIEW&amp;highlight=true");<a name="line.321"></a>
+<span class="sourceLineNo">322</span>            this.parsed = new URI(uri + "?method=PARSE");<a name="line.322"></a>
+<span class="sourceLineNo">323</span>            this.download = new URI(uri + "?method=DOWNLOAD");<a name="line.323"></a>
+<span class="sourceLineNo">324</span>            this.delete = new URI(uri + "?method=DELETE");<a name="line.324"></a>
+<span class="sourceLineNo">325</span>         }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
 <span class="sourceLineNo">327</span>   }<a name="line.327"></a>
 <span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>   private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>}<a name="line.332"></a>
+<span class="sourceLineNo">329</span>   static final class FileResourceComparator implements Comparator&lt;FileResource&gt;, Serializable {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      private static final long serialVersionUID = 1L;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      @Override /* Comparator */<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      public int compare(FileResource o1, FileResource o2) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>         int c = o1.type.compareTo(o2.type);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>         return c != 0 ? c : o1.f.getName().compareTo(o2.f.getName());<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      }<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>   private Object getReader(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      if (start == null &amp;&amp; end == null &amp;&amp; thread == null &amp;&amp; loggers == null)<a name="line.339"></a>
+<span class="sourceLineNo">340</span>         return getReader(f);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      return getLogParser(f, start, end, thread, loggers, severity);<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>   private LogParser getLogParser(File f, final Date start, final Date end, final String thread, final String[] loggers, final String[] severity) throws IOException {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      return new LogParser(leFormatter, f, start, end, thread, loggers, severity);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   }<a name="line.346"></a>
+<span class="sourceLineNo">347</span>}<a name="line.347"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/BasicRestInfoProvider.html b/content/site/apidocs/src-html/org/apache/juneau/rest/BasicRestInfoProvider.html
index 481cc80..d641df9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/BasicRestInfoProvider.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/BasicRestInfoProvider.html
@@ -20,14 +20,14 @@
 <span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
 <span class="sourceLineNo">013</span>package org.apache.juneau.rest;<a name="line.13"></a>
 <span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static javax.servlet.http.HttpServletResponse.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import static org.apache.juneau.dto.swagger.SwaggerBuilder.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span>import static org.apache.juneau.internal.ReflectionUtils.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.lang.reflect.Method;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.concurrent.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.ReflectionUtils.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>import java.lang.reflect.Method;<a name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.util.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.util.concurrent.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import org.apache.juneau.dto.swagger.*;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import org.apache.juneau.http.*;<a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.juneau.internal.*;<a name="line.25"></a>
@@ -35,1413 +35,573 @@
 <span class="sourceLineNo">027</span>import org.apache.juneau.parser.*;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.juneau.rest.annotation.*;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import org.apache.juneau.svl.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>/**<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * Default implementation of {@link RestInfoProvider}.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <a name="line.33"></a>
-<span class="sourceLineNo">034</span> * &lt;p&gt;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Subclasses can override these methods to tailor how HTTP REST resources are documented.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <a name="line.36"></a>
-<span class="sourceLineNo">037</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * &lt;ul&gt;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *    &lt;li class='jf'&gt;{@link RestContext#REST_infoProvider}<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.OptionsPages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; OPTIONS Pages&lt;/a&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;/ul&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>public class BasicRestInfoProvider implements RestInfoProvider {<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   private final RestContext context;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   private final String<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      siteName,<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      title,<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      description,<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      termsOfService,<a name="line.50"></a>
-<span class="sourceLineNo">051</span>      contact,<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      license,<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      version,<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      tags,<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      externalDocs;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   private final ConcurrentHashMap&lt;Locale,Swagger&gt; swaggers = new ConcurrentHashMap&lt;&gt;();<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>   /**<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * Constructor.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * <a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * @param context The resource context.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    */<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   public BasicRestInfoProvider(RestContext context) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      this.context = context;<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>      Builder b = new Builder(context);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      this.siteName = b.siteName;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      this.title = b.title;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      this.description = b.description;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      this.termsOfService = b.termsOfService;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      this.contact = b.contact;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      this.license = b.license;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      this.version = b.version;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      this.tags = b.tags;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      this.externalDocs = b.externalDocs;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>   private static final class Builder {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      String<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         siteName,<a name="line.80"></a>
-<span class="sourceLineNo">081</span>         title,<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         description,<a name="line.82"></a>
-<span class="sourceLineNo">083</span>         termsOfService,<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         contact,<a name="line.84"></a>
-<span class="sourceLineNo">085</span>         license,<a name="line.85"></a>
-<span class="sourceLineNo">086</span>         version,<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         tags,<a name="line.87"></a>
-<span class="sourceLineNo">088</span>         externalDocs;<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>      Builder(RestContext context) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>         LinkedHashMap&lt;Class&lt;?&gt;,RestResource&gt; restResourceAnnotationsParentFirst = findAnnotationsMapParentFirst(RestResource.class, context.getResource().getClass());<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>         for (RestResource r : restResourceAnnotationsParentFirst.values()) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>            if (! r.siteName().isEmpty())<a name="line.95"></a>
-<span class="sourceLineNo">096</span>               siteName = r.siteName();<a name="line.96"></a>
-<span class="sourceLineNo">097</span>            if (! r.title().isEmpty())<a name="line.97"></a>
-<span class="sourceLineNo">098</span>               title = r.title();<a name="line.98"></a>
-<span class="sourceLineNo">099</span>            if (! r.description().isEmpty())<a name="line.99"></a>
-<span class="sourceLineNo">100</span>               description = r.description();<a name="line.100"></a>
-<span class="sourceLineNo">101</span>            ResourceSwagger sr = r.swagger();<a name="line.101"></a>
-<span class="sourceLineNo">102</span>            if (! sr.termsOfService().isEmpty())<a name="line.102"></a>
-<span class="sourceLineNo">103</span>               termsOfService = sr.termsOfService();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>            if (! sr.contact().isEmpty())<a name="line.104"></a>
-<span class="sourceLineNo">105</span>               contact = sr.contact();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            if (! sr.license().isEmpty())<a name="line.106"></a>
-<span class="sourceLineNo">107</span>               license = sr.license();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            if (! sr.version().isEmpty())<a name="line.108"></a>
-<span class="sourceLineNo">109</span>               version = sr.version();<a name="line.109"></a>
-<span class="sourceLineNo">110</span>            if (! sr.tags().isEmpty())<a name="line.110"></a>
-<span class="sourceLineNo">111</span>               tags = sr.tags();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>            if (! sr.externalDocs().isEmpty())<a name="line.112"></a>
-<span class="sourceLineNo">113</span>               externalDocs = sr.externalDocs();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>         }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      }<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>   /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * Returns the localized Swagger from the file system.<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * <a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * &lt;p&gt;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * Looks for a file called &lt;js&gt;"{ServletClass}_{locale}.json"&lt;/js&gt; in the same package as this servlet and returns<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * it as a parsed {@link Swagger} object.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * <a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * &lt;p&gt;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    * Returned objects are cached per-locale for later quick-lookup.<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * <a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * @param req The incoming HTTP request.<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @return The parsed swagger object, or &lt;jk&gt;null&lt;/jk&gt; if none could be found.<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    * @throws Exception <a name="line.130"></a>
-<span class="sourceLineNo">131</span>    *    If swagger file was not valid JSON.<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    */<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   public Swagger getSwaggerFromFile(RestRequest req) throws Exception {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      Locale locale = req.getLocale();<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      Swagger s = swaggers.get(locale);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      if (s == null) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>         s = context.getClasspathResource(Swagger.class, MediaType.JSON, getClass().getSimpleName() + ".json", locale);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>         swaggers.putIfAbsent(locale, s == null ? Swagger.NULL : s);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      return s == Swagger.NULL ? null : s;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>   /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    * Returns the localized swagger for this REST resource.<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    * <a name="line.145"></a>
-<span class="sourceLineNo">146</span>    * &lt;p&gt;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    * Subclasses can override this method to customize the Swagger.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * <a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * @param req The incoming HTTP request.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * @return <a name="line.150"></a>
-<span class="sourceLineNo">151</span>    *    A new Swagger instance.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    * @throws Exception<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   @Override /* RestInfoProvider */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   public Swagger getSwagger(RestRequest req) throws Exception {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      <a name="line.157"></a>
-<span class="sourceLineNo">158</span>      // If a file is defined, use that.<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      Swagger s = getSwaggerFromFile(req);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (s != null)<a name="line.160"></a>
-<span class="sourceLineNo">161</span>         return s;<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>      s = swagger(<a name="line.163"></a>
-<span class="sourceLineNo">164</span>         info(getTitle(req), getVersion(req))<a name="line.164"></a>
-<span class="sourceLineNo">165</span>            .contact(getContact(req))<a name="line.165"></a>
-<span class="sourceLineNo">166</span>            .license(getLicense(req))<a name="line.166"></a>
-<span class="sourceLineNo">167</span>            .description(getDescription(req))<a name="line.167"></a>
-<span class="sourceLineNo">168</span>            .termsOfService(getTermsOfService(req))<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         )<a name="line.169"></a>
-<span class="sourceLineNo">170</span>         .consumes(getConsumes(req))<a name="line.170"></a>
-<span class="sourceLineNo">171</span>         .produces(getProduces(req))<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         .tags(getTags(req))<a name="line.172"></a>
-<span class="sourceLineNo">173</span>         .externalDocs(getExternalDocs(req));<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>      for (RestJavaMethod sm : context.getCallMethods().values()) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>         if (sm.isRequestAllowed(req)) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            Method m = sm.method;<a name="line.177"></a>
-<span class="sourceLineNo">178</span>            Operation o = operation()<a name="line.178"></a>
-<span class="sourceLineNo">179</span>               .operationId(getMethodOperationId(m, req))<a name="line.179"></a>
-<span class="sourceLineNo">180</span>               .description(getMethodDescription(m, req))<a name="line.180"></a>
-<span class="sourceLineNo">181</span>               .tags(getMethodTags(m, req))<a name="line.181"></a>
-<span class="sourceLineNo">182</span>               .summary(getMethodSummary(m, req))<a name="line.182"></a>
-<span class="sourceLineNo">183</span>               .externalDocs(getMethodExternalDocs(m, req))<a name="line.183"></a>
-<span class="sourceLineNo">184</span>               .parameters(getMethodParameters(m, req))<a name="line.184"></a>
-<span class="sourceLineNo">185</span>               .responses(getMethodResponses(m, req));<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>            if (isDeprecated(m, req))<a name="line.187"></a>
-<span class="sourceLineNo">188</span>               o.deprecated(true);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            <a name="line.189"></a>
-<span class="sourceLineNo">190</span>            o.consumes(getMethodConsumes(m, req));<a name="line.190"></a>
-<span class="sourceLineNo">191</span>            o.produces(getMethodProduces(m, req));<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>            s.path(<a name="line.193"></a>
-<span class="sourceLineNo">194</span>               sm.getPathPattern(),<a name="line.194"></a>
-<span class="sourceLineNo">195</span>               sm.getHttpMethod().toLowerCase(),<a name="line.195"></a>
-<span class="sourceLineNo">196</span>               o<a name="line.196"></a>
-<span class="sourceLineNo">197</span>            );<a name="line.197"></a>
-<span class="sourceLineNo">198</span>         }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      <a name="line.200"></a>
-<span class="sourceLineNo">201</span>      return s;<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>   /**<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    * Returns the localized operation ID of the specified java method.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    * <a name="line.206"></a>
-<span class="sourceLineNo">207</span>    * &lt;p&gt;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * Subclasses can override this method to provide their own operation ID.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    * <a name="line.209"></a>
-<span class="sourceLineNo">210</span>    * &lt;p&gt;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    * The default implementation simply returns the Java method name.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    * <a name="line.212"></a>
-<span class="sourceLineNo">213</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    * @param req The current request.<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    * @return The localized operation ID of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    * @throws Exception <a name="line.216"></a>
-<span class="sourceLineNo">217</span>    */<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   public String getMethodOperationId(Method method, RestRequest req) throws Exception {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      return method.getName();<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>   /**<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * Returns the localized summary of the specified java method on this servlet.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    * <a name="line.224"></a>
-<span class="sourceLineNo">225</span>    * &lt;p&gt;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    * Subclasses can override this method to provide their own summary.<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    * <a name="line.227"></a>
-<span class="sourceLineNo">228</span>    * &lt;p&gt;<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    * &lt;ol class='spaced-list'&gt;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    *    &lt;li&gt;{@link RestMethod#summary() @RestMethod.summary()} annotation.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    *       &lt;p class='bcode'&gt;<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(summary=&lt;js&gt;"Summary of my method"&lt;/js&gt;)<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    *    <a name="line.237"></a>
-<span class="sourceLineNo">238</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(summary=&lt;js&gt;"$L{myLocalizedSummary}"&lt;/js&gt;)<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    *       &lt;/p&gt;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    *    &lt;li&gt;Localized string from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    *       on the resource class, then any parent classes.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    *       &lt;ol&gt;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].summary&lt;/ck&gt;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].summary&lt;/ck&gt;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    *       &lt;/ol&gt;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestMethod#summary() @RestMethod.summary()} annotation.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    *       &lt;p class='bcode'&gt;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    *    &lt;ck&gt;MyClass.myMethod.summary&lt;/ck&gt; = &lt;cv&gt;Summary of my method.&lt;/cv&gt;<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    *    <a name="line.253"></a>
-<span class="sourceLineNo">254</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    *    &lt;ck&gt;MyClass.myMethod.summary&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.summary}&lt;/cv&gt;<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    *       &lt;/p&gt;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    * &lt;/ol&gt;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    * <a name="line.258"></a>
-<span class="sourceLineNo">259</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    * @param req The current request.<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    * @return The localized summary of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    * @throws Exception <a name="line.262"></a>
-<span class="sourceLineNo">263</span>    */<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   @Override /* RestInfoProvider */<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   public String getMethodSummary(Method method, RestRequest req) throws Exception {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>      String s = method.getAnnotation(RestMethod.class).summary();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      if (s.isEmpty())<a name="line.269"></a>
-<span class="sourceLineNo">270</span>         s = context.getMessages().findFirstString(req.getLocale(), method.getName() + ".summary");<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      if (s != null)<a name="line.271"></a>
-<span class="sourceLineNo">272</span>         return vr.resolve(s);<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      <a name="line.273"></a>
-<span class="sourceLineNo">274</span>      Operation o = getSwaggerOperationFromFile(method, req);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      return o == null ? null : o.getSummary();<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>   /**<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    * Returns the localized description of the specified java method on this servlet.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    * <a name="line.280"></a>
-<span class="sourceLineNo">281</span>    * &lt;p&gt;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    * Subclasses can override this method to provide their own description.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    * <a name="line.283"></a>
-<span class="sourceLineNo">284</span>    * &lt;p&gt;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    * &lt;ol class='spaced-list'&gt;<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    *    &lt;li&gt;{@link RestMethod#description() @RestMethod.description()} annotation.<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    *       &lt;p class='bcode'&gt;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(description=&lt;js&gt;"Description of my method"&lt;/js&gt;)<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    *    <a name="line.293"></a>
-<span class="sourceLineNo">294</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(description=&lt;js&gt;"$L{myLocalizedDescription}"&lt;/js&gt;)<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    *       &lt;/p&gt;<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    *    &lt;li&gt;Localized string from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    *       on the resource class, then any parent classes.<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    *       &lt;ol&gt;<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].description&lt;/ck&gt;<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].description&lt;/ck&gt;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    *       &lt;/ol&gt;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestMethod#description() @RestMethod.description()} annotation.<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    *       &lt;p class='bcode'&gt;<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    *    &lt;ck&gt;MyClass.myMethod.description&lt;/ck&gt; = &lt;cv&gt;Description of my method.&lt;/cv&gt;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    *    <a name="line.309"></a>
-<span class="sourceLineNo">310</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    *    &lt;ck&gt;MyClass.myMethod.description&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.description}&lt;/cv&gt;<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    *       &lt;/p&gt;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    * &lt;/ol&gt;<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    * <a name="line.314"></a>
-<span class="sourceLineNo">315</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    * @param req The current request.<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    * @return The localized description of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    * @throws Exception <a name="line.318"></a>
-<span class="sourceLineNo">319</span>    */<a name="line.319"></a>
-<span class="sourceLineNo">320</span>   @Override /* RestInfoProvider */<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   public String getMethodDescription(Method method, RestRequest req) throws Exception {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      <a name="line.323"></a>
-<span class="sourceLineNo">324</span>      String s = method.getAnnotation(RestMethod.class).description();<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      if (s.isEmpty())<a name="line.325"></a>
-<span class="sourceLineNo">326</span>         s = context.getMessages().findFirstString(req.getLocale(), method.getName() + ".description");<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      if (s != null)<a name="line.327"></a>
-<span class="sourceLineNo">328</span>         return vr.resolve(s);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      <a name="line.329"></a>
-<span class="sourceLineNo">330</span>      Operation o = getSwaggerOperationFromFile(method, req);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      return o == null ? null : o.getDescription();<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>   /**<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    * Returns the localized Swagger tags for this Java method.<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    * <a name="line.336"></a>
-<span class="sourceLineNo">337</span>    * &lt;p&gt;<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    * Subclasses can override this method to provide their own tags.<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    * <a name="line.339"></a>
-<span class="sourceLineNo">340</span>    * &lt;p&gt;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    * &lt;ol class='spaced-list'&gt;<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    *    &lt;li&gt;{@link MethodSwagger#tags() @MethodSwagger.tags()} annotation.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    *       &lt;p class='bcode'&gt;<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(tags=&lt;js&gt;"foo,bar,baz"&lt;/js&gt;)<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    *    )<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    *    <a name="line.351"></a>
-<span class="sourceLineNo">352</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(tags=&lt;js&gt;"$L{myLocalizedTags}"&lt;/js&gt;)<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    *    )<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    *       &lt;/p&gt;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    *    &lt;li&gt;Localized string from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    *       on the resource class, then any parent classes.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    *       &lt;ol&gt;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].tags&lt;/ck&gt;<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].tags&lt;/ck&gt;<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    *       &lt;/ol&gt;<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    *       &lt;br&gt;Value can be a comma-delimited list or JSON array.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link MethodSwagger#tags() @MethodSwagger.tags()} annotation.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    *       &lt;p class='bcode'&gt;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    *    &lt;cc&gt;// Comma-delimited list&lt;/cc&gt;<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    *    &lt;ck&gt;MyClass.myMethod.tags&lt;/ck&gt; = &lt;cv&gt;foo, bar, baz&lt;/cv&gt;<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    *    <a name="line.370"></a>
-<span class="sourceLineNo">371</span>    *    &lt;cc&gt;// JSON array&lt;/cc&gt;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    *    &lt;ck&gt;MyClass.myMethod.tags&lt;/ck&gt; = &lt;cv&gt;["foo", "bar", "baz"]&lt;/cv&gt;<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    * <a name="line.373"></a>
-<span class="sourceLineNo">374</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    *    &lt;ck&gt;MyClass.myMethod.description&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.tags}&lt;/cv&gt;<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    *       &lt;/p&gt;<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    * &lt;/ol&gt;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    * <a name="line.378"></a>
-<span class="sourceLineNo">379</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    * @param req The current request.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    * @return The localized tags of the method, or &lt;jk&gt;null&lt;/jk&gt; if none were found.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    * @throws Exception <a name="line.382"></a>
-<span class="sourceLineNo">383</span>    */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public List&lt;String&gt; getMethodTags(Method method, RestRequest req) throws Exception {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      JsonParser p = JsonParser.DEFAULT;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      <a name="line.387"></a>
-<span class="sourceLineNo">388</span>      String s = method.getAnnotation(RestMethod.class).swagger().tags();<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      if (s.isEmpty())<a name="line.389"></a>
-<span class="sourceLineNo">390</span>         s = context.getMessages().findFirstString(req.getLocale(), method.getName() + ".tags");<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      if (s != null) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>         s = vr.resolve(s);<a name="line.392"></a>
-<span class="sourceLineNo">393</span>         if (StringUtils.isObjectList(s)) <a name="line.393"></a>
-<span class="sourceLineNo">394</span>            return p.parse(s, ArrayList.class, String.class);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>         return Arrays.asList(StringUtils.split(s));<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>      Operation o = getSwaggerOperationFromFile(method, req);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      return o == null ? null : o.getTags();<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span>   /**<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    * Returns the localized external documentation of the specified java method on this servlet.<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    * <a name="line.404"></a>
-<span class="sourceLineNo">405</span>    * &lt;p&gt;<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    * Subclasses can override this method to provide their own external documentation.<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    * <a name="line.407"></a>
-<span class="sourceLineNo">408</span>    * &lt;p&gt;<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    * &lt;ol class='spaced-list'&gt;<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    *    &lt;li&gt;{@link MethodSwagger#externalDocs() @MethodSwagger.externalDocs()} annotation.<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    *       &lt;p class='bcode'&gt;<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(externalDocs=&lt;js&gt;"{description:'Find more info here',url:'https://swagger.io'}"&lt;/js&gt;)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    *    )<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    *    <a name="line.419"></a>
-<span class="sourceLineNo">420</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(externalDocs=&lt;js&gt;"$L{myLocalizedExternalDocs}"&lt;/js&gt;)<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    *    )<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    *       &lt;/p&gt;<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    *    &lt;li&gt;Localized string from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    *       on the resource class, then any parent classes.<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    *       &lt;ol&gt;<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].externalDocs&lt;/ck&gt;<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].externalDocs&lt;/ck&gt;<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    *       &lt;/ol&gt;<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    *       &lt;br&gt;Value is a JSON representation of a {@link ExternalDocumentation} object.<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link MethodSwagger#externalDocs() @MethodSwagger.externalDocs()} annotation.<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    *       &lt;p class='bcode'&gt;<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    *    &lt;ck&gt;MyClass.myMethod.externalDocs&lt;/ck&gt; = &lt;cv&gt;{description:"Find more info here",url:"https://swagger.io"}&lt;/js&gt;<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    *    <a name="line.438"></a>
-<span class="sourceLineNo">439</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    *    &lt;ck&gt;MyClass.myMethod.externalDocs&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.externalDocs}&lt;/cv&gt;<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    *       &lt;/p&gt;<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    * &lt;/ol&gt;<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    * <a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    * @param req The current request.<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    * @return The localized external documentation of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    * @throws Exception <a name="line.447"></a>
-<span class="sourceLineNo">448</span>    */<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   public ExternalDocumentation getMethodExternalDocs(Method method, RestRequest req) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      JsonParser p = JsonParser.DEFAULT;<a name="line.450"></a>
-<span class="sourceLineNo">451</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      <a name="line.452"></a>
-<span class="sourceLineNo">453</span>      String s = method.getAnnotation(RestMethod.class).swagger().externalDocs();<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      if (s.isEmpty())<a name="line.454"></a>
-<span class="sourceLineNo">455</span>         s = context.getMessages().findFirstString(req.getLocale(), method.getName() + ".externalDocs");<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      if (s != null) <a name="line.456"></a>
-<span class="sourceLineNo">457</span>         return p.parse(vr.resolve(s), ExternalDocumentation.class);<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>      Operation o = getSwaggerOperationFromFile(method, req);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      return o == null ? null : o.getExternalDocs();<a name="line.460"></a>
-<span class="sourceLineNo">461</span>   }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>   <a name="line.462"></a>
-<span class="sourceLineNo">463</span>   /**<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    * Returns the localized parameter info for the specified java method.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    * <a name="line.465"></a>
-<span class="sourceLineNo">466</span>    * &lt;p&gt;<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    * Subclasses can override this method to provide their own parameter info.<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    * <a name="line.468"></a>
-<span class="sourceLineNo">469</span>    * &lt;p&gt;<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    * &lt;ol class='spaced-list'&gt;<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    *    &lt;li&gt;Operation information from swagger file.<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    *    &lt;li&gt;{@link MethodSwagger#parameters() @MethodSwagger.parameters()} annotation.<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    *       &lt;p class='bcode'&gt;<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    *          parameters={<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    *             &lt;ja&gt;@Parameter&lt;/ja&gt;(in=&lt;js&gt;"path"&lt;/js&gt;, name=&lt;js&gt;"a"&lt;/js&gt;, description=&lt;js&gt;"The 'a' attribute"&lt;/js&gt;)<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    *          }<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    *       )<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    *    )<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    *    <a name="line.485"></a>
-<span class="sourceLineNo">486</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    *          parameters={<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    *             &lt;ja&gt;@Parameter&lt;/ja&gt;(in=&lt;js&gt;"path"&lt;/js&gt;, name=&lt;js&gt;"a"&lt;/js&gt;, description=&lt;js&gt;"$L{myLocalizedParamADescription}"&lt;/js&gt;)<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    *          }<a name="line.491"></a>
-<span class="sourceLineNo">492</span>    *       )<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    *    )<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    *       &lt;/p&gt;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    *       on the resource class, then any parent classes.<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    *       &lt;ol&gt;<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].parameters&lt;/ck&gt;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].parameters&lt;/ck&gt;<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    *       &lt;/ol&gt;<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    *       &lt;br&gt;Value is a JSON representation of a &lt;code&gt;{@link ParameterInfo}[]&lt;/code&gt; object.<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link MethodSwagger#parameters() @MethodSwagger.parameters()} annotation.<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    *       &lt;p class='bcode'&gt;<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    *    &lt;ck&gt;MyClass.myMethod.parameters&lt;/ck&gt; = &lt;cv&gt;[{name:"a",in:"path",description:"The ''a'' attribute"}]&lt;/cv&gt;<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    *    <a name="line.508"></a>
-<span class="sourceLineNo">509</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    *    &lt;ck&gt;MyClass.myMethod.parameters&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.parameters}&lt;/cv&gt;<a name="line.510"></a>
-<span class="sourceLineNo">511</span>    *       &lt;/p&gt;<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    *    &lt;li&gt;Information gathered directly from the parameters on the Java method.<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    * &lt;/ol&gt;<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    * <a name="line.514"></a>
-<span class="sourceLineNo">515</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    * @param req The current request.<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    * @return The localized parameter info of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    * @throws Exception <a name="line.518"></a>
-<span class="sourceLineNo">519</span>    */<a name="line.519"></a>
-<span class="sourceLineNo">520</span>   public List&lt;ParameterInfo&gt; getMethodParameters(Method method, RestRequest req) throws Exception {<a name="line.520"></a>
-<span class="sourceLineNo">521</span>      <a name="line.521"></a>
-<span class="sourceLineNo">522</span>      Operation o = getSwaggerOperationFromFile(method, req);<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      if (o != null &amp;&amp; o.getParameters() != null)<a name="line.523"></a>
-<span class="sourceLineNo">524</span>         return o.getParameters();<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      JsonParser jp = JsonParser.DEFAULT;<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      Map&lt;String,ParameterInfo&gt; m = new TreeMap&lt;&gt;();<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>      // First parse @RestMethod.parameters() annotation.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>      for (org.apache.juneau.rest.annotation.Parameter v : method.getAnnotation(RestMethod.class).swagger().parameters()) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>         String in = vr.resolve(v.in());<a name="line.532"></a>
-<span class="sourceLineNo">533</span>         ParameterInfo p = parameterInfo(in, vr.resolve(v.name()));<a name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span>         if (! v.description().isEmpty())<a name="line.535"></a>
-<span class="sourceLineNo">536</span>            p.description(vr.resolve(v.description()));<a name="line.536"></a>
-<span class="sourceLineNo">537</span>         if (v.required())<a name="line.537"></a>
-<span class="sourceLineNo">538</span>            p.required(v.required());<a name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span>         if ("body".equals(in)) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span>            if (! v.schema().isEmpty())<a name="line.541"></a>
-<span class="sourceLineNo">542</span>               p.schema(jp.parse(vr.resolve(v.schema()), SchemaInfo.class));<a name="line.542"></a>
-<span class="sourceLineNo">543</span>         } else {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>            if (v.allowEmptyValue())<a name="line.544"></a>
-<span class="sourceLineNo">545</span>               p.allowEmptyValue(v.allowEmptyValue());<a name="line.545"></a>
-<span class="sourceLineNo">546</span>            if (! v.collectionFormat().isEmpty())<a name="line.546"></a>
-<span class="sourceLineNo">547</span>               p.collectionFormat(vr.resolve(v.collectionFormat()));<a name="line.547"></a>
-<span class="sourceLineNo">548</span>            if (! v._default().isEmpty())<a name="line.548"></a>
-<span class="sourceLineNo">549</span>               p._default(vr.resolve(v._default()));<a name="line.549"></a>
-<span class="sourceLineNo">550</span>            if (! v.format().isEmpty())<a name="line.550"></a>
-<span class="sourceLineNo">551</span>               p.format(vr.resolve(v.format()));<a name="line.551"></a>
-<span class="sourceLineNo">552</span>            if (! v.items().isEmpty())<a name="line.552"></a>
-<span class="sourceLineNo">553</span>               p.items(jp.parse(vr.resolve(v.items()), Items.class));<a name="line.553"></a>
-<span class="sourceLineNo">554</span>            p.type(vr.resolve(v.type()));<a name="line.554"></a>
-<span class="sourceLineNo">555</span>         }<a name="line.555"></a>
-<span class="sourceLineNo">556</span>         m.put(p.getIn() + '.' + p.getName(), p);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      }<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span>      // Next, look in resource bundle.<a name="line.559"></a>
-<span class="sourceLineNo">560</span>      String s = context.getMessages().findFirstString(req.getLocale(), method.getName() + ".parameters");<a name="line.560"></a>
-<span class="sourceLineNo">561</span>      if (s != null) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>         for (ParameterInfo pi : jp.parse(vr.resolve(s), ParameterInfo[].class)) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>            String key = pi.getIn() + '.' + pi.getName();<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            ParameterInfo p = m.get(key);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            if (p == null)<a name="line.565"></a>
-<span class="sourceLineNo">566</span>               m.put(key, pi);<a name="line.566"></a>
-<span class="sourceLineNo">567</span>            else <a name="line.567"></a>
-<span class="sourceLineNo">568</span>               p.copyFrom(pi);<a name="line.568"></a>
-<span class="sourceLineNo">569</span>         }<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      }<a name="line.570"></a>
-<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span>      // Finally, look for parameters defined on method.<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      for (RestParam mp : context.getRestParams(method)) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>         RestParamType in = mp.getParamType();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>         if (in != RestParamType.OTHER) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>            String k2 = in.toString() + '.' + (in == RestParamType.BODY ? null : mp.getName());<a name="line.576"></a>
-<span class="sourceLineNo">577</span>            ParameterInfo p = m.get(k2);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>            if (p == null) {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>               p = parameterInfoStrict(in.toString(), mp.getName());<a name="line.579"></a>
-<span class="sourceLineNo">580</span>               m.put(k2, p);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>            }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>         }<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      <a name="line.584"></a>
-<span class="sourceLineNo">585</span>      return m.isEmpty() ? null : new ArrayList&lt;&gt;(m.values());<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>   /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    * Returns the localized response info for the specified java method.<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    * <a name="line.590"></a>
-<span class="sourceLineNo">591</span>    * &lt;p&gt;<a name="line.591"></a>
-<span class="sourceLineNo">592</span>    * Subclasses can override this method to provide their own parameter info.<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    * <a name="line.593"></a>
-<span class="sourceLineNo">594</span>    * &lt;p&gt;<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    * &lt;ol class='spaced-list'&gt;<a name="line.596"></a>
-<span class="sourceLineNo">597</span>    *    &lt;li&gt;Operation information from swagger file.<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    *    &lt;li&gt;{@link MethodSwagger#responses() @MethodSwagger.responses()} annotation.<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    *       &lt;p class='bcode'&gt;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.602"></a>
-<span class="sourceLineNo">603</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    *          responses={<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    *             &lt;ja&gt;@Response&lt;/ja&gt;(<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    *                value=302,<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    *                description=&lt;js&gt;"Thing wasn't found here"&lt;/js&gt;,<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    *                headers={<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    *                   &lt;ja&gt;@Parameter&lt;/ja&gt;(name=&lt;js&gt;"Location"&lt;/js&gt;, description=&lt;js&gt;"The place to find the thing"&lt;/js&gt;)<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    *                }<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    *             )<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    *          }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    *       )<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    *    )<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    *    <a name="line.616"></a>
-<span class="sourceLineNo">617</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.617"></a>
-<span class="sourceLineNo">618</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    *          responses={<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    *             &lt;ja&gt;@Response&lt;/ja&gt;(<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    *                value=302,<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    *                description=&lt;js&gt;"Thing wasn't found here"&lt;/js&gt;,<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    *                headers={<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    *                   &lt;ja&gt;@Parameter&lt;/ja&gt;(name=&lt;js&gt;"Location"&lt;/js&gt;, description=&lt;js&gt;"$L{myLocalizedResponseDescription}"&lt;/js&gt;)<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    *                }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    *             )<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    *          }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>    *       )<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    *    )<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    *       &lt;/p&gt;<a name="line.632"></a>
-<span class="sourceLineNo">633</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    *       on the resource class, then any parent classes.<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    *       &lt;ol&gt;<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].responses&lt;/ck&gt;<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].responses&lt;/ck&gt;<a name="line.637"></a>
-<span class="sourceLineNo">638</span>    *       &lt;/ol&gt;<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    *       &lt;br&gt;Value is a JSON representation of a &lt;code&gt;Map&amp;lt;Integer,{@link ResponseInfo}&amp;gt;&lt;/code&gt; object.<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link MethodSwagger#responses() @MethodSwagger.responses()} annotation.<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.641"></a>
-<span class="sourceLineNo">642</span>    *       &lt;p class='bcode'&gt;<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    *    &lt;ck&gt;MyClass.myMethod.responses&lt;/ck&gt; = &lt;cv&gt;{302:{description:'Thing wasn''t found here',headers={Location:{description:"The place to find the thing"}}}&lt;/cv&gt;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    *    <a name="line.645"></a>
-<span class="sourceLineNo">646</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    *    &lt;ck&gt;MyClass.myMethod.responses&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.responses}&lt;/cv&gt;<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    *       &lt;/p&gt;<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    *    &lt;li&gt;Information gathered directly from the parameters on the Java method.<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    * &lt;/ol&gt;<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    * <a name="line.651"></a>
-<span class="sourceLineNo">652</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    * @param req The current request.<a name="line.653"></a>
-<span class="sourceLineNo">654</span>    * @return The localized response info of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    * @throws Exception <a name="line.655"></a>
-<span class="sourceLineNo">656</span>    */<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   @SuppressWarnings("unchecked")<a name="line.657"></a>
-<span class="sourceLineNo">658</span>   public Map&lt;Integer,ResponseInfo&gt; getMethodResponses(Method method, RestRequest req) throws Exception {<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      <a name="line.659"></a>
-<span class="sourceLineNo">660</span>      Operation o = getSwaggerOperationFromFile(method, req);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      if (o != null &amp;&amp; o.getResponses() != null)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>         return o.getResponses();<a name="line.662"></a>
-<span class="sourceLineNo">663</span><a name="line.663"></a>
-<span class="sourceLineNo">664</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      JsonParser jp = JsonParser.DEFAULT;<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      Map&lt;Integer,ResponseInfo&gt; m = new TreeMap&lt;&gt;();<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      Map&lt;String,HeaderInfo&gt; m2 = new TreeMap&lt;&gt;();<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span>      // First parse @RestMethod.parameters() annotation.<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      for (Response r : method.getAnnotation(RestMethod.class).swagger().responses()) {<a name="line.670"></a>
-<span class="sourceLineNo">671</span>         int httpCode = r.value();<a name="line.671"></a>
-<span class="sourceLineNo">672</span>         String description = r.description().isEmpty() ? RestUtils.getHttpResponseText(r.value()) : vr.resolve(r.description());<a name="line.672"></a>
-<span class="sourceLineNo">673</span>         ResponseInfo r2 = responseInfo(description);<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>         if (r.headers().length &gt; 0) {<a name="line.675"></a>
-<span class="sourceLineNo">676</span>            for (org.apache.juneau.rest.annotation.Parameter v : r.headers()) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>               HeaderInfo h = headerInfoStrict(vr.resolve(v.type()));<a name="line.677"></a>
-<span class="sourceLineNo">678</span>               if (! v.collectionFormat().isEmpty())<a name="line.678"></a>
-<span class="sourceLineNo">679</span>                  h.collectionFormat(vr.resolve(v.collectionFormat()));<a name="line.679"></a>
-<span class="sourceLineNo">680</span>               if (! v._default().isEmpty())<a name="line.680"></a>
-<span class="sourceLineNo">681</span>                  h._default(vr.resolve(v._default()));<a name="line.681"></a>
-<span class="sourceLineNo">682</span>               if (! v.description().isEmpty())<a name="line.682"></a>
-<span class="sourceLineNo">683</span>                  h.description(vr.resolve(v.description()));<a name="line.683"></a>
-<span class="sourceLineNo">684</span>               if (! v.format().isEmpty())<a name="line.684"></a>
-<span class="sourceLineNo">685</span>                  h.format(vr.resolve(v.format()));<a name="line.685"></a>
-<span class="sourceLineNo">686</span>               if (! v.items().isEmpty())<a name="line.686"></a>
-<span class="sourceLineNo">687</span>                  h.items(jp.parse(vr.resolve(v.items()), Items.class));<a name="line.687"></a>
-<span class="sourceLineNo">688</span>               r2.header(v.name(), h);<a name="line.688"></a>
-<span class="sourceLineNo">689</span>               m2.put(httpCode + '.' + v.name(), h);<a name="line.689"></a>
-<span class="sourceLineNo">690</span>            }<a name="line.690"></a>
-<span class="sourceLineNo">691</span>         }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>         m.put(httpCode, r2);<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      }<a name="line.693"></a>
-<span class="sourceLineNo">694</span><a name="line.694"></a>
-<span class="sourceLineNo">695</span>      // Next, look in resource bundle.<a name="line.695"></a>
-<span class="sourceLineNo">696</span>      String s = context.getMessages().findFirstString(req.getLocale(), method.getName() + ".responses");<a name="line.696"></a>
-<span class="sourceLineNo">697</span>      if (s != null) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>         for (Map.Entry&lt;Integer,ResponseInfo&gt; e : ((Map&lt;Integer,ResponseInfo&gt;)jp.parse(vr.resolve(s), Map.class, Integer.class, ResponseInfo.class)).entrySet()) {<a name="line.698"></a>
-<span class="sourceLineNo">699</span>            Integer httpCode = e.getKey();<a name="line.699"></a>
-<span class="sourceLineNo">700</span>            ResponseInfo ri = e.getValue();<a name="line.700"></a>
-<span class="sourceLineNo">701</span><a name="line.701"></a>
-<span class="sourceLineNo">702</span>            ResponseInfo r = m.get(httpCode);<a name="line.702"></a>
-<span class="sourceLineNo">703</span>            if (r == null)<a name="line.703"></a>
-<span class="sourceLineNo">704</span>               m.put(httpCode, ri);<a name="line.704"></a>
-<span class="sourceLineNo">705</span>            else<a name="line.705"></a>
-<span class="sourceLineNo">706</span>               r.copyFrom(ri);<a name="line.706"></a>
-<span class="sourceLineNo">707</span>         }<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      }<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>      return m.isEmpty() ? null : m;<a name="line.710"></a>
-<span class="sourceLineNo">711</span>   }<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span>   /**<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    * Returns the supported &lt;code&gt;Accept&lt;/code&gt; types the specified Java method.<a name="line.714"></a>
-<span class="sourceLineNo">715</span>    * <a name="line.715"></a>
-<span class="sourceLineNo">716</span>    * &lt;p&gt;<a name="line.716"></a>
-<span class="sourceLineNo">717</span>    * Subclasses can override this method to provide their own produces info.<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    * <a name="line.718"></a>
-<span class="sourceLineNo">719</span>    * &lt;p&gt;<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    * &lt;ol class='spaced-list'&gt;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    *    &lt;li&gt;{@link RestMethod#produces() @RestMethod.supportedAcceptTypes()} annotation.<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    *       &lt;p class='bcode'&gt;<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(supportedAcceptTypes={&lt;js&gt;"text/json"&lt;/js&gt;})<a name="line.726"></a>
-<span class="sourceLineNo">727</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    *    <a name="line.728"></a>
-<span class="sourceLineNo">729</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.729"></a>
-<span class="sourceLineNo">730</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(supportedAcceptTypes={&lt;js&gt;"$C{mySupportedProduces}"&lt;/js&gt;})<a name="line.730"></a>
-<span class="sourceLineNo">731</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.731"></a>
-<span class="sourceLineNo">732</span>    *       &lt;/p&gt;<a name="line.732"></a>
-<span class="sourceLineNo">733</span>    *    &lt;li&gt;Media types defined on the parsers associated with the method.<a name="line.733"></a>
-<span class="sourceLineNo">734</span>    * &lt;/ol&gt;<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    * <a name="line.735"></a>
-<span class="sourceLineNo">736</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.736"></a>
-<span class="sourceLineNo">737</span>    * @param req The current request.<a name="line.737"></a>
-<span class="sourceLineNo">738</span>    * @return The supported &lt;code&gt;Accept&lt;/code&gt; types of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found <a name="line.738"></a>
-<span class="sourceLineNo">739</span>    *    or the list of media types match those of the parent resource class.<a name="line.739"></a>
-<span class="sourceLineNo">740</span>    * @throws Exception <a name="line.740"></a>
-<span class="sourceLineNo">741</span>    */<a name="line.741"></a>
-<span class="sourceLineNo">742</span>   public List&lt;MediaType&gt; getMethodProduces(Method method, RestRequest req) throws Exception {<a name="line.742"></a>
-<span class="sourceLineNo">743</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.743"></a>
-<span class="sourceLineNo">744</span>      String[] s = method.getAnnotation(RestMethod.class).produces();<a name="line.744"></a>
-<span class="sourceLineNo">745</span>      if (s.length &gt; 0)<a name="line.745"></a>
-<span class="sourceLineNo">746</span>         return Arrays.asList(MediaType.forStrings(vr.resolve(s)));<a name="line.746"></a>
-<span class="sourceLineNo">747</span>      List&lt;MediaType&gt; l = req.getSerializers().getSupportedMediaTypes();<a name="line.747"></a>
-<span class="sourceLineNo">748</span>      return (l.equals(context.getProduces())  ? null : l);<a name="line.748"></a>
-<span class="sourceLineNo">749</span>   }<a name="line.749"></a>
-<span class="sourceLineNo">750</span>   <a name="line.750"></a>
-<span class="sourceLineNo">751</span>   /**<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    * Returns the supported &lt;code&gt;Content-Type&lt;/code&gt; types the specified Java method.<a name="line.752"></a>
-<span class="sourceLineNo">753</span>    * <a name="line.753"></a>
-<span class="sourceLineNo">754</span>    * &lt;p&gt;<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.755"></a>
-<span class="sourceLineNo">756</span>    * &lt;ol class='spaced-list'&gt;<a name="line.756"></a>
-<span class="sourceLineNo">757</span>    *    &lt;li&gt;{@link RestMethod#consumes() @RestMethod.supportedContentTypes()} annotation.<a name="line.757"></a>
-<span class="sourceLineNo">758</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.758"></a>
-<span class="sourceLineNo">759</span>    *       &lt;p class='bcode'&gt;<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.760"></a>
-<span class="sourceLineNo">761</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(supportedContentTypes={&lt;js&gt;"text/json"&lt;/js&gt;})<a name="line.761"></a>
-<span class="sourceLineNo">762</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    *    <a name="line.763"></a>
-<span class="sourceLineNo">764</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(supportedContentTypes={&lt;js&gt;"$C{mySupportedConsumes}"&lt;/js&gt;})<a name="line.765"></a>
-<span class="sourceLineNo">766</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    *       &lt;/p&gt;<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    *    &lt;li&gt;Media types defined on the serializers associated with the method.<a name="line.768"></a>
-<span class="sourceLineNo">769</span>    * &lt;/ol&gt;<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    * <a name="line.770"></a>
-<span class="sourceLineNo">771</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    * @param req The current request.<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    * @return The supported &lt;code&gt;Content-Type&lt;/code&gt; types of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found <a name="line.773"></a>
-<span class="sourceLineNo">774</span>    *    or the list of media types match those of the parent resource class.<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    * @throws Exception <a name="line.775"></a>
-<span class="sourceLineNo">776</span>    */<a name="line.776"></a>
-<span class="sourceLineNo">777</span>   public List&lt;MediaType&gt; getMethodConsumes(Method method, RestRequest req) throws Exception {<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      String[] s = method.getAnnotation(RestMethod.class).consumes();<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      if (s.length &gt; 0)<a name="line.780"></a>
-<span class="sourceLineNo">781</span>         return Arrays.asList(MediaType.forStrings(vr.resolve(s)));<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      List&lt;MediaType&gt; l = req.getParsers().getSupportedMediaTypes();<a name="line.782"></a>
-<span class="sourceLineNo">783</span>      return (l.equals(context.getConsumes())  ? null : l);<a name="line.783"></a>
-<span class="sourceLineNo">784</span>   }<a name="line.784"></a>
-<span class="sourceLineNo">785</span><a name="line.785"></a>
-<span class="sourceLineNo">786</span>   /**<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    * Returns whether the specified method is deprecated<a name="line.787"></a>
-<span class="sourceLineNo">788</span>    * <a name="line.788"></a>
-<span class="sourceLineNo">789</span>    * &lt;p&gt;<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    * The default implementation returns the value from the following location:<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    * &lt;ol class='spaced-list'&gt;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    *    &lt;li&gt;{@link MethodSwagger#deprecated() @MethodSwagger.deprecated()} annotation.<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.793"></a>
-<span class="sourceLineNo">794</span>    *       &lt;p class='bcode'&gt;<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.795"></a>
-<span class="sourceLineNo">796</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    *          deprecated=&lt;jk&gt;true&lt;/jk&gt;<a name="line.797"></a>
-<span class="sourceLineNo">798</span>    *       )<a name="line.798"></a>
-<span class="sourceLineNo">799</span>    *    )<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.800"></a>
-<span class="sourceLineNo">801</span>    *       &lt;/p&gt;<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    * &lt;/ol&gt;<a name="line.802"></a>
-<span class="sourceLineNo">803</span>    * <a name="line.803"></a>
-<span class="sourceLineNo">804</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    * @param req The current request.<a name="line.805"></a>
-<span class="sourceLineNo">806</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the method is deprecated.<a name="line.806"></a>
-<span class="sourceLineNo">807</span>    * @throws Exception <a name="line.807"></a>
-<span class="sourceLineNo">808</span>    */<a name="line.808"></a>
-<span class="sourceLineNo">809</span>   public boolean isDeprecated(Method method, RestRequest req) throws Exception {<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      return method.getAnnotation(RestMethod.class).swagger().deprecated();<a name="line.810"></a>
-<span class="sourceLineNo">811</span>   }<a name="line.811"></a>
-<span class="sourceLineNo">812</span><a name="line.812"></a>
-<span class="sourceLineNo">813</span>   /**<a name="line.813"></a>
-<span class="sourceLineNo">814</span>    * Returns the localized site name of this REST resource.<a name="line.814"></a>
-<span class="sourceLineNo">815</span>    * <a name="line.815"></a>
-<span class="sourceLineNo">816</span>    * &lt;p&gt;<a name="line.816"></a>
-<span class="sourceLineNo">817</span>    * Subclasses can override this method to provide their own site name.<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    * <a name="line.818"></a>
-<span class="sourceLineNo">819</span>    * &lt;p&gt;<a name="line.819"></a>
-<span class="sourceLineNo">820</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.820"></a>
-<span class="sourceLineNo">821</span>    * &lt;ol class='spaced-list'&gt;<a name="line.821"></a>
-<span class="sourceLineNo">822</span>    *    &lt;li&gt;{@link RestResource#siteName() @RestResource.siteName()} annotation on this class, and then any parent classes.<a name="line.822"></a>
-<span class="sourceLineNo">823</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.823"></a>
-<span class="sourceLineNo">824</span>    *       &lt;p class='bcode'&gt;<a name="line.824"></a>
-<span class="sourceLineNo">825</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.825"></a>
-<span class="sourceLineNo">826</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(siteName=&lt;js&gt;"My Site"&lt;/js&gt;)<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.827"></a>
-<span class="sourceLineNo">828</span>    *    <a name="line.828"></a>
-<span class="sourceLineNo">829</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.829"></a>
-<span class="sourceLineNo">830</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(siteName=&lt;js&gt;"$L{myLocalizedSiteName}"&lt;/js&gt;)<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.831"></a>
-<span class="sourceLineNo">832</span>    *       &lt;/p&gt;<a name="line.832"></a>
-<span class="sourceLineNo">833</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    *       on the resource class, then any parent classes.<a name="line.834"></a>
-<span class="sourceLineNo">835</span>    *       &lt;ol&gt;<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].siteName&lt;/ck&gt;<a name="line.836"></a>
-<span class="sourceLineNo">837</span>    *          &lt;li&gt;&lt;ck&gt;siteName&lt;/ck&gt;<a name="line.837"></a>
-<span class="sourceLineNo">838</span>    *       &lt;/ol&gt;<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestResource#siteName() @RestResource.siteName()} annotation.<a name="line.839"></a>
-<span class="sourceLineNo">840</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.840"></a>
-<span class="sourceLineNo">841</span>    *       &lt;p class='bcode'&gt;<a name="line.841"></a>
-<span class="sourceLineNo">842</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.842"></a>
-<span class="sourceLineNo">843</span>    *    &lt;ck&gt;MyClass.siteName&lt;/ck&gt; = &lt;cv&gt;My Site&lt;/cv&gt;<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    *    <a name="line.844"></a>
-<span class="sourceLineNo">845</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.845"></a>
-<span class="sourceLineNo">846</span>    *    &lt;ck&gt;MyClass.siteName&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.siteName}&lt;/cv&gt;<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    *       &lt;/p&gt;<a name="line.847"></a>
-<span class="sourceLineNo">848</span>    * &lt;/ol&gt;<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    * <a name="line.849"></a>
-<span class="sourceLineNo">850</span>    * @param req The current request.<a name="line.850"></a>
-<span class="sourceLineNo">851</span>    * @return The localized site name of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    * @throws Exception <a name="line.852"></a>
-<span class="sourceLineNo">853</span>    */<a name="line.853"></a>
-<span class="sourceLineNo">854</span>   @Override /* RestInfoProvider */<a name="line.854"></a>
-<span class="sourceLineNo">855</span>   public String getSiteName(RestRequest req) throws Exception {<a name="line.855"></a>
-<span class="sourceLineNo">856</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.856"></a>
-<span class="sourceLineNo">857</span>      if (siteName != null)<a name="line.857"></a>
-<span class="sourceLineNo">858</span>         return vr.resolve(siteName);<a name="line.858"></a>
-<span class="sourceLineNo">859</span>      String siteName = context.getMessages().findFirstString(req.getLocale(), "siteName");<a name="line.859"></a>
-<span class="sourceLineNo">860</span>      if (siteName != null)<a name="line.860"></a>
-<span class="sourceLineNo">861</span>         return vr.resolve(siteName);<a name="line.861"></a>
-<span class="sourceLineNo">862</span>      return null;<a name="line.862"></a>
-<span class="sourceLineNo">863</span>   }<a name="line.863"></a>
-<span class="sourceLineNo">864</span><a name="line.864"></a>
-<span class="sourceLineNo">865</span>   /**<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    * Returns the localized title of this REST resource.<a name="line.866"></a>
-<span class="sourceLineNo">867</span>    * <a name="line.867"></a>
-<span class="sourceLineNo">868</span>    * &lt;p&gt;<a name="line.868"></a>
-<span class="sourceLineNo">869</span>    * Subclasses can override this method to provide their own title.<a name="line.869"></a>
-<span class="sourceLineNo">870</span>    * <a name="line.870"></a>
-<span class="sourceLineNo">871</span>    * &lt;p&gt;<a name="line.871"></a>
-<span class="sourceLineNo">872</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.872"></a>
-<span class="sourceLineNo">873</span>    * &lt;ol class='spaced-list'&gt;<a name="line.873"></a>
-<span class="sourceLineNo">874</span>    *    &lt;li&gt;{@link RestResource#title() @RestResource.siteName()} annotation on this class, and then any parent classes.<a name="line.874"></a>
-<span class="sourceLineNo">875</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    *       &lt;p class='bcode'&gt;<a name="line.876"></a>
-<span class="sourceLineNo">877</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.877"></a>
-<span class="sourceLineNo">878</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(title=&lt;js&gt;"My Resource"&lt;/js&gt;)<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    *    <a name="line.880"></a>
-<span class="sourceLineNo">881</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.881"></a>
-<span class="sourceLineNo">882</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(title=&lt;js&gt;"$L{myLocalizedTitle}"&lt;/js&gt;)<a name="line.882"></a>
-<span class="sourceLineNo">883</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.883"></a>
-<span class="sourceLineNo">884</span>    *       &lt;/p&gt;<a name="line.884"></a>
-<span class="sourceLineNo">885</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.885"></a>
-<span class="sourceLineNo">886</span>    *       on the resource class, then any parent classes.<a name="line.886"></a>
-<span class="sourceLineNo">887</span>    *       &lt;ol&gt;<a name="line.887"></a>
-<span class="sourceLineNo">888</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].title&lt;/ck&gt;<a name="line.888"></a>
-<span class="sourceLineNo">889</span>    *          &lt;li&gt;&lt;ck&gt;title&lt;/ck&gt;<a name="line.889"></a>
-<span class="sourceLineNo">890</span>    *       &lt;/ol&gt;<a name="line.890"></a>
-<span class="sourceLineNo">891</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestResource#title() @RestResource.title()} annotation.<a name="line.891"></a>
-<span class="sourceLineNo">892</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.892"></a>
-<span class="sourceLineNo">893</span>    *       &lt;p class='bcode'&gt;<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.894"></a>
-<span class="sourceLineNo">895</span>    *    &lt;ck&gt;MyClass.title&lt;/ck&gt; = &lt;cv&gt;My Resource&lt;/cv&gt;<a name="line.895"></a>
-<span class="sourceLineNo">896</span>    *    <a name="line.896"></a>
-<span class="sourceLineNo">897</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.897"></a>
-<span class="sourceLineNo">898</span>    *    &lt;ck&gt;MyClass.title&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.title}&lt;/cv&gt;<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    *       &lt;/p&gt;<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    *    &lt;li&gt;&lt;ck&gt;/info/title&lt;/ck&gt; entry in swagger file.<a name="line.900"></a>
-<span class="sourceLineNo">901</span>    * &lt;/ol&gt;<a name="line.901"></a>
-<span class="sourceLineNo">902</span>    * <a name="line.902"></a>
-<span class="sourceLineNo">903</span>    * @param req The current request.<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    * @return The localized title of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.904"></a>
-<span class="sourceLineNo">905</span>    * @throws Exception <a name="line.905"></a>
-<span class="sourceLineNo">906</span>    */<a name="line.906"></a>
-<span class="sourceLineNo">907</span>   @Override /* RestInfoProvider */<a name="line.907"></a>
-<span class="sourceLineNo">908</span>   public String getTitle(RestRequest req) throws Exception {<a name="line.908"></a>
-<span class="sourceLineNo">909</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.909"></a>
-<span class="sourceLineNo">910</span>      if (title != null)<a name="line.910"></a>
-<span class="sourceLineNo">911</span>         return vr.resolve(title);<a name="line.911"></a>
-<span class="sourceLineNo">912</span>      String title = context.getMessages().findFirstString(req.getLocale(), "title");<a name="line.912"></a>
-<span class="sourceLineNo">913</span>      if (title != null)<a name="line.913"></a>
-<span class="sourceLineNo">914</span>         return vr.resolve(title);<a name="line.914"></a>
-<span class="sourceLineNo">915</span>      Swagger s = getSwaggerFromFile(req);<a name="line.915"></a>
-<span class="sourceLineNo">916</span>      if (s != null &amp;&amp; s.getInfo() != null)<a name="line.916"></a>
-<span class="sourceLineNo">917</span>         return s.getInfo().getTitle();<a name="line.917"></a>
-<span class="sourceLineNo">918</span>      return null;<a name="line.918"></a>
-<span class="sourceLineNo">919</span>   }<a name="line.919"></a>
-<span class="sourceLineNo">920</span><a name="line.920"></a>
-<span class="sourceLineNo">921</span>   /**<a name="line.921"></a>
-<span class="sourceLineNo">922</span>    * Returns the localized description of this REST resource.<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    * <a name="line.923"></a>
-<span class="sourceLineNo">924</span>    * &lt;p&gt;<a name="line.924"></a>
-<span class="sourceLineNo">925</span>    * Subclasses can override this method to provide their own description.<a name="line.925"></a>
-<span class="sourceLineNo">926</span>    * <a name="line.926"></a>
-<span class="sourceLineNo">927</span>    * &lt;p&gt;<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    * &lt;ol class='spaced-list'&gt;<a name="line.929"></a>
-<span class="sourceLineNo">930</span>    *    &lt;li&gt;{@link RestResource#description() @RestResource.description()} annotation on this class, and then any parent classes.<a name="line.930"></a>
-<span class="sourceLineNo">931</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.931"></a>
-<span class="sourceLineNo">932</span>    *       &lt;p class='bcode'&gt;<a name="line.932"></a>
-<span class="sourceLineNo">933</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.933"></a>
-<span class="sourceLineNo">934</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(description=&lt;js&gt;"My Resource"&lt;/js&gt;)<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.935"></a>
-<span class="sourceLineNo">936</span>    *    <a name="line.936"></a>
-<span class="sourceLineNo">937</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(description=&lt;js&gt;"$L{myLocalizedDescription}"&lt;/js&gt;)<a name="line.938"></a>
-<span class="sourceLineNo">939</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.939"></a>
-<span class="sourceLineNo">940</span>    *       &lt;/p&gt;<a name="line.940"></a>
-<span class="sourceLineNo">941</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.941"></a>
-<span class="sourceLineNo">942</span>    *       on the resource class, then any parent classes.<a name="line.942"></a>
-<span class="sourceLineNo">943</span>    *       &lt;ol&gt;<a name="line.943"></a>
-<span class="sourceLineNo">944</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].description&lt;/ck&gt;<a name="line.944"></a>
-<span class="sourceLineNo">945</span>    *          &lt;li&gt;&lt;ck&gt;description&lt;/ck&gt;<a name="line.945"></a>
-<span class="sourceLineNo">946</span>    *       &lt;/ol&gt;<a name="line.946"></a>
-<span class="sourceLineNo">947</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestResource#description() @RestResource.description()} annotation.<a name="line.947"></a>
-<span class="sourceLineNo">948</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.948"></a>
-<span class="sourceLineNo">949</span>    *       &lt;p class='bcode'&gt;<a name="line.949"></a>
-<span class="sourceLineNo">950</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    *    &lt;ck&gt;MyClass.description&lt;/ck&gt; = &lt;cv&gt;My Resource&lt;/cv&gt;<a name="line.951"></a>
-<span class="sourceLineNo">952</span>    *    <a name="line.952"></a>
-<span class="sourceLineNo">953</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.953"></a>
-<span class="sourceLineNo">954</span>    *    &lt;ck&gt;MyClass.description&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.description}&lt;/cv&gt;<a name="line.954"></a>
-<span class="sourceLineNo">955</span>    *       &lt;/p&gt;<a name="line.955"></a>
-<span class="sourceLineNo">956</span>    *    &lt;li&gt;&lt;ck&gt;/info/description&lt;/ck&gt; entry in swagger file.<a name="line.956"></a>
-<span class="sourceLineNo">957</span>    * &lt;/ol&gt;<a name="line.957"></a>
-<span class="sourceLineNo">958</span>    * <a name="line.958"></a>
-<span class="sourceLineNo">959</span>    * @param req The current request.<a name="line.959"></a>
-<span class="sourceLineNo">960</span>    * @return The localized description of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was was found.<a name="line.960"></a>
-<span class="sourceLineNo">961</span>    * @throws Exception <a name="line.961"></a>
-<span class="sourceLineNo">962</span>    */<a name="line.962"></a>
-<span class="sourceLineNo">963</span>   @Override /* RestInfoProvider */<a name="line.963"></a>
-<span class="sourceLineNo">964</span>   public String getDescription(RestRequest req) throws Exception {<a name="line.964"></a>
-<span class="sourceLineNo">965</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.965"></a>
-<span class="sourceLineNo">966</span>      if (description != null)<a name="line.966"></a>
-<span class="sourceLineNo">967</span>         return vr.resolve(description);<a name="line.967"></a>
-<span class="sourceLineNo">968</span>      String description = context.getMessages().findFirstString(req.getLocale(), "description");<a name="line.968"></a>
-<span class="sourceLineNo">969</span>      if (description != null)<a name="line.969"></a>
-<span class="sourceLineNo">970</span>         return vr.resolve(description);<a name="line.970"></a>
-<span class="sourceLineNo">971</span>      Swagger s = getSwaggerFromFile(req);<a name="line.971"></a>
-<span class="sourceLineNo">972</span>      if (s != null &amp;&amp; s.getInfo() != null)<a name="line.972"></a>
-<span class="sourceLineNo">973</span>         return s.getInfo().getDescription();<a name="line.973"></a>
-<span class="sourceLineNo">974</span>      return null;<a name="line.974"></a>
-<span class="sourceLineNo">975</span>   }<a name="line.975"></a>
-<span class="sourceLineNo">976</span><a name="line.976"></a>
-<span class="sourceLineNo">977</span>   /**<a name="line.977"></a>
-<span class="sourceLineNo">978</span>    * Returns the localized contact information of this REST resource.<a name="line.978"></a>
-<span class="sourceLineNo">979</span>    * <a name="line.979"></a>
-<span class="sourceLineNo">980</span>    * &lt;p&gt;<a name="line.980"></a>
-<span class="sourceLineNo">981</span>    * Subclasses can override this method to provide their own contact information.<a name="line.981"></a>
-<span class="sourceLineNo">982</span>    * <a name="line.982"></a>
-<span class="sourceLineNo">983</span>    * &lt;p&gt;<a name="line.983"></a>
-<span class="sourceLineNo">984</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.984"></a>
-<span class="sourceLineNo">985</span>    * &lt;ol class='spaced-list'&gt;<a name="line.985"></a>
-<span class="sourceLineNo">986</span>    *    &lt;li&gt;{@link ResourceSwagger#contact() @ResourceSwagger.contact()} annotation on this class, and then any parent classes.<a name="line.986"></a>
-<span class="sourceLineNo">987</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    *       &lt;p class='bcode'&gt;<a name="line.988"></a>
-<span class="sourceLineNo">989</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.989"></a>
-<span class="sourceLineNo">990</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.990"></a>
-<span class="sourceLineNo">991</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(contact=&lt;js&gt;"{name:'John Smith',email:'john.smith@foo.bar'}"&lt;/js&gt;)<a name="line.991"></a>
-<span class="sourceLineNo">992</span>    *    )<a name="line.992"></a>
-<span class="sourceLineNo">993</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.993"></a>
-<span class="sourceLineNo">994</span>    *    <a name="line.994"></a>
-<span class="sourceLineNo">995</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.995"></a>
-<span class="sourceLineNo">996</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.996"></a>
-<span class="sourceLineNo">997</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(contact=&lt;js&gt;"$C{MyStrings/MyClass.myContactInfo}"&lt;/js&gt;)<a name="line.997"></a>
-<span class="sourceLineNo">998</span>    *    )<a name="line.998"></a>
-<span class="sourceLineNo">999</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>    *       &lt;/p&gt;<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>    *       on the resource class, then any parent classes.<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    *       &lt;ol&gt;<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].contact&lt;/ck&gt;<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    *          &lt;li&gt;&lt;ck&gt;contact&lt;/ck&gt;<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>    *       &lt;/ol&gt;<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link ResourceSwagger#contact() @ResourceSwagger.contact()} annotation.<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>    *       &lt;p class='bcode'&gt;<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>    *    &lt;ck&gt;MyClass.contact&lt;/ck&gt; = &lt;cv&gt;{name:"John Smith",email:"john.smith@foo.bar"}&lt;/cv&gt;<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>    *    <a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>    *    &lt;ck&gt;MyClass.contact&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myContactInfo}&lt;/cv&gt;<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>    *       &lt;/p&gt;<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>    *    &lt;li&gt;&lt;ck&gt;/info/contact&lt;/ck&gt; entry in swagger file.<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>    * &lt;/ol&gt;<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>    * <a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>    * @param req The current request.<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>    * @return<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span>    *    The localized contact information of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>    * @throws Exception <a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>    */<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>   public Contact getContact(RestRequest req) throws Exception {<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>      JsonParser jp = JsonParser.DEFAULT;<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>      try {<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>         if (contact != null)<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>            return jp.parse(vr.resolve(contact), Contact.class);<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>         String contact = context.getMessages().findFirstString(req.getLocale(), "contact");<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span>         if (contact != null)<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>            return jp.parse(vr.resolve(contact), Contact.class);<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>         Swagger s = getSwaggerFromFile(req);<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span>         if (s != null &amp;&amp; s.getInfo() != null)<a name="line.1034"></a>
-<span class="sourceLineNo">1035</span>            return s.getInfo().getContact();<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>         return null;<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>      } catch (ParseException e) {<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span>      }<a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>   }<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span><a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>   /**<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>    * Returns the localized license information of this REST resource.<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>    * <a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>    * &lt;p&gt;<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span>    * Subclasses can override this method to provide their own license information.<a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>    * <a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>    * &lt;p&gt;<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span>    * &lt;ol class='spaced-list'&gt;<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    *    &lt;li&gt;{@link ResourceSwagger#license() @ResourceSwagger.license()} annotation on this class, and then any parent classes.<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span>    *       &lt;p class='bcode'&gt;<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(license=&lt;js&gt;"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"&lt;/js&gt;)<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>    *    )<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>    *    <a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(license=&lt;js&gt;"$C{MyStrings/MyClass.myLicenseInfo}"&lt;/js&gt;)<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>    *    )<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>    *       &lt;/p&gt;<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span>    *       on the resource class, then any parent classes.<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>    *       &lt;ol&gt;<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].license&lt;/ck&gt;<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>    *          &lt;li&gt;&lt;ck&gt;license&lt;/ck&gt;<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>    *       &lt;/ol&gt;<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link ResourceSwagger#license() @ResourceSwagger.license()} annotation.<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span>    *       &lt;p class='bcode'&gt;<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>    *    &lt;ck&gt;MyClass.license&lt;/ck&gt; = &lt;cv&gt;{name:"Apache 2.0",url:"http://www.apache.org/licenses/LICENSE-2.0.html"}&lt;/cv&gt;<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span>    *    <a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>    *    &lt;ck&gt;MyClass.license&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myLicenseInfo}&lt;/cv&gt;<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>    *       &lt;/p&gt;<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>    *    &lt;li&gt;&lt;ck&gt;/info/license&lt;/ck&gt; entry in swagger file.<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span>    * &lt;/ol&gt;<a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>    * <a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>    * @param req The current request.<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>    * @return<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>    *    The localized license information of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found found.<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span>    * @throws Exception <a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>    */<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>   public License getLicense(RestRequest req) throws Exception {<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>      JsonParser jp = JsonParser.DEFAULT;<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span>      try {<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>         if (license != null)<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>            return jp.parse(vr.resolve(license), License.class);<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>         String license = context.getMessages().findFirstString(req.getLocale(), "license");<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>         if (license != null)<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span>            return jp.parse(vr.resolve(license), License.class);<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>         Swagger s = getSwaggerFromFile(req);<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>         if (s != null &amp;&amp; s.getInfo() != null)<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>            return s.getInfo().getLicense();<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>         return null;<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>      } catch (ParseException e) {<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>      }<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>   }<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span><a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>   /**<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>    * Returns the terms-of-service information of this REST resource.<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>    * <a name="line.1109"></a>
-<span class="sourceLineNo">1110</span>    * &lt;p&gt;<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>    * Subclasses can override this method to provide their own terms-of-service information.<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>    * <a name="line.1112"></a>
-<span class="sourceLineNo">1113</span>    * &lt;p&gt;<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>    * &lt;ol class='spaced-list'&gt;<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>    *    &lt;li&gt;{@link ResourceSwagger#termsOfService() @ResourceSwagger.termsOfService()} annotation on this class, and then any parent classes.<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>    *       &lt;p class='bcode'&gt;<a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(termsOfService=&lt;js&gt;"You're on your own"&lt;/js&gt;)<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span>    *    )<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>    *    <a name="line.1124"></a>
-<span class="sourceLineNo">1125</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(termsOfService=&lt;js&gt;"$C{MyStrings/MyClass.myTermsOfService}"&lt;/js&gt;)<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span>    *    )<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span>    *       &lt;/p&gt;<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>    *       on the resource class, then any parent classes.<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span>    *       &lt;ol&gt;<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].termsOfService&lt;/ck&gt;<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>    *          &lt;li&gt;&lt;ck&gt;termsOfService&lt;/ck&gt;<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span>    *       &lt;/ol&gt;<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link ResourceSwagger#termsOfService() @ResourceSwagger.termsOfService()} annotation.<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span>    *       &lt;p class='bcode'&gt;<a name="line.1139"></a>
-<span class="sourceLineNo">1140</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>    *    &lt;ck&gt;MyClass.termsOfService&lt;/ck&gt; = &lt;cv&gt;You''re on your own&lt;/cv&gt;<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span>    *    <a name="line.1142"></a>
-<span class="sourceLineNo">1143</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>    *    &lt;ck&gt;MyClass.termsOfService&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myTermsOfService}&lt;/cv&gt;<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>    *       &lt;/p&gt;<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>    *    &lt;li&gt;&lt;ck&gt;/info/termsOfService&lt;/ck&gt; entry in swagger file.<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span>    * &lt;/ol&gt;<a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>    * <a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>    * @param req The current request.<a name="line.1149"></a>
-<span class="sourceLineNo">1150</span>    * @return<a name="line.1150"></a>
-<span class="sourceLineNo">1151</span>    *    The localized terms-of-service of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>    * @throws Exception <a name="line.1152"></a>
-<span class="sourceLineNo">1153</span>    */<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>   public String getTermsOfService(RestRequest req) throws Exception {<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>      if (termsOfService != null)<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>         return vr.resolve(termsOfService);<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>      String termsOfService = context.getMessages().findFirstString(req.getLocale(), "termsOfService");<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span>      if (termsOfService != null)<a name="line.1159"></a>
-<span class="sourceLineNo">1160</span>         return vr.resolve(termsOfService);<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>      Swagger s = getSwaggerFromFile(req);<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>      if (s != null &amp;&amp; s.getInfo() != null)<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>         return s.getInfo().getTermsOfService();<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>      return null;<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>   }<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span><a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>   /**<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>    * Returns the version information of this REST resource.<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>    * <a name="line.1169"></a>
-<span class="sourceLineNo">1170</span>    * &lt;p&gt;<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span>    * Subclasses can override this method to provide their own version information.<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span>    * <a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>    * &lt;p&gt;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span>    * &lt;ol class='spaced-list'&gt;<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>    *    &lt;li&gt;{@link ResourceSwagger#version() @ResourceSwagger.version()} annotation on this class, and then any parent classes.<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1177"></a>
-<span class="sourceLineNo">1178</span>    *       &lt;p class='bcode'&gt;<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(version=&lt;js&gt;"2.0"&lt;/js&gt;)<a name="line.1181"></a>
-<span class="sourceLineNo">1182</span>    *    )<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1183"></a>
-<span class="sourceLineNo">1184</span>    *    <a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(version=&lt;js&gt;"$C{MyStrings/MyClass.myVersion}"&lt;/js&gt;)<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span>    *    )<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span>    *       &lt;/p&gt;<a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span>    *       on the resource class, then any parent classes.<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>    *       &lt;ol&gt;<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].version&lt;/ck&gt;<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span>    *          &lt;li&gt;&lt;ck&gt;version&lt;/ck&gt;<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>    *       &lt;/ol&gt;<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link ResourceSwagger#version() @ResourceSwagger.version()} annotation.<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span>    *       &lt;p class='bcode'&gt;<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.1200"></a>
-<span class="sourceLineNo">1201</span>    *    &lt;ck&gt;MyClass.version&lt;/ck&gt; = &lt;cv&gt;2.0&lt;/cv&gt;<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span>    *    <a name="line.1202"></a>
-<span class="sourceLineNo">1203</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.1203"></a>
-<span class="sourceLineNo">1204</span>    *    &lt;ck&gt;MyClass.version&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myVersion}&lt;/cv&gt;<a name="line.1204"></a>
-<span class="sourceLineNo">1205</span>    *       &lt;/p&gt;<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span>    *    &lt;li&gt;&lt;ck&gt;/info/version&lt;/ck&gt; entry in swagger file.<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span>    * &lt;/ol&gt;<a name="line.1207"></a>
-<span class="sourceLineNo">1208</span>    * <a name="line.1208"></a>
-<span class="sourceLineNo">1209</span>    * @param req The current request.<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span>    * @return<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span>    *    The localized version of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span>    * @throws Exception <a name="line.1212"></a>
-<span class="sourceLineNo">1213</span>    */<a name="line.1213"></a>
-<span class="sourceLineNo">1214</span>   public String getVersion(RestRequest req) throws Exception {<a name="line.1214"></a>
-<span class="sourceLineNo">1215</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.1215"></a>
-<span class="sourceLineNo">1216</span>      if (version != null)<a name="line.1216"></a>
-<span class="sourceLineNo">1217</span>         return vr.resolve(version);<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span>      String version = context.getMessages().findFirstString(req.getLocale(), "version");<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span>      if (version != null)<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span>         return vr.resolve(version);<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span>      Swagger s = getSwaggerFromFile(req);<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span>      if (s != null &amp;&amp; s.getInfo() != null)<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span>         return s.getInfo().getVersion();<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span>      return null;<a name="line.1224"></a>
-<span class="sourceLineNo">1225</span>   }<a name="line.1225"></a>
-<span class="sourceLineNo">1226</span><a name="line.1226"></a>
-<span class="sourceLineNo">1227</span>   /**<a name="line.1227"></a>
-<span class="sourceLineNo">1228</span>    * Returns the supported &lt;code&gt;Content-Type&lt;/code&gt; request headers for the REST resource.<a name="line.1228"></a>
-<span class="sourceLineNo">1229</span>    * &lt;p&gt;<a name="line.1229"></a>
-<span class="sourceLineNo">1230</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.1230"></a>
-<span class="sourceLineNo">1231</span>    * &lt;ol class='spaced-list'&gt;<a name="line.1231"></a>
-<span class="sourceLineNo">1232</span>    *    &lt;li&gt;{@link ResourceSwagger#version() @ResourceSwagger.version()} annotation on this class, and then any parent classes.<a name="line.1232"></a>
-<span class="sourceLineNo">1233</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1233"></a>
-<span class="sourceLineNo">1234</span>    *       &lt;p class='bcode'&gt;<a name="line.1234"></a>
-<span class="sourceLineNo">1235</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.1235"></a>
-<span class="sourceLineNo">1236</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1236"></a>
-<span class="sourceLineNo">1237</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(version=&lt;js&gt;"2.0"&lt;/js&gt;)<a name="line.1237"></a>
-<span class="sourceLineNo">1238</span>    *    )<a name="line.1238"></a>
-<span class="sourceLineNo">1239</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1239"></a>
-<span class="sourceLineNo">1240</span>    *    <a name="line.1240"></a>
-<span class="sourceLineNo">1241</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.1241"></a>
-<span class="sourceLineNo">1242</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1242"></a>
-<span class="sourceLineNo">1243</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(version=&lt;js&gt;"$C{MyStrings/MyClass.myVersion}"&lt;/js&gt;)<a name="line.1243"></a>
-<span class="sourceLineNo">1244</span>    *    )<a name="line.1244"></a>
-<span class="sourceLineNo">1245</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1245"></a>
-<span class="sourceLineNo">1246</span>    *       &lt;/p&gt;<a name="line.1246"></a>
-<span class="sourceLineNo">1247</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.1247"></a>
-<span class="sourceLineNo">1248</span>    *       on the resource class, then any parent classes.<a name="line.1248"></a>
-<span class="sourceLineNo">1249</span>    *       &lt;ol&gt;<a name="line.1249"></a>
-<span class="sourceLineNo">1250</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].version&lt;/ck&gt;<a name="line.1250"></a>
-<span class="sourceLineNo">1251</span>    *          &lt;li&gt;&lt;ck&gt;version&lt;/ck&gt;<a name="line.1251"></a>
-<span class="sourceLineNo">1252</span>    *       &lt;/ol&gt;<a name="line.1252"></a>
-<span class="sourceLineNo">1253</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link ResourceSwagger#version() @ResourceSwagger.version()} annotation.<a name="line.1253"></a>
-<span class="sourceLineNo">1254</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1254"></a>
-<span class="sourceLineNo">1255</span>    *       &lt;p class='bcode'&gt;<a name="line.1255"></a>
-<span class="sourceLineNo">1256</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.1256"></a>
-<span class="sourceLineNo">1257</span>    *    &lt;ck&gt;MyClass.version&lt;/ck&gt; = &lt;cv&gt;2.0&lt;/cv&gt;<a name="line.1257"></a>
-<span class="sourceLineNo">1258</span>    *    <a name="line.1258"></a>
-<span class="sourceLineNo">1259</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.1259"></a>
-<span class="sourceLineNo">1260</span>    *    &lt;ck&gt;MyClass.version&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myVersion}&lt;/cv&gt;<a name="line.1260"></a>
-<span class="sourceLineNo">1261</span>    *       &lt;/p&gt;<a name="line.1261"></a>
-<span class="sourceLineNo">1262</span>    *    &lt;li&gt;&lt;ck&gt;/info/version&lt;/ck&gt; entry in swagger file.<a name="line.1262"></a>
-<span class="sourceLineNo">1263</span>    * &lt;/ol&gt;<a name="line.1263"></a>
-<span class="sourceLineNo">1264</span>    * <a name="line.1264"></a>
-<span class="sourceLineNo">1265</span>    * @param req The current request.<a name="line.1265"></a>
-<span class="sourceLineNo">1266</span>    * @return<a name="line.1266"></a>
-<span class="sourceLineNo">1267</span>    *    The supported &lt;code&gt;Content-Type&lt;/code&gt; request headers of the REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none were found.<a name="line.1267"></a>
-<span class="sourceLineNo">1268</span>    * @throws Exception <a name="line.1268"></a>
-<span class="sourceLineNo">1269</span>    */<a name="line.1269"></a>
-<span class="sourceLineNo">1270</span>   public List&lt;MediaType&gt; getConsumes(RestRequest req) throws Exception {<a name="line.1270"></a>
-<span class="sourceLineNo">1271</span>      List&lt;MediaType&gt; l = req.getContext().getConsumes();<a name="line.1271"></a>
-<span class="sourceLineNo">1272</span>      return l.isEmpty() ? null : l;<a name="line.1272"></a>
-<span class="sourceLineNo">1273</span>   }<a name="line.1273"></a>
-<span class="sourceLineNo">1274</span>   <a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>   /**<a name="line.1275"></a>
-<span class="sourceLineNo">1276</span>    * Returns the supported &lt;code&gt;Accept&lt;/code&gt; request headers for the REST resource.<a name="line.1276"></a>
-<span class="sourceLineNo">1277</span>    * <a name="line.1277"></a>
-<span class="sourceLineNo">1278</span>    * @param req The current request.<a name="line.1278"></a>
-<span class="sourceLineNo">1279</span>    * @return<a name="line.1279"></a>
-<span class="sourceLineNo">1280</span>    *    The supported &lt;code&gt;Accept&lt;/code&gt; request headers of the REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none were found.<a name="line.1280"></a>
-<span class="sourceLineNo">1281</span>    * @throws Exception <a name="line.1281"></a>
-<span class="sourceLineNo">1282</span>    */<a name="line.1282"></a>
-<span class="sourceLineNo">1283</span>   public List&lt;MediaType&gt; getProduces(RestRequest req) throws Exception {<a name="line.1283"></a>
-<span class="sourceLineNo">1284</span>      List&lt;MediaType&gt; l = req.getContext().getProduces();<a name="line.1284"></a>
-<span class="sourceLineNo">1285</span>      return l.isEmpty() ? null : l;<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>   }<a name="line.1286"></a>
-<span class="sourceLineNo">1287</span><a name="line.1287"></a>
-<span class="sourceLineNo">1288</span>   /**<a name="line.1288"></a>
-<span class="sourceLineNo">1289</span>    * Returns the version information of this REST resource.<a name="line.1289"></a>
-<span class="sourceLineNo">1290</span>    * <a name="line.1290"></a>
-<span class="sourceLineNo">1291</span>    * &lt;p&gt;<a name="line.1291"></a>
-<span class="sourceLineNo">1292</span>    * Subclasses can override this method to provide their own version information.<a name="line.1292"></a>
-<span class="sourceLineNo">1293</span>    * <a name="line.1293"></a>
-<span class="sourceLineNo">1294</span>    * &lt;p&gt;<a name="line.1294"></a>
-<span class="sourceLineNo">1295</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.1295"></a>
-<span class="sourceLineNo">1296</span>    * &lt;ol class='spaced-list'&gt;<a name="line.1296"></a>
-<span class="sourceLineNo">1297</span>    *    &lt;li&gt;{@link ResourceSwagger#tags() @ResourceSwagger.tags()} annotation on this class, and then any parent classes.<a name="line.1297"></a>
-<span class="sourceLineNo">1298</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1298"></a>
-<span class="sourceLineNo">1299</span>    *       &lt;p class='bcode'&gt;<a name="line.1299"></a>
-<span class="sourceLineNo">1300</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.1300"></a>
-<span class="sourceLineNo">1301</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1301"></a>
-<span class="sourceLineNo">1302</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(tags=&lt;js&gt;"foo,bar,baz"&lt;/js&gt;)<a name="line.1302"></a>
-<span class="sourceLineNo">1303</span>    *    )<a name="line.1303"></a>
-<span class="sourceLineNo">1304</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1304"></a>
-<span class="sourceLineNo">1305</span>    *    <a name="line.1305"></a>
-<span class="sourceLineNo">1306</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.1306"></a>
-<span class="sourceLineNo">1307</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1307"></a>
-<span class="sourceLineNo">1308</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(tags=&lt;js&gt;"$C{MyStrings/MyClass.myTags}"&lt;/js&gt;)<a name="line.1308"></a>
-<span class="sourceLineNo">1309</span>    *    )<a name="line.1309"></a>
-<span class="sourceLineNo">1310</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1310"></a>
-<span class="sourceLineNo">1311</span>    *       &lt;/p&gt;<a name="line.1311"></a>
-<span class="sourceLineNo">1312</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.1312"></a>
-<span class="sourceLineNo">1313</span>    *       on the resource class, then any parent classes.<a name="line.1313"></a>
-<span class="sourceLineNo">1314</span>    *       &lt;ol&gt;<a name="line.1314"></a>
-<span class="sourceLineNo">1315</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].tags&lt;/ck&gt;<a name="line.1315"></a>
-<span class="sourceLineNo">1316</span>    *          &lt;li&gt;&lt;ck&gt;tags&lt;/ck&gt;<a name="line.1316"></a>
-<span class="sourceLineNo">1317</span>    *       &lt;/ol&gt;<a name="line.1317"></a>
-<span class="sourceLineNo">1318</span>    *       &lt;br&gt;Value is either a comma-delimited list or a JSON array.<a name="line.1318"></a>
-<span class="sourceLineNo">1319</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link ResourceSwagger#tags() @ResourceSwagger.tags()} annotation.<a name="line.1319"></a>
-<span class="sourceLineNo">1320</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1320"></a>
-<span class="sourceLineNo">1321</span>    *       &lt;p class='bcode'&gt;<a name="line.1321"></a>
-<span class="sourceLineNo">1322</span>    *    &lt;cc&gt;// Comma-delimited list&lt;/cc&gt;<a name="line.1322"></a>
-<span class="sourceLineNo">1323</span>    *    &lt;ck&gt;MyClass.tags&lt;/ck&gt; = &lt;cv&gt;foo,bar,baz&lt;/cv&gt;<a name="line.1323"></a>
-<span class="sourceLineNo">1324</span>    *    <a name="line.1324"></a>
-<span class="sourceLineNo">1325</span>    *    &lt;cc&gt;// JSON array&lt;/cc&gt;<a name="line.1325"></a>
-<span class="sourceLineNo">1326</span>    *    &lt;ck&gt;MyClass.tags&lt;/ck&gt; = &lt;cv&gt;["foo","bar","baz"]&lt;/cv&gt;<a name="line.1326"></a>
-<span class="sourceLineNo">1327</span>    * <a name="line.1327"></a>
-<span class="sourceLineNo">1328</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.1328"></a>
-<span class="sourceLineNo">1329</span>    *    &lt;ck&gt;MyClass.tags&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myTags}&lt;/cv&gt;<a name="line.1329"></a>
-<span class="sourceLineNo">1330</span>    *       &lt;/p&gt;<a name="line.1330"></a>
-<span class="sourceLineNo">1331</span>    *    &lt;li&gt;&lt;ck&gt;tags&lt;/ck&gt; entry in swagger file.<a name="line.1331"></a>
-<span class="sourceLineNo">1332</span>    * &lt;/ol&gt;<a name="line.1332"></a>
-<span class="sourceLineNo">1333</span>    * <a name="line.1333"></a>
-<span class="sourceLineNo">1334</span>    * @param req The current request.<a name="line.1334"></a>
-<span class="sourceLineNo">1335</span>    * @return<a name="line.1335"></a>
-<span class="sourceLineNo">1336</span>    *    The localized tags of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.1336"></a>
-<span class="sourceLineNo">1337</span>    * @throws Exception <a name="line.1337"></a>
-<span class="sourceLineNo">1338</span>    */<a name="line.1338"></a>
-<span class="sourceLineNo">1339</span>   public List&lt;Tag&gt; getTags(RestRequest req) throws Exception {<a name="line.1339"></a>
-<span class="sourceLineNo">1340</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.1340"></a>
-<span class="sourceLineNo">1341</span>      JsonParser jp = JsonParser.DEFAULT;<a name="line.1341"></a>
-<span class="sourceLineNo">1342</span>      try {<a name="line.1342"></a>
-<span class="sourceLineNo">1343</span>         if (tags != null)<a name="line.1343"></a>
-<span class="sourceLineNo">1344</span>            return jp.parse(vr.resolve(tags), ArrayList.class, Tag.class);<a name="line.1344"></a>
-<span class="sourceLineNo">1345</span>         String tags = context.getMessages().findFirstString(req.getLocale(), "tags");<a name="line.1345"></a>
-<span class="sourceLineNo">1346</span>         if (tags != null)<a name="line.1346"></a>
-<span class="sourceLineNo">1347</span>            return jp.parse(vr.resolve(tags), ArrayList.class, Tag.class);<a name="line.1347"></a>
-<span class="sourceLineNo">1348</span>         Swagger s = getSwaggerFromFile(req);<a name="line.1348"></a>
-<span class="sourceLineNo">1349</span>         if (s != null &amp;&amp; s.getTags() != null)<a name="line.1349"></a>
-<span class="sourceLineNo">1350</span>            return s.getTags();<a name="line.1350"></a>
-<span class="sourceLineNo">1351</span>         return null;<a name="line.1351"></a>
-<span class="sourceLineNo">1352</span>      } catch (Exception e) {<a name="line.1352"></a>
-<span class="sourceLineNo">1353</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.1353"></a>
-<span class="sourceLineNo">1354</span>      }<a name="line.1354"></a>
-<span class="sourceLineNo">1355</span>   }<a name="line.1355"></a>
-<span class="sourceLineNo">1356</span><a name="line.1356"></a>
-<span class="sourceLineNo">1357</span>   /**<a name="line.1357"></a>
-<span class="sourceLineNo">1358</span>    * Returns the version information of this REST resource.<a name="line.1358"></a>
-<span class="sourceLineNo">1359</span>    * <a name="line.1359"></a>
-<span class="sourceLineNo">1360</span>    * &lt;p&gt;<a name="line.1360"></a>
-<span class="sourceLineNo">1361</span>    * Subclasses can override this method to provide their own version information.<a name="line.1361"></a>
-<span class="sourceLineNo">1362</span>    * <a name="line.1362"></a>
-<span class="sourceLineNo">1363</span>    * &lt;p&gt;<a name="line.1363"></a>
-<span class="sourceLineNo">1364</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.1364"></a>
-<span class="sourceLineNo">1365</span>    * &lt;ol class='spaced-list'&gt;<a name="line.1365"></a>
-<span class="sourceLineNo">1366</span>    *    &lt;li&gt;{@link ResourceSwagger#externalDocs() @ResourceSwagger.externalDocs()} annotation on this class, and then any parent classes.<a name="line.1366"></a>
-<span class="sourceLineNo">1367</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1367"></a>
-<span class="sourceLineNo">1368</span>    *       &lt;p class='bcode'&gt;<a name="line.1368"></a>
-<span class="sourceLineNo">1369</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.1369"></a>
-<span class="sourceLineNo">1370</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1370"></a>
-<span class="sourceLineNo">1371</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(externalDocs=&lt;js&gt;"{url:'http://juneau.apache.org'}"&lt;/js&gt;)<a name="line.1371"></a>
-<span class="sourceLineNo">1372</span>    *    )<a name="line.1372"></a>
-<span class="sourceLineNo">1373</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1373"></a>
-<span class="sourceLineNo">1374</span>    *    <a name="line.1374"></a>
-<span class="sourceLineNo">1375</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.1375"></a>
-<span class="sourceLineNo">1376</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.1376"></a>
-<span class="sourceLineNo">1377</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(externalDocs=&lt;js&gt;"$C{MyStrings/MyClass.myExternalDocs}"&lt;/js&gt;)<a name="line.1377"></a>
-<span class="sourceLineNo">1378</span>    *    )<a name="line.1378"></a>
-<span class="sourceLineNo">1379</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.1379"></a>
-<span class="sourceLineNo">1380</span>    *       &lt;/p&gt;<a name="line.1380"></a>
-<span class="sourceLineNo">1381</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.1381"></a>
-<span class="sourceLineNo">1382</span>    *       on the resource class, then any parent classes.<a name="line.1382"></a>
-<span class="sourceLineNo">1383</span>    *       &lt;ol&gt;<a name="line.1383"></a>
-<span class="sourceLineNo">1384</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].externalDocs&lt;/ck&gt;<a name="line.1384"></a>
-<span class="sourceLineNo">1385</span>    *          &lt;li&gt;&lt;ck&gt;externalDocs&lt;/ck&gt;<a name="line.1385"></a>
-<span class="sourceLineNo">1386</span>    *       &lt;/ol&gt;<a name="line.1386"></a>
-<span class="sourceLineNo">1387</span>    *       &lt;br&gt;Value is a JSON objec representation of a {@link ExternalDocumentation} object.<a name="line.1387"></a>
-<span class="sourceLineNo">1388</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link ResourceSwagger#externalDocs() @ResourceSwagger.externalDocs()} annotation.<a name="line.1388"></a>
-<span class="sourceLineNo">1389</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.1389"></a>
-<span class="sourceLineNo">1390</span>    *       &lt;p class='bcode'&gt;<a name="line.1390"></a>
-<span class="sourceLineNo">1391</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.1391"></a>
-<span class="sourceLineNo">1392</span>    *    &lt;ck&gt;MyClass.externalDocs&lt;/ck&gt; = &lt;cv&gt;{url:"http://juneau.apache.org"}&lt;/cv&gt;<a name="line.1392"></a>
-<span class="sourceLineNo">1393</span>    *    <a name="line.1393"></a>
-<span class="sourceLineNo">1394</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.1394"></a>
-<span class="sourceLineNo">1395</span>    *    &lt;ck&gt;MyClass.externalDocs&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myExternalDocs}&lt;/cv&gt;<a name="line.1395"></a>
-<span class="sourceLineNo">1396</span>    *       &lt;/p&gt;<a name="line.1396"></a>
-<span class="sourceLineNo">1397</span>    *    &lt;li&gt;&lt;ck&gt;externalDocs&lt;/ck&gt; entry in swagger file.<a name="line.1397"></a>
-<span class="sourceLineNo">1398</span>    * &lt;/ol&gt;<a name="line.1398"></a>
-<span class="sourceLineNo">1399</span>    * <a name="line.1399"></a>
-<span class="sourceLineNo">1400</span>    * @param req The current request.<a name="line.1400"></a>
-<span class="sourceLineNo">1401</span>    * @return<a name="line.1401"></a>
-<span class="sourceLineNo">1402</span>    *    The localized external documentation of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.1402"></a>
-<span class="sourceLineNo">1403</span>    * @throws Exception <a name="line.1403"></a>
-<span class="sourceLineNo">1404</span>    */<a name="line.1404"></a>
-<span class="sourceLineNo">1405</span>   public ExternalDocumentation getExternalDocs(RestRequest req) throws Exception {<a name="line.1405"></a>
-<span class="sourceLineNo">1406</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.1406"></a>
-<span class="sourceLineNo">1407</span>      JsonParser jp = JsonParser.DEFAULT;<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span>      try {<a name="line.1408"></a>
-<span class="sourceLineNo">1409</span>         if (externalDocs != null)<a name="line.1409"></a>
-<span class="sourceLineNo">1410</span>            return jp.parse(vr.resolve(externalDocs), ExternalDocumentation.class);<a name="line.1410"></a>
-<span class="sourceLineNo">1411</span>         String externalDocs = context.getMessages().findFirstString(req.getLocale(), "externalDocs");<a name="line.1411"></a>
-<span class="sourceLineNo">1412</span>         if (externalDocs != null)<a name="line.1412"></a>
-<span class="sourceLineNo">1413</span>            return jp.parse(vr.resolve(externalDocs), ExternalDocumentation.class);<a name="line.1413"></a>
-<span class="sourceLineNo">1414</span>         Swagger s = getSwaggerFromFile(req);<a name="line.1414"></a>
-<span class="sourceLineNo">1415</span>         if (s != null)<a name="line.1415"></a>
-<span class="sourceLineNo">1416</span>            return s.getExternalDocs();<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span>         return null;<a name="line.1417"></a>
-<span class="sourceLineNo">1418</span>      } catch (Exception e) {<a name="line.1418"></a>
-<span class="sourceLineNo">1419</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span>      }<a name="line.1420"></a>
-<span class="sourceLineNo">1421</span>   }<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span>   <a name="line.1422"></a>
-<span class="sourceLineNo">1423</span>   private Operation getSwaggerOperationFromFile(Method method, RestRequest req) throws Exception {<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span><a name="line.1424"></a>
-<span class="sourceLineNo">1425</span>      Swagger s = getSwaggerFromFile(req);<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span>      if (s != null) {<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span>         Map&lt;String,Map&lt;String,Operation&gt;&gt; sp = s.getPaths();<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span>         if (sp != null) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span>            Map&lt;String,Operation&gt; spp = sp.get(method.getAnnotation(RestMethod.class).path());<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span>            if (spp != null)<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span>               return spp.get(req.getMethod());<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span>         }<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span>      }<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span>      return null;<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span>   }<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span>}<a name="line.1436"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.utils.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * Default implementation of {@link RestInfoProvider}.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <a name="line.34"></a>
+<span class="sourceLineNo">035</span> * &lt;p&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Subclasses can override these methods to tailor how HTTP REST resources are documented.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <a name="line.37"></a>
+<span class="sourceLineNo">038</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * &lt;ul&gt;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *    &lt;li class='jf'&gt;{@link RestContext#REST_infoProvider}<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.OptionsPages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; OPTIONS Pages&lt;/a&gt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * &lt;/ul&gt;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>public class BasicRestInfoProvider implements RestInfoProvider {<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>   private final RestContext context;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>   private final String<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      siteName,<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      title,<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      description;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   private final ConcurrentHashMap&lt;Locale,Swagger&gt; swaggers = new ConcurrentHashMap&lt;&gt;();<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>   /**<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    * Constructor.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    * <a name="line.55"></a>
+<span class="sourceLineNo">056</span>    * @param context The resource context.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   public BasicRestInfoProvider(RestContext context) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      this.context = context;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>      Builder b = new Builder(context);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      this.siteName = b.siteName;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      this.title = b.title;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      this.description = b.description;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>   private static final class Builder {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      String<a name="line.68"></a>
+<span class="sourceLineNo">069</span>         siteName,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         title,<a name="line.70"></a>
+<span class="sourceLineNo">071</span>         description;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      <a name="line.72"></a>
+<span class="sourceLineNo">073</span>      Builder(RestContext context) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>         LinkedHashMap&lt;Class&lt;?&gt;,RestResource&gt; restResourceAnnotationsParentFirst = findAnnotationsMapParentFirst(RestResource.class, context.getResource().getClass());<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>         for (RestResource r : restResourceAnnotationsParentFirst.values()) {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>            if (! r.siteName().isEmpty())<a name="line.78"></a>
+<span class="sourceLineNo">079</span>               siteName = r.siteName();<a name="line.79"></a>
+<span class="sourceLineNo">080</span>            if (! r.title().isEmpty())<a name="line.80"></a>
+<span class="sourceLineNo">081</span>               title = r.title();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>            if (! r.description().isEmpty())<a name="line.82"></a>
+<span class="sourceLineNo">083</span>               description = r.description();<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         }<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      }<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>   /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    * Returns the localized swagger for this REST resource.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    * <a name="line.90"></a>
+<span class="sourceLineNo">091</span>    * &lt;p&gt;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    * Subclasses can override this method to customize the Swagger.<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    * <a name="line.93"></a>
+<span class="sourceLineNo">094</span>    * @param req The incoming HTTP request.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    * @return <a name="line.95"></a>
+<span class="sourceLineNo">096</span>    *    A new Swagger instance.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    * @throws Exception<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    */<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   @Override /* RestInfoProvider */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   public Swagger getSwagger(RestRequest req) throws Exception {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      <a name="line.102"></a>
+<span class="sourceLineNo">103</span>      Locale locale = req.getLocale();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      <a name="line.104"></a>
+<span class="sourceLineNo">105</span>      Swagger s = swaggers.get(locale);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      if (s != null)<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         return s;<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      JsonParser jp = JsonParser.DEFAULT;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      MessageBundle mb = context.getMessages();<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      <a name="line.112"></a>
+<span class="sourceLineNo">113</span>      ObjectMap om = context.getClasspathResource(ObjectMap.class, MediaType.JSON, getClass().getSimpleName() + ".json", locale);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      if (om == null)<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         om = new ObjectMap();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      <a name="line.116"></a>
+<span class="sourceLineNo">117</span>      LinkedHashMap&lt;Class&lt;?&gt;,RestResource&gt; restResourceAnnotationsParentFirst = findAnnotationsMapParentFirst(RestResource.class, context.getResource().getClass());<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>      for (RestResource r : restResourceAnnotationsParentFirst.values()) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>         if (r.swagger().length &gt; 0) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>            try {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>               String json = vr.resolve(StringUtils.join(r.swagger(), '\n').trim());<a name="line.122"></a>
+<span class="sourceLineNo">123</span>               if (! (json.startsWith("{") &amp;&amp; json.endsWith("}")))<a name="line.123"></a>
+<span class="sourceLineNo">124</span>                  json = "{\n" + json + "\n}";<a name="line.124"></a>
+<span class="sourceLineNo">125</span>               om.putAll(new ObjectMap(json));<a name="line.125"></a>
+<span class="sourceLineNo">126</span>            } catch (ParseException e) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>               throw new ParseException("Malformed swagger JSON encountered in @RestResource(swagger) on class "+context.getResource().getClass().getName()+".").initCause(e);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>            }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>         }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>      String title = this.title;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      if (title == null)<a name="line.133"></a>
+<span class="sourceLineNo">134</span>         title = mb.findFirstString(locale, "title");<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      if (title != null) <a name="line.135"></a>
+<span class="sourceLineNo">136</span>         getInfo(om).put("title", vr.resolve(title));<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>      String description = this.description;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      if (description == null)<a name="line.139"></a>
+<span class="sourceLineNo">140</span>         description = mb.findFirstString(locale, "description");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      if (description != null) <a name="line.141"></a>
+<span class="sourceLineNo">142</span>         getInfo(om).put("description", vr.resolve(description));<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      <a name="line.143"></a>
+<span class="sourceLineNo">144</span>      String version = mb.findFirstString(locale, "version");<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      if (version != null) <a name="line.145"></a>
+<span class="sourceLineNo">146</span>         getInfo(om).put("version", vr.resolve(version));<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      <a name="line.147"></a>
+<span class="sourceLineNo">148</span>      String contact = mb.findFirstString(locale, "contact");<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      if (contact != null) <a name="line.149"></a>
+<span class="sourceLineNo">150</span>         getInfo(om).put("contact", jp.parse(vr.resolve(contact), ObjectMap.class));<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      <a name="line.151"></a>
+<span class="sourceLineNo">152</span>      String license = mb.findFirstString(locale, "license");<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      if (license != null) <a name="line.153"></a>
+<span class="sourceLineNo">154</span>         getInfo(om).put("license", jp.parse(vr.resolve(license), ObjectMap.class));<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      <a name="line.155"></a>
+<span class="sourceLineNo">156</span>      String termsOfService = mb.findFirstString(locale, "termsOfService");<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      if (termsOfService != null) <a name="line.157"></a>
+<span class="sourceLineNo">158</span>         getInfo(om).put("termsOfService", vr.resolve(termsOfService));<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      <a name="line.159"></a>
+<span class="sourceLineNo">160</span>      if (! om.containsKey("consumes")) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>         List&lt;MediaType&gt; consumes = req.getContext().getConsumes();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>         if (! consumes.isEmpty())<a name="line.162"></a>
+<span class="sourceLineNo">163</span>            om.put("consumes", consumes);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      if (! om.containsKey("produces")) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>         List&lt;MediaType&gt; produces = req.getContext().getProduces();<a name="line.167"></a>
+<span class="sourceLineNo">168</span>         if (! produces.isEmpty())<a name="line.168"></a>
+<span class="sourceLineNo">169</span>            om.put("produces", produces);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      }<a name="line.170"></a>
+<span class="sourceLineNo">171</span>         <a name="line.171"></a>
+<span class="sourceLineNo">172</span>      String tags = mb.findFirstString(locale, "tags");<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      if (tags != null)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>         om.put("tags", jp.parse(vr.resolve(tags), ObjectList.class));<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>      String externalDocs = mb.findFirstString(locale, "externalDocs");<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      if (externalDocs != null)<a name="line.177"></a>
+<span class="sourceLineNo">178</span>         om.put("externalDocs", jp.parse(vr.resolve(externalDocs), ObjectMap.class));<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      <a name="line.179"></a>
+<span class="sourceLineNo">180</span>      for (RestJavaMethod sm : context.getCallMethods().values()) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>         if (sm.isRequestAllowed(req)) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>            Method m = sm.method;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>            RestMethod rm = m.getAnnotation(RestMethod.class);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>            String mn = m.getName(), cn = m.getClass().getName();<a name="line.184"></a>
+<span class="sourceLineNo">185</span>            <a name="line.185"></a>
+<span class="sourceLineNo">186</span>            ObjectMap mom = getOperation(om, sm.getPathPattern(), sm.getHttpMethod().toLowerCase());<a name="line.186"></a>
+<span class="sourceLineNo">187</span>            <a name="line.187"></a>
+<span class="sourceLineNo">188</span>            if (rm.swagger().length &gt; 0) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>               try {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>                  String json = vr.resolve(StringUtils.join(rm.swagger(), '\n').trim());<a name="line.190"></a>
+<span class="sourceLineNo">191</span>                  if (! (json.startsWith("{") &amp;&amp; json.endsWith("}")))<a name="line.191"></a>
+<span class="sourceLineNo">192</span>                     json = "{\n" + json + "\n}";<a name="line.192"></a>
+<span class="sourceLineNo">193</span>                  mom.putAll(new ObjectMap(json));<a name="line.193"></a>
+<span class="sourceLineNo">194</span>               } catch (ParseException e) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>                  throw new ParseException("Malformed swagger JSON encountered in @RestMethod(swagger) on method "+mn+" on class "+cn+".").initCause(e);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>               }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>            }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>            mom.put("operationId", mn);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>            <a name="line.200"></a>
+<span class="sourceLineNo">201</span>            String mDescription = rm.description();<a name="line.201"></a>
+<span class="sourceLineNo">202</span>            if (mDescription.isEmpty())<a name="line.202"></a>
+<span class="sourceLineNo">203</span>               mDescription = mb.findFirstString(locale, mn + ".description");<a name="line.203"></a>
+<span class="sourceLineNo">204</span>            if (mDescription != null)<a name="line.204"></a>
+<span class="sourceLineNo">205</span>               mom.put("description", vr.resolve(mDescription));<a name="line.205"></a>
+<span class="sourceLineNo">206</span>            <a name="line.206"></a>
+<span class="sourceLineNo">207</span>            String mTags = mb.findFirstString(locale, mn + ".tags");<a name="line.207"></a>
+<span class="sourceLineNo">208</span>            if (mTags != null) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>               mTags = vr.resolve(mTags);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>               if (StringUtils.isObjectList(mTags)) <a name="line.210"></a>
+<span class="sourceLineNo">211</span>                  mom.put("tags", jp.parse(mTags, ArrayList.class, String.class));<a name="line.211"></a>
+<span class="sourceLineNo">212</span>               else<a name="line.212"></a>
+<span class="sourceLineNo">213</span>                  mom.put("tags", Arrays.asList(StringUtils.split(mTags)));<a name="line.213"></a>
+<span class="sourceLineNo">214</span>            }<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            <a name="line.215"></a>
+<span class="sourceLineNo">216</span>            String mSummary = mb.findFirstString(locale, mn + ".summary");<a name="line.216"></a>
+<span class="sourceLineNo">217</span>            if (mSummary != null)<a name="line.217"></a>
+<span class="sourceLineNo">218</span>               mom.put("summary", vr.resolve(mSummary));<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>            String mExternalDocs = mb.findFirstString(locale, mn + ".externalDocs");<a name="line.220"></a>
+<span class="sourceLineNo">221</span>            if (mExternalDocs != null) <a name="line.221"></a>
+<span class="sourceLineNo">222</span>               mom.put("externalDocs", jp.parse(vr.resolve(s), ObjectMap.class));<a name="line.222"></a>
+<span class="sourceLineNo">223</span>            <a name="line.223"></a>
+<span class="sourceLineNo">224</span>            Map&lt;String,ObjectMap&gt; paramMap = new LinkedHashMap&lt;&gt;();<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>            ObjectList parameters = mom.getObjectList("parameters");<a name="line.226"></a>
+<span class="sourceLineNo">227</span>            if (parameters != null) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>               for (ObjectMap param : parameters.elements(ObjectMap.class)) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>                  String key = param.getString("in") + '.' + param.getString("name");<a name="line.229"></a>
+<span class="sourceLineNo">230</span>                  paramMap.put(key, param);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>               }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>            }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>         <a name="line.233"></a>
+<span class="sourceLineNo">234</span>            String mParameters = mb.findFirstString(locale, mn + ".parameters");<a name="line.234"></a>
+<span class="sourceLineNo">235</span>            if (mParameters != null) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>               ObjectList ol = jp.parse(vr.resolve(mParameters), ObjectList.class);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>               for (ObjectMap param : ol.elements(ObjectMap.class)) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>                  String key = param.getString("in") + '.' + param.getString("name");<a name="line.238"></a>
+<span class="sourceLineNo">239</span>                  if (paramMap.containsKey(key))<a name="line.239"></a>
+<span class="sourceLineNo">240</span>                     paramMap.get(key).putAll(param);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>                  else<a name="line.241"></a>
+<span class="sourceLineNo">242</span>                     paramMap.put(key, param);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>               }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>            }<a name="line.244"></a>
+<span class="sourceLineNo">245</span>            <a name="line.245"></a>
+<span class="sourceLineNo">246</span>            // Finally, look for parameters defined on method.<a name="line.246"></a>
+<span class="sourceLineNo">247</span>            for (RestParam mp : context.getRestParams(m)) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>               RestParamType in = mp.getParamType();<a name="line.248"></a>
+<span class="sourceLineNo">249</span>               if (in != RestParamType.OTHER) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span>                  String key = in.toString() + '.' + (in == RestParamType.BODY ? null : mp.getName());<a name="line.250"></a>
+<span class="sourceLineNo">251</span>                  ObjectMap param = new ObjectMap().append("in", in);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>                  if (in != RestParamType.BODY)<a name="line.252"></a>
+<span class="sourceLineNo">253</span>                     param.append("name", mp.name);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>                  if (paramMap.containsKey(key)) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>                     paramMap.get(key).putAll(param);<a name="line.255"></a>
+<span class="sourceLineNo">256</span>                  } else {<a name="line.256"></a>
+<span class="sourceLineNo">257</span>                     paramMap.put(key, param);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>                  }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>               }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>            }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>            <a name="line.261"></a>
+<span class="sourceLineNo">262</span>            if (! paramMap.isEmpty())<a name="line.262"></a>
+<span class="sourceLineNo">263</span>               mom.put("parameters", paramMap.values());<a name="line.263"></a>
+<span class="sourceLineNo">264</span>            <a name="line.264"></a>
+<span class="sourceLineNo">265</span>            String mResponses = mb.findFirstString(locale, mn + ".responses");<a name="line.265"></a>
+<span class="sourceLineNo">266</span>            if (mResponses != null) <a name="line.266"></a>
+<span class="sourceLineNo">267</span>               mom.put("responses", jp.parse(vr.resolve(mResponses), ObjectMap.class));<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span>            if (! mom.containsKey("consumes")) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>               List&lt;MediaType&gt; mConsumes = req.getParsers().getSupportedMediaTypes();<a name="line.270"></a>
+<span class="sourceLineNo">271</span>               if (! mConsumes.equals(om.get("consumes")))<a name="line.271"></a>
+<span class="sourceLineNo">272</span>                  mom.put("consumes", mConsumes);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>            }<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   <a name="line.274"></a>
+<span class="sourceLineNo">275</span>            if (! mom.containsKey("produces")) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>               List&lt;MediaType&gt; mProduces = req.getSerializers().getSupportedMediaTypes();<a name="line.276"></a>
+<span class="sourceLineNo">277</span>               if (! mProduces.equals(om.get("produces")))<a name="line.277"></a>
+<span class="sourceLineNo">278</span>                  mom.put("produces", mProduces);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>            }<a name="line.279"></a>
+<span class="sourceLineNo">280</span>         }<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      <a name="line.282"></a>
+<span class="sourceLineNo">283</span>      s = jp.parse(vr.resolve(om.toString()), Swagger.class);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      swaggers.put(locale, s);<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      <a name="line.285"></a>
+<span class="sourceLineNo">286</span>      return s;<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   }<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   <a name="line.288"></a>
+<span class="sourceLineNo">289</span>   private ObjectMap getInfo(ObjectMap om) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      if (! om.containsKey("info"))<a name="line.290"></a>
+<span class="sourceLineNo">291</span>         om.put("info", new ObjectMap());<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      return om.getObjectMap("info");<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>   private ObjectMap getOperation(ObjectMap om, String path, String httpMethod) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (! om.containsKey("paths"))<a name="line.296"></a>
+<span class="sourceLineNo">297</span>         om.put("paths", new ObjectMap());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      om = om.getObjectMap("paths");<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      if (! om.containsKey(path))<a name="line.299"></a>
+<span class="sourceLineNo">300</span>         om.put(path, new ObjectMap());<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      om = om.getObjectMap(path);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      if (! om.containsKey(httpMethod))<a name="line.302"></a>
+<span class="sourceLineNo">303</span>         om.put(httpMethod, new ObjectMap());<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      return om.getObjectMap(httpMethod);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>   }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>   /**<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    * Returns the localized summary of the specified java method on this servlet.<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    * <a name="line.309"></a>
+<span class="sourceLineNo">310</span>    * &lt;p&gt;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    * Subclasses can override this method to provide their own summary.<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    * <a name="line.312"></a>
+<span class="sourceLineNo">313</span>    * &lt;p&gt;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    * &lt;ol class='spaced-list'&gt;<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    *    &lt;li&gt;{@link RestMethod#summary() @RestMethod.summary()} annotation.<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    *       &lt;p class='bcode'&gt;<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(summary=&lt;js&gt;"Summary of my method"&lt;/js&gt;)<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    *    <a name="line.322"></a>
+<span class="sourceLineNo">323</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(summary=&lt;js&gt;"$L{myLocalizedSummary}"&lt;/js&gt;)<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    *       &lt;/p&gt;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    *    &lt;li&gt;Localized string from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    *       on the resource class, then any parent classes.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    *       &lt;ol&gt;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].summary&lt;/ck&gt;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].summary&lt;/ck&gt;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    *       &lt;/ol&gt;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestMethod#summary() @RestMethod.summary()} annotation.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    *       &lt;p class='bcode'&gt;<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    *    &lt;ck&gt;MyClass.myMethod.summary&lt;/ck&gt; = &lt;cv&gt;Summary of my method.&lt;/cv&gt;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    *    <a name="line.338"></a>
+<span class="sourceLineNo">339</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    *    &lt;ck&gt;MyClass.myMethod.summary&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.summary}&lt;/cv&gt;<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    *       &lt;/p&gt;<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    * &lt;/ol&gt;<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    * <a name="line.343"></a>
+<span class="sourceLineNo">344</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    * @param req The current request.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    * @return The localized summary of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    * @throws Exception <a name="line.347"></a>
+<span class="sourceLineNo">348</span>    */<a name="line.348"></a>
+<span class="sourceLineNo">349</span>   @Override /* RestInfoProvider */<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   public String getMethodSummary(Method method, RestRequest req) throws Exception {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span>      String s = method.getAnnotation(RestMethod.class).summary();<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      if (s.isEmpty()) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         Operation o = getSwaggerOperation(method, req);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         if (o != null)<a name="line.356"></a>
+<span class="sourceLineNo">357</span>            s = o.getSummary();<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      }<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      <a name="line.359"></a>
+<span class="sourceLineNo">360</span>      return isEmpty(s) ? null : vr.resolve(s);<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span>   /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    * Returns the localized description of the specified java method on this servlet.<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    * <a name="line.365"></a>
+<span class="sourceLineNo">366</span>    * &lt;p&gt;<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    * Subclasses can override this method to provide their own description.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    * <a name="line.368"></a>
+<span class="sourceLineNo">369</span>    * &lt;p&gt;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    * &lt;ol class='spaced-list'&gt;<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    *    &lt;li&gt;{@link RestMethod#description() @RestMethod.description()} annotation.<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    *       &lt;p class='bcode'&gt;<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(description=&lt;js&gt;"Description of my method"&lt;/js&gt;)<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    *    <a name="line.378"></a>
+<span class="sourceLineNo">379</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(description=&lt;js&gt;"$L{myLocalizedDescription}"&lt;/js&gt;)<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod() {...}<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    *       &lt;/p&gt;<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    *    &lt;li&gt;Localized string from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    *       on the resource class, then any parent classes.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    *       &lt;ol&gt;<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].[javaMethodName].description&lt;/ck&gt;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    *          &lt;li&gt;&lt;ck&gt;[javaMethodName].description&lt;/ck&gt;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    *       &lt;/ol&gt;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestMethod#description() @RestMethod.description()} annotation.<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    *       &lt;p class='bcode'&gt;<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    *    &lt;ck&gt;MyClass.myMethod.description&lt;/ck&gt; = &lt;cv&gt;Description of my method.&lt;/cv&gt;<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    *    <a name="line.394"></a>
+<span class="sourceLineNo">395</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    *    &lt;ck&gt;MyClass.myMethod.description&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.myMethod.description}&lt;/cv&gt;<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    *       &lt;/p&gt;<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    * &lt;/ol&gt;<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    * <a name="line.399"></a>
+<span class="sourceLineNo">400</span>    * @param method The Java method annotated with {@link RestMethod @RestMethod}.<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    * @param req The current request.<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    * @return The localized description of the method, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    * @throws Exception <a name="line.403"></a>
+<span class="sourceLineNo">404</span>    */<a name="line.404"></a>
+<span class="sourceLineNo">405</span>   @Override /* RestInfoProvider */<a name="line.405"></a>
+<span class="sourceLineNo">406</span>   public String getMethodDescription(Method method, RestRequest req) throws Exception {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      <a name="line.408"></a>
+<span class="sourceLineNo">409</span>      String s = method.getAnnotation(RestMethod.class).description();<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      if (s.isEmpty()) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>         Operation o = getSwaggerOperation(method, req);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>         if (o != null)<a name="line.412"></a>
+<span class="sourceLineNo">413</span>            s = o.getDescription();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      <a name="line.415"></a>
+<span class="sourceLineNo">416</span>      return isEmpty(s) ? null : vr.resolve(s);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>   }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span>   /**<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    * Returns the localized site name of this REST resource.<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    * <a name="line.421"></a>
+<span class="sourceLineNo">422</span>    * &lt;p&gt;<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    * Subclasses can override this method to provide their own site name.<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    * <a name="line.424"></a>
+<span class="sourceLineNo">425</span>    * &lt;p&gt;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    * &lt;ol class='spaced-list'&gt;<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    *    &lt;li&gt;{@link RestResource#siteName() @RestResource.siteName()} annotation on this class, and then any parent classes.<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    *       &lt;p class='bcode'&gt;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(siteName=&lt;js&gt;"My Site"&lt;/js&gt;)<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    *    <a name="line.434"></a>
+<span class="sourceLineNo">435</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(siteName=&lt;js&gt;"$L{myLocalizedSiteName}"&lt;/js&gt;)<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    *       &lt;/p&gt;<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    *       on the resource class, then any parent classes.<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    *       &lt;ol&gt;<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].siteName&lt;/ck&gt;<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    *          &lt;li&gt;&lt;ck&gt;siteName&lt;/ck&gt;<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    *       &lt;/ol&gt;<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestResource#siteName() @RestResource.siteName()} annotation.<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    *       &lt;p class='bcode'&gt;<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    *    &lt;ck&gt;MyClass.siteName&lt;/ck&gt; = &lt;cv&gt;My Site&lt;/cv&gt;<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    *    <a name="line.450"></a>
+<span class="sourceLineNo">451</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    *    &lt;ck&gt;MyClass.siteName&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.siteName}&lt;/cv&gt;<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    *       &lt;/p&gt;<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    * &lt;/ol&gt;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    * <a name="line.455"></a>
+<span class="sourceLineNo">456</span>    * @param req The current request.<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    * @return The localized site name of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    * @throws Exception <a name="line.458"></a>
+<span class="sourceLineNo">459</span>    */<a name="line.459"></a>
+<span class="sourceLineNo">460</span>   @Override /* RestInfoProvider */<a name="line.460"></a>
+<span class="sourceLineNo">461</span>   public String getSiteName(RestRequest req) throws Exception {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      if (siteName != null)<a name="line.463"></a>
+<span class="sourceLineNo">464</span>         return vr.resolve(siteName);<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      String siteName = context.getMessages().findFirstString(req.getLocale(), "siteName");<a name="line.465"></a>
+<span class="sourceLineNo">466</span>      if (siteName != null)<a name="line.466"></a>
+<span class="sourceLineNo">467</span>         return vr.resolve(siteName);<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      return null;<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>   /**<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    * Returns the localized title of this REST resource.<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    * <a name="line.473"></a>
+<span class="sourceLineNo">474</span>    * &lt;p&gt;<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    * Subclasses can override this method to provide their own title.<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    * <a name="line.476"></a>
+<span class="sourceLineNo">477</span>    * &lt;p&gt;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    * &lt;ol class='spaced-list'&gt;<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    *    &lt;li&gt;{@link RestResource#title() @RestResource.siteName()} annotation on this class, and then any parent classes.<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    *       &lt;p class='bcode'&gt;<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(title=&lt;js&gt;"My Resource"&lt;/js&gt;)<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    *    <a name="line.486"></a>
+<span class="sourceLineNo">487</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(title=&lt;js&gt;"$L{myLocalizedTitle}"&lt;/js&gt;)<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    *       &lt;/p&gt;<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    *       on the resource class, then any parent classes.<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    *       &lt;ol&gt;<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].title&lt;/ck&gt;<a name="line.494"></a>
+<span class="sourceLineNo">495</span>    *          &lt;li&gt;&lt;ck&gt;title&lt;/ck&gt;<a name="line.495"></a>
+<span class="sourceLineNo">496</span>    *       &lt;/ol&gt;<a name="line.496"></a>
+<span class="sourceLineNo">497</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestResource#title() @RestResource.title()} annotation.<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    *       &lt;p class='bcode'&gt;<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    *    &lt;ck&gt;MyClass.title&lt;/ck&gt; = &lt;cv&gt;My Resource&lt;/cv&gt;<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    *    <a name="line.502"></a>
+<span class="sourceLineNo">503</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    *    &lt;ck&gt;MyClass.title&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.title}&lt;/cv&gt;<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    *       &lt;/p&gt;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    *    &lt;li&gt;&lt;ck&gt;/info/title&lt;/ck&gt; entry in swagger file.<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    * &lt;/ol&gt;<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    * <a name="line.508"></a>
+<span class="sourceLineNo">509</span>    * @param req The current request.<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    * @return The localized title of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was found.<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    * @throws Exception <a name="line.511"></a>
+<span class="sourceLineNo">512</span>    */<a name="line.512"></a>
+<span class="sourceLineNo">513</span>   @Override /* RestInfoProvider */<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   public String getTitle(RestRequest req) throws Exception {<a name="line.514"></a>
+<span class="sourceLineNo">515</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.515"></a>
+<span class="sourceLineNo">516</span>      if (title != null)<a name="line.516"></a>
+<span class="sourceLineNo">517</span>         return vr.resolve(title);<a name="line.517"></a>
+<span class="sourceLineNo">518</span>      String title = context.getMessages().findFirstString(req.getLocale(), "title");<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      if (title != null)<a name="line.519"></a>
+<span class="sourceLineNo">520</span>         return vr.resolve(title);<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      Swagger s = getSwagger(req);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      if (s != null &amp;&amp; s.getInfo() != null)<a name="line.522"></a>
+<span class="sourceLineNo">523</span>         return s.getInfo().getTitle();<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      return null;<a name="line.524"></a>
+<span class="sourceLineNo">525</span>   }<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span>   /**<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    * Returns the localized description of this REST resource.<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    * <a name="line.529"></a>
+<span class="sourceLineNo">530</span>    * &lt;p&gt;<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    * Subclasses can override this method to provide their own description.<a name="line.531"></a>
+<span class="sourceLineNo">532</span>    * <a name="line.532"></a>
+<span class="sourceLineNo">533</span>    * &lt;p&gt;<a name="line.533"></a>
+<span class="sourceLineNo">534</span>    * The default implementation returns the value from the following locations (whichever matches first):<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    * &lt;ol class='spaced-list'&gt;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    *    &lt;li&gt;{@link RestResource#description() @RestResource.description()} annotation on this class, and then any parent classes.<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    *       &lt;p class='bcode'&gt;<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    *    &lt;jc&gt;// Direct value&lt;/jc&gt;<a name="line.539"></a>
+<span class="sourceLineNo">540</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(description=&lt;js&gt;"My Resource"&lt;/js&gt;)<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    *    <a name="line.542"></a>
+<span class="sourceLineNo">543</span>    *    &lt;jc&gt;// Pulled from some other location&lt;/jc&gt;<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(description=&lt;js&gt;"$L{myLocalizedDescription}"&lt;/js&gt;)<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    *    &lt;jk&gt;public class&lt;/jk&gt; MyResource {...}<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    *       &lt;/p&gt;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    *    &lt;li&gt;Localized strings from resource bundle identified by {@link RestResource#messages() @RestResource.messages()}<a name="line.547"></a>
+<span class="sourceLineNo">548</span>    *       on the resource class, then any parent classes.<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    *       &lt;ol&gt;<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    *          &lt;li&gt;&lt;ck&gt;[ClassName].description&lt;/ck&gt;<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    *          &lt;li&gt;&lt;ck&gt;description&lt;/ck&gt;<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    *       &lt;/ol&gt;<a name="line.552"></a>
+<span class="sourceLineNo">553</span>    *       &lt;br&gt;Value can contain any SVL variables defined on the {@link RestResource#description() @RestResource.description()} annotation.<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    *       &lt;h5 class='figure'&gt;Examples:&lt;/h5&gt;<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    *       &lt;p class='bcode'&gt;<a name="line.555"></a>
+<span class="sourceLineNo">556</span>    *    &lt;cc&gt;// Direct value&lt;/cc&gt;<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    *    &lt;ck&gt;MyClass.description&lt;/ck&gt; = &lt;cv&gt;My Resource&lt;/cv&gt;<a name="line.557"></a>
+<span class="sourceLineNo">558</span>    *    <a name="line.558"></a>
+<span class="sourceLineNo">559</span>    *    &lt;cc&gt;// Pulled from some other location&lt;/cc&gt;<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    *    &lt;ck&gt;MyClass.description&lt;/ck&gt; = &lt;cv&gt;$C{MyStrings/MyClass.description}&lt;/cv&gt;<a name="line.560"></a>
+<span class="sourceLineNo">561</span>    *       &lt;/p&gt;<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    *    &lt;li&gt;&lt;ck&gt;/info/description&lt;/ck&gt; entry in swagger file.<a name="line.562"></a>
+<span class="sourceLineNo">563</span>    * &lt;/ol&gt;<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    * <a name="line.564"></a>
+<span class="sourceLineNo">565</span>    * @param req The current request.<a name="line.565"></a>
+<span class="sourceLineNo">566</span>    * @return The localized description of this REST resource, or &lt;jk&gt;null&lt;/jk&gt; if none was was found.<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    * @throws Exception <a name="line.567"></a>
+<span class="sourceLineNo">568</span>    */<a name="line.568"></a>
+<span class="sourceLineNo">569</span>   @Override /* RestInfoProvider */<a name="line.569"></a>
+<span class="sourceLineNo">570</span>   public String getDescription(RestRequest req) throws Exception {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      VarResolverSession vr = req.getVarResolverSession();<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      if (description != null)<a name="line.572"></a>
+<span class="sourceLineNo">573</span>         return vr.resolve(description);<a name="line.573"></a>
+<span class="sourceLineNo">574</span>      String description = context.getMessages().findFirstString(req.getLocale(), "description");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>      if (description != null)<a name="line.575"></a>
+<span class="sourceLineNo">576</span>         return vr.resolve(description);<a name="line.576"></a>
+<span class="sourceLineNo">577</span>      Swagger s = getSwagger(req);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      if (s != null &amp;&amp; s.getInfo() != null)<a name="line.578"></a>
+<span class="sourceLineNo">579</span>         return s.getInfo().getDescription();<a name="line.579"></a>
+<span class="sourceLineNo">580</span>      return null;<a name="line.580"></a>
+<span class="sourceLineNo">581</span>   }<a name="line.581"></a>
+<span class="sourceLineNo">582</span><a name="line.582"></a>
+<span class="sourceLineNo">583</span>   private Operation getSwaggerOperation(Method method, RestRequest req) throws Exception {<a name="line.583"></a>
+<span class="sourceLineNo">584</span><a name="line.584"></a>
+<span class="sourceLineNo">585</span>      Swagger s = getSwagger(req);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>      if (s != null) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span>         Map&lt;String,Map&lt;String,Operation&gt;&gt; sp = s.getPaths();<a name="line.587"></a>
+<span class="sourceLineNo">588</span>         if (sp != null) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span>            Map&lt;String,Operation&gt; spp = sp.get(method.getAnnotation(RestMethod.class).path());<a name="line.589"></a>
+<span class="sourceLineNo">590</span>            if (spp != null)<a name="line.590"></a>
+<span class="sourceLineNo">591</span>               return spp.get(req.getMethod());<a name="line.591"></a>
+<span class="sourceLineNo">592</span>         }<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      }<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      return null;<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   }<a name="line.595"></a>
+<span class="sourceLineNo">596</span>}<a name="line.596"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
index efe0688..eceb35f 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
@@ -1259,7 +1259,7 @@
 <span class="sourceLineNo">1251</span>    * <a name="line.1251"></a>
 <span class="sourceLineNo">1252</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1252"></a>
 <span class="sourceLineNo">1253</span>    * @param resolveVars<a name="line.1253"></a>
-<span class="sourceLineNo">1254</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter @Parameter} variables will be<a name="line.1254"></a>
+<span class="sourceLineNo">1254</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any SVL variables will be<a name="line.1254"></a>
 <span class="sourceLineNo">1255</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1255"></a>
 <span class="sourceLineNo">1256</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1256"></a>
 <span class="sourceLineNo">1257</span>    * @param mediaType The value to set as the &lt;js&gt;"Content-Type"&lt;/js&gt; header for this object.<a name="line.1257"></a>
@@ -1282,7 +1282,7 @@
 <span class="sourceLineNo">1274</span>    * <a name="line.1274"></a>
 <span class="sourceLineNo">1275</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1275"></a>
 <span class="sourceLineNo">1276</span>    * @param resolveVars<a name="line.1276"></a>
-<span class="sourceLineNo">1277</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter @Parameter} variables will be<a name="line.1277"></a>
+<span class="sourceLineNo">1277</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any SVL variables will be<a name="line.1277"></a>
 <span class="sourceLineNo">1278</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1278"></a>
 <span class="sourceLineNo">1279</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1279"></a>
 <span class="sourceLineNo">1280</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1280"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/MethodSwagger.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/MethodSwagger.html
deleted file mode 100644
index 0836c74..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/MethodSwagger.html
+++ /dev/null
@@ -1,282 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License.  You may obtain a copy of the License at                                                              *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// *                                                                                                                         *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// *                                                                                                                         *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License.                                              *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.rest.annotation;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import org.apache.juneau.rest.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
-<span class="sourceLineNo">018</span> * Extended annotation for {@link RestMethod#swagger() RestMethod.swagger()}.<a name="line.18"></a>
-<span class="sourceLineNo">019</span> * <a name="line.19"></a>
-<span class="sourceLineNo">020</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * &lt;ul&gt;<a name="line.21"></a>
-<span class="sourceLineNo">022</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; OPTIONS Pages&lt;/a&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * &lt;/ul&gt;<a name="line.23"></a>
-<span class="sourceLineNo">024</span> */<a name="line.24"></a>
-<span class="sourceLineNo">025</span>public @interface MethodSwagger {<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>   /**<a name="line.27"></a>
-<span class="sourceLineNo">028</span>    * Optional deprecated flag for the exposed API.<a name="line.28"></a>
-<span class="sourceLineNo">029</span>    * <a name="line.29"></a>
-<span class="sourceLineNo">030</span>    * &lt;p&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    * Used to populate the Swagger deprecated field.<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    * <a name="line.32"></a>
-<span class="sourceLineNo">033</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>    * &lt;p class='bcode'&gt;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.36"></a>
-<span class="sourceLineNo">037</span>    *          deprecated=&lt;jk&gt;true&lt;/jk&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>    *       )<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    *    )<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * &lt;/p&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    * <a name="line.41"></a>
-<span class="sourceLineNo">042</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * &lt;ul class='spaced-list'&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    *    &lt;li&gt;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    *       Corresponds to the swagger field &lt;code&gt;/paths/{path}/{method}/deprecated&lt;/code&gt;.<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    * &lt;/ul&gt;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    * <a name="line.47"></a>
-<span class="sourceLineNo">048</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    * &lt;ul&gt;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    *    &lt;li class='jm'&gt;{@link BasicRestInfoProvider#isDeprecated(java.lang.reflect.Method, RestRequest) BasicRestInfoProvider.isDeprecated(Method,RestRequest)}<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * &lt;/ul&gt;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   boolean deprecated() default false;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>   /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * Optional external documentation information for the exposed API.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * <a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * &lt;p&gt;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * Used to populate the Swagger external documentation field.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * <a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * &lt;p&gt;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * A simplified JSON string with the following fields:<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * &lt;p class='bcode'&gt;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    *    {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    *       description: string,<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    *       url: string<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    *    }<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    * &lt;/p&gt;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * <a name="line.69"></a>
-<span class="sourceLineNo">070</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * &lt;p class='bcode'&gt;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    *          &lt;js&gt;"{url:'http://juneau.apache.org'}"&lt;/js&gt;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    *       )<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    *    )<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * &lt;/p&gt;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * <a name="line.78"></a>
-<span class="sourceLineNo">079</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    * &lt;ul class='spaced-list'&gt;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    *    &lt;li&gt;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time and request-time variables&lt;/a&gt; <a name="line.82"></a>
-<span class="sourceLineNo">083</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    *    &lt;li&gt;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    *       Corresponds to the swagger field &lt;code&gt;/paths/{path}/{method}/externalDocs&lt;/code&gt;.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    * &lt;/ul&gt;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * <a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    * &lt;ul&gt;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    *    &lt;li class='jm'&gt;{@link BasicRestInfoProvider#getMethodExternalDocs(java.lang.reflect.Method, RestRequest) BasicRestInfoProvider.getMethodExternalDocs(Method,RestRequest)}<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    * &lt;/ul&gt;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    */<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   String externalDocs() default "";<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>   /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    * Optional parameter descriptions.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    * <a name="line.97"></a>
-<span class="sourceLineNo">098</span>    * &lt;p&gt;<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * This annotation is provided for documentation purposes and is used to populate the method &lt;js&gt;"parameters"&lt;/js&gt;<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * column on the Swagger page.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    * <a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * &lt;p class='bcode'&gt;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    *       name=&lt;jsf&gt;POST&lt;/jsf&gt;, path=&lt;js&gt;"/{a}"&lt;/js&gt;,<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    *       description=&lt;js&gt;"This is my method."&lt;/js&gt;,<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    *          parameters={<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    *             &lt;ja&gt;@Parameter&lt;/ja&gt;(in=&lt;js&gt;"path"&lt;/js&gt;, name=&lt;js&gt;"a"&lt;/js&gt;, description=&lt;js&gt;"The 'a' attribute"&lt;/js&gt;),<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    *             &lt;ja&gt;@Parameter&lt;/ja&gt;(in=&lt;js&gt;"query"&lt;/js&gt;, name=&lt;js&gt;"b"&lt;/js&gt;, description=&lt;js&gt;"The 'b' parameter"&lt;/js&gt;, required=&lt;jk&gt;true&lt;/jk&gt;),<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    *             &lt;ja&gt;@Parameter&lt;/ja&gt;(in=&lt;js&gt;"body"&lt;/js&gt;, description=&lt;js&gt;"The HTTP content"&lt;/js&gt;),<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    *             &lt;ja&gt;@Parameter&lt;/ja&gt;(in=&lt;js&gt;"header"&lt;/js&gt;, name=&lt;js&gt;"D"&lt;/js&gt;, description=&lt;js&gt;"The 'D' header"&lt;/js&gt;),<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    *          }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    *       )<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    *    )<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    * &lt;/p&gt;<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    * <a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * &lt;ul class='spaced-list'&gt;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    *    &lt;li&gt;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time and request-time variables&lt;/a&gt; <a name="line.121"></a>
-<span class="sourceLineNo">122</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    *    &lt;li&gt;<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    *       Corresponds to the swagger field &lt;code&gt;/paths/{path}/{method}/parameters&lt;/code&gt;.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * &lt;/ul&gt;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    * <a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * &lt;ul&gt;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    *    &lt;li class='jm'&gt;{@link BasicRestInfoProvider#getMethodParameters(java.lang.reflect.Method, RestRequest) BasicRestInfoProvider.getMethodParameters(Method,RestRequest)}<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    * &lt;/ul&gt;<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    */<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   Parameter[] parameters() default {};<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>   /**<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    * Optional output description.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    * <a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * &lt;p&gt;<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * This annotation is provided for documentation purposes and is used to populate the method &lt;js&gt;"responses"&lt;/js&gt;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * column on the Swagger page.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    * <a name="line.140"></a>
-<span class="sourceLineNo">141</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    * &lt;p class='bcode'&gt;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    *       name=&lt;jsf&gt;GET&lt;/jsf&gt;, path=&lt;js&gt;"/"&lt;/js&gt;,<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    *          responses={<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    *             &lt;ja&gt;@Response&lt;/ja&gt;(200),<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    *             &lt;ja&gt;@Response&lt;/ja&gt;(<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    *                value=302,<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    *                description=&lt;js&gt;"Thing wasn't found here"&lt;/js&gt;,<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    *                headers={<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    *                   &lt;ja&gt;@Parameter&lt;/ja&gt;(name=&lt;js&gt;"Location"&lt;/js&gt;, description=&lt;js&gt;"The place to find the thing"&lt;/js&gt;)<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    *                }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    *             )<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    *          }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    *       )<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    *    )<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    * &lt;/p&gt;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    * <a name="line.159"></a>
-<span class="sourceLineNo">160</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * &lt;ul class='spaced-list'&gt;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    *    &lt;li&gt;<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time and request-time variables&lt;/a&gt; <a name="line.163"></a>
-<span class="sourceLineNo">164</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    *    &lt;li&gt;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    *       Corresponds to the swagger field &lt;code&gt;/paths/{path}/{method}/responses&lt;/code&gt;.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    * &lt;/ul&gt;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    * <a name="line.168"></a>
-<span class="sourceLineNo">169</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    * &lt;ul&gt;<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    *    &lt;li class='jm'&gt;{@link BasicRestInfoProvider#getMethodResponses(java.lang.reflect.Method, RestRequest) BasicRestInfoProvider.getMethodResponses(Method,RestRequest)}<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    * &lt;/ul&gt;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   Response[] responses() default {};<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>   /**<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    * Optional tagging information for the exposed API.<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    * <a name="line.178"></a>
-<span class="sourceLineNo">179</span>    * &lt;p&gt;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    * Used to populate the Swagger tags field.<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    * <a name="line.181"></a>
-<span class="sourceLineNo">182</span>    * &lt;p&gt;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    * A comma-delimited list of tags for API documentation control.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    * &lt;br&gt;Tags can be used for logical grouping of operations by resources or any other qualifier.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    * <a name="line.185"></a>
-<span class="sourceLineNo">186</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * &lt;p class='bcode'&gt;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    *          tags=&lt;js&gt;"foo,bar"&lt;/js&gt;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    *       )<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    *    )<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    * &lt;/p&gt;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    * <a name="line.194"></a>
-<span class="sourceLineNo">195</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    * &lt;ul class='spaced-list'&gt;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    *    &lt;li&gt;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time and request-time variables&lt;/a&gt; <a name="line.198"></a>
-<span class="sourceLineNo">199</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    *    &lt;li&gt;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    *       Corresponds to the swagger field &lt;code&gt;/paths/{path}/{method}/tags&lt;/code&gt;.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    * &lt;/ul&gt;<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    * <a name="line.203"></a>
-<span class="sourceLineNo">204</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    * &lt;ul&gt;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    *    &lt;li class='jm'&gt;{@link BasicRestInfoProvider#getMethodTags(java.lang.reflect.Method, RestRequest) BasicRestInfoProvider.getMethodTags(Method,RestRequest)}<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    * &lt;/ul&gt;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    */<a name="line.208"></a>
-<span class="sourceLineNo">209</span>   String tags() default "";<a name="line.209"></a>
-<span class="sourceLineNo">210</span>}<a name="line.210"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Parameter.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Parameter.html
deleted file mode 100644
index d666591..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Parameter.html
+++ /dev/null
@@ -1,285 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License.  You may obtain a copy of the License at                                                              *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// *                                                                                                                         *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// *                                                                                                                         *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License.                                              *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.rest.annotation;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static java.lang.annotation.ElementType.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import static java.lang.annotation.RetentionPolicy.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * Annotation used in conjunction with {@link MethodSwagger#parameters() @MethodSwagger.parameters()} to identify <a name="line.21"></a>
-<span class="sourceLineNo">022</span> * content and header descriptions on specific method requests.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * <a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * &lt;p class='bcode'&gt;<a name="line.25"></a>
-<span class="sourceLineNo">026</span> *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.26"></a>
-<span class="sourceLineNo">027</span> *       name=&lt;js&gt;"*"&lt;/js&gt;,<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *       swagger=@MethodSwagger(<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *          parameters={<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *             &lt;ja&gt;@Parameter&lt;/ja&gt;(in=&lt;js&gt;"header"&lt;/js&gt;, name=&lt;js&gt;"Range"&lt;/js&gt;, description=&lt;js&gt;"$L{ContentRange.description}"&lt;/js&gt;)<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *          }<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *       )<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *    )<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *    &lt;jk&gt;public void&lt;/jk&gt; doAnything(RestRequest req, RestResponse res, &lt;ja&gt;@Method&lt;/ja&gt; String method) {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *       ...<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *    }<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * &lt;/p&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <a name="line.38"></a>
-<span class="sourceLineNo">039</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;ul&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; OPTIONS Pages&lt;/a&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * &lt;/ul&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>@Documented<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@Target(PARAMETER)<a name="line.45"></a>
-<span class="sourceLineNo">046</span>@Retention(RUNTIME)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Inherited<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public @interface Parameter {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>   /**<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * Declares the value of the parameter that the server will use if none is provided.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * <a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * &lt;p&gt;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * For example a "count" to control the number of results per page might default to 100 if not supplied by the<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * client in the request.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * (Note: "default" has no meaning for required parameters.)<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * See &lt;a class="doclink" href="http://json-schema.org/latest/json-schema-validation.html#anchor101"&gt;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * http://json-schema.org/latest/json-schema-validation.html#anchor101&lt;/a&gt;.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * Unlike JSON Schema this value MUST conform to the defined &lt;code&gt;type&lt;/code&gt; for this parameter.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   String _default() default "";<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>   /**<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    * Sets the ability to pass empty-valued parameters.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * <a name="line.65"></a>
-<span class="sourceLineNo">066</span>    * &lt;p&gt;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * This is valid only for either &lt;code&gt;query&lt;/code&gt; or &lt;code&gt;formData&lt;/code&gt; parameters and allows you to send a<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    * parameter with a name only or an empty value.<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * Default value is &lt;jk&gt;false&lt;/jk&gt;.<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    */<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   boolean allowEmptyValue() default false;<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>   /**<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * Determines the format of the array if type array is used.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * <a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * &lt;p&gt;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * Possible values are:<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * &lt;ul&gt;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    *    &lt;li&gt;&lt;js&gt;"csv"&lt;/js&gt; - comma separated values &lt;js&gt;"foo,bar"&lt;/js&gt;.<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    *    &lt;li&gt;&lt;js&gt;"ssv"&lt;/js&gt; - space separated values &lt;js&gt;"foo bar"&lt;/js&gt;.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    *    &lt;li&gt;&lt;js&gt;"tsv"&lt;/js&gt; - tab separated values &lt;js&gt;"foo\tbar"&lt;/js&gt;.<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    *    &lt;li&gt;&lt;js&gt;"pipes"&lt;/js&gt; - pipe separated values &lt;js&gt;"foo|bar"&lt;/js&gt;.<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    *    &lt;li&gt;&lt;js&gt;"multi"&lt;/js&gt; - corresponds to multiple parameter instances instead of multiple values for a single<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    *       instance &lt;js&gt;"foo=bar&amp;amp;foo=baz"&lt;/js&gt;.<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    *       This is valid only for parameters &lt;code&gt;in&lt;/code&gt; &lt;js&gt;"query"&lt;/js&gt; or &lt;js&gt;"formData"&lt;/js&gt;.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    * &lt;/ul&gt;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * Default value is &lt;js&gt;"csv"&lt;/js&gt;.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    */<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   String collectionFormat() default "";<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>   /**<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    * Parameter description (e.g. &lt;js&gt;"Indicates the range returned when Range header is present in the request"&lt;/js&gt;).<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    * <a name="line.93"></a>
-<span class="sourceLineNo">094</span>    * &lt;p&gt;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    * A brief description of the parameter.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    * This could contain examples of use.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    * &lt;a class="doclink" href="https://help.github.com/articles/github-flavored-markdown"&gt;GFM syntax&lt;/a&gt; can be used<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    * for rich text representation.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * <a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * &lt;p&gt;<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    * The default value pulls the description from the &lt;code&gt;description&lt;/code&gt; entry in the servlet resource bundle.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * (e.g. &lt;js&gt;"myMethod.res.[code].[category].[name] = foo"&lt;/js&gt; or<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * &lt;js&gt;"MyServlet.myMethod.res.[code].[category].[name] = foo"&lt;/js&gt;).<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   String description() default "";<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span>   /**<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    * The extending format for the previously mentioned &lt;code&gt;type&lt;/code&gt;.<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    * <a name="line.109"></a>
-<span class="sourceLineNo">110</span>    * &lt;p&gt;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    * See &lt;a class="doclink" href="http://swagger.io/specification/#dataTypeFormat"&gt;Data Type Formats&lt;/a&gt; for further<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    * details.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   String format() default "";<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>   /**<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    * The location of the parameter.<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * <a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * &lt;p&gt;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * Possible values are:<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * &lt;ul&gt;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    *    &lt;li&gt;&lt;js&gt;"query"&lt;/js&gt;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    *    &lt;li&gt;&lt;js&gt;"header"&lt;/js&gt;<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    *    &lt;li&gt;&lt;js&gt;"path"&lt;/js&gt;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    *    &lt;li&gt;&lt;js&gt;"formData"&lt;/js&gt;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    *    &lt;li&gt;&lt;js&gt;"body"&lt;/js&gt;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * &lt;/ul&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    */<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   String in() default "";<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>   /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    * Required if &lt;code&gt;type&lt;/code&gt; is &lt;js&gt;"array"&lt;/js&gt;.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    * <a name="line.133"></a>
-<span class="sourceLineNo">134</span>    * &lt;p&gt;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    * Describes the type of items in the array.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    * <a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * &lt;p class='bcode'&gt;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    *       parameters={<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    *          &lt;ja&gt;@Parameter&lt;/ja&gt;(<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    *             in=&lt;js&gt;"header"&lt;/js&gt;,<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    *             name=&lt;js&gt;"Foo"&lt;/js&gt;,<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    *             type=&lt;js&gt;"array"&lt;/js&gt;,<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    *             items=&lt;js&gt;"{type:'string',collectionFormat:'csv'}"&lt;/js&gt;)<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    *       }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    *    )<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doAnything() {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * &lt;/p&gt;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * <a name="line.150"></a>
-<span class="sourceLineNo">151</span>    * &lt;p&gt;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    * See &lt;a class="doclink" href="http://swagger.io/specification/#itemsObject"&gt;Items Object&lt;/a&gt; for further details.<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   String items() default "";<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>   /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    * The name of the parameter (e.g. &lt;js&gt;"Content-Range"&lt;/js&gt;).<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    * <a name="line.158"></a>
-<span class="sourceLineNo">159</span>    * &lt;p&gt;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    * Parameter names are case sensitive.<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * If &lt;code&gt;in&lt;/code&gt; is &lt;js&gt;"path"&lt;/js&gt;, the name field MUST correspond to the associated path segment from the<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * &lt;code&gt;path&lt;/code&gt; field in the &lt;a class="doclink"<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * href="http://swagger.io/specification/#pathsObject"&gt;Paths Object&lt;/a&gt;.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    * See &lt;a class="doclink" href="http://swagger.io/specification/#pathTemplating"&gt;Path Templating&lt;/a&gt; for further<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    * information.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    * For all other cases, the name corresponds to the parameter name used based on the &lt;code&gt;in&lt;/code&gt; property.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    */<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   String name() default "";<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>   /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    * Determines whether this parameter is mandatory.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    * <a name="line.172"></a>
-<span class="sourceLineNo">173</span>    * &lt;p&gt;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    * If the parameter is &lt;code&gt;in&lt;/code&gt; &lt;js&gt;"path"&lt;/js&gt;, this property is required and its value MUST be &lt;jk&gt;true&lt;/jk&gt;.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    * Otherwise, the property MAY be included and its default value is &lt;jk&gt;false&lt;/jk&gt;.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>   boolean required() default false;<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>   /**<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    * The schema defining the type used for the body parameter.<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    * <a name="line.181"></a>
-<span class="sourceLineNo">182</span>    * &lt;p&gt;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    * Only applicable for &lt;code&gt;in&lt;/code&gt; of type &lt;js&gt;"body"&lt;/js&gt;.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    * <a name="line.184"></a>
-<span class="sourceLineNo">185</span>    * &lt;p&gt;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    * The schema is a JSON object specified &lt;a class="doclink" href="http://swagger.io/specification/#schemaObject"&gt;here&lt;/a&gt;.<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * <a name="line.187"></a>
-<span class="sourceLineNo">188</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    * &lt;p class='bcode'&gt;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    *       parameters={<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    *          &lt;ja&gt;@Parameter&lt;/ja&gt;(<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    *             in=&lt;js&gt;"header"&lt;/js&gt;,<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    *             name=&lt;js&gt;"Foo"&lt;/js&gt;,<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    *             schema=&lt;js&gt;"{format:'string',title:'Foo header',description:'Header that contains the Foo value.'}"&lt;/js&gt;)<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    *       }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    *    )<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doAnything() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    * &lt;/p&gt;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   String schema() default "";<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>   /**<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    * The type of the parameter.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    * <a name="line.205"></a>
-<span class="sourceLineNo">206</span>    * &lt;p&gt;<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    * The value MUST be one of &lt;js&gt;"string"&lt;/js&gt;, &lt;js&gt;"number"&lt;/js&gt;, &lt;js&gt;"integer"&lt;/js&gt;, &lt;js&gt;"boolean"&lt;/js&gt;,<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * &lt;js&gt;"array"&lt;/js&gt; or &lt;js&gt;"file"&lt;/js&gt;.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    * If type is &lt;js&gt;"file"&lt;/js&gt;, the consumes MUST be either &lt;js&gt;"multipart/form-data"&lt;/js&gt;,<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    * &lt;js&gt;"application/x-www-form-urlencoded"&lt;/js&gt; or both and the parameter MUST be in &lt;js&gt;"formData"&lt;/js&gt;.<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    */<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   String type() default "string";<a name="line.212"></a>
-<span class="sourceLineNo">213</span>}<a name="line.213"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html
deleted file mode 100644
index 94e751b..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/ResourceSwagger.html
+++ /dev/null
@@ -1,405 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License.  You may obtain a copy of the License at                                                              *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// *                                                                                                                         *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// *                                                                                                                         *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License.                                              *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.rest.annotation;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import org.apache.juneau.config.vars.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import org.apache.juneau.rest.vars.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.svl.vars.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>/**<a name="line.19"></a>
-<span class="sourceLineNo">020</span> * Extended annotation for {@link RestResource#swagger() @RestResource.swagger()}.<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * <a name="line.21"></a>
-<span class="sourceLineNo">022</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * &lt;ul&gt;<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; OPTIONS pages&lt;/a&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * &lt;/ul&gt;<a name="line.25"></a>
-<span class="sourceLineNo">026</span> */<a name="line.26"></a>
-<span class="sourceLineNo">027</span>public @interface ResourceSwagger {<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>   /**<a name="line.29"></a>
-<span class="sourceLineNo">030</span>    * Optional contact information for the exposed API.<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    * <a name="line.31"></a>
-<span class="sourceLineNo">032</span>    * &lt;p&gt;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>    * It is used to populate the Swagger contact field and to display on HTML pages.<a name="line.33"></a>
-<span class="sourceLineNo">034</span>    * <a name="line.34"></a>
-<span class="sourceLineNo">035</span>    * &lt;p&gt;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    * A simplified JSON string with the following fields:<a name="line.36"></a>
-<span class="sourceLineNo">037</span>    * &lt;p class='bcode'&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>    *    {<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    *       name: string,<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    *       url: string,<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    *       email: string<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    *    }<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * &lt;/p&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    * <a name="line.44"></a>
-<span class="sourceLineNo">045</span>    * &lt;p&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    * The default value pulls the description from the &lt;code&gt;contact&lt;/code&gt; entry in the servlet resource bundle.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    * (e.g. &lt;js&gt;"contact = {name:'John Smith',email:'john.smith@foo.bar'}"&lt;/js&gt; or<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    * &lt;js&gt;"MyServlet.contact = {name:'John Smith',email:'john.smith@foo.bar'}"&lt;/js&gt;).<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    * <a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    * &lt;p class='bcode'&gt;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    *          contact=&lt;js&gt;"{name:'John Smith',email:'john.smith@foo.bar'}"&lt;/js&gt;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    *       )<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    *    )<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * &lt;/p&gt;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * <a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * &lt;p&gt;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * Value can contain any of the following variables:  <a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * {@link ConfigVar $C} <a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * {@link CoalesceVar $CO}<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * {@link EnvVariablesVar $E} <a name="line.63"></a>
-<span class="sourceLineNo">064</span>    * {@link FileVar $F} <a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * {@link ServletInitParamVar $I},<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    * {@link IfVar $IF}<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * {@link LocalizationVar $L}<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    * {@link RequestAttributeVar $RA} <a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * {@link RequestFormDataVar $RF} <a name="line.69"></a>
-<span class="sourceLineNo">070</span>    * {@link RequestHeaderVar $RH} <a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * {@link RequestPathVar $RP} <a name="line.71"></a>
-<span class="sourceLineNo">072</span>    * {@link RequestQueryVar $RQ} <a name="line.72"></a>
-<span class="sourceLineNo">073</span>    * {@link RequestVar $R} <a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * {@link SystemPropertiesVar $S}<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * {@link SerializedRequestAttrVar $SA}<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * {@link SwitchVar $SW}<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * {@link UrlVar $U}<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * {@link UrlEncodeVar $UE}<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    * {@link WidgetVar $W}<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    * <a name="line.80"></a>
-<span class="sourceLineNo">081</span>    * &lt;p&gt;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    * Corresponds to the swagger field &lt;code&gt;/info/contact&lt;/code&gt;.<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    */<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   String contact() default "";<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>   /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * Optional external documentation information for the exposed API.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * <a name="line.88"></a>
-<span class="sourceLineNo">089</span>    * &lt;p&gt;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    * It is used to populate the Swagger external documentation field and to display on HTML pages.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    * <a name="line.91"></a>
-<span class="sourceLineNo">092</span>    * &lt;p&gt;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    * A simplified JSON string with the following fields:<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    * &lt;p class='bcode'&gt;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    *    {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    *       description: string,<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    *       url: string<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    *    }<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * &lt;/p&gt;<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * <a name="line.100"></a>
-<span class="sourceLineNo">101</span>    * &lt;p&gt;<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * The default value pulls the description from the &lt;code&gt;externalDocs&lt;/code&gt; entry in the servlet resource bundle.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * (e.g. &lt;js&gt;"externalDocs = {url:'http://juneau.apache.org'}"&lt;/js&gt; or<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    * &lt;js&gt;"MyServlet.externalDocs = {url:'http://juneau.apache.org'}"&lt;/js&gt;).<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    * <a name="line.105"></a>
-<span class="sourceLineNo">106</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    * &lt;p class='bcode'&gt;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    *          externalDocs=&lt;js&gt;"{url:'http://juneau.apache.org'}"&lt;/js&gt;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    *       )<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    *    )<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    * &lt;/p&gt;<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    * <a name="line.114"></a>
-<span class="sourceLineNo">115</span>    * &lt;p&gt;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    * Value can contain any of the following variables:  <a name="line.116"></a>
-<span class="sourceLineNo">117</span>    * {@link ConfigVar $C} <a name="line.117"></a>
-<span class="sourceLineNo">118</span>    * {@link CoalesceVar $CO}<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    * {@link EnvVariablesVar $E} <a name="line.119"></a>
-<span class="sourceLineNo">120</span>    * {@link FileVar $F} <a name="line.120"></a>
-<span class="sourceLineNo">121</span>    * {@link ServletInitParamVar $I},<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    * {@link IfVar $IF}<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    * {@link LocalizationVar $L}<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * {@link RequestAttributeVar $RA} <a name="line.124"></a>
-<span class="sourceLineNo">125</span>    * {@link RequestFormDataVar $RF} <a name="line.125"></a>
-<span class="sourceLineNo">126</span>    * {@link RequestHeaderVar $RH} <a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * {@link RequestPathVar $RP} <a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * {@link RequestQueryVar $RQ} <a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * {@link RequestVar $R} <a name="line.129"></a>
-<span class="sourceLineNo">130</span>    * {@link SystemPropertiesVar $S}<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    * {@link SerializedRequestAttrVar $SA}<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    * {@link SwitchVar $SW}<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    * {@link UrlVar $U}<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    * {@link UrlEncodeVar $UE}<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    * {@link WidgetVar $W}<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    * <a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * &lt;p&gt;<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * Corresponds to the swagger field &lt;code&gt;/tags&lt;/code&gt;.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   String externalDocs() default "";<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>   /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    * Optional license information for the exposed API.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    * <a name="line.144"></a>
-<span class="sourceLineNo">145</span>    * &lt;p&gt;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    * It is used to populate the Swagger license field and to display on HTML pages.<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    * <a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * &lt;p&gt;<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * A simplified JSON string with the following fields:<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * &lt;p class='bcode'&gt;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    *    {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    *       name: string,<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    *       url: string<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    *    }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    * &lt;/p&gt;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    * <a name="line.156"></a>
-<span class="sourceLineNo">157</span>    * &lt;p&gt;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    * The default value pulls the description from the &lt;code&gt;license&lt;/code&gt; entry in the servlet resource bundle.<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    * (e.g. &lt;js&gt;"license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"&lt;/js&gt; or<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    * &lt;js&gt;"MyServlet.license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"&lt;/js&gt;).<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * <a name="line.161"></a>
-<span class="sourceLineNo">162</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * &lt;p class='bcode'&gt;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    *          license=&lt;js&gt;"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"&lt;/js&gt;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    *       )<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    *    )<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    * &lt;/p&gt;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    * <a name="line.170"></a>
-<span class="sourceLineNo">171</span>    * &lt;p&gt;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    * Value can contain any of the following variables:  <a name="line.172"></a>
-<span class="sourceLineNo">173</span>    * {@link ConfigVar $C} <a name="line.173"></a>
-<span class="sourceLineNo">174</span>    * {@link CoalesceVar $CO}<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    * {@link EnvVariablesVar $E} <a name="line.175"></a>
-<span class="sourceLineNo">176</span>    * {@link FileVar $F} <a name="line.176"></a>
-<span class="sourceLineNo">177</span>    * {@link ServletInitParamVar $I},<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    * {@link IfVar $IF}<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    * {@link LocalizationVar $L}<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    * {@link RequestAttributeVar $RA} <a name="line.180"></a>
-<span class="sourceLineNo">181</span>    * {@link RequestFormDataVar $RF} <a name="line.181"></a>
-<span class="sourceLineNo">182</span>    * {@link RequestHeaderVar $RH} <a name="line.182"></a>
-<span class="sourceLineNo">183</span>    * {@link RequestPathVar $RP} <a name="line.183"></a>
-<span class="sourceLineNo">184</span>    * {@link RequestQueryVar $RQ} <a name="line.184"></a>
-<span class="sourceLineNo">185</span>    * {@link RequestVar $R} <a name="line.185"></a>
-<span class="sourceLineNo">186</span>    * {@link SystemPropertiesVar $S}<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * {@link SerializedRequestAttrVar $SA}<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    * {@link SwitchVar $SW}<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    * {@link UrlVar $U}<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    * {@link UrlEncodeVar $UE}<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    * {@link WidgetVar $W}<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    * <a name="line.192"></a>
-<span class="sourceLineNo">193</span>    * &lt;p&gt;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    * Corresponds to the swagger field &lt;code&gt;/info/license&lt;/code&gt;.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    */<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   String license() default "";<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>   /**<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    * Optional tagging information for the exposed API.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    * <a name="line.200"></a>
-<span class="sourceLineNo">201</span>    * &lt;p&gt;<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    * It is used to populate the Swagger tags field and to display on HTML pages.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    * <a name="line.203"></a>
-<span class="sourceLineNo">204</span>    * &lt;p&gt;<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    * A simplified JSON string with the following fields:<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    * &lt;p class='bcode'&gt;<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    *    [<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    *       {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    *          name: string,<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    *          description: string,<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    *          externalDocs: {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    *             description: string,<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    *             url: string<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    *          }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    *       }<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    *    ]<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    * &lt;/p&gt;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * <a name="line.218"></a>
-<span class="sourceLineNo">219</span>    * &lt;p&gt;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * The default value pulls the description from the &lt;code&gt;tags&lt;/code&gt; entry in the servlet resource bundle.<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    * (e.g. &lt;js&gt;"tags = [{name:'Foo',description:'Foobar'}]"&lt;/js&gt; or<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    * &lt;js&gt;"MyServlet.tags = [{name:'Foo',description:'Foobar'}]"&lt;/js&gt;).<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * <a name="line.223"></a>
-<span class="sourceLineNo">224</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    * &lt;p class='bcode'&gt;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    *       swagger=&lt;ja&gt;@MethodSwagger&lt;/ja&gt;(<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    *          tags=&lt;js&gt;"[{name:'Foo',description:'Foobar'}]"&lt;/js&gt;<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    *       )<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    *    )<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    * &lt;/p&gt;<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    * <a name="line.232"></a>
-<span class="sourceLineNo">233</span>    * &lt;p&gt;<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    * Value can contain any of the following variables:  <a name="line.234"></a>
-<span class="sourceLineNo">235</span>    * {@link ConfigVar $C} <a name="line.235"></a>
-<span class="sourceLineNo">236</span>    * {@link CoalesceVar $CO}<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    * {@link EnvVariablesVar $E} <a name="line.237"></a>
-<span class="sourceLineNo">238</span>    * {@link FileVar $F} <a name="line.238"></a>
-<span class="sourceLineNo">239</span>    * {@link ServletInitParamVar $I},<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    * {@link IfVar $IF}<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    * {@link LocalizationVar $L}<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    * {@link RequestAttributeVar $RA} <a name="line.242"></a>
-<span class="sourceLineNo">243</span>    * {@link RequestFormDataVar $RF} <a name="line.243"></a>
-<span class="sourceLineNo">244</span>    * {@link RequestHeaderVar $RH} <a name="line.244"></a>
-<span class="sourceLineNo">245</span>    * {@link RequestPathVar $RP} <a name="line.245"></a>
-<span class="sourceLineNo">246</span>    * {@link RequestQueryVar $RQ} <a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * {@link RequestVar $R} <a name="line.247"></a>
-<span class="sourceLineNo">248</span>    * {@link SystemPropertiesVar $S}<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    * {@link SerializedRequestAttrVar $SA}<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    * {@link SwitchVar $SW}<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    * {@link UrlVar $U}<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    * {@link UrlEncodeVar $UE}<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    * {@link WidgetVar $W}<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * <a name="line.254"></a>
-<span class="sourceLineNo">255</span>    * &lt;p&gt;<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    * Corresponds to the swagger field &lt;code&gt;/tags&lt;/code&gt;.<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    */<a name="line.257"></a>
-<span class="sourceLineNo">258</span>   String tags() default "";<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   <a name="line.259"></a>
-<span class="sourceLineNo">260</span>   /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    * Optional servlet terms-of-service for this API.<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    * <a name="line.262"></a>
-<span class="sourceLineNo">263</span>    * &lt;p&gt;<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    * It is used to populate the Swagger terms-of-service field.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    * <a name="line.265"></a>
-<span class="sourceLineNo">266</span>    * &lt;p&gt;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    * The default value pulls the description from the &lt;code&gt;termsOfService&lt;/code&gt; entry in the servlet resource bundle.<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * (e.g. &lt;js&gt;"termsOfService = foo"&lt;/js&gt; or &lt;js&gt;"MyServlet.termsOfService = foo"&lt;/js&gt;).<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    * <a name="line.269"></a>
-<span class="sourceLineNo">270</span>    * &lt;p&gt;<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    * Value can contain any of the following variables:  <a name="line.271"></a>
-<span class="sourceLineNo">272</span>    * {@link ConfigVar $C} <a name="line.272"></a>
-<span class="sourceLineNo">273</span>    * {@link CoalesceVar $CO}<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    * {@link EnvVariablesVar $E} <a name="line.274"></a>
-<span class="sourceLineNo">275</span>    * {@link FileVar $F} <a name="line.275"></a>
-<span class="sourceLineNo">276</span>    * {@link ServletInitParamVar $I},<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    * {@link IfVar $IF}<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    * {@link LocalizationVar $L}<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    * {@link RequestAttributeVar $RA} <a name="line.279"></a>
-<span class="sourceLineNo">280</span>    * {@link RequestFormDataVar $RF} <a name="line.280"></a>
-<span class="sourceLineNo">281</span>    * {@link RequestHeaderVar $RH} <a name="line.281"></a>
-<span class="sourceLineNo">282</span>    * {@link RequestPathVar $RP} <a name="line.282"></a>
-<span class="sourceLineNo">283</span>    * {@link RequestQueryVar $RQ} <a name="line.283"></a>
-<span class="sourceLineNo">284</span>    * {@link RequestVar $R} <a name="line.284"></a>
-<span class="sourceLineNo">285</span>    * {@link SystemPropertiesVar $S}<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    * {@link SerializedRequestAttrVar $SA}<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * {@link SwitchVar $SW}<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    * {@link UrlVar $U}<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    * {@link UrlEncodeVar $UE}<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    * {@link WidgetVar $W}<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    * <a name="line.291"></a>
-<span class="sourceLineNo">292</span>    * &lt;p&gt;<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    * Corresponds to the swagger field &lt;code&gt;/info/termsOfService&lt;/code&gt;.<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    */<a name="line.294"></a>
-<span class="sourceLineNo">295</span>   String termsOfService() default "";<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>   /**<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    * Provides the version of the application API (not to be confused with the specification version).<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    * <a name="line.299"></a>
-<span class="sourceLineNo">300</span>    * &lt;p&gt;<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    * It is used to populate the Swagger version field and to display on HTML pages.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    * <a name="line.302"></a>
-<span class="sourceLineNo">303</span>    * &lt;p&gt;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    * The default value pulls the description from the &lt;code&gt;version&lt;/code&gt; entry in the servlet resource bundle.<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    * (e.g. &lt;js&gt;"version = 2.0"&lt;/js&gt; or &lt;js&gt;"MyServlet.version = 2.0"&lt;/js&gt;).<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    * <a name="line.306"></a>
-<span class="sourceLineNo">307</span>    * &lt;p&gt;<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    * Value can contain any of the following variables:  <a name="line.308"></a>
-<span class="sourceLineNo">309</span>    * {@link ConfigVar $C} <a name="line.309"></a>
-<span class="sourceLineNo">310</span>    * {@link CoalesceVar $CO}<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    * {@link EnvVariablesVar $E} <a name="line.311"></a>
-<span class="sourceLineNo">312</span>    * {@link FileVar $F} <a name="line.312"></a>
-<span class="sourceLineNo">313</span>    * {@link ServletInitParamVar $I},<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    * {@link IfVar $IF}<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    * {@link LocalizationVar $L}<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    * {@link RequestAttributeVar $RA} <a name="line.316"></a>
-<span class="sourceLineNo">317</span>    * {@link RequestFormDataVar $RF} <a name="line.317"></a>
-<span class="sourceLineNo">318</span>    * {@link RequestHeaderVar $RH} <a name="line.318"></a>
-<span class="sourceLineNo">319</span>    * {@link RequestPathVar $RP} <a name="line.319"></a>
-<span class="sourceLineNo">320</span>    * {@link RequestQueryVar $RQ} <a name="line.320"></a>
-<span class="sourceLineNo">321</span>    * {@link RequestVar $R} <a name="line.321"></a>
-<span class="sourceLineNo">322</span>    * {@link SystemPropertiesVar $S}<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    * {@link SerializedRequestAttrVar $SA}<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    * {@link SwitchVar $SW}<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    * {@link UrlVar $U}<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    * {@link UrlEncodeVar $UE}<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    * {@link WidgetVar $W}<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    * <a name="line.328"></a>
-<span class="sourceLineNo">329</span>    * &lt;p&gt;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    * Corresponds to the swagger field &lt;code&gt;/info/version&lt;/code&gt;.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    */<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   String version() default "";<a name="line.332"></a>
-<span class="sourceLineNo">333</span>}<a name="line.333"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Response.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Response.html
deleted file mode 100644
index 73f9d22..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/Response.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License.  You may obtain a copy of the License at                                                              *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// *                                                                                                                         *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// *                                                                                                                         *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License.                                              *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau.rest.annotation;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static java.lang.annotation.ElementType.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import static java.lang.annotation.RetentionPolicy.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.rest.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Annotation used in conjunction with {@link MethodSwagger#responses() @MethodSwagger.responses()} to identify possible responses by the method.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * <a name="line.24"></a>
-<span class="sourceLineNo">025</span> * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;p class='bcode'&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.27"></a>
-<span class="sourceLineNo">028</span> *       name=&lt;js&gt;"*"&lt;/js&gt;,<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *       swagger=@ResourceSwagger(<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *          responses={<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *             &lt;ja&gt;@Response&lt;/ja&gt;(value=200,description=&lt;js&gt;"Everything was great."&lt;/js&gt;),<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *             &lt;ja&gt;@Response&lt;/ja&gt;(value=404,description=&lt;js&gt;"File was not found."&lt;/js&gt;)<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *             &lt;ja&gt;@Response&lt;/ja&gt;(500),<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *          }<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *       )<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *    )<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *    &lt;jk&gt;public void&lt;/jk&gt; doAnything(RestRequest req, RestResponse res, &lt;ja&gt;@Method&lt;/ja&gt; String method) {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       ...<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *    }<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;/p&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <a name="line.41"></a>
-<span class="sourceLineNo">042</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * &lt;ul&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; OPTIONS pages&lt;/a&gt;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * &lt;/ul&gt;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Documented<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@Target(PARAMETER)<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Retention(RUNTIME)<a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Inherited<a name="line.50"></a>
-<span class="sourceLineNo">051</span>public @interface Response {<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>   /**<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * Optional description.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * <a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * &lt;p&gt;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * The default value pulls the description from the &lt;code&gt;description&lt;/code&gt; entry in the servlet resource bundle.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * (e.g. &lt;js&gt;"myMethod.res.[code].description = foo"&lt;/js&gt; or<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    * &lt;js&gt;"MyServlet.myMethod.res.[code].description = foo"&lt;/js&gt;).<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * <a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * &lt;p&gt;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * This field can contain variables (e.g. "$L{my.localized.variable}").<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    * <a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * &lt;p&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    * Corresponds to the swagger field &lt;code&gt;/paths/{path}/{method}/responses/{code}/description&lt;/code&gt;.<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   String description() default "";<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>   /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * Optional response headers.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    * <a name="line.72"></a>
-<span class="sourceLineNo">073</span>    * &lt;p&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    * Response variables can also be defined in the servlet resource bundle.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * (e.g. &lt;js&gt;"myMethod.res.[code].[category].[name] = foo"&lt;/js&gt; or<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * &lt;js&gt;"MyServlet.myMethod.res.[code].[category].[name] = foo"&lt;/js&gt;).<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    */<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   Parameter[] headers() default {};<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>   /**<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    * A definition of the response structure.<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    * <a name="line.82"></a>
-<span class="sourceLineNo">083</span>    * &lt;p&gt;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    * It can be a primitive, an array or an object.<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    * If this field does not exist, it means no content is returned as part of the response.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    * As an extension to the &lt;a class="doclink" href="http://swagger.io/specification/#schemaObject"&gt;Schema Object&lt;/a&gt;,<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * its root type value may also be &lt;js&gt;"file"&lt;/js&gt;.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * This SHOULD be accompanied by a relevant produces mime-type.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    * <a name="line.89"></a>
-<span class="sourceLineNo">090</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    * &lt;p class='bcode'&gt;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    *       name=&lt;js&gt;"*"&lt;/js&gt;,<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    *       swagger=@MethodSwagger(<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    *          responses={<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    *             &lt;ja&gt;@Response&lt;/ja&gt;(value=200,schema=&lt;js&gt;"{type:'string',description:'A serialized Person bean.'}"&lt;/js&gt;),<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    *          }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    *       )<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * &lt;/p&gt;<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   String schema() default "";<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>   /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    * HTTP response code.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   int value();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>}<a name="line.107"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html
index 062440f..021b493 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestMethod.html
@@ -745,10 +745,43 @@
 <span class="sourceLineNo">737</span>   String[] consumes() default {};<a name="line.737"></a>
 <span class="sourceLineNo">738</span><a name="line.738"></a>
 <span class="sourceLineNo">739</span>   /**<a name="line.739"></a>
-<span class="sourceLineNo">740</span>    * Provides swagger-specific metadata on this method.<a name="line.740"></a>
-<span class="sourceLineNo">741</span>    */<a name="line.741"></a>
-<span class="sourceLineNo">742</span>   MethodSwagger swagger() default @MethodSwagger;<a name="line.742"></a>
-<span class="sourceLineNo">743</span>}<a name="line.743"></a>
+<span class="sourceLineNo">740</span>   /**<a name="line.740"></a>
+<span class="sourceLineNo">741</span>    * Provides swagger-specific metadata on this method.<a name="line.741"></a>
+<span class="sourceLineNo">742</span>    * <a name="line.742"></a>
+<span class="sourceLineNo">743</span>    * &lt;p&gt;<a name="line.743"></a>
+<span class="sourceLineNo">744</span>    * Used to populate the auto-generated OPTIONS swagger documentation.<a name="line.744"></a>
+<span class="sourceLineNo">745</span>    * <a name="line.745"></a>
+<span class="sourceLineNo">746</span>    * &lt;p&gt;<a name="line.746"></a>
+<span class="sourceLineNo">747</span>    * The format of this annotation is JSON when all individual parts are concatenated.<a name="line.747"></a>
+<span class="sourceLineNo">748</span>    * &lt;br&gt;The starting and ending &lt;js&gt;'{'&lt;/js&gt;/&lt;js&gt;'}'&lt;/js&gt; characters around the entire value are optional.<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    * <a name="line.749"></a>
+<span class="sourceLineNo">750</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.750"></a>
+<span class="sourceLineNo">751</span>    * &lt;p class='bcode'&gt;<a name="line.751"></a>
+<span class="sourceLineNo">752</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.752"></a>
+<span class="sourceLineNo">753</span>    *       name=&lt;jsf&gt;PUT&lt;/jsf&gt;, <a name="line.753"></a>
+<span class="sourceLineNo">754</span>    *       path=&lt;js&gt;"/{propertyName}"&lt;/js&gt;,<a name="line.754"></a>
+<span class="sourceLineNo">755</span>    * <a name="line.755"></a>
+<span class="sourceLineNo">756</span>    *       &lt;jc&gt;// Swagger info.&lt;/jc&gt;<a name="line.756"></a>
+<span class="sourceLineNo">757</span>    *       swagger={<a name="line.757"></a>
+<span class="sourceLineNo">758</span>    *          &lt;js&gt;"parameters:["&lt;/js&gt;,<a name="line.758"></a>
+<span class="sourceLineNo">759</span>    *             &lt;js&gt;"{name:'propertyName',in:'path',description:'The system property name.'},"&lt;/js&gt;,<a name="line.759"></a>
+<span class="sourceLineNo">760</span>    *             &lt;js&gt;"{in:'body',description:'The new system property value.'}"&lt;/js&gt;,<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    *          &lt;js&gt;"],"&lt;/js&gt;,<a name="line.761"></a>
+<span class="sourceLineNo">762</span>    *          &lt;js&gt;"responses:{"&lt;/js&gt;,<a name="line.762"></a>
+<span class="sourceLineNo">763</span>    *             &lt;js&gt;"302: {headers:{Location:{description:'The root URL of this resource.'}}},"&lt;/js&gt;,<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    *             &lt;js&gt;"403: {description:'User is not an admin.'}"&lt;/js&gt;,<a name="line.764"></a>
+<span class="sourceLineNo">765</span>    *          &lt;js&gt;"}"&lt;/js&gt;<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    *       }<a name="line.766"></a>
+<span class="sourceLineNo">767</span>    *    )<a name="line.767"></a>
+<span class="sourceLineNo">768</span>    * &lt;/p&gt;<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    * <a name="line.769"></a>
+<span class="sourceLineNo">770</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.770"></a>
+<span class="sourceLineNo">771</span>    * &lt;ul&gt;<a name="line.771"></a>
+<span class="sourceLineNo">772</span>    *    &lt;li class='jm'&gt;{@link RestInfoProvider#getSwagger(RestRequest)}<a name="line.772"></a>
+<span class="sourceLineNo">773</span>    * &lt;/ul&gt;<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    */<a name="line.774"></a>
+<span class="sourceLineNo">775</span>   String[] swagger() default {};<a name="line.775"></a>
+<span class="sourceLineNo">776</span>}<a name="line.776"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
index 34112cb..ceeaf79 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/annotation/RestResource.html
@@ -847,95 +847,99 @@
 <span class="sourceLineNo">839</span>    * &lt;p&gt;<a name="line.839"></a>
 <span class="sourceLineNo">840</span>    * Used to populate the auto-generated OPTIONS swagger documentation.<a name="line.840"></a>
 <span class="sourceLineNo">841</span>    * <a name="line.841"></a>
-<span class="sourceLineNo">842</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.842"></a>
-<span class="sourceLineNo">843</span>    * &lt;p class='bcode'&gt;<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.844"></a>
-<span class="sourceLineNo">845</span>    *       path=&lt;js&gt;"/addressBook"&lt;/js&gt;,<a name="line.845"></a>
-<span class="sourceLineNo">846</span>    * <a name="line.846"></a>
-<span class="sourceLineNo">847</span>    *       &lt;jc&gt;// Swagger info.&lt;/jc&gt;<a name="line.847"></a>
-<span class="sourceLineNo">848</span>    *       swagger=&lt;ja&gt;@ResourceSwagger&lt;/ja&gt;(<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    *          contact=&lt;js&gt;"{name:'John Smith',email:'john@smith.com'}"&lt;/js&gt;,<a name="line.849"></a>
-<span class="sourceLineNo">850</span>    *          license=&lt;js&gt;"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"&lt;/js&gt;,<a name="line.850"></a>
-<span class="sourceLineNo">851</span>    *          version=&lt;js&gt;"2.0"&lt;/js&gt;,<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    *          termsOfService=&lt;js&gt;"You're on your own."&lt;/js&gt;,<a name="line.852"></a>
-<span class="sourceLineNo">853</span>    *          tags=&lt;js&gt;"[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}]"&lt;/js&gt;,<a name="line.853"></a>
-<span class="sourceLineNo">854</span>    *          externalDocs=&lt;js&gt;"{description:'Home page',url:'http://juneau.apache.org'}"&lt;/js&gt;<a name="line.854"></a>
-<span class="sourceLineNo">855</span>    *       )<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    *    )<a name="line.856"></a>
-<span class="sourceLineNo">857</span>    * &lt;/p&gt;<a name="line.857"></a>
-<span class="sourceLineNo">858</span>    * <a name="line.858"></a>
-<span class="sourceLineNo">859</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.859"></a>
-<span class="sourceLineNo">860</span>    * &lt;ul&gt;<a name="line.860"></a>
-<span class="sourceLineNo">861</span>    *    &lt;li class='jm'&gt;{@link RestInfoProvider#getSwagger(RestRequest)}<a name="line.861"></a>
-<span class="sourceLineNo">862</span>    * &lt;/ul&gt;<a name="line.862"></a>
-<span class="sourceLineNo">863</span>    */<a name="line.863"></a>
-<span class="sourceLineNo">864</span>   ResourceSwagger swagger() default @ResourceSwagger;<a name="line.864"></a>
-<span class="sourceLineNo">865</span><a name="line.865"></a>
-<span class="sourceLineNo">866</span>   /**<a name="line.866"></a>
-<span class="sourceLineNo">867</span>    * Optional servlet title.<a name="line.867"></a>
-<span class="sourceLineNo">868</span>    * <a name="line.868"></a>
-<span class="sourceLineNo">869</span>    * &lt;p&gt;<a name="line.869"></a>
-<span class="sourceLineNo">870</span>    * It is used to populate the Swagger title field.<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    * &lt;br&gt;This value can be retrieved programmatically through the {@link RestRequest#getResourceTitle()} method.<a name="line.871"></a>
+<span class="sourceLineNo">842</span>    * &lt;p&gt;<a name="line.842"></a>
+<span class="sourceLineNo">843</span>    * The format of this annotation is JSON when all individual parts are concatenated.<a name="line.843"></a>
+<span class="sourceLineNo">844</span>    * &lt;br&gt;The starting and ending &lt;js&gt;'{'&lt;/js&gt;/&lt;js&gt;'}'&lt;/js&gt; characters around the entire value are optional.<a name="line.844"></a>
+<span class="sourceLineNo">845</span>    * <a name="line.845"></a>
+<span class="sourceLineNo">846</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.846"></a>
+<span class="sourceLineNo">847</span>    * &lt;p class='bcode'&gt;<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    *    &lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.848"></a>
+<span class="sourceLineNo">849</span>    *       path=&lt;js&gt;"/addressBook"&lt;/js&gt;,<a name="line.849"></a>
+<span class="sourceLineNo">850</span>    * <a name="line.850"></a>
+<span class="sourceLineNo">851</span>    *       &lt;jc&gt;// Swagger info.&lt;/jc&gt;<a name="line.851"></a>
+<span class="sourceLineNo">852</span>    *       swagger={<a name="line.852"></a>
+<span class="sourceLineNo">853</span>    *          &lt;js&gt;"contact:{name:'John Smith',email:'john@smith.com'},"&lt;/js&gt;,<a name="line.853"></a>
+<span class="sourceLineNo">854</span>    *          &lt;js&gt;"license:{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'},"&lt;/js&gt;,<a name="line.854"></a>
+<span class="sourceLineNo">855</span>    *          &lt;js&gt;"version:'2.0',&lt;/js&gt;,<a name="line.855"></a>
+<span class="sourceLineNo">856</span>    *          &lt;js&gt;"termsOfService:'You are on your own.',"&lt;/js&gt;,<a name="line.856"></a>
+<span class="sourceLineNo">857</span>    *          &lt;js&gt;"tags:[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}],"&lt;/js&gt;,<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    *          &lt;js&gt;"externalDocs:{description:'Home page',url:'http://juneau.apache.org'}"&lt;/js&gt;<a name="line.858"></a>
+<span class="sourceLineNo">859</span>    *       }<a name="line.859"></a>
+<span class="sourceLineNo">860</span>    *    )<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    * &lt;/p&gt;<a name="line.861"></a>
+<span class="sourceLineNo">862</span>    * <a name="line.862"></a>
+<span class="sourceLineNo">863</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.863"></a>
+<span class="sourceLineNo">864</span>    * &lt;ul&gt;<a name="line.864"></a>
+<span class="sourceLineNo">865</span>    *    &lt;li class='jm'&gt;{@link RestInfoProvider#getSwagger(RestRequest)}<a name="line.865"></a>
+<span class="sourceLineNo">866</span>    * &lt;/ul&gt;<a name="line.866"></a>
+<span class="sourceLineNo">867</span>    */<a name="line.867"></a>
+<span class="sourceLineNo">868</span>   String[] swagger() default {};<a name="line.868"></a>
+<span class="sourceLineNo">869</span><a name="line.869"></a>
+<span class="sourceLineNo">870</span>   /**<a name="line.870"></a>
+<span class="sourceLineNo">871</span>    * Optional servlet title.<a name="line.871"></a>
 <span class="sourceLineNo">872</span>    * <a name="line.872"></a>
-<span class="sourceLineNo">873</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.873"></a>
-<span class="sourceLineNo">874</span>    * &lt;ul class='spaced-list'&gt;<a name="line.874"></a>
-<span class="sourceLineNo">875</span>    *    &lt;li&gt;<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time and request-time variables&lt;/a&gt; <a name="line.876"></a>
-<span class="sourceLineNo">877</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.877"></a>
-<span class="sourceLineNo">878</span>    *    &lt;li&gt;<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    *       Corresponds to the swagger field &lt;code&gt;/info/title&lt;/code&gt;.<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    * &lt;/ul&gt;<a name="line.880"></a>
-<span class="sourceLineNo">881</span>    * <a name="line.881"></a>
-<span class="sourceLineNo">882</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.882"></a>
-<span class="sourceLineNo">883</span>    * &lt;ul&gt;<a name="line.883"></a>
-<span class="sourceLineNo">884</span>    *    &lt;li class='jm'&gt;{@link RestInfoProvider#getTitle(RestRequest)}<a name="line.884"></a>
-<span class="sourceLineNo">885</span>    * &lt;/ul&gt;<a name="line.885"></a>
-<span class="sourceLineNo">886</span>    */<a name="line.886"></a>
-<span class="sourceLineNo">887</span>   String title() default "";<a name="line.887"></a>
-<span class="sourceLineNo">888</span><a name="line.888"></a>
-<span class="sourceLineNo">889</span>   /**<a name="line.889"></a>
-<span class="sourceLineNo">890</span>    * Configuration property:  Use classpath resource caching. <a name="line.890"></a>
-<span class="sourceLineNo">891</span>    * <a name="line.891"></a>
-<span class="sourceLineNo">892</span>    * &lt;p&gt;<a name="line.892"></a>
-<span class="sourceLineNo">893</span>    * When enabled, resources retrieved via {@link RestRequest#getClasspathReaderResource(String, boolean)} (and related <a name="line.893"></a>
-<span class="sourceLineNo">894</span>    * methods) will be cached in memory to speed subsequent lookups.<a name="line.894"></a>
+<span class="sourceLineNo">873</span>    * &lt;p&gt;<a name="line.873"></a>
+<span class="sourceLineNo">874</span>    * It is used to populate the Swagger title field.<a name="line.874"></a>
+<span class="sourceLineNo">875</span>    * &lt;br&gt;This value can be retrieved programmatically through the {@link RestRequest#getResourceTitle()} method.<a name="line.875"></a>
+<span class="sourceLineNo">876</span>    * <a name="line.876"></a>
+<span class="sourceLineNo">877</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.877"></a>
+<span class="sourceLineNo">878</span>    * &lt;ul class='spaced-list'&gt;<a name="line.878"></a>
+<span class="sourceLineNo">879</span>    *    &lt;li&gt;<a name="line.879"></a>
+<span class="sourceLineNo">880</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time and request-time variables&lt;/a&gt; <a name="line.880"></a>
+<span class="sourceLineNo">881</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.881"></a>
+<span class="sourceLineNo">882</span>    *    &lt;li&gt;<a name="line.882"></a>
+<span class="sourceLineNo">883</span>    *       Corresponds to the swagger field &lt;code&gt;/info/title&lt;/code&gt;.<a name="line.883"></a>
+<span class="sourceLineNo">884</span>    * &lt;/ul&gt;<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    * <a name="line.885"></a>
+<span class="sourceLineNo">886</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.886"></a>
+<span class="sourceLineNo">887</span>    * &lt;ul&gt;<a name="line.887"></a>
+<span class="sourceLineNo">888</span>    *    &lt;li class='jm'&gt;{@link RestInfoProvider#getTitle(RestRequest)}<a name="line.888"></a>
+<span class="sourceLineNo">889</span>    * &lt;/ul&gt;<a name="line.889"></a>
+<span class="sourceLineNo">890</span>    */<a name="line.890"></a>
+<span class="sourceLineNo">891</span>   String title() default "";<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>   /**<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    * Configuration property:  Use classpath resource caching. <a name="line.894"></a>
 <span class="sourceLineNo">895</span>    * <a name="line.895"></a>
-<span class="sourceLineNo">896</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.896"></a>
-<span class="sourceLineNo">897</span>    * &lt;ul class='spaced-list'&gt;<a name="line.897"></a>
-<span class="sourceLineNo">898</span>    *    &lt;li&gt;<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time variables&lt;/a&gt; <a name="line.899"></a>
-<span class="sourceLineNo">900</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.900"></a>
-<span class="sourceLineNo">901</span>    * &lt;/ul&gt;<a name="line.901"></a>
-<span class="sourceLineNo">902</span>    * <a name="line.902"></a>
-<span class="sourceLineNo">903</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    * &lt;ul&gt;<a name="line.904"></a>
-<span class="sourceLineNo">905</span>    *    &lt;li class='jf'&gt;{@link RestContext#REST_useClasspathResourceCaching}<a name="line.905"></a>
-<span class="sourceLineNo">906</span>    * &lt;/ul&gt;<a name="line.906"></a>
-<span class="sourceLineNo">907</span>    */<a name="line.907"></a>
-<span class="sourceLineNo">908</span>   String useClasspathResourceCaching() default "";<a name="line.908"></a>
-<span class="sourceLineNo">909</span>   <a name="line.909"></a>
-<span class="sourceLineNo">910</span>   /**<a name="line.910"></a>
-<span class="sourceLineNo">911</span>    * Use stack trace hashes.<a name="line.911"></a>
-<span class="sourceLineNo">912</span>    * <a name="line.912"></a>
-<span class="sourceLineNo">913</span>    * &lt;p&gt;<a name="line.913"></a>
-<span class="sourceLineNo">914</span>    * When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,<a name="line.914"></a>
-<span class="sourceLineNo">915</span>    * made available through the {@link RestException#getOccurrence()} method.<a name="line.915"></a>
+<span class="sourceLineNo">896</span>    * &lt;p&gt;<a name="line.896"></a>
+<span class="sourceLineNo">897</span>    * When enabled, resources retrieved via {@link RestRequest#getClasspathReaderResource(String, boolean)} (and related <a name="line.897"></a>
+<span class="sourceLineNo">898</span>    * methods) will be cached in memory to speed subsequent lookups.<a name="line.898"></a>
+<span class="sourceLineNo">899</span>    * <a name="line.899"></a>
+<span class="sourceLineNo">900</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.900"></a>
+<span class="sourceLineNo">901</span>    * &lt;ul class='spaced-list'&gt;<a name="line.901"></a>
+<span class="sourceLineNo">902</span>    *    &lt;li&gt;<a name="line.902"></a>
+<span class="sourceLineNo">903</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time variables&lt;/a&gt; <a name="line.903"></a>
+<span class="sourceLineNo">904</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.904"></a>
+<span class="sourceLineNo">905</span>    * &lt;/ul&gt;<a name="line.905"></a>
+<span class="sourceLineNo">906</span>    * <a name="line.906"></a>
+<span class="sourceLineNo">907</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    * &lt;ul&gt;<a name="line.908"></a>
+<span class="sourceLineNo">909</span>    *    &lt;li class='jf'&gt;{@link RestContext#REST_useClasspathResourceCaching}<a name="line.909"></a>
+<span class="sourceLineNo">910</span>    * &lt;/ul&gt;<a name="line.910"></a>
+<span class="sourceLineNo">911</span>    */<a name="line.911"></a>
+<span class="sourceLineNo">912</span>   String useClasspathResourceCaching() default "";<a name="line.912"></a>
+<span class="sourceLineNo">913</span>   <a name="line.913"></a>
+<span class="sourceLineNo">914</span>   /**<a name="line.914"></a>
+<span class="sourceLineNo">915</span>    * Use stack trace hashes.<a name="line.915"></a>
 <span class="sourceLineNo">916</span>    * <a name="line.916"></a>
-<span class="sourceLineNo">917</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    * &lt;ul class='spaced-list'&gt;<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    *    &lt;li&gt;<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time variables&lt;/a&gt; <a name="line.920"></a>
-<span class="sourceLineNo">921</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.921"></a>
-<span class="sourceLineNo">922</span>    * &lt;/ul&gt;<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    * <a name="line.923"></a>
-<span class="sourceLineNo">924</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.924"></a>
-<span class="sourceLineNo">925</span>    * &lt;ul&gt;<a name="line.925"></a>
-<span class="sourceLineNo">926</span>    *    &lt;li class='jf'&gt;{@link RestContext#REST_useStackTraceHashes}<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    * &lt;/ul&gt;<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    */<a name="line.928"></a>
-<span class="sourceLineNo">929</span>   String useStackTraceHashes() default "";<a name="line.929"></a>
-<span class="sourceLineNo">930</span>}<a name="line.930"></a>
+<span class="sourceLineNo">917</span>    * &lt;p&gt;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    * When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,<a name="line.918"></a>
+<span class="sourceLineNo">919</span>    * made available through the {@link RestException#getOccurrence()} method.<a name="line.919"></a>
+<span class="sourceLineNo">920</span>    * <a name="line.920"></a>
+<span class="sourceLineNo">921</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    * &lt;ul class='spaced-list'&gt;<a name="line.922"></a>
+<span class="sourceLineNo">923</span>    *    &lt;li&gt;<a name="line.923"></a>
+<span class="sourceLineNo">924</span>    *       Supports &lt;a class="doclink" href="../../../../../overview-summary.html#DefaultRestSvlVariables"&gt;initialization-time variables&lt;/a&gt; <a name="line.924"></a>
+<span class="sourceLineNo">925</span>    *       (e.g. &lt;js&gt;"$L{my.localized.variable}"&lt;/js&gt;).<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    * &lt;/ul&gt;<a name="line.926"></a>
+<span class="sourceLineNo">927</span>    * <a name="line.927"></a>
+<span class="sourceLineNo">928</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.928"></a>
+<span class="sourceLineNo">929</span>    * &lt;ul&gt;<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    *    &lt;li class='jf'&gt;{@link RestContext#REST_useStackTraceHashes}<a name="line.930"></a>
+<span class="sourceLineNo">931</span>    * &lt;/ul&gt;<a name="line.931"></a>
+<span class="sourceLineNo">932</span>    */<a name="line.932"></a>
+<span class="sourceLineNo">933</span>   String useStackTraceHashes() default "";<a name="line.933"></a>
+<span class="sourceLineNo">934</span>}<a name="line.934"></a>
 
 
 

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.

Mime
View raw message