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 Sat, 03 Mar 2018 21:51:40 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 b91b2a5  Update Javadocs.
b91b2a5 is described below

commit b91b2a526c1c3f7e570e33129891d5b4799b8407
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Sat Mar 3 16:51:30 2018 -0500

    Update Javadocs.
---
 content/documentation.html                         |   36 +-
 ...ent-on-gray-background-vector-eps-615000389.jpg |  Bin 0 -> 218850 bytes
 content/site/apidocs/allclasses-frame.html         |    1 +
 content/site/apidocs/allclasses-noframe.html       |    1 +
 ...u-rest-server.RemoteableProxiesServerSide.1.png |  Bin 15845 -> 238253 bytes
 ...u-rest-server.RemoteableProxiesServerSide.2.png |  Bin 20379 -> 154803 bytes
 ...u-rest-server.RemoteableProxiesServerSide.3.png |  Bin 33919 -> 193060 bytes
 ...u-rest-server.RemoteableProxiesServerSide.4.png |  Bin 21108 -> 96014 bytes
 ...u-rest-server.RemoteableProxiesServerSide.5.png |  Bin 10553 -> 62998 bytes
 ...u-rest-server.RemoteableProxiesServerSide.6.png |  Bin 24934 -> 191932 bytes
 ...u-rest-server.RemoteableProxiesServerSide.7.png |  Bin 0 -> 138344 bytes
 ...u-rest-server.RemoteableProxiesServerSide.8.png |  Bin 0 -> 145941 bytes
 ...u-rest-server.RemoteableProxiesServerSide.9.png |  Bin 0 -> 143557 bytes
 content/site/apidocs/index-all.html                |   40 +-
 .../{AsciiSet.html => AsciiSet.Builder.html}       |  120 +-
 .../org/apache/juneau/internal/AsciiSet.html       |   98 +-
 .../apache/juneau/internal/BeanPropertyUtils.html  |    4 +-
 .../org/apache/juneau/internal/StringUtils.html    |   60 +-
 .../org/apache/juneau/internal/package-frame.html  |    1 +
 .../apache/juneau/internal/package-summary.html    |   82 +-
 .../org/apache/juneau/internal/package-tree.html   |    1 +
 .../org/apache/juneau/rest/RestRequest.html        |  112 +-
 .../juneau/rest/remoteable/RemoteableServlet.html  |   66 +-
 content/site/apidocs/overview-summary.html         |  469 ++--
 content/site/apidocs/overview-tree.html            |    1 +
 .../apache/juneau/config/internal/ConfigEntry.html |    4 +-
 .../apache/juneau/config/internal/ConfigMap.html   |    2 +-
 .../apache/juneau/internal/AsciiSet.Builder.html   |  235 ++
 .../org/apache/juneau/internal/AsciiSet.html       |  219 +-
 .../org/apache/juneau/internal/StringUtils.html    |  965 +++----
 .../org/apache/juneau/json/JsonParserSession.html  |    2 +-
 .../org/apache/juneau/json/JsonWriter.html         |    8 +-
 .../org/apache/juneau/rest/RestRequest.html        | 2819 ++++++++++----------
 .../juneau/rest/remoteable/RemoteableServlet.html  |  330 ++-
 .../org/apache/juneau/uon/UonParserSession.html    |    4 +-
 .../src-html/org/apache/juneau/uon/UonUtils.html   |    4 +-
 .../src-html/org/apache/juneau/uon/UonWriter.html  |    8 +-
 37 files changed, 3093 insertions(+), 2599 deletions(-)

diff --git a/content/documentation.html b/content/documentation.html
index cb59ec5..16926ef 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -130,7 +130,6 @@
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.FileSystemChanges'>File System Changes</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.CustomEntrySerialization'>Custom Entry Serialization</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.BulkSettingValues'>Setting Values in Bulk</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.ConfigStoreListeners"'>ConfigStore Listeners</a></p>
 			</ol>		
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.Listeners'>Listeners</a></p>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.Serializing'>Serializing</a></p>
@@ -139,6 +138,7 @@
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.ConfigMemoryStore'>ConfigMemoryStore</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.ConfigFileStore'>ConfigFileStore</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.CustomConfigStores"'>Custom ConfigStores</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.ConfigStoreListeners"'>ConfigStore Listeners</a></p>
 			</ol>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.ReadOnlyConfigs'>Read-only Configs</a></p>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config.ClosingConfigs'>Closing Configs</a></p>
@@ -150,7 +150,7 @@
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Instantiation'>Instantiation</a></p>
 			<ol>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RestServlet'>RestServlet</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RestServletDefault'>RestServletDefault</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.BasicRestServlet'>BasicRestServlet</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Children'>Children</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RouterPages'>Router Pages</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.ResourceResolvers'>Resource Resolvers</a></p>
@@ -201,11 +201,12 @@
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.OptionsPages'>OPTIONS pages</a></p>
 			<ol>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RestInfoProvider'>RestInfoProvider</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RestInfoProviderDefault'>RestInfoProviderDefault</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.BasicRestInfoProvider'>BasicRestInfoProvider</a></p>
 			</ol>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.HtmlDocAnnotation'>@HtmlDoc</a></p>
 			<ol>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Widgets'>Widgets</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.PredefinedWidgets'>Predefined Widgets</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.UiCustomization'>UI Customization</a></p>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Stylesheets'>Stylesheets</a></p>
 			</ol>
@@ -218,9 +219,9 @@
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.UsingWithOsgi'>Using with OSGi</a></p>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RemoteableProxies'>Remoteable Proxies</a></p>
 			<ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RemoteableProxiesClientSide'>Remoteable Proxies - Client Side</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RemoteableProxiesServerSide'>Remoteable Proxies - Server Side</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RemoteableProxiesRemoteableAnnotation'>Remoteable Proxies - @Remoteable Annotation</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RemoteableProxiesClientSide'>Client Side</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RemoteableProxiesServerSide'>Server Side</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.RemoteableProxiesRemoteableAnnotation'>@Remoteable Annotation</a></p>
 			</ol>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Injection'>Using with Spring and Injection frameworks</a></p>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.HTTP2'>Using HTTP/2 features</a></p>
@@ -228,9 +229,28 @@
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.OtherNotes'>Other Notes</a></p>
 		</ol>
 		<li><p class='toc2'><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs'><i>juneau-rest-server-jaxrs</i></a></p>
+		<ol>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs.BaseProvider'>Juneau JAX-RS Provider</a></p>
+		</ol>	
 		<li><p class='toc2'><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client'><i>juneau-rest-client</i></a></p>
 		<ol>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.3rdPartyProxies'>Interface Proxies Against 3rd-party REST Interfaces</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.SSL'>SSL Support</a></p>
+			<ol>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.SSLOpts'>SSLOpts Bean</a></p>
+			</ol>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.Authentication'>Authentication</a></p>
+			<ol>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.BASIC'>BASIC Authentication</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.FORM'>FORM-based Authentication</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.OIDC'>OIDC Authentication</a></p>
+			</ol>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.ResponsePatterns'>Using Response Patterns</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.PipingOutput'>Piping Response Output</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.Debugging'>Debugging</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.Logging'>Logging</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.Interceptors'>Interceptors</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.Other'>Other Useful Methods</a></p>
 		</ol>
 		<li><p class='toc2'><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server'><i>juneau-microservice-server</i></a></p>
 		<ol>
@@ -245,9 +265,9 @@
 			<ol>
 				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server.ManifestApi'>Manifest API</a></p>
 			</ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server.ConfigFile'>Config File</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server.Config'>Config</a></p>
 			<ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server.ConfigFileApi'>Config File API</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server.ConfigApi'>Config API</a></p>
 			</ol>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server.ResourceClasses'>Resource Classes</a></p>
 			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server.PredefinedResourceClasses'>Predefined Resource Classes</a></p>
diff --git a/content/images/stock-vector-technology-stylish-circular-abstract-element-on-gray-background-vector-eps-615000389.jpg b/content/images/stock-vector-technology-stylish-circular-abstract-element-on-gray-background-vector-eps-615000389.jpg
new file mode 100644
index 0000000..b49cdfb
Binary files /dev/null and b/content/images/stock-vector-technology-stylish-circular-abstract-element-on-gray-background-vector-eps-615000389.jpg differ
diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index a099bca..fe29a7e 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -34,6 +34,7 @@
 <li><a href="org/apache/juneau/dto/html5/Article.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Article</a></li>
 <li><a href="org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiMap</a></li>
 <li><a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiSet</a></li>
+<li><a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiSet.Builder</a></li>
 <li><a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils" target="classFrame">ASet</a></li>
 <li><a href="org/apache/juneau/dto/html5/Aside.html" title="class in org.apache.juneau.dto.html5" target="classFrame">Aside</a></li>
 <li><a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom" target="classFrame">AtomBuilder</a></li>
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index 373d142..66e39a1 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -34,6 +34,7 @@
 <li><a href="org/apache/juneau/dto/html5/Article.html" title="class in org.apache.juneau.dto.html5">Article</a></li>
 <li><a href="org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal">AsciiMap</a></li>
 <li><a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></li>
+<li><a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></li>
 <li><a href="org/apache/juneau/utils/ASet.html" title="class in org.apache.juneau.utils">ASet</a></li>
 <li><a href="org/apache/juneau/dto/html5/Aside.html" title="class in org.apache.juneau.dto.html5">Aside</a></li>
 <li><a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom">AtomBuilder</a></li>
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.1.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.1.png
index 9cd4b2f..19d3106 100644
Binary files a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.1.png and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.1.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.2.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.2.png
index de2074d..e5d1953 100644
Binary files a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.2.png and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.2.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.3.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.3.png
index 8307c13..ecab4ad 100644
Binary files a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.3.png and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.3.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.4.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.4.png
index 896f579..c9c0f1c 100644
Binary files a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.4.png and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.4.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.5.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.5.png
index 2c255d3..bf38b24 100644
Binary files a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.5.png and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.5.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.6.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.6.png
index f45a3d2..0a166d8 100644
Binary files a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.6.png and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.6.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.7.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.7.png
new file mode 100644
index 0000000..e454740
Binary files /dev/null and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.7.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.8.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.8.png
new file mode 100644
index 0000000..1f228ca
Binary files /dev/null and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.8.png differ
diff --git a/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.9.png b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.9.png
new file mode 100644
index 0000000..0385fe5
Binary files /dev/null and b/content/site/apidocs/doc-files/juneau-rest-server.RemoteableProxiesServerSide.9.png differ
diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html
index e94e964..0f94504 100644
--- a/content/site/apidocs/index-all.html
+++ b/content/site/apidocs/index-all.html
@@ -1496,9 +1496,9 @@
 <dd>
 <div class="block">Stores a set of ASCII characters for quick lookup.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.html#AsciiSet-java.lang.String-">AsciiSet(String)</a></span> - Constructor for class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></dt>
+<dt><a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiSet.Builder</span></a> - Class in <a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.internal</a></dt>
 <dd>
-<div class="block">Constructor.</div>
+<div class="block">Builder class for <a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><code>AsciiSet</code></a> objects.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/http/HeaderDate.html#asDate--">asDate()</a></span> - Method in class org.apache.juneau.http.<a href="org/apache/juneau/http/HeaderDate.html" title="class in org.apache.juneau.http">HeaderDate</a></dt>
 <dd>
@@ -4175,6 +4175,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/httppart/UonPartSerializerBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.httppart.<a href="org/apache/juneau/httppart/UonPartSerializerBuilder.html" title="class in org.apache.juneau.httppart">UonPartSerializerBuilder</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.Builder.html#build--">build()</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></dt>
+<dd>
+<div class="block">Create a new <a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><code>AsciiSet</code></a> object with the contents of this builder.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/FileReaderBuilder.html#build--">build()</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/FileReaderBuilder.html" title="class in org.apache.juneau.internal">FileReaderBuilder</a></dt>
 <dd>
 <div class="block">Creates a new File reader.</div>
@@ -4303,6 +4307,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/httppart/UonPartSerializer.html#builder--">builder()</a></span> - Method in class org.apache.juneau.httppart.<a href="org/apache/juneau/httppart/UonPartSerializer.html" title="class in org.apache.juneau.httppart">UonPartSerializer</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.Builder.html#Builder--">Builder()</a></span> - Constructor for class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfParser.html#builder--">builder()</a></span> - Method in class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfParser.html" title="class in org.apache.juneau.jena">RdfParser</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/jena/RdfSerializer.html#builder--">builder()</a></span> - Method in class org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfSerializer.html" title="class in org.apache.juneau.jena">RdfSerializer</a></dt>
@@ -4724,6 +4730,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#charAt-int-">charAt(int)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.Builder.html#chars-java.lang.String-">chars(String)</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></dt>
+<dd>
+<div class="block">Adds a set of characters to this set.</div>
+</dd>
 <dt><a href="org/apache/juneau/internal/CharSequenceReader.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">CharSequenceReader</span></a> - Class in <a href="org/apache/juneau/internal/package-summary.html">org.apache.juneau.internal</a></dt>
 <dd>
 <div class="block">Similar to <a href="http://docs.oracle.com/javase/7/docs/api/java/io/StringReader.html?is-external=true" title="class or interface in java.io"><code>StringReader</code></a> except reads from a generic <a href="org/apache/juneau/internal/CharSequenceReader.html" title="class in org.apache.juneau.internal"><code>CharSequenceReader</code></a>.</div>
@@ -6282,6 +6292,14 @@
 <dd>
 <div class="block">Instantiates a new clean-slate <a href="org/apache/juneau/httppart/UonPartSerializerBuilder.html" title="class in org.apache.juneau.httppart"><code>UonPartSerializerBuilder</code></a> object.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.html#create-java.lang.String-">create(String)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></dt>
+<dd>
+<div class="block">Creates an ASCII set with the specified characters.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.html#create--">create()</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></dt>
+<dd>
+<div class="block">Creates a builder for an ASCII set.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/internal/FileReaderBuilder.html#create--">create()</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/FileReaderBuilder.html" title="class in org.apache.juneau.internal">FileReaderBuilder</a></dt>
 <dd>
 <div class="block">Creates a new builder.</div>
@@ -18471,7 +18489,7 @@
 <dd>
 <div class="block">Configuration property:  Serializer listener.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html#listMethods-java.lang.String-">listMethods(String)</a></span> - Method in class org.apache.juneau.rest.remoteable.<a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.rest.remoteable">RemoteableServlet</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html#listMethods-org.apache.juneau.rest.RestRequest-java.lang.String-">listMethods(RestRequest, String)</a></span> - Method in class org.apache.juneau.rest.remoteable.<a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.rest.remoteable">RemoteableServlet</a></dt>
 <dd>
 <div class="block">[GET /{javaInterface] - Get the list of all remoteable methods on the specified interface name.</div>
 </dd>
@@ -23130,6 +23148,10 @@
 <dd>
 <div class="block">Represents a parsed <l>Range</l> HTTP request header.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.Builder.html#range-char-char-">range(char, char)</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></dt>
+<dd>
+<div class="block">Adds a range of characters to this set.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestCall.html#range-java.lang.Object-">range(Object)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a></dt>
 <dd>
 <div class="block">Sets the value for the <code>Range</code> request header.</div>
@@ -23138,6 +23160,10 @@
 <dd>
 <div class="block">Sets the value for the <code>Range</code> request header.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/AsciiSet.Builder.html#ranges-java.lang.String...-">ranges(String...)</a></span> - Method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></dt>
+<dd>
+<div class="block">Shortcut for calling multiple ranges.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/BeanPropertyMeta.Builder.html#rawMetaType-org.apache.juneau.ClassMeta-">rawMetaType(ClassMeta&lt;?&gt;)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanPropertyMeta.Builder.html" title="class in org.apache.juneau">BeanPropertyMeta.Builder</a></dt>
 <dd>
 <div class="block">Sets the raw metadata type for this bean property.</div>
@@ -27086,6 +27112,10 @@
 <dd>
 <div class="block">Returns <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html#showEntryForm-org.apache.juneau.rest.RestRequest-java.lang.String-java.lang.String-">showEntryForm(RestRequest, String, String)</a></span> - Method in class org.apache.juneau.rest.remoteable.<a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.rest.remoteable">RemoteableServlet</a></dt>
+<dd>
+<div class="block">[GET /{javaInterface] - Get the list of all remoteable methods on the specified interface name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/microservice/resources/ShutdownResource.html#shutdown--">shutdown()</a></span> - Method in class org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/ShutdownResource.html" title="class in org.apache.juneau.microservice.resources">ShutdownResource</a></dt>
 <dd>
 <div class="block">[GET /] - Shutdown this resource.</div>
@@ -30944,6 +30974,10 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html#UrlEncodedFormMatcher--">UrlEncodedFormMatcher()</a></span> - Constructor for class org.apache.juneau.rest.matchers.<a href="org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.html" title="class in org.apache.juneau.rest.matchers">UrlEncodedFormMatcher</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#urlEncodePath-java.lang.Object-">urlEncodePath(Object)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
+<dd>
+<div class="block">Similar to <a href="org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.Object-"><code>StringUtils.urlEncode(Object)</code></a> but doesn't encode <js>"/"</js> characters.</div>
+</dd>
 <dt><a href="org/apache/juneau/rest/vars/UrlEncodeVar.html" title="class in org.apache.juneau.rest.vars"><span class="typeNameLink">UrlEncodeVar</span></a> - Class in <a href="org/apache/juneau/rest/vars/package-summary.html">org.apache.juneau.rest.vars</a></dt>
 <dd>
 <div class="block">URL-encoding variable resolver.</div>
diff --git a/content/site/apidocs/org/apache/juneau/internal/AsciiSet.html b/content/site/apidocs/org/apache/juneau/internal/AsciiSet.Builder.html
similarity index 66%
copy from content/site/apidocs/org/apache/juneau/internal/AsciiSet.html
copy to content/site/apidocs/org/apache/juneau/internal/AsciiSet.Builder.html
index 12baf8d..d9387bb 100644
--- a/content/site/apidocs/org/apache/juneau/internal/AsciiSet.html
+++ b/content/site/apidocs/org/apache/juneau/internal/AsciiSet.Builder.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AsciiSet (Apache Juneau 7.1.1-SNAPSHOT)</title>
+<title>AsciiSet.Builder (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>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AsciiSet (Apache Juneau 7.1.1-SNAPSHOT)";
+            parent.document.title="AsciiSet.Builder (Apache Juneau 7.1.1-SNAPSHOT)";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/internal/AsciiSet.html" target="_top">Frames</a></li>
-<li><a href="AsciiSet.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/internal/AsciiSet.Builder.html" target="_top">Frames</a></li>
+<li><a href="AsciiSet.Builder.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>
@@ -92,25 +92,29 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.juneau.internal</div>
-<h2 title="Class AsciiSet" class="title">Class AsciiSet</h2>
+<h2 title="Class AsciiSet.Builder" class="title">Class AsciiSet.Builder</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.juneau.internal.AsciiSet</li>
+<li>org.apache.juneau.internal.AsciiSet.Builder</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.18">AsciiSet</a>
+<pre>public static class <a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.49">AsciiSet.Builder</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">Stores a set of ASCII characters for quick lookup.</div>
+<div class="block">Builder class for <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><code>AsciiSet</code></a> objects.</div>
 </li>
 </ul>
 </div>
@@ -129,9 +133,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#AsciiSet-java.lang.String-">AsciiSet</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;chars)</code>
-<div class="block">Constructor.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html#Builder--">Builder</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -149,27 +151,28 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#contains-char-">contains</a></span>(char&nbsp;c)</code>
-<div class="block">Returns <jk>true</jk> if the specified character is in this store.</div>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html#build--">build</a></span>()</code>
+<div class="block">Create a new <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><code>AsciiSet</code></a> object with the contents of this builder.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#contains-java.lang.CharSequence-">contains</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;s)</code>
-<div class="block">Returns <jk>true</jk> if the specified string contains at least one character in this set.</div>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html#chars-java.lang.String-">chars</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;chars)</code>
+<div class="block">Adds a set of characters to this set.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#contains-int-">contains</a></span>(int&nbsp;c)</code>
-<div class="block">Returns <jk>true</jk> if the specified character is in this store.</div>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html#range-char-char-">range</a></span>(char&nbsp;start,
+     char&nbsp;end)</code>
+<div class="block">Adds a range of characters to this set.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#containsOnly-java.lang.String-">containsOnly</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;s)</code>
-<div class="block">Returns <jk>true</jk> if the specified string contains only characters in this set.</div>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html#ranges-java.lang.String...-">ranges</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;s)</code>
+<div class="block">Shortcut for calling multiple ranges.</div>
 </td>
 </tr>
 </table>
@@ -194,18 +197,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="AsciiSet-java.lang.String-">
+<a name="Builder--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>AsciiSet</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.26">AsciiSet</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;chars)</pre>
-<div class="block">Constructor.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>chars</code> - The characters to keep in this store.</dd>
-</dl>
+<h4>Builder</h4>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.Builder.html#line.49">Builder</a>()</pre>
 </li>
 </ul>
 </li>
@@ -216,69 +214,67 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="contains-char-">
+<a name="range-char-char-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>contains</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.40">contains</a>(char&nbsp;c)</pre>
-<div class="block">Returns <jk>true</jk> if the specified character is in this store.</div>
+<h4>range</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.Builder.html#line.59">range</a>(char&nbsp;start,
+                              char&nbsp;end)</pre>
+<div class="block">Adds a range of characters to this set.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>c</code> - The character to check.</dd>
+<dd><code>start</code> - The start character.</dd>
+<dd><code>end</code> - The end character.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd><jk>true</jk> if the specified character is in this store.</dd>
+<dd>This object (for method chaining).</dd>
 </dl>
 </li>
 </ul>
-<a name="contains-int-">
+<a name="ranges-java.lang.String...-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>contains</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.52">contains</a>(int&nbsp;c)</pre>
-<div class="block">Returns <jk>true</jk> if the specified character is in this store.</div>
+<h4>ranges</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.Builder.html#line.72">ranges</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;s)</pre>
+<div class="block">Shortcut for calling multiple ranges.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>c</code> - The character to check.</dd>
+<dd><code>s</code> - Strings of the form "A-Z" where A and Z represent the first and last characters in the range.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd><jk>true</jk> if the specified character is in this store.</dd>
+<dd>This object (for method chaining).</dd>
 </dl>
 </li>
 </ul>
-<a name="contains-java.lang.CharSequence-">
+<a name="chars-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>contains</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.64">contains</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;s)</pre>
-<div class="block">Returns <jk>true</jk> if the specified string contains at least one character in this set.</div>
+<h4>chars</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.Builder.html#line.87">chars</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;chars)</pre>
+<div class="block">Adds a set of characters to this set.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The string to test.</dd>
+<dd><code>chars</code> - The characters to keep in this store.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd><jk>true</jk> if the string is not null and contains at least one character in this set.</dd>
+<dd>This object (for method chaining).</dd>
 </dl>
 </li>
 </ul>
-<a name="containsOnly-java.lang.String-">
+<a name="build--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>containsOnly</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.82">containsOnly</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;s)</pre>
-<div class="block">Returns <jk>true</jk> if the specified string contains only characters in this set.</div>
+<h4>build</h4>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.Builder.html#line.101">build</a>()</pre>
+<div class="block">Create a new <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><code>AsciiSet</code></a> object with the contents of this builder.</div>
 <dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>s</code> - The string to test.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd><jk>true</jk> if the string contains only characters in this set.
-   <br>Nulls always return <jk>false</jk>.
-   <br>Blanks always return <jk>true</jk>.</dd>
+<dd>A new {link AsciiSet} object.</dd>
 </dl>
 </li>
 </ul>
@@ -309,12 +305,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/internal/AsciiSet.html" target="_top">Frames</a></li>
-<li><a href="AsciiSet.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/juneau/internal/AsciiSet.Builder.html" target="_top">Frames</a></li>
+<li><a href="AsciiSet.Builder.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>
diff --git a/content/site/apidocs/org/apache/juneau/internal/AsciiSet.html b/content/site/apidocs/org/apache/juneau/internal/AsciiSet.html
index 12baf8d..08d31ec 100644
--- a/content/site/apidocs/org/apache/juneau/internal/AsciiSet.html
+++ b/content/site/apidocs/org/apache/juneau/internal/AsciiSet.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/internal/AsciiSet.html" target="_top">Frames</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.18">AsciiSet</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.20">AsciiSet</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">Stores a set of ASCII characters for quick lookup.</div>
 </li>
@@ -117,20 +117,22 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#AsciiSet-java.lang.String-">AsciiSet</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;chars)</code>
-<div class="block">Constructor.</div>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></span></code>
+<div class="block">Builder class for <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><code>AsciiSet</code></a> objects.</div>
 </td>
 </tr>
 </table>
@@ -143,7 +145,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -172,6 +174,18 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Returns <jk>true</jk> if the specified string contains only characters in this set.</div>
 </td>
 </tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#create--">create</a></span>()</code>
+<div class="block">Creates a builder for an ASCII set.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/AsciiSet.html#create-java.lang.String-">create</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;chars)</code>
+<div class="block">Creates an ASCII set with the specified characters.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -188,41 +202,49 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="AsciiSet-java.lang.String-">
+<h3>Method Detail</h3>
+<a name="create-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>AsciiSet</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.26">AsciiSet</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;chars)</pre>
-<div class="block">Constructor.</div>
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal">AsciiSet</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.33">create</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;chars)</pre>
+<div class="block">Creates an ASCII set with the specified characters.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>chars</code> - The characters to keep in this store.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new object.</dd>
 </dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<a name="create--">
 <!--   -->
 </a>
-<h3>Method Detail</h3>
+<ul class="blockList">
+<li class="blockList">
+<h4>create</h4>
+<pre>public static&nbsp;<a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.42">create</a>()</pre>
+<div class="block">Creates a builder for an ASCII set.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new builder.</dd>
+</dl>
+</li>
+</ul>
 <a name="contains-char-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>contains</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.40">contains</a>(char&nbsp;c)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.113">contains</a>(char&nbsp;c)</pre>
 <div class="block">Returns <jk>true</jk> if the specified character is in this store.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -238,7 +260,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>contains</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.52">contains</a>(int&nbsp;c)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.125">contains</a>(int&nbsp;c)</pre>
 <div class="block">Returns <jk>true</jk> if the specified character is in this store.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -254,7 +276,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>contains</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.64">contains</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;s)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.137">contains</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;s)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string contains at least one character in this set.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -270,7 +292,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>containsOnly</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.82">containsOnly</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;s)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/AsciiSet.html#line.155">containsOnly</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;s)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string contains only characters in this set.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -310,7 +332,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/internal/AsciiSet.html" target="_top">Frames</a></li>
@@ -334,15 +356,15 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/content/site/apidocs/org/apache/juneau/internal/BeanPropertyUtils.html b/content/site/apidocs/org/apache/juneau/internal/BeanPropertyUtils.html
index 24e75a2..dbe3dc7 100644
--- a/content/site/apidocs/org/apache/juneau/internal/BeanPropertyUtils.html
+++ b/content/site/apidocs/org/apache/juneau/internal/BeanPropertyUtils.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -544,7 +544,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/site/apidocs/org/apache/juneau/internal/StringUtils.html b/content/site/apidocs/org/apache/juneau/internal/StringUtils.html
index ee0c52f..61584c1 100644
--- a/content/site/apidocs/org/apache/juneau/internal/StringUtils.html
+++ b/content/site/apidocs/org/apache/juneau/internal/StringUtils.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":9,"i52":9,"i53":9,"i54":9,"i55":9,"i56":9,"i57":9,"i58":9,"i59":9,"i60":9 [...]
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":9,"i52":9,"i53":9,"i54":9,"i55":9,"i56":9,"i57":9,"i58":9,"i59":9,"i60":9 [...]
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -687,6 +687,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="block">Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 </td>
 </tr>
+<tr id="i83" class="rowColor">
+<td class="colFirst"><code>static <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/internal/StringUtils.html#urlEncodePath-java.lang.Object-">urlEncodePath</a></span>(<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;o)</code>
+<div class="block">Similar to <a href="../../../../org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.Object-"><code>urlEncode(Object)</code></a> but doesn't encode <js>"/"</js> characters.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -1957,13 +1963,29 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="urlEncodePath-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>urlEncodePath</h4>
+<pre>public static&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/internal/StringUtils.html#line.1552">urlEncodePath</a>(<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;o)</pre>
+<div class="block">Similar to <a href="../../../../org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.Object-"><code>urlEncode(Object)</code></a> but doesn't encode <js>"/"</js> characters.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>o</code> - The object to encode.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The URL encoded string, or <jk>null</jk> if the object was null.</dd>
+</dl>
+</li>
+</ul>
 <a name="urlDecode-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>urlDecode</h4>
-<pre>public static&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/internal/StringUtils.html#line.1549">urlDecode</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;s)</pre>
+<pre>public static&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/internal/StringUtils.html#line.1620">urlDecode</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;s)</pre>
 <div class="block">Decodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1979,7 +2001,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>urlEncode</h4>
-<pre>public static&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/internal/StringUtils.html#line.1572">urlEncode</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;s)</pre>
+<pre>public static&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/internal/StringUtils.html#line.1643">urlEncode</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;s)</pre>
 <div class="block">Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1995,7 +2017,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>splitEqually</h4>
-<pre>public static&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/internal/StringUtils.html#line.1593">splitEqually</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-e [...]
+<pre>public static&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/internal/StringUtils.html#line.1664">splitEqually</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-e [...]
                                         int&nbsp;size)</pre>
 <div class="block">Splits a string into equally-sized parts.</div>
 <dl>
@@ -2013,7 +2035,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>firstNonWhitespaceChar</h4>
-<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1615">firstNonWhitespaceChar</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;s)</pre>
+<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1686">firstNonWhitespaceChar</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;s)</pre>
 <div class="block">Returns the first non-whitespace character in the string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2030,7 +2052,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>lastNonWhitespaceChar</h4>
-<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1631">lastNonWhitespaceChar</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;s)</pre>
+<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1702">lastNonWhitespaceChar</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;s)</pre>
 <div class="block">Returns the last non-whitespace character in the string.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2047,7 +2069,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>charAt</h4>
-<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1648">charAt</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;s,
+<pre>public static&nbsp;char&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1719">charAt</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;s,
                           int&nbsp;i)</pre>
 <div class="block">Returns the character at the specified index in the string without throwing exceptions.</div>
 <dl>
@@ -2066,7 +2088,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isAbsoluteUri</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1662">isAbsoluteUri</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;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1733">isAbsoluteUri</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;s)</pre>
 <div class="block">Efficiently determines whether a URL is of the pattern "xxx://xxx"</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2082,7 +2104,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isUri</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1717">isUri</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;s)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1788">isUri</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;s)</pre>
 <div class="block">Efficiently determines whether a URL is of the pattern "xxx:/xxx".
  
  <p>
@@ -2104,7 +2126,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getAuthorityUri</h4>
-<pre>public static&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/internal/StringUtils.html#line.1763">getAuthorityUri</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;s)</pre>
+<pre>public static&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/internal/StringUtils.html#line.1834">getAuthorityUri</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;s)</pre>
 <div class="block">Given an absolute URI, returns just the authority portion (e.g. <js>"http://hostname:port"</js>)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2120,7 +2142,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>toURI</h4>
-<pre>public static&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>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1816">toURI</a>(<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;o)</pre>
+<pre>public static&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>&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1887">toURI</a>(<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;o)</pre>
 <div class="block">Converts the specified object to a URI.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2136,7 +2158,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>firstNonEmpty</h4>
-<pre>public static&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/internal/StringUtils.html#line.1832">firstNonEmpty</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;s)</pre>
+<pre>public static&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/internal/StringUtils.html#line.1903">firstNonEmpty</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;s)</pre>
 <div class="block">Returns the first non-null, non-empty string in the list.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2152,7 +2174,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>indexOf</h4>
-<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1846">indexOf</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;s,
+<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1917">indexOf</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;s,
                           char...&nbsp;c)</pre>
 <div class="block">Same as <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true#indexOf-int-" title="class or interface in java.lang"><code>String.indexOf(int)</code></a> except allows you to check for multiple characters.</div>
 <dl>
@@ -2170,7 +2192,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>format</h4>
-<pre>public static&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/internal/StringUtils.html#line.1865">format</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;pattern,
+<pre>public static&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/internal/StringUtils.html#line.1936">format</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;pattern,
                             <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;args)</pre>
 <div class="block">Similar to <a href="http://docs.oracle.com/javase/7/docs/api/java/text/MessageFormat.html?is-external=true#format-java.lang.String-java.lang.Object...-" title="class or interface in java.text"><code>MessageFormat.format(String, Object...)</code></a> except allows you to specify POJO arguments.</div>
 <dl>
@@ -2188,7 +2210,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>parseIntWithSuffix</h4>
-<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1904">parseIntWithSuffix</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;s)</pre>
+<pre>public static&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1975">parseIntWithSuffix</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;s)</pre>
 <div class="block">Converts a string containing a possible multiplier suffix to an integer.
  
  <p>
@@ -2212,7 +2234,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>parseLongWithSuffix</h4>
-<pre>public static&nbsp;long&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1934">parseLongWithSuffix</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;s)</pre>
+<pre>public static&nbsp;long&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2005">parseLongWithSuffix</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;s)</pre>
 <div class="block">Converts a string containing a possible multiplier suffix to a long.
  
  <p>
@@ -2236,7 +2258,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>contains</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1957">contains</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,
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2028">contains</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,
                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;substring)</pre>
 <div class="block">Same as <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true#contains-java.lang.CharSequence-" title="class or interface in java.lang"><code>String.contains(CharSequence)</code></a> except returns <jk>null</jk> if the value is null.</div>
 <dl>
@@ -2254,7 +2276,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isObjectList</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1967">isObjectList</a>(<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;o)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2038">isObjectList</a>(<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;o)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string appears to be an JSON array.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -2270,7 +2292,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isObjectMap</h4>
-<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.1981">isObjectMap</a>(<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;o)</pre>
+<pre>public static&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/internal/StringUtils.html#line.2052">isObjectMap</a>(<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;o)</pre>
 <div class="block">Returns <jk>true</jk> if the specified string appears to be a JSON object.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/content/site/apidocs/org/apache/juneau/internal/package-frame.html b/content/site/apidocs/org/apache/juneau/internal/package-frame.html
index 7817404..3fbb383 100644
--- a/content/site/apidocs/org/apache/juneau/internal/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/internal/package-frame.html
@@ -16,6 +16,7 @@
 <li><a href="ArrayUtils.html" title="class in org.apache.juneau.internal" target="classFrame">ArrayUtils</a></li>
 <li><a href="AsciiMap.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiMap</a></li>
 <li><a href="AsciiSet.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiSet</a></li>
+<li><a href="AsciiSet.Builder.html" title="class in org.apache.juneau.internal" target="classFrame">AsciiSet.Builder</a></li>
 <li><a href="BeanPropertyUtils.html" title="class in org.apache.juneau.internal" target="classFrame">BeanPropertyUtils</a></li>
 <li><a href="ByteArrayCache.html" title="class in org.apache.juneau.internal" target="classFrame">ByteArrayCache</a></li>
 <li><a href="ByteArrayInOutStream.html" title="class in org.apache.juneau.internal" target="classFrame">ByteArrayInOutStream</a></li>
diff --git a/content/site/apidocs/org/apache/juneau/internal/package-summary.html b/content/site/apidocs/org/apache/juneau/internal/package-summary.html
index bc5a293..a103ab0 100644
--- a/content/site/apidocs/org/apache/juneau/internal/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/internal/package-summary.html
@@ -104,237 +104,243 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal">AsciiSet.Builder</a></td>
+<td class="colLast">
+<div class="block">Builder class for <a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><code>AsciiSet</code></a> objects.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal">BeanPropertyUtils</a></td>
 <td class="colLast">
 <div class="block">Utility methods when working with setting of bean properties.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal">ByteArrayCache</a></td>
 <td class="colLast">
 <div class="block">A utility class for caching byte arrays in memory so that duplicate arrays can be reused.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/ByteArrayInOutStream.html" title="class in org.apache.juneau.internal">ByteArrayInOutStream</a></td>
 <td class="colLast">
 <div class="block">Subclass of a ByteArrayOutputStream that avoids a byte array copy when reading from an input stream.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/Cache.html" title="class in org.apache.juneau.internal">Cache</a>&lt;K,V&gt;</td>
 <td class="colLast">
 <div class="block">Simple in-memory cache of objects.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/CharSequenceReader.html" title="class in org.apache.juneau.internal">CharSequenceReader</a></td>
 <td class="colLast">
 <div class="block">Similar to <a href="http://docs.oracle.com/javase/7/docs/api/java/io/StringReader.html?is-external=true" title="class or interface in java.io"><code>StringReader</code></a> except reads from a generic <a href="../../../../org/apache/juneau/internal/CharSequenceReader.html" title="class in org.apache.juneau.internal"><code>CharSequenceReader</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/ClassUtils.html" title="class in org.apache.juneau.internal">ClassUtils</a></td>
 <td class="colLast">
 <div class="block">Class-related utility methods.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/ClassUtils.MethodInfo.html" title="class in org.apache.juneau.internal">ClassUtils.MethodInfo</a></td>
 <td class="colLast">
 <div class="block">Simple bean that shows the name, parameter types, and return type of a method.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/CollectionUtils.html" title="class in org.apache.juneau.internal">CollectionUtils</a></td>
 <td class="colLast">
 <div class="block">Utility methods for collections.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/DateUtils.html" title="class in org.apache.juneau.internal">DateUtils</a></td>
 <td class="colLast">
 <div class="block">A utility class for parsing and formatting HTTP dates as used in cookies and other headers.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateBeanMap.html" title="class in org.apache.juneau.internal">DelegateBeanMap</a>&lt;T&gt;</td>
 <td class="colLast">
 <div class="block">Represents a wrapped <a href="../../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau"><code>BeanMap</code></a> where property values can be overridden, removed, or reordered without
  affecting the underlying bean.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateList.html" title="class in org.apache.juneau.internal">DelegateList</a>&lt;T extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;?&gt;&gt;</td>
 <td class="colLast">
 <div class="block">Represents a wrapped <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> where entries in the list can be removed or reordered without affecting the
  underlying list.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/DelegateMap.html" title="class in org.apache.juneau.internal">DelegateMap</a>&lt;T&gt;</td>
 <td class="colLast">
 <div class="block">Represents a wrapped <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> where entries in the map can be removed without affecting the underlying map.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/FileReaderBuilder.html" title="class in org.apache.juneau.internal">FileReaderBuilder</a></td>
 <td class="colLast">
 <div class="block">Utility class for creating <a href="http://docs.oracle.com/javase/7/docs/api/java/io/FileReader.html?is-external=true" title="class or interface in java.io"><code>FileReader</code></a> objects.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/FileUtils.html" title="class in org.apache.juneau.internal">FileUtils</a></td>
 <td class="colLast">
 <div class="block">File utilities.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/FileWriterBuilder.html" title="class in org.apache.juneau.internal">FileWriterBuilder</a></td>
 <td class="colLast">
 <div class="block">Utility class for creating <a href="http://docs.oracle.com/javase/7/docs/api/java/io/FileWriter.html?is-external=true" title="class or interface in java.io"><code>FileWriter</code></a> objects.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/FilteredMap.html" title="class in org.apache.juneau.internal">FilteredMap</a>&lt;K,V&gt;</td>
 <td class="colLast">
 <div class="block">Wrapper around a map where the key names are overridden.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/HashCode.html" title="class in org.apache.juneau.internal">HashCode</a></td>
 <td class="colLast">
 <div class="block">Utility class for generating integer hash codes.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/IdentityList.html" title="class in org.apache.juneau.internal">IdentityList</a>&lt;T&gt;</td>
 <td class="colLast">
 <div class="block">Combination of a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util"><code>LinkedList</code></a> and <code>IdentitySet</code>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/IOUtils.html" title="class in org.apache.juneau.internal">IOUtils</a></td>
 <td class="colLast">
 <div class="block">Various I/O related utility methods.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/JuneauLogger.html" title="class in org.apache.juneau.internal">JuneauLogger</a></td>
 <td class="colLast">
 <div class="block">Wraps and extends the <a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Logger.html?is-external=true" title="class or interface in java.util.logging"><code>Logger</code></a> class to provide some additional convenience methods.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/KeywordSet.html" title="class in org.apache.juneau.internal">KeywordSet</a></td>
 <td class="colLast">
 <div class="block">Stores a set of language keywords for quick lookup.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/MultiIterable.html" title="class in org.apache.juneau.internal">MultiIterable</a>&lt;E&gt;</td>
 <td class="colLast">
 <div class="block">Utility class for defining an iterator over one or more iterables.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/MultiSet.html" title="class in org.apache.juneau.internal">MultiSet</a>&lt;E&gt;</td>
 <td class="colLast">
 <div class="block">Encapsulates multiple collections so they can be iterated over as if they were all part of the same collection.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/NoCloseOutputStream.html" title="class in org.apache.juneau.internal">NoCloseOutputStream</a></td>
 <td class="colLast">
 <div class="block">Wraps an existing <a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io"><code>OutputStream</code></a> where the <a href="../../../../org/apache/juneau/internal/NoCloseOutputStream.html#close--"><code>NoCloseOutputStream.close()</code></a> method is a no-op.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/NoCloseWriter.html" title="class in org.apache.juneau.internal">NoCloseWriter</a></td>
 <td class="colLast">
 <div class="block">Wraps an existing <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a> where the <a href="../../../../org/apache/juneau/internal/NoCloseWriter.html#close--"><code>NoCloseWriter.close()</code></a> method is a no-op.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html" title="class in org.apache.juneau.internal">ObjectUtils</a></td>
 <td class="colLast">
 <div class="block">Utility class for efficiently converting objects between types.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/Pair.html" title="class in org.apache.juneau.internal">Pair</a>&lt;F,S&gt;</td>
 <td class="colLast">
 <div class="block">Represents a simple object pair.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/ReflectionUtils.html" title="class in org.apache.juneau.internal">ReflectionUtils</a></td>
 <td class="colLast">
 <div class="block">Reflection utilities.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/SimpleMap.html" title="class in org.apache.juneau.internal">SimpleMap</a></td>
 <td class="colLast">
 <div class="block">An instance of a <code>Map</code> where the keys and values are simple <code>String[]</code> and
  <code>Object[]</code> arrays.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/StringBuilderWriter.html" title="class in org.apache.juneau.internal">StringBuilderWriter</a></td>
 <td class="colLast">
 <div class="block">Similar to <a href="http://docs.oracle.com/javase/7/docs/api/java/io/StringWriter.html?is-external=true" title="class or interface in java.io"><code>StringWriter</code></a>, but uses a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang"><code>StringBuilder</code></a> instead to avoid synchronization overhead.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></td>
 <td class="colLast">
 <div class="block">Reusable string utility methods.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/SystemUtils.html" title="class in org.apache.juneau.internal">SystemUtils</a></td>
 <td class="colLast">
 <div class="block">System utilities.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/TeeOutputStream.html" title="class in org.apache.juneau.internal">TeeOutputStream</a></td>
 <td class="colLast">
 <div class="block">Output stream that can send output to multiple output streams.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/TeeWriter.html" title="class in org.apache.juneau.internal">TeeWriter</a></td>
 <td class="colLast">
 <div class="block">Writer that can send output to multiple writers.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/ThrowableUtils.html" title="class in org.apache.juneau.internal">ThrowableUtils</a></td>
 <td class="colLast">
 <div class="block">Various utility methods for creating and working with throwables.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/Utils.html" title="class in org.apache.juneau.internal">Utils</a></td>
 <td class="colLast">
 <div class="block">Various utility methods.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/Version.html" title="class in org.apache.juneau.internal">Version</a></td>
 <td class="colLast">
 <div class="block">Represents a version string such as <js>"1.2"</js> or <js>"1.2.3"</js></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/VersionRange.html" title="class in org.apache.juneau.internal">VersionRange</a></td>
 <td class="colLast">
 <div class="block">Represents an OSGi-style version range like <js>"1.2"</js> or <js>"[1.0,2.0)"</js>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/juneau/internal/WrappedMap.html" title="class in org.apache.juneau.internal">WrappedMap</a>&lt;K,V&gt;</td>
 <td class="colLast">
 <div class="block">Wraps an existing map inside an extensible interface so that convenience methods can be added to the subclass.</div>
diff --git a/content/site/apidocs/org/apache/juneau/internal/package-tree.html b/content/site/apidocs/org/apache/juneau/internal/package-tree.html
index f0314cd..3931781 100644
--- a/content/site/apidocs/org/apache/juneau/internal/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/internal/package-tree.html
@@ -134,6 +134,7 @@
 <li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ArrayUtils</span></a></li>
 <li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiMap</span></a></li>
 <li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiSet</span></a></li>
+<li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiSet.Builder</span></a></li>
 <li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/BeanPropertyUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">BeanPropertyUtils</span></a></li>
 <li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/ByteArrayCache.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ByteArrayCache</span></a></li>
 <li type="circle">org.apache.juneau.internal.<a href="../../../../org/apache/juneau/internal/Cache.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">Cache</span></a>&lt;K,V&gt;</li>
diff --git a/content/site/apidocs/org/apache/juneau/rest/RestRequest.html b/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
index 87a6ebd..857c98a 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RestRequest.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.71">RestRequest</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.72">RestRequest</a>
 extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <div class="block">Represents an HTTP request for a REST resource.
  
@@ -555,7 +555,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <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/RestRequest.html#line.203">getDescription</a>()</pre>
+<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/RestRequest.html#line.204">getDescription</a>()</pre>
 <div class="block">Returns a string of the form <js>"HTTP method-name full-url"</js></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -569,7 +569,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAttribute</h4>
-<pre>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/rest/RestRequest.html#line.215">getAttribute</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;name,
+<pre>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/rest/RestRequest.html#line.216">getAttribute</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;name,
                            <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;def)</pre>
 <div class="block">Same as <code>ServletRequestWrapper.getAttribute(String)</code> but returns a default value if not found.</div>
 <dl>
@@ -587,7 +587,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>attr</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.227">attr</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;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.228">attr</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;name,
                         <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;value)</pre>
 <div class="block">Shorthand method for calling <code>ServletRequestWrapper.setAttribute(String, Object)</code> fluently.</div>
 <dl>
@@ -605,7 +605,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProperties</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestProperties.html" title="class in org.apache.juneau.rest">RequestProperties</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.278">getProperties</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestProperties.html" title="class in org.apache.juneau.rest">RequestProperties</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.279">getProperties</a>()</pre>
 <div class="block">Retrieve the properties active for this request.
  
  <p>
@@ -655,7 +655,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>prop</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.289">prop</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;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.290">prop</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;name,
                         <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;value)</pre>
 <div class="block">Shortcut for calling <code>getProperties().append(name, value);</code> fluently.</div>
 <dl>
@@ -673,7 +673,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getHeaders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.345">getHeaders</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.346">getHeaders</a>()</pre>
 <div class="block">Request headers.
  
  <p>
@@ -727,7 +727,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getHeader</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/RestRequest.html#line.350">getHeader</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;name)</pre>
+<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/RestRequest.html#line.351">getHeader</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;name)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getHeader</code>&nbsp;in interface&nbsp;<code>javax.servlet.http.HttpServletRequest</code></dd>
@@ -742,7 +742,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getHeaders</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</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/RestRequest.html#line.355">getHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-e [...]
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</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/RestRequest.html#line.356">getHeaders</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-e [...]
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getHeaders</code>&nbsp;in interface&nbsp;<code>javax.servlet.http.HttpServletRequest</code></dd>
@@ -757,7 +757,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <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/RestRequest.html#line.367">getProduces</a>()</pre>
+<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/RestRequest.html#line.368">getProduces</a>()</pre>
 <div class="block">Returns the media types that are valid for <code>Accept</code> headers on the request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -771,7 +771,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <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/RestRequest.html#line.376">getConsumes</a>()</pre>
+<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/RestRequest.html#line.377">getConsumes</a>()</pre>
 <div class="block">Returns the media types that are valid for <code>Content-Type</code> headers on the request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -785,7 +785,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>setCharacterEncoding</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.384">setCharacterEncoding</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;charset)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.385">setCharacterEncoding</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;charset)</pre>
 <div class="block">Sets the charset to expect on the request body.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -801,7 +801,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getCharacterEncoding</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/RestRequest.html#line.392">getCharacterEncoding</a>()</pre>
+<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/RestRequest.html#line.393">getCharacterEncoding</a>()</pre>
 <div class="block">Returns the charset specified on the <code>Content-Type</code> header, or <js>"UTF-8"</js> if not specified.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -817,7 +817,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLocale</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.412">getLocale</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.413">getLocale</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getLocale</code>&nbsp;in interface&nbsp;<code>javax.servlet.ServletRequest</code></dd>
@@ -832,7 +832,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLocales</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.423">getLocales</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.424">getLocales</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getLocales</code>&nbsp;in interface&nbsp;<code>javax.servlet.ServletRequest</code></dd>
@@ -847,7 +847,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getQuery</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.489">getQuery</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.490">getQuery</a>()</pre>
 <div class="block">Query parameters. 
  
  <p>
@@ -902,7 +902,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getQuery</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/RestRequest.html#line.499">getQuery</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;name)</pre>
+<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/RestRequest.html#line.500">getQuery</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;name)</pre>
 <div class="block">Shortcut for calling <code>getQuery().getString(name)</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -918,7 +918,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getFormData</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.554">getFormData</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.555">getFormData</a>()</pre>
 <div class="block">Form-data.
  
  <p>
@@ -973,7 +973,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getFormData</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/RestRequest.html#line.582">getFormData</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;name)</pre>
+<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/RestRequest.html#line.583">getFormData</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;name)</pre>
 <div class="block">Shortcut for calling <code>getFormData().getString(name)</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -989,7 +989,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getPathMatch</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestPathMatch.html" title="class in org.apache.juneau.rest">RequestPathMatch</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.635">getPathMatch</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestPathMatch.html" title="class in org.apache.juneau.rest">RequestPathMatch</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.636">getPathMatch</a>()</pre>
 <div class="block">Request path match.
  
  <p>
@@ -1041,7 +1041,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getPath</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/RestRequest.html#line.645">getPath</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;name)</pre>
+<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/RestRequest.html#line.646">getPath</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;name)</pre>
 <div class="block">Shortcut for calling <code>getPathMatch().get(name)</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1057,7 +1057,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getBody</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestBody.html" title="class in org.apache.juneau.rest">RequestBody</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.687">getBody</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RequestBody.html" title="class in org.apache.juneau.rest">RequestBody</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.688">getBody</a>()</pre>
 <div class="block">Request body.
  
  <p>
@@ -1099,7 +1099,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReader</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/io/BufferedReader.html?is-external=true" title="class or interface in java.io">BufferedReader</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.702">getReader</a>()
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/io/BufferedReader.html?is-external=true" title="class or interface in java.io">BufferedReader</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.703">getReader</a>()
                          throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Returns the HTTP body content as 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"><code>Reader</code></a>.
  
@@ -1125,7 +1125,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInputStream</h4>
-<pre>public&nbsp;javax.servlet.ServletInputStream&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.716">getInputStream</a>()
+<pre>public&nbsp;javax.servlet.ServletInputStream&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.717">getInputStream</a>()
                                                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Returns the HTTP body content as an <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><code>InputStream</code></a>.
  
@@ -1149,7 +1149,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getContextPath</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/RestRequest.html#line.730">getContextPath</a>()</pre>
+<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/RestRequest.html#line.731">getContextPath</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getContextPath</code>&nbsp;in interface&nbsp;<code>javax.servlet.http.HttpServletRequest</code></dd>
@@ -1164,7 +1164,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletPath</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/RestRequest.html#line.736">getServletPath</a>()</pre>
+<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/RestRequest.html#line.737">getServletPath</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getServletPath</code>&nbsp;in interface&nbsp;<code>javax.servlet.http.HttpServletRequest</code></dd>
@@ -1179,7 +1179,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getUriContext</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.751">getUriContext</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.752">getUriContext</a>()</pre>
 <div class="block">Returns the URI context of the request.
  
  <p>
@@ -1197,7 +1197,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getUriResolver</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.770">getUriResolver</a>(<a href="../../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>&nbsp;resolution,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.771">getUriResolver</a>(<a href="../../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a>&nbsp;resolution,
                                   <a href="../../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a>&nbsp;relativity)</pre>
 <div class="block">Returns a URI resolver that can be used to convert URIs to absolute or root-relative form.</div>
 <dl>
@@ -1215,7 +1215,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getUriResolver</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.780">getUriResolver</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.781">getUriResolver</a>()</pre>
 <div class="block">Shortcut for calling <a href="../../../../org/apache/juneau/rest/RestRequest.html#getUriResolver--"><code>getUriResolver()</code></a> using <a href="../../../../org/apache/juneau/UriResolution.html#ROOT_RELATIVE"><code>UriResolution.ROOT_RELATIVE</code></a> and
  <a href="../../../../org/apache/juneau/UriRelativity.html#RESOURCE"><code>UriRelativity.RESOURCE</code></a></div>
 <dl>
@@ -1230,7 +1230,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getUri</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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.796">getUri</a>(boolean&nbsp;includeQuery,
+<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>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.797">getUri</a>(boolean&nbsp;includeQuery,
                   <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>,?&gt;&nbsp;addQueryParams)</pre>
 <div class="block">Returns the URI for this request.
  
@@ -1253,7 +1253,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInfoProvider</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.865">getInfoProvider</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestInfoProvider.html" title="interface in org.apache.juneau.rest">RestInfoProvider</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.866">getInfoProvider</a>()</pre>
 <div class="block">Resource information provider.
  
  <p>
@@ -1306,7 +1306,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <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/RestRequest.html#line.901">getSwagger</a>()</pre>
+<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/RestRequest.html#line.902">getSwagger</a>()</pre>
 <div class="block">Returns the localized swagger associated with the resource.
  
  <p>
@@ -1346,7 +1346,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <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/RestRequest.html#line.936">getSiteName</a>()</pre>
+<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/RestRequest.html#line.937">getSiteName</a>()</pre>
 <div class="block">Returns the localized site name.
  
  <p>
@@ -1378,7 +1378,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getResourceTitle</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/RestRequest.html#line.954">getResourceTitle</a>()</pre>
+<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/RestRequest.html#line.955">getResourceTitle</a>()</pre>
 <div class="block">Returns the localized resource title.
  
  <p>
@@ -1395,7 +1395,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getResourceDescription</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/RestRequest.html#line.972">getResourceDescription</a>()</pre>
+<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/RestRequest.html#line.973">getResourceDescription</a>()</pre>
 <div class="block">Returns the localized resource description.
  
  <p>
@@ -1412,7 +1412,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <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/RestRequest.html#line.990">getMethodSummary</a>()</pre>
+<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/RestRequest.html#line.991">getMethodSummary</a>()</pre>
 <div class="block">Returns the localized method summary.
  
  <p>
@@ -1429,7 +1429,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <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/RestRequest.html#line.1008">getMethodDescription</a>()</pre>
+<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/RestRequest.html#line.1009">getMethodDescription</a>()</pre>
 <div class="block">Returns the localized method description.
  
  <p>
@@ -1446,7 +1446,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSerializers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1032">getSerializers</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/serializer/SerializerGroup.html" title="class in org.apache.juneau.serializer">SerializerGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1033">getSerializers</a>()</pre>
 <div class="block">Returns the serializers associated with this request.
  
  <h5 class='section'>See Also:</h5>
@@ -1465,7 +1465,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getParsers</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1046">getParsers</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/parser/ParserGroup.html" title="class in org.apache.juneau.parser">ParserGroup</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1047">getParsers</a>()</pre>
 <div class="block">Returns the parsers associated with this request.
  
  <h5 class='section'>See Also:</h5>
@@ -1484,7 +1484,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMethod</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/RestRequest.html#line.1059">getMethod</a>()</pre>
+<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/RestRequest.html#line.1060">getMethod</a>()</pre>
 <div class="block">Returns the method of this request.
  
  <p>
@@ -1504,7 +1504,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getHttpMethod</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/HttpMethod.html" title="enum in org.apache.juneau.http">HttpMethod</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1071">getHttpMethod</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/http/HttpMethod.html" title="enum in org.apache.juneau.http">HttpMethod</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1072">getHttpMethod</a>()</pre>
 <div class="block">Returns the HTTP 1.1 method name of the request as an enum.
  
  <p>
@@ -1521,7 +1521,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getContentLength</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1076">getContentLength</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1077">getContentLength</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>getContentLength</code>&nbsp;in interface&nbsp;<code>javax.servlet.ServletRequest</code></dd>
@@ -1536,7 +1536,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>isPlainText</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1096">isPlainText</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1097">isPlainText</a>()</pre>
 <div class="block">Returns <jk>true</jk> if <code>&amp;plainText=true</code> was specified as a URL parameter.
  
  <p>
@@ -1557,7 +1557,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMessageBundle</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1133">getMessageBundle</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in org.apache.juneau.utils">MessageBundle</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1134">getMessageBundle</a>()</pre>
 <div class="block">Returns the resource bundle for the request locale.
  
  <h5 class='section'>Example:</h5>
@@ -1598,7 +1598,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMessage</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/RestRequest.html#line.1144">getMessage</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;key,
+<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/RestRequest.html#line.1145">getMessage</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;key,
                          <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;args)</pre>
 <div class="block">Shortcut method for calling <a href="../../../../org/apache/juneau/utils/MessageBundle.html#getString-java.util.Locale-java.lang.String-java.lang.Object...-"><code>MessageBundle.getString(Locale, String, Object...)</code></a> based on the request locale.</div>
 <dl>
@@ -1616,7 +1616,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getContext</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1157">getContext</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest">RestContext</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1158">getContext</a>()</pre>
 <div class="block">Returns the resource context handling the request.
  
  <p>
@@ -1634,7 +1634,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getJavaMethod</h4>
-<pre>public&nbsp;<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;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1177">getJavaMethod</a>()</pre>
+<pre>public&nbsp;<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;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1178">getJavaMethod</a>()</pre>
 <div class="block">Returns the java method handling the request.
  
  <p>
@@ -1659,7 +1659,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getBeanSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1186">getBeanSession</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1187">getBeanSession</a>()</pre>
 <div class="block">Returns the <a href="../../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau"><code>BeanSession</code></a> associated with this request.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1673,7 +1673,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getVarResolverSession</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1223">getVarResolverSession</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/svl/VarResolverSession.html" title="class in org.apache.juneau.svl">VarResolverSession</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1224">getVarResolverSession</a>()</pre>
 <div class="block">Request-level variable resolver session.
  
  <p>
@@ -1715,7 +1715,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getClasspathReaderResource</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1260">getClasspathReaderResource</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;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1261">getClasspathReaderResource</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;name,
                                                  boolean&nbsp;resolveVars,
                                                  <a href="../../../../org/apache/juneau/http/MediaType.html" title="class in org.apache.juneau.http">MediaType</a>&nbsp;mediaType)
                                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -1759,7 +1759,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getClasspathReaderResource</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1282">getClasspathReaderResource</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;name,
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1283">getClasspathReaderResource</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;name,
                                                  boolean&nbsp;resolveVars)
                                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getClasspathReaderResource-java.lang.String-boolean-org.apache.juneau.http.MediaType-"><code>getClasspathReaderResource(String, boolean, MediaType)</code></a> except uses the resource mime-type map
@@ -1783,7 +1783,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getClasspathReaderResource</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1293">getClasspathReaderResource</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;name)
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1294">getClasspathReaderResource</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;name)
                                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Same as <a href="../../../../org/apache/juneau/rest/RestRequest.html#getClasspathReaderResource-java.lang.String-boolean-"><code>getClasspathReaderResource(String, boolean)</code></a> with <code>resolveVars == <jk>false</jk></code></div>
 <dl>
@@ -1802,7 +1802,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getConfig</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/config/Config.html" title="class in org.apache.juneau.config">Config</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1340">getConfig</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/config/Config.html" title="class in org.apache.juneau.config">Config</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1341">getConfig</a>()</pre>
 <div class="block">Config file associated with the resource.
  
  <p>
@@ -1853,7 +1853,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWidgets</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/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest. [...]
+<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/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest. [...]
 <div class="block">Returns the widgets used for resolving <js>"$W{...}"</js> string variables.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -1868,7 +1868,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</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/RestRequest.html#line.1358">toString</a>()</pre>
+<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/RestRequest.html#line.1359">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><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></code></dd>
@@ -1881,7 +1881,7 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getLogger</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestLogger.html" title="interface in org.apache.juneau.rest">RestLogger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1419">getLogger</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/rest/RestLogger.html" title="interface in org.apache.juneau.rest">RestLogger</a>&nbsp;<a href="../../../../src-html/org/apache/juneau/rest/RestRequest.html#line.1420">getLogger</a>()</pre>
 <div class="block">Logger.
  
  <p>
diff --git a/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html b/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html
index bb38287..5dcb45c 100644
--- a/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html
+++ b/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":6,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":6,"i2":10,"i3":10,"i4":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -132,7 +132,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.43">RemoteableServlet</a>
+<pre>public abstract class <a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.49">RemoteableServlet</a>
 extends <a href="../../../../../org/apache/juneau/rest/BasicRestServlet.html" title="class in org.apache.juneau.rest">BasicRestServlet</a></pre>
 <div class="block">Abstract class for defining Remoteable services.
  
@@ -207,8 +207,17 @@ extends <a href="../../../../../org/apache/juneau/rest/BasicRestServlet.html" ti
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</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/remoteable/RemoteableServlet.html#listMethods-java.lang.String-">listMethods</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;javaInterface)</code>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/juneau/dto/LinkString.html" title="class in org.apache.juneau.dto">LinkString</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/remoteable/RemoteableServlet.html#listMethods-org.apache.juneau.rest.RestRequest-java.lang.String-">listMethods</a></span>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
+           <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;javaInterface)</code>
+<div class="block">[GET /{javaInterface] - Get the list of all remoteable methods on the specified interface name.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/juneau/dto/html5/Div.html" title="class in org.apache.juneau.dto.html5">Div</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/remoteable/RemoteableServlet.html#showEntryForm-org.apache.juneau.rest.RestRequest-java.lang.String-java.lang.String-">showEntryForm</a></span>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
+             <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;javaInterface,
+             <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;javaMethod)</code>
 <div class="block">[GET /{javaInterface] - Get the list of all remoteable methods on the specified interface name.</div>
 </td>
 </tr>
@@ -268,7 +277,7 @@ extends <a href="../../../../../org/apache/juneau/rest/BasicRestServlet.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>RemoteableServlet</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.43">RemoteableServlet</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.49">RemoteableServlet</a>()</pre>
 </li>
 </ul>
 </li>
@@ -285,7 +294,7 @@ extends <a href="../../../../../org/apache/juneau/rest/BasicRestServlet.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>getServiceMap</h4>
-<pre>protected abstract&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/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;,<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>&gt;&nbsp;<a href="../../../../../src [...]
+<pre>protected abstract&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/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;,<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>&gt;&nbsp;<a href="../../../../../src [...]
                                                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 list of interfaces to their implementation objects.
  
@@ -307,7 +316,7 @@ extends <a href="../../../../../org/apache/juneau/rest/BasicRestServlet.html" ti
 <h4>getInterfaces</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>="/")
-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/LinkString.html" title="class in org.apache.juneau.dto">LinkString</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.74">getInterfaces</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.junea [...]
+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/LinkString.html" title="class in org.apache.juneau.dto">LinkString</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.80">getInterfaces</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.junea [...]
                                                                              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 the list of all remote interfaces.</div>
 <dl>
@@ -320,20 +329,23 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.htm
 </dl>
 </li>
 </ul>
-<a name="listMethods-java.lang.String-">
+<a name="listMethods-org.apache.juneau.rest.RestRequest-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>listMethods</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>="/{javaInterface}")
-public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</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/remoteable/RemoteableServlet.html#line.92">listMethods</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path. [...]
-                                                                                                   <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;javaInterface)
-                                                                                            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#path--">path</a>="/{javaInterface}",
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#summary--">summary</a>="List of available methods on $RP{javaInterface}.")
+public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/juneau/dto/LinkString.html" title="class in org.apache.juneau.dto">LinkString</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.99">listMethods</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.ap [...]
+                                                                                                                                                                               <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>="javaInterface")
+                                                                                                                                                                               <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;javaInterface)
+                                                                                                                                                                        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 /{javaInterface] - Get the list of all remoteable methods on the specified interface name.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>req</code> - The HTTP servlet request.</dd>
 <dd><code>javaInterface</code> - The Java interface name.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The methods defined on the interface.</dd>
@@ -342,6 +354,34 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collecti
 </dl>
 </li>
 </ul>
+<a name="showEntryForm-org.apache.juneau.rest.RestRequest-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>showEntryForm</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>="/{javaInterface}/{javaMethod}",
+            <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#summary--">summary</a>="Form entry for method $RP{javaMethod} on interface $RP{javaInterface}")
+public&nbsp;<a href="../../../../../org/apache/juneau/dto/html5/Div.html" title="class in org.apache.juneau.dto.html5">Div</a>&nbsp;<a href="../../../../../src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html#line.117">showEntryForm</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/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>(<a href="../../../../../org/apache/juneau/rest/annotation/Path.html#value--">value</a>="javaInterface")
+                                                                                                                                                                                                <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;javaInterface,
+                                                                                                                                                                                                <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>="javaMethod")
+                                                                                                                                                                                                <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;javaMethod)
+                                                                                                                                                                                         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 /{javaInterface] - Get the list of all remoteable methods on the specified interface name.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>req</code> - The HTTP servlet request.</dd>
+<dd><code>javaInterface</code> - The Java interface name.</dd>
+<dd><code>javaMethod</code> - The Java method name or signature.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A simple form entry page for invoking a remoteable method.</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="invoke-org.apache.juneau.rest.RestRequest-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
@@ -350,7 +390,7 @@ public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collecti
 <h4>invoke</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>="POST",
             <a href="../../../../../org/apache/juneau/rest/annotation/RestMethod.html#path--">path</a>="/{javaInterface}/{javaMethod}")
-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/rest/remoteable/RemoteableServlet.html#line.106">invoke</a>(<a href="../../../../../org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a>&nbsp;req,
+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/rest/remoteable/RemoteableServlet.html#line.160">invoke</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/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</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;javaInterface,
                                                                                                 <a href="../../../../../org/apache/juneau/rest/annotation/Path.html" title="annotation in org.apache.juneau.rest.annotation">@Path</a>
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index ea1c46c..d35f1d1 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -679,7 +679,6 @@
       <li><p><a class='doclink' href='#juneau-rest-client.Debugging'>Debugging</a></p>
       <li><p><a class='doclink' href='#juneau-rest-client.Logging'>Logging</a></p>
       <li><p><a class='doclink' href='#juneau-rest-client.Interceptors'>Interceptors</a></p>
-      <li><p><a class='doclink' href='#juneau-rest-client.Remoteable'>Remoteable Proxies</a></p>
       <li><p><a class='doclink' href='#juneau-rest-client.Other'>Other Useful Methods</a></p>
    </ol>
    <li><p class='toc2'><a class='doclink' href='#juneau-microservice-server'><i>juneau-microservice-server</i></a></p>
@@ -993,18 +992,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-marshall<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-marshall-7.0.0.jar 
+   juneau-marshall-7.1.0.jar 
    </p>  
    
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.marshall_7.0.0.jar 
+   org.apache.juneau.marshall_7.1.0.jar 
    </p>  
 
    <p>
@@ -4199,18 +4198,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-marshall-rdf<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-marshall-rdf-7.0.0.jar 
+   juneau-marshall-rdf-7.1.0.jar 
    </p>  
 
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.marshall.rdf_7.0.0.jar 
+   org.apache.juneau.marshall.rdf_7.1.0.jar 
    </p>  
 
    <p>
@@ -4301,18 +4300,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-dto<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-dto-7.0.0.jar 
+   juneau-dto-7.1.0.jar 
    </p>  
 
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.dto_7.0.0.jar 
+   org.apache.juneau.dto_7.1.0.jar 
    </p>  
 
    <p>
@@ -4748,18 +4747,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-svl<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-svl-7.0.0.jar 
+   juneau-svl-7.1.0.jar 
    </p>  
 
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.svl_7.0.0.jar 
+   org.apache.juneau.svl_7.1.0.jar 
    </p>  
 
    <!-- ======================================================================================================== -->
@@ -5078,18 +5077,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-config<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-config-7.0.0.jar 
+   juneau-config-7.1.0.jar 
    </p>  
 
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.config_7.0.0.jar 
+   org.apache.juneau.config_7.1.0.jar 
    </p>  
 
    <!-- ======================================================================================================== -->
@@ -6615,18 +6614,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-rest-server<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-rest-server-7.0.0.jar 
+   juneau-rest-server-7.1.0.jar 
    </p>  
 
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.rest.server_7.0.0.jar 
+   org.apache.juneau.rest.server_7.1.0.jar 
       </p>  
 
    <p>
@@ -10771,7 +10770,7 @@
       <p>
          Proxy interfaces are retrieved using the <a href="org/apache/juneau/rest/client/RestClient.html#getRemoteableProxy-java.lang.Class-"><code>RestClient.getRemoteableProxy(Class)</code></a> 
          method.
-         The remoteable servlet is a specialized subclass of <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> that provides a 
+         <br>The remoteable servlet is a specialized subclass of <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> that provides a 
          full-blown REST interface for calling remoteable services (e.g. POJOs) remotely. 
       </p>
       <p>
@@ -10779,55 +10778,56 @@
          on a client...
       </p>
       <p class='bcode'>
+   <ja>@Remoteable</ja>
    <jk>public interface</jk> IAddressBook {
+
+      <jd>/** Initialize this address book with preset entries */</jd>
+      <jk>void</jk> init() <jk>throws</jk> Exception;
+   
+      <jd>/** Return all people in the address book */</jd>
+      List&lt;Person&gt; getPeople();
+   
+      <jd>/** Return all addresses in the address book */</jd>
+      List&lt;Address&gt; getAddresses();
+   
+      <jd>/** Create a person in this address book */</jd>
       Person createPerson(CreatePerson cp) <jk>throws</jk> Exception;
+   
+      <jd>/** Find a person by id */</jd>
       Person findPerson(<jk>int</jk> id);
+   
+      <jd>/** Find an address by id */</jd>
       Address findAddress(<jk>int</jk> id);
+   
+      <jd>/** Find a person by address id */</jd>
       Person findPersonWithAddress(<jk>int</jk> id);
+   
+      <jd>/** Remove a person by id */</jd>
+      Person removePerson(<jk>int</jk> id);
    }
       </p>        
       <p>
-         The client side code for invoking this method is shown below...
-      </p>
-      <p class='bcode'>
-   <jc>// Create a RestClient using JSON for serialization, and point to the server-side remoteable servlet.</jc>
-   RestClient client = RestClient.<jsm>create</jsm>()
-      .rootUrl(<js>"https://localhost:9080/juneau/sample/remoteable"</js>)
-      .build();
-   
-   <jc>// Create a proxy interface.</jc>
-   IAddressBook ab = client.getRemoteableProxy(IAddressBook.<jk>class</jk>);
-   
-   <jc>// Invoke a method on the server side and get the returned result.</jc>
-   Person p = ab.createPerson(
-      <jk>new</jk> CreatePerson(<js>"Test Person"</js>,
-         AddressBook.<jsm>toCalendar</jsm>(<js>"Aug 1, 1999"</js>),
-         <jk>new</jk> CreateAddress(<js>"Test street"</js>, <js>"Test city"</js>, <js>"Test state"</js>, 12345, <jk>true</jk>))
-   );
-      </p>
-      <p>
-         The requirements for a method to be callable through the remoteable service are:
+         The requirements for an interface method to be callable through the remoteable service are:
       </p>
       <ul class='spaced-list'>
          <li>
             The method must be public.
          <li>
             The parameter and return types must be <a class='doclink' href='#juneau-marshall.PojoCategories'>serializable and parsable</a>.
+         <li>
+            The method can optionally throw any <code>Throwable</code> that has a public no-arg or single-arg-string constructors.
+            <br>There are automatically recreated on the client side when thrown on the server side.
       </ul>
       <p>
-         Juneau provides the capability of calling methods on POJOs on a server through client-side proxy interfaces.
-         It offers a number of advantages over other similar remote proxy interfaces, such as being much simpler to 
-            define and use, and allowing much more flexibility in the types of objects serialized.
-      </p>
-      <p>
-         The remote proxy interface API allows you to invoke server-side POJO methods on the client side using REST as 
-         the communications protocol:
+         The client side code for invoking this method is shown below...
       </p>
       <p class='bcode'>
-   <jc>// Create a client with basic JSON support.</jc>
-   RestClient client = RestClient.<jsm>create</jsm>().rootUrl(<js>"http://localhost/remoteable"</js>).build();
+   <jc>// Create a RestClient using JSON for serialization, and point to the server-side remoteable servlet.</jc>
+   RestClient client = RestClient.<jsm>create</jsm>()
+      .rootUrl(<js>"http://localhost:10000/remoteable"</js>)
+      .build();
    
-   <jc>// Get an interface proxy.</jc>
+   <jc>// Create a proxy interface.</jc>
    IAddressBook ab = client.getRemoteableProxy(IAddressBook.<jk>class</jk>);
    
    <jc>// Invoke a method on the server side and get the returned result.</jc>
@@ -10843,7 +10843,7 @@
          Under the covers, this method call gets converted to a REST POST.
       </p>
       <p class='bcode'>
-   HTTP POST http://localhost/remoteable/org.apache.juneau.examples.rest.IAddressBook/createPerson
+   HTTP POST http://localhost:10000/remoteable/org.apache.juneau.examples.rest.IAddressBook/createPerson
    Accept: application/json
    Content-Type: application/json
    
@@ -10864,8 +10864,9 @@
    ]
       </p>
       <p>
-         Note that the body of the request is an array.  This array contains the serialized arguments of the method.
-         The object returned by the method is then serialized as the body of the response.
+         Note that the body of the request is an array.  
+         <br>This array contains the serialized arguments of the method.
+         <br>The object returned by the method is then serialized as the body of the response.
       </p>
       <p>
          To define a remoteable interface, simply add the <a href="org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable"><code>@Remoteable</code></a> 
@@ -10873,18 +10874,14 @@
       </p>
       <p class='bcode'>
    <ja>@Remoteable</ja>
-   <jk>public interface</jk> IAddressBook {...}
+   <jk>public interface</jk> MyInterface {...}
       </p>
       <p>
          This annotation tells the framework that all methods defined on this interface can be executed remotely.
-         It can be applied to super-interfaces, super-classes, etc..., and exposes the methods at whatever level it is 
+         <br>It can be applied to super-interfaces, super-classes, etc..., and exposes the methods at whatever level it is 
          defined.  
       </p>
       <p>
-         The <a href="org/apache/juneau/remoteable/RemoteMethod.html" title="annotation in org.apache.juneau.remoteable"><code>@RemoteMethod</code></a> annotation can also be used on individual 
-         methods to tailor which methods are exposed or their paths.
-      </p>
-      <p>
          There are two ways to expose remoteable proxies on the server side:
       </p>
       <ol class='spaced-list'>
@@ -10899,7 +10896,7 @@
       </p>
       <p class='bcode'>
    <ja>@RestResource</ja>(
-      path=<js>"/remote"</js>
+      path=<js>"/remoteable"</js>
    )
    <jk>public class</jk> SampleRemoteableServlet <jk>extends</jk> RemoteableServlet {
    
@@ -10922,7 +10919,7 @@
       <p>
          The <code><ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>)</code> approach is easier if you only have a single 
          interface you want to expose.  
-         You simply define a Java method whose return type is an interface, and return the implementation of that 
+         <br>You simply define a Java method whose return type is an interface, and return the implementation of that 
          interface:
       </p>
       <p class='bcode'>
@@ -10934,37 +10931,17 @@
       </p>
       <p>
          In either case, the proxy communications layer is pure REST.
-         Therefore, in cases where the interface classes are not available on the client side, the same method calls can 
+         <br>Therefore, in cases where the interface classes are not available on the client side, the same method calls can 
          be made through pure REST calls.  
-         This can also aid significantly in debugging, since calls to the remoteable service can be made directly from
+         <br>This can also aid significantly in debugging, since calls to the remoteable service can be made directly from
          a browser with no coding involved.
       </p>
       <p>
          The parameters and return types of the Java methods can be any of the supported <a class='doclink' href='#juneau-marshall.PojoCategories'>serializable and parsable types</a>.
-         This ends up being WAY more flexible than other proxy interfaces since Juneau can handle so may POJO types 
+         <br>This ends up being WAY more flexible than other proxy interfaces since Juneau can handle so may POJO types 
          out-of-the-box.
-         Most of the time you don't even need to modify your existing Java implementation code.
-      </p>
-      <p>
-         The <code>RemoteableServlet</code> class itself shows how sophisticated REST interfaces can be built on the Juneau 
-         RestServlet API using very little code.  
-         The class consists of only 53 lines of code, yet is a sophisticated discoverable and 
-         self-documenting REST interface.  
-         And since the remote proxy API is built on top of REST, it can be debugged using just a browser.
-      </p>
-      <p>
-         The requirements for a method to be callable through a remoteable service are:
+         <br>Most of the time you don't even need to modify your existing Java implementation code.
       </p>
-      <ul class='spaced-list'>
-         <li>
-            The method must be public.
-         <li>
-            The parameter and return types must be <a href='#juneau-marshall.PojoCategories'>serializable and parsable</a>.
-            Parameterized types are supported.
-         <li>
-            Methods can throw <code>Throwables</code> with public no-arg or single-arg-string constructors which will 
-            be automatically recreated on the client side.
-      </ul>
       
       <!-- ======================================================================================================== -->
       <a id="juneau-rest-server.RemoteableProxiesClientSide"></a>
@@ -10976,9 +10953,9 @@
          </p>
          <p>
             It may seem that the client-side code would need to be complex.
-            In reality, it builds upon existing serializing, parsing, and REST capabilities in Juneau resulting in very 
+            <br>In reality, it builds upon existing serializing, parsing, and REST capabilities in Juneau resulting in very 
             little additional code.
-            The entire code for the <code>RestClient.getRemoteableProxy(Class)</code> method is shown below:
+            <br>The entire code for the <code>RestClient.getRemoteableProxy(Class)</code> method is shown below:
          </p>
          <p class='bcode'>
    <jk>public</jk> &lt;T&gt; T getRemoteableProxy(<jk>final</jk> Class&lt;T&gt; interfaceClass) {
@@ -10989,7 +10966,7 @@
             <ja>@Override</ja> <jc>/* InvocationHandler */</jc>
             <jk>public</jk> Object invoke(Object proxy, Method method, Object[] args) {
                <jk>try</jk> {
-                  String uri = <jf>remoteableServletUri</jf> + '/' + interfaceClass.getName() + '/' + ClassUtils.<jsm>getMethodSignature</jsm>(method);
+                  String uri = <jf>remoteableServletUri</jf> + <js>'/'</js> + interfaceClass.getName() + <js>'/'</js> + ClassUtils.<jsm>getMethodSignature</jsm>(method);
                   <jk>return</jk> doPost(uri, args).getResponse(method.getReturnType());
                } <jk>catch</jk> (Exception e) {
                   <jk>throw new</jk> RuntimeException(e);
@@ -11000,7 +10977,7 @@
          </p>
          <p>
             Since we build upon the existing <code>RestClient</code> API, we inherit all of it's features.
-            For example, convenience methods for setting POJO filters and properties to customize the behavior of the 
+            <br>For example, convenience methods for setting POJO filters and properties to customize the behavior of the 
             serializers and parsers, and the ability to provide your own customized Apache <code>HttpClient</code> for 
             handling various scenarios involving authentication and Internet proxies.
          </p>
@@ -11016,13 +10993,13 @@
          <p>
             The <a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.rest.remoteable"><code>RemoteableServlet</code></a> class is an implementation of 
             <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> that provides a REST interface for invoking calls on POJOs.
-            The <code>RemoteableServlet</code> class is abstract and must implement a single method for providing the set 
+            <br>The <code>RemoteableServlet</code> class is abstract and must implement a single method for providing the set 
             of POJOs to expose as remote interfaces.  
          </p>
          <p>
             The samples bundle includes a sample implementation of a remoteable service that can be used to interact with 
             the address book POJO also included in the bundle.  
-            The method that must be implemented is <a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html#getServiceMap--"><code>RemoteableServlet.getServiceMap()</code></a>
+            <br>The method that must be implemented is <a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html#getServiceMap--"><code>RemoteableServlet.getServiceMap()</code></a>
             that simply returns a mapping of Java interfaces (or classes) to POJO instances.
          </p>
          <p class='bcode'>
@@ -11049,27 +11026,31 @@
          </p>
          <p>
             Since this class is a servlet, and can be deployed as such.  
-            In the sample code, it's listed as a child resource to <code>org.apache.juneau.rest.samples.RootResources</code>
-               which makes it available under the URL <code>/juneau/sample/remoteable</code>.
+            <br>In the sample code, it's listed as a child resource to <code>org.apache.juneau.rest.samples.RootResources</code>
+               which makes it available under the URL <code>/sample/remoteable</code>.
          </p>
          <p>
             If you point your browser to that URL, you get a list of available interfaces:
          </p>
-         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.1.png">
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.1.png" style='width:800px;'>
          <p>
             Clicking the hyperlinks on each shows you the list of methods that can be invoked on that service.
-            Note that the <code>IAddressBook</code> link shows that you can only invoke methods defined on that
+            <br>Note that the <code>IAddressBook</code> link shows that you can only invoke methods defined on that
             interface, whereas the <code>AddressBook</code> link shows ALL public methods defined on that class.
+         </p>
+         <h5 class='figure'>IAddressBook</h5>
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.2.png" style='width:800px;'>
+         <p>
             Since <code>AddressBook</code> extends from <code>LinkedList</code>, you may notice familiar collections
             framework methods listed.
          </p>
-         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.2.png">
-         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.3.png">
+         <h5 class='figure'>AddressBook</h5>
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.3.png" style='width:800px;'>
          <p>
             Let's see how we can interact with this interface through nothing more than REST calls to get a better idea on 
             how this works.
-            We'll use the same method call as in the introduction.
-            First, we need to create the serialized form of the arguments:
+            <br>We'll use the same method call as in the introduction.
+            <br>First, we need to create the serialized form of the arguments:
          </p>
    <p class='bcode'>
    Object[] args = <jk>new</jk> Object[] {
@@ -11102,57 +11083,80 @@
          </p>
          <p>
             Note that in this example we're using JSON.  
-            However, various other content types can also be used such as XML, URL-Encoding, UON, or HTML.  
-            In practice however, JSON will preferred since it is often the most efficient.
+            <br>However, various other content types can also be used such as XML, URL-Encoding, UON, or HTML.  
+            <br>In practice however, JSON will preferred since it is often the most efficient.
          </p>
          <p>
             Next, we can use a tool such as Poster to make the REST call.
-            Methods are invoked by POSTing the serialized object array to the URI of the interface method.
-            In this case, we want to POST our JSON to <code>/juneau/sample/remoteable/org.apache.juneau.examples.addressbook.IAddressBook/createPerson(org.apache.juneau.examples.addressbook.CreatePerson)</code>.
-            Make sure that we specify the <code>Content-Type</code> of the body as <code>text/json</code>.
-            We also want the results to be returned as JSON, so we set the <code>Accept</code> header to 
+            <br>Methods are invoked by POSTing the serialized object array to the URI of the interface method.
+            In this case, we want to POST our JSON to the following URL:
+         </p>
+         <p class='bcode'>
+   http://localhost:10000/remoteable/org.apache.juneau.examples.addressbook.IAddressBook/createPerson(org.apache.juneau.examples.addressbook.CreatePerson)
+         </p>
+         <p>
+            <br>Make sure that we specify the <code>Content-Type</code> of the body as <code>text/json</code>.
+            <br>We also want the results to be returned as JSON, so we set the <code>Accept</code> header to 
             <code>text/json</code> as well.
          </p>
-         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.4.png">
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.4.png" style='width:400px;'>
          <p>
             When we execute the POST, we should see the following successful response whose body contains the returned 
             <code>Person</code> bean serialized to JSON:
          </p>
-         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.5.png">
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.5.png" style='width:400px;'>
          <p>
             From there, we could use the following code snippet to reconstruct the response object from JSON:
          </p>
          <p class='bcode'>
-            String response = <js>"<i>output from above</i>"</js>;
-            Person p = JsonParser.<jsf>DEFAULT</jsf>.parse(response, Person.<jk>class</jk>);
+   String response = <js>"<i>output from above</i>"</js>;
+   Person p = JsonParser.<jsf>DEFAULT</jsf>.parse(response, Person.<jk>class</jk>);
          </p>
          <p>
             If we alter our servlet to allow overloaded GET requests, we can invoke methods using nothing more than a 
             browser...
          </p>
          <p class='bcode'>
-         <ja>@RestResource</ja>(
-            path=<js>"/remoteable"</js>,
-            
-            <jc>// Allow us to use method=POST from a browser.</jc>
-            allowedMethodParams=<js>"*"</js>
-         )
-         <jk>public class</jk> SampleRemoteableServlet <jk>extends</jk> RemoteableServlet {
+   <ja>@RestResource</ja>(
+      path=<js>"/remoteable"</js>,
+      
+      <jc>// Allow us to use method=POST from a browser.</jc>
+      allowedMethodParams=<js>"*"</js>
+   )
+   <jk>public class</jk> SampleRemoteableServlet <jk>extends</jk> RemoteableServlet {
          </p>
          <p>
-            For example, here we call the <code>findPerson(<jk>int</jk>)</code> method to retrieve a person and get the 
+            For example, to invoke the <code>getPeople()</code> method on our bean:
+         </p>
+         <p class='bcode'>
+   http://localhost:10000/remoteable/org.apache.juneau.examples.addressbook.IAddressBook/getPeople?method=POST
+         </p>        
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.6.png" style='width:800px;'>
+         <p>
+            Here we call the <code>findPerson(<jk>int</jk>)</code> method to retrieve a person and get the 
             returned POJO (in this case as HTML since that's what's in the <code>Accept</code> header when calling from a 
             browser):
          </p>
-         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.6.png">
+         <p class='bcode'>
+   http://localhost:10000/remoteable/org.apache.juneau.examples.addressbook.IAddressBook/findPerson(int)?method=POST&amp;body=@(3)
+         </p>        
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.7.png" style='width:800px;'>
          <p>
-            When specifying the POST body as a <code>&amp;content</code> parameter, the method arguments should be in UON 
+            When specifying the POST body as a <code>&amp;body</code> parameter, the method arguments should be in UON 
             notation.
-            See <a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon"><code>UonSerializer</code></a> for more information about this encoding.
-            Usually you can also pass in JSON if you specify <code>&amp;Content-Type=text/json</code> in the URL parameters
+            <br>See <a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon"><code>UonSerializer</code></a> for more information about this encoding.
+            <br>Usually you can also pass in JSON if you specify <code>&amp;Content-Type=text/json</code> in the URL parameters
             but passing in unencoded JSON in a URL may not work in all browsers.  
-            Therefore, UON is preferred.
+            <br>Therefore, UON is preferred.
+         </p>
+         <p>
+            The hyperlinks on the method names above lead you to a simple form-entry page where you can test
+            passing parameters in UON notation as URL-encoded form posts.
          </p>
+         <h5 class='figure'>Sample form entry page</h5>
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.8.png" style='width:800px;'>
+         <h5 class='figure'>Sample form entry page results</h5>
+         <img class='bordered' src="doc-files/juneau-rest-server.RemoteableProxiesServerSide.9.png" style='width:800px;'>
       </div>
 
       <!-- ======================================================================================================== -->
@@ -11163,45 +11167,45 @@
          <p>
             What if you want fine-tuned control over which methods are exposed in an interface instead of just all public 
             methods?
-            For this, the <a href="org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable"><code>@Remoteable</code></a> annotation is provided.
-            It can be applied to individual interface methods to only expose those methods through the remoteable servlet.
+            <br>For this, the <a href="org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable"><code>@Remoteable</code></a> annotation is provided.
+            <br>It can be applied to individual interface methods to only expose those methods through the remoteable servlet.
          </p>
          <p>
             For example, to expose only the first 2 methods in our <code>IAddressBook</code> interface...
          </p>
          <p class='bcode'>
-         <jk>public interface</jk> IAddressBook {
-            <ja>@Remoteable</ja> Person createPerson(CreatePerson cp) <jk>throws</jk> Exception;
-            <ja>@Remoteable</ja> Person findPerson(<jk>int</jk> id);
-            Address findAddress(<jk>int</jk> id);
-            Person findPersonWithAddress(<jk>int</jk> id);
-         }
+   <jk>public interface</jk> IAddressBook {
+      <ja>@Remoteable</ja> Person createPerson(CreatePerson cp) <jk>throws</jk> Exception;
+      <ja>@Remoteable</ja> Person findPerson(<jk>int</jk> id);
+      Address findAddress(<jk>int</jk> id);
+      Person findPersonWithAddress(<jk>int</jk> id);
+   }
          </p>  
          <p>
             On the server side, the option to restrict access to only annotated methods is defined through a property:
          </p>
          <p class='bcode'>
-         <ja>@RestResource</ja>(
-            path=<js>"/remoteable"</js>,
-            properties={
-               <jc>// Only expose methods annotated with @Remoteable.</jc>
-               <ja>@Property</ja>(name=<jsf>REMOTEABLE_includeOnlyRemotableMethods</jsf>, value=<js>"true"</js>)
-            }
-         )
-         <jk>public class</jk> SampleRemoteableServlet <jk>extends</jk> RemoteableServlet {
+   <ja>@RestResource</ja>(
+      path=<js>"/remoteable"</js>,
+      properties={
+         <jc>// Only expose methods annotated with @Remoteable.</jc>
+         <ja>@Property</ja>(name=<jsf>REMOTEABLE_includeOnlyRemotableMethods</jsf>, value=<js>"true"</js>)
+      }
+   )
+   <jk>public class</jk> SampleRemoteableServlet <jk>extends</jk> RemoteableServlet {
          </p>
          <p>
             The <ja>@Remoteable</ja> annotation can also be applied to the interface class to expose all public methods 
             defined on that interface.
          </p>
          <p class='bcode'>
-         <ja>@Remoteable</ja>
-         <jk>public interface</jk> IAddressBook {
-            Person createPerson(CreatePerson cp) <jk>throws</jk> Exception;
-            Person findPerson(<jk>int</jk> id);
-            Address findAddress(<jk>int</jk> id);
-            Person findPersonWithAddress(<jk>int</jk> id);
-         }
+   <ja>@Remoteable</ja>
+   <jk>public interface</jk> IAddressBook {
+      Person createPerson(CreatePerson cp) <jk>throws</jk> Exception;
+      Person findPerson(<jk>int</jk> id);
+      Address findAddress(<jk>int</jk> id);
+      Person findPersonWithAddress(<jk>int</jk> id);
+   }
          </p>  
       </div>
    </div>   
@@ -11444,18 +11448,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-rest-server-jaxrs<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-rest-server-jaxrs-7.0.0.jar 
+   juneau-rest-server-jaxrs-7.1.0.jar 
    </p>  
    
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.rest.server_7.0.0.jar 
+   org.apache.juneau.rest.server_7.1.0.jar 
    </p>  
    
    <p>
@@ -11542,18 +11546,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-rest-client<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-rest-client-7.0.0.jar 
+   juneau-rest-client-7.1.0.jar 
    </p>  
    
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.rest.client_7.0.0.jar 
+   org.apache.juneau.rest.client_7.1.0.jar 
    </p>  
 
    <p>
@@ -11561,7 +11565,7 @@
       and output to and from POJOs using any of the provided serializers and parsers.
    </p>
    <p>
-      Built upon the <l>Apache HttpClient</l> libraries, it extends that API and provides specialized APIs for working with 
+      Built upon the Apache HttpClient libraries, it extends that API and provides specialized APIs for working with 
       REST interfaces while maintaining all the functionality available in the HttpClient API.
    </p>
    <p class='bcode'>
@@ -11569,7 +11573,7 @@
    <jk>try</jk> (RestClient client = RestClient.<jsm>create</jsm>().build()) {
    
       <jc>// The address of the root resource.</jc>
-      String url = <js>"http://localhost:9080/sample/addressBook"</js>;
+      String url = <js>"http://localhost:10000/addressBook"</js>;
       
       <jc>// Do a REST GET against a remote REST interface and convert
       // the response to an unstructured ObjectMap object.</jc>
@@ -11631,7 +11635,7 @@
    
       <jc>// GET request, ignoring output</jc>
       <jk>try</jk> {
-         <jk>int</jk> rc = client.doGet(<js>"http://localhost:9080/sample/addressBook"</js>).run();
+         <jk>int</jk> rc = client.doGet(<js>"http://localhost:10000/addressBook"</js>).run();
          <jc>// Succeeded!</jc>
       } <jk>catch</jk> (RestCallException e) {
          <jc>// Failed!</jc>
@@ -11648,70 +11652,70 @@
       <jc>// GET request, getting output as a String.  No POJO parsing is performed.
       // Note that when calling one of the getX() methods, you don't need to call connect() or disconnect(), since
       // it's automatically called for you.</jc>
-      String output = client.doGet(<js>"http://localhost:9080/sample/addressBook"</js>)
+      String output = client.doGet(<js>"http://localhost:10000/addressBook"</js>)
          .getResponseAsString();
             
       <jc>// GET request, getting output as a Reader</jc>
-      Reader r = client.doGet(<js>"http://localhost:9080/sample/addressBook"</js>)
+      Reader r = client.doGet(<js>"http://localhost:10000/addressBook"</js>)
          .getReader();
             
       <jc>// GET request, getting output as an untyped map</jc>
       <jc>// Input must be an object (e.g. "{...}")</jc>
-      ObjectMap m = client.doGet(<js>"http://localhost:9080/sample/addressBook/0"</js>)
+      ObjectMap m = client.doGet(<js>"http://localhost:10000/addressBook/0"</js>)
          .getResponse(ObjectMap.<jk>class</jk>);
             
       <jc>// GET request, getting output as an untyped list</jc>
       <jc>// Input must be an array (e.g. "[...]")</jc>
-      ObjectList l = client.doGet(<js>"http://localhost:9080/sample/addressBook"</js>)
+      ObjectList l = client.doGet(<js>"http://localhost:10000/addressBook"</js>)
          .getResponse(ObjectList.<jk>class</jk>);
             
       <jc>// GET request, getting output as a parsed bean</jc>
       <jc>// Input must be an object (e.g. "{...}")</jc>
       <jc>// Note that you don't have to do any casting!</jc>
-      Person p = client.doGet(<js>"http://localhost:9080/sample/addressBook/0"</js>)
+      Person p = client.doGet(<js>"http://localhost:10000/addressBook/0"</js>)
          .getResponse(Person.<jk>class</jk>);
             
       <jc>// GET request, getting output as a parsed bean</jc>
       <jc>// Input must be an array of objects (e.g. "[{...},{...}]")</jc>
-      Person[] pa = client.doGet(<js>"http://localhost:9080/sample/addressBook"</js>)
+      Person[] pa = client.doGet(<js>"http://localhost:10000/addressBook"</js>)
          .getResponse(Person[].<jk>class</jk>);
             
       <jc>// Same as above, except as a List&lt;Person&gt;</jc>
-      List&lt;Person&gt; pl = client.doGet(<js>"http://localhost:9080/sample/addressBook"</js>)
+      List&lt;Person&gt; pl = client.doGet(<js>"http://localhost:10000/addressBook"</js>)
          .getResponse(List.<jk>class</jk>, Person.<jk>class</jk>);
             
       <jc>// GET request, getting output as a parsed string</jc>
       <jc>// Input must be a string (e.g. "&lt;string&gt;foo&lt;/string&gt;" or "'foo'")</jc>
-      String name = client.doGet(<js>"http://localhost:9080/sample/addressBook/0/name"</js>)
+      String name = client.doGet(<js>"http://localhost:10000/addressBook/0/name"</js>)
          .getResponse(String.<jk>class</jk>);
             
       <jc>// GET request, getting output as a parsed number</jc>
       <jc>// Input must be a number (e.g. "&lt;number&gt;123&lt;/number&gt;" or "123")</jc>
-      <jk>int</jk> age = client.doGet(<js>"http://localhost:9080/sample/addressBook/0/age"</js>)
+      <jk>int</jk> age = client.doGet(<js>"http://localhost:10000/addressBook/0/age"</js>)
          .getResponse(Integer.<jk>class</jk>);
             
       <jc>// GET request, getting output as a parsed boolean</jc>
       <jc>// Input must be a boolean (e.g. "&lt;boolean&gt;true&lt;/boolean&gt;" or "true")</jc>
-      <jk>boolean</jk> isCurrent = client.doGet(<js>"http://localhost:9080/sample/addressBook/0/addresses/0/isCurrent"</js>)
+      <jk>boolean</jk> isCurrent = client.doGet(<js>"http://localhost:10000/addressBook/0/addresses/0/isCurrent"</js>)
          .getResponse(Boolean.<jk>class</jk>);
    }
             
    <jc>// GET request, getting a filtered object</jc>
    <jk>try</jk> (RestClient client = RestClient.<jsm>create</jsm>().pojoSwaps(CalendarSwap.<jsf>ISO8601</jsf>.<jk>class</jk>).build()) {
-      Calendar birthDate = client.doGet(<js>"http://localhost:9080/sample/addressBook/0/birthDate"</js>)
+      Calendar birthDate = client.doGet(<js>"http://localhost:10000/addressBook/0/birthDate"</js>)
          .getResponse(GregorianCalendar.<jk>class</jk>);
    
       <jc>// PUT request on regular field</jc>
       String newName = <js>"John Smith"</js>;
-      <jk>int</jk> rc = client.doPut(<js>"http://localhost:9080/addressBook/0/name"</js>, newName).run();
+      <jk>int</jk> rc = client.doPut(<js>"http://localhost:10000/addressBook/0/name"</js>, newName).run();
       
       <jc>// PUT request on filtered field</jc>
       Calendar newBirthDate = <jk>new</jk> GregorianCalendar(1, 2, 3, 4, 5, 6);
-      rc = client.doPut(<js>"http://localhost:9080/sample/addressBook/0/birthDate"</js>, newBirthDate).run();
+      rc = client.doPut(<js>"http://localhost:10000/addressBook/0/birthDate"</js>, newBirthDate).run();
       
       <jc>// POST of a new entry to a list</jc>
       Address newAddress = <jk>new</jk> Address(<js>"101 Main St"</js>, <js>"Anywhere"</js>, <js>"NY"</js>, 12121, <jk>false</jk>);
-      rc = client.doPost(<js>"http://localhost:9080/addressBook/0/addresses"</js>, newAddress).run(); 
+      rc = client.doPost(<js>"http://localhost:10000/addressBook/0/addresses"</js>, newAddress).run();   
    }
    </p>
    
@@ -12495,69 +12499,8 @@
    </div>
    
    <!-- ======================================================================================================= -->
-   <a id="juneau-rest-client.Remoteable"></a>
-   <h3 class='topic' onclick='toggle(this)'>9.9 - Remoteable Proxies</h3>
-   <div class='topic'>
-      <p>
-         Juneau provides the capability of calling methods on POJOs on a server through client-side proxy interfaces.
-         <br>It offers a number of advantages over other similar remote proxy interfaces, such as being much simpler to 
-         use and allowing much more flexibility.
-      </p>
-      <p>
-         Proxy interfaces are retrieved using the <a href="org/apache/juneau/rest/client/RestClient.html#getRemoteableProxy-java.lang.Class-"><code>RestClient.getRemoteableProxy(Class)</code></a> 
-         <br>method.
-         The remoteable servlet is a specialized subclass of <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> that 
-         provides a full-blown REST interface for calling interfaces remotely. 
-      </p>
-      <p>
-         In this example, we have the following interface defined that we want to call from the client side against
-         a POJO on the server side (i.e. a Remoteable Service)...
-      </p>
-      <p class='bcode'>
-   <jk>public interface</jk> IAddressBook {
-      Person createPerson(CreatePerson cp) <jk>throws</jk> Exception;
-   }
-      </p>        
-      <p>
-         The client side code for invoking this method is shown below...
-      </p>
-      <p class='bcode'>
-   <jc>// Create a RestClient using JSON for serialization, and point to the server-side remoteable servlet.</jc>
-   RestClient client = RestClient.<jsm>create</jsm>()
-      .rootUrl(<js>"https://localhost:9080/juneau/sample/remoteable"</js>)
-      .build();
-   
-   <jc>// Create a proxy interface.</jc>
-   IAddressBook ab = client.getRemoteableProxy(IAddressBook.<jk>class</jk>);
-   
-   <jc>// Invoke a method on the server side and get the returned result.</jc>
-   Person p = ab.createPerson(
-      <jk>new</jk> CreatePerson(<js>"Test Person"</js>,
-         AddressBook.<jsm>toCalendar</jsm>(<js>"Aug 1, 1999"</js>),
-         <jk>new</jk> CreateAddress(<js>"Test street"</js>, <js>"Test city"</js>, <js>"Test state"</js>, 12345, <jk>true</jk>))
-   );
-      </p>
-      <p>
-         The requirements for a method to be callable through a remoteable service are:
-      </p>
-      <ul class='spaced-list'>
-         <li>
-            The method must be public.
-         <li>
-            The parameter and return types must be <a class='doclink' href='#juneau-marshall.PojoCategories'>serializable and parsable</a>.
-      </ul>
-      <p>
-         One significant feature is that the remoteable services servlet is a full-blown REST interface.  
-         <br>Therefore, in cases where the interface classes are not available on the client side, the same method calls 
-         can be made through pure REST calls.  
-         <br>This can also aid significantly in debugging since calls to the remoteable service can be called directly 
-         from a browser with no code involved.
-      </p>
-   </div>
-   
-   <!-- ======================================================================================================= -->
    <a id="juneau-rest-client.Other"></a>
-   <h3 class='topic' onclick='toggle(this)'>9.10 - Other Useful Methods</h3>
+   <h3 class='topic' onclick='toggle(this)'>9.9 - Other Useful Methods</h3>
    <div class='topic'>
       <p>
          The <a href="org/apache/juneau/rest/client/RestClientBuilder.html#rootUrl-java.lang.Object-"><code>RestClientBuilder.rootUrl(Object)</code></a> method can be used to specify a 
@@ -12608,18 +12551,18 @@
    <xt>&lt;dependency&gt;</xt>
       <xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
       <xt>&lt;artifactId&gt;</xt>juneau-microservice-server<xt>&lt;/artifactId&gt;</xt>
-      <xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
+      <xt>&lt;version&gt;</xt>7.1.0<xt>&lt;/version&gt;</xt>
    <xt>&lt;/dependency&gt;</xt>
    </p>  
    
    <h5 class='figure'>Java Library</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-microservice-server-7.0.0.jar 
+   juneau-microservice-server-7.1.0.jar 
    </p>  
 
    <h5 class='figure'>OSGi Module</h5>
    <p class='bcode' style='width:500px;'>
-   org.apache.juneau.microservice.server_7.0.0.jar 
+   org.apache.juneau.microservice.server_7.1.0.jar 
    </p>  
 
    <h5 class='figure'>Microservice Starter Project</h5>
@@ -12928,7 +12871,7 @@
             Now open your browser and point to <l>http://localhost:10000</l>.  
             You should see the following:
          </p>
-         <img class='bordered' src="doc-files/MicroserviceServer.Running.6.png" style='width:800px;'>
+         <img class='bordered' src="doc-files/juneau-microservice-server.Running.1.png" style='width:400px;'>
          <p>
             You have started a REST interface on port 10000.
             <br>You can enter the command <code>exit</code> to shut it down.
@@ -13433,7 +13376,7 @@
 
    <h5 class='figure'>Archive File</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-examples-core-7.0.0.zip 
+   juneau-examples-core-7.1.0.zip 
    </p>  
    
    <p>
@@ -13441,12 +13384,12 @@
    </p>
    <p>
       The project project can be loaded into your workspace by importing the 
-      <code>juneau-examples-core-7.0.0.zip</code> file. 
+      <code>juneau-examples-core-7.1.0.zip</code> file. 
    </p>
    
    <h5 class='topic'>Instructions on how to install juneau-examples-core project</h5>
    <p>
-      Download the <code>juneau-examples-core-7.0.0.zip</code> file from the downloads page
+      Download the <code>juneau-examples-core-7.1.0.zip</code> file from the downloads page
       (located in the binaries) and import it into your workspace as an existing project:
    </p>
    <img class='bordered' src='doc-files/juneau-examples-core.1.png' style='width:512px'>
@@ -13472,7 +13415,7 @@
 
    <h5 class='figure'>Archive File</h5>
    <p class='bcode' style='width:500px;'>
-   juneau-examples-rest-7.0.0.zip 
+   juneau-examples-rest-7.1.0.zip 
    </p>  
 
    <p>
@@ -13486,7 +13429,7 @@
    
    <h5 class='topic'>Instructions on how to install juneau-examples-rest project</h5>
    <p>
-      Download the <code>juneau-examples-rest-7.0.0.zip</code> file from the downloads page
+      Download the <code>juneau-examples-rest-7.1.0.zip</code> file from the downloads page
       (located in the binaries) and import it into your workspace as an existing project:
    </p>
    <img class='bordered' src='doc-files/juneau-examples-rest.1.png' style='width:524px'>
@@ -16842,7 +16785,6 @@
          RDF, you may want to consider lowering the max-input value above.
       </p>
    </div>
-
 </div>
 
 <!-- =============================================================================================================== -->
@@ -16932,17 +16874,13 @@
       <p>
          TBD
       </p>
-
-
-      <h5 class='topic'>juneau-microservice</h5>
+      
+      <h5 class='topic'>juneau-server</h5>
       <ul class='spaced-list'>
          <li>
-            <code>Resource</code> and <code>ResourceGroup</code> classes removed.
-            <br><a href="org/apache/juneau/rest/BasicRestServlet.html" title="class in org.apache.juneau.rest"><code>BasicRestServlet</code></a> and <a href="org/apache/juneau/rest/BasicRestServletGroup.html" title="class in org.apache.juneau.rest"><code>BasicRestServletGroup</code></a> can be used instead.
+            Fixed bug in <code>UriResolver</code> when request path info had special characters.
          <li>
-            <code>ResourceJena</code> and <code>ResourceJenaGroup</code> classes rename to
-            <a href="org/apache/juneau/microservice/BasicRestServletJena.html" title="class in org.apache.juneau.microservice"><code>BasicRestServletJena</code></a> and <a href="org/apache/juneau/microservice/BasicRestServletJenaGroup.html" title="class in org.apache.juneau.microservice"><code>BasicRestServletJenaGroup</code></a> can be used instead.
-            
+            <a href="org/apache/juneau/rest/remoteable/RemoteableServlet.html" title="class in org.apache.juneau.rest.remoteable"><code>RemoteableServlet</code></a> now provides a form page for invoking remoteable methods in a browser.
       </ul>
    </div>
    
@@ -17381,38 +17319,15 @@
             <a href="org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client"><code>RestCall</code></a> and <a href="org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client"><code>RestClient</code></a>
             now implement the <code>Closeable</code> interface.
       </ul>
-
-      <h5 class='topic'>Documentation</h5>
+      
+      <h5 class='topic'>juneau-microservice</h5>
       <ul class='spaced-list'>
          <li>
-            New and updated sections in overview document:
-            <ul>
-               <li><p><a class='doclink' href='#juneau-marshall.PojoSwaps'>PojoSwaps</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.PerMediaTypePojoSwaps'>Per-media-type PojoSwaps</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.OneWayPojoSwaps'>One-way PojoSwaps</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.SwapAnnotation'>@Swap Annotation</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.SwapMethods'>Swap Methods</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.SurrogateClasses'>Surrogate Classes</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.BeanAnnotation'>@Bean Annotation</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.BeanPropertyAnnotation'>@BeanProperty Annotation</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.BeanConstructorAnnotation'>@BeanConstructor Annotation</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.BeanIgnoreAnnotation'>@BeanIgnore Annotation</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.NamePropertyAnnotation'>@NameProperty Annotation</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.ParentPropertyAnnotation'>@ParentProperty Annotation</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.URIs'>URIs</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.BeanFilters'>BeanFilters</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.StopClasses'>Stop Classes</a></p>
-               <li><p><a class='doclink' href='#juneau-marshall.BypassSerialization'>Bypass Serialization</a></p>
-            </ul>    
+            <code>Resource</code> and <code>ResourceGroup</code> classes removed.
+            <br><a href="org/apache/juneau/rest/BasicRestServlet.html" title="class in org.apache.juneau.rest"><code>BasicRestServlet</code></a> and <a href="org/apache/juneau/rest/BasicRestServletGroup.html" title="class in org.apache.juneau.rest"><code>BasicRestServletGroup</code></a> can be used instead.
          <li>
-            Updated javadocs:
-            <ul>
-               <li><a href="org/apache/juneau/BeanContext.html" title="class in org.apache.juneau"><code>BeanContext</code></a>
-               <li><a href="org/apache/juneau/BeanContextBuilder.html" title="class in org.apache.juneau"><code>BeanContextBuilder</code></a>
-               <li><a href="org/apache/juneau/rest/RestContext.html" title="class in org.apache.juneau.rest"><code>RestContext</code></a>
-               <li><a href="org/apache/juneau/rest/RestContextBuilder.html" title="class in org.apache.juneau.rest"><code>RestContextBuilder</code></a>
-               <li>Swagger DTOs.
-            </ul>    
+            <code>ResourceJena</code> and <code>ResourceJenaGroup</code> classes renamed to
+            <a href="org/apache/juneau/microservice/BasicRestServletJena.html" title="class in org.apache.juneau.microservice"><code>BasicRestServletJena</code></a> and <a href="org/apache/juneau/microservice/BasicRestServletJenaGroup.html" title="class in org.apache.juneau.microservice"><code>BasicRestServletJenaGroup</code></a>.
       </ul>
    </div>
 
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 7956621..825e1ed 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -254,6 +254,7 @@
 <li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">ArrayUtils</span></a></li>
 <li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiMap.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiMap</span></a></li>
 <li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiSet</span></a></li>
+<li type="circle">org.apache.juneau.internal.<a href="org/apache/juneau/internal/AsciiSet.Builder.html" title="class in org.apache.juneau.internal"><span class="typeNameLink">AsciiSet.Builder</span></a></li>
 <li type="circle">org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom"><span class="typeNameLink">AtomBuilder</span></a></li>
 <li type="circle">org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">BaseProvider</span></a> (implements javax.ws.rs.ext.MessageBodyReader&lt;T&gt;, javax.ws.rs.ext.MessageBodyWriter&lt;T&gt;)
 <ul>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigEntry.html b/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigEntry.html
index de9b74f..f69f61d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigEntry.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigEntry.html
@@ -41,7 +41,7 @@
 <span class="sourceLineNo">033</span>   <a name="line.33"></a>
 <span class="sourceLineNo">034</span>   static final ConfigEntry NULL = new ConfigEntry(null, null, null, null, null);<a name="line.34"></a>
 <span class="sourceLineNo">035</span>   <a name="line.35"></a>
-<span class="sourceLineNo">036</span>   private final static AsciiSet MOD_CHARS = new AsciiSet("#$%&amp;*+^@~");<a name="line.36"></a>
+<span class="sourceLineNo">036</span>   private final static AsciiSet MOD_CHARS = AsciiSet.create("#$%&amp;*+^@~");<a name="line.36"></a>
 <span class="sourceLineNo">037</span><a name="line.37"></a>
 <span class="sourceLineNo">038</span>   ConfigEntry(String line, List&lt;String&gt; preLines) {<a name="line.38"></a>
 <span class="sourceLineNo">039</span>      this.rawLine = line;<a name="line.39"></a>
@@ -172,7 +172,7 @@
 <span class="sourceLineNo">164</span>      return w;<a name="line.164"></a>
 <span class="sourceLineNo">165</span>   }<a name="line.165"></a>
 <span class="sourceLineNo">166</span>   <a name="line.166"></a>
-<span class="sourceLineNo">167</span>   private static final AsciiSet REPLACE_CHARS = new AsciiSet("\\#");<a name="line.167"></a>
+<span class="sourceLineNo">167</span>   private static final AsciiSet REPLACE_CHARS = AsciiSet.create("\\#");<a name="line.167"></a>
 <span class="sourceLineNo">168</span>}<a name="line.168"></a>
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigMap.html b/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigMap.html
index bb152bc..1126ee6 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigMap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/config/internal/ConfigMap.html
@@ -42,7 +42,7 @@
 <span class="sourceLineNo">034</span>   private volatile String contents;        // The original contents of this object.<a name="line.34"></a>
 <span class="sourceLineNo">035</span>   private final String name;               // The name  of this object.<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>   private final static AsciiSet MOD_CHARS = new AsciiSet("#$%&amp;*+^@~");<a name="line.37"></a>
+<span class="sourceLineNo">037</span>   private final static AsciiSet MOD_CHARS = AsciiSet.create("#$%&amp;*+^@~");<a name="line.37"></a>
 <span class="sourceLineNo">038</span>   <a name="line.38"></a>
 <span class="sourceLineNo">039</span>   // Changes that have been applied since the last load.<a name="line.39"></a>
 <span class="sourceLineNo">040</span>   private final List&lt;ConfigEvent&gt; changes = Collections.synchronizedList(new ArrayList&lt;ConfigEvent&gt;());<a name="line.40"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/AsciiSet.Builder.html b/content/site/apidocs/src-html/org/apache/juneau/internal/AsciiSet.Builder.html
new file mode 100644
index 0000000..c81bd2c
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/AsciiSet.Builder.html
@@ -0,0 +1,235 @@
+<!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.internal;<a name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import java.util.Arrays;<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> * Stores a set of ASCII characters for quick lookup.<a name="line.18"></a>
+<span class="sourceLineNo">019</span> */<a name="line.19"></a>
+<span class="sourceLineNo">020</span>public final class AsciiSet {<a name="line.20"></a>
+<span class="sourceLineNo">021</span>   private final boolean[] store;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>   AsciiSet(boolean[] store) {<a name="line.23"></a>
+<span class="sourceLineNo">024</span>      this.store = Arrays.copyOf(store, store.length);<a name="line.24"></a>
+<span class="sourceLineNo">025</span>   }<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>    * Creates an ASCII set with the specified characters.<a name="line.28"></a>
+<span class="sourceLineNo">029</span>    * <a name="line.29"></a>
+<span class="sourceLineNo">030</span>    * @param chars The characters to keep in this store.<a name="line.30"></a>
+<span class="sourceLineNo">031</span>    * @return A new object.<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    */<a name="line.32"></a>
+<span class="sourceLineNo">033</span>   public static AsciiSet create(String chars) {<a name="line.33"></a>
+<span class="sourceLineNo">034</span>      return new Builder().chars(chars).build();<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>   /**<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    * Creates a builder for an ASCII set.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    * <a name="line.39"></a>
+<span class="sourceLineNo">040</span>    * @return A new builder.<a name="line.40"></a>
+<span class="sourceLineNo">041</span>    */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   public static AsciiSet.Builder create() {<a name="line.42"></a>
+<span class="sourceLineNo">043</span>      return new Builder();<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   }<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>   /**<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    * Builder class for {@link AsciiSet} objects.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   public static class Builder {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      final boolean[] store = new boolean[128];<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      <a name="line.51"></a>
+<span class="sourceLineNo">052</span>      /**<a name="line.52"></a>
+<span class="sourceLineNo">053</span>       * Adds a range of characters to this set.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>       * <a name="line.54"></a>
+<span class="sourceLineNo">055</span>       * @param start The start character.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>       * @param end The end character.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>       * @return This object (for method chaining).<a name="line.57"></a>
+<span class="sourceLineNo">058</span>       */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      public AsciiSet.Builder range(char start, char end) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>         for (char c = start; c &lt;= end; c++)<a name="line.60"></a>
+<span class="sourceLineNo">061</span>            if (c &lt; 128)<a name="line.61"></a>
+<span class="sourceLineNo">062</span>               store[c] = true;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>         return this;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      }<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>       * Shortcut for calling multiple ranges.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>       * <a name="line.68"></a>
+<span class="sourceLineNo">069</span>       * @param s Strings of the form "A-Z" where A and Z represent the first and last characters in the range.<a name="line.69"></a>
+<span class="sourceLineNo">070</span>       * @return This object (for method chaining).<a name="line.70"></a>
+<span class="sourceLineNo">071</span>       */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      public AsciiSet.Builder ranges(String...s) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         for (String ss : s) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>            if (ss.length() != 3 || ss.charAt(1) != '-')<a name="line.74"></a>
+<span class="sourceLineNo">075</span>               throw new RuntimeException("Value passed to ranges() must be 3 characters");<a name="line.75"></a>
+<span class="sourceLineNo">076</span>            range(ss.charAt(0), ss.charAt(2));<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         }<a name="line.77"></a>
+<span class="sourceLineNo">078</span>         return this;<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 name="line.81"></a>
+<span class="sourceLineNo">082</span>       * Adds a set of characters to this set.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>       * <a name="line.83"></a>
+<span class="sourceLineNo">084</span>       * @param chars The characters to keep in this store.<a name="line.84"></a>
+<span class="sourceLineNo">085</span>       * @return This object (for method chaining).<a name="line.85"></a>
+<span class="sourceLineNo">086</span>       */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      public AsciiSet.Builder chars(String chars) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>         for (int i = 0; i &lt; chars.length(); i++) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>            char c = chars.charAt(i);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>            if (c &lt; 128)<a name="line.90"></a>
+<span class="sourceLineNo">091</span>               store[c] = true;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         }<a name="line.92"></a>
+<span class="sourceLineNo">093</span>         return this;<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>      /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span>       * Create a new {@link AsciiSet} object with the contents of this builder.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>       * <a name="line.98"></a>
+<span class="sourceLineNo">099</span>       * @return A new {link AsciiSet} object.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>       */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      public AsciiSet build() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>         return new AsciiSet(store);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   }<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   <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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * <a name="line.109"></a>
+<span class="sourceLineNo">110</span>    * @param c The character to check.<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    */<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   public boolean contains(char c) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      if (c &gt; 127)<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         return false;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      return store[c];<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>   /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    * <a name="line.121"></a>
+<span class="sourceLineNo">122</span>    * @param c The character to check.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    */<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   public boolean contains(int c) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      if (c &lt; 0 || c &gt; 127)<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         return false;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      return store[c];<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string contains at least one character in this set.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * <a name="line.133"></a>
+<span class="sourceLineNo">134</span>    * @param s The string to test.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the string is not null and contains at least one character in this set.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   public boolean contains(CharSequence s) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      if (s == null)<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         return false;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      for (int i = 0; i &lt; s.length(); i++)<a name="line.140"></a>
+<span class="sourceLineNo">141</span>         if (contains(s.charAt(i)))<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            return true;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      return false;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string contains only characters in this set.<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    * <a name="line.148"></a>
+<span class="sourceLineNo">149</span>    * @param s The string to test.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    * @return <a name="line.150"></a>
+<span class="sourceLineNo">151</span>    *    &lt;jk&gt;true&lt;/jk&gt; if the string contains only characters in this set.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    *    &lt;br&gt;Nulls always return &lt;jk&gt;false&lt;/jk&gt;.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    *    &lt;br&gt;Blanks always return &lt;jk&gt;true&lt;/jk&gt;.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   public boolean containsOnly(String s) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      if (s == null)<a name="line.156"></a>
+<span class="sourceLineNo">157</span>         return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      for (int i = 0; i &lt; s.length(); i++)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>         if (! contains(s.charAt(i)))<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            return false;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return true;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>}<a name="line.163"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/AsciiSet.html b/content/site/apidocs/src-html/org/apache/juneau/internal/AsciiSet.html
index 5bfa244..c81bd2c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/AsciiSet.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/AsciiSet.html
@@ -20,82 +20,155 @@
 <span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
 <span class="sourceLineNo">013</span>package org.apache.juneau.internal;<a name="line.13"></a>
 <span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>/**<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * Stores a set of ASCII characters for quick lookup.<a name="line.16"></a>
-<span class="sourceLineNo">017</span> */<a name="line.17"></a>
-<span class="sourceLineNo">018</span>public final class AsciiSet {<a name="line.18"></a>
-<span class="sourceLineNo">019</span>   final boolean[] store = new boolean[128];<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>   /**<a name="line.21"></a>
-<span class="sourceLineNo">022</span>    * Constructor.<a name="line.22"></a>
-<span class="sourceLineNo">023</span>    * <a name="line.23"></a>
-<span class="sourceLineNo">024</span>    * @param chars The characters to keep in this store.<a name="line.24"></a>
-<span class="sourceLineNo">025</span>    */<a name="line.25"></a>
-<span class="sourceLineNo">026</span>   public AsciiSet(String chars) {<a name="line.26"></a>
-<span class="sourceLineNo">027</span>      for (int i = 0; i &lt; chars.length(); i++) {<a name="line.27"></a>
-<span class="sourceLineNo">028</span>         char c = chars.charAt(i);<a name="line.28"></a>
-<span class="sourceLineNo">029</span>         if (c &lt; 128)<a name="line.29"></a>
-<span class="sourceLineNo">030</span>            store[c] = true;<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>   /**<a name="line.34"></a>
-<span class="sourceLineNo">035</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    * <a name="line.36"></a>
-<span class="sourceLineNo">037</span>    * @param c The character to check.<a name="line.37"></a>
-<span class="sourceLineNo">038</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    */<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   public boolean contains(char c) {<a name="line.40"></a>
-<span class="sourceLineNo">041</span>      if (c &gt; 127)<a name="line.41"></a>
-<span class="sourceLineNo">042</span>         return false;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>      return store[c];<a name="line.43"></a>
+<span class="sourceLineNo">015</span>import java.util.Arrays;<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> * Stores a set of ASCII characters for quick lookup.<a name="line.18"></a>
+<span class="sourceLineNo">019</span> */<a name="line.19"></a>
+<span class="sourceLineNo">020</span>public final class AsciiSet {<a name="line.20"></a>
+<span class="sourceLineNo">021</span>   private final boolean[] store;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>   AsciiSet(boolean[] store) {<a name="line.23"></a>
+<span class="sourceLineNo">024</span>      this.store = Arrays.copyOf(store, store.length);<a name="line.24"></a>
+<span class="sourceLineNo">025</span>   }<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>    * Creates an ASCII set with the specified characters.<a name="line.28"></a>
+<span class="sourceLineNo">029</span>    * <a name="line.29"></a>
+<span class="sourceLineNo">030</span>    * @param chars The characters to keep in this store.<a name="line.30"></a>
+<span class="sourceLineNo">031</span>    * @return A new object.<a name="line.31"></a>
+<span class="sourceLineNo">032</span>    */<a name="line.32"></a>
+<span class="sourceLineNo">033</span>   public static AsciiSet create(String chars) {<a name="line.33"></a>
+<span class="sourceLineNo">034</span>      return new Builder().chars(chars).build();<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>   /**<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    * Creates a builder for an ASCII set.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    * <a name="line.39"></a>
+<span class="sourceLineNo">040</span>    * @return A new builder.<a name="line.40"></a>
+<span class="sourceLineNo">041</span>    */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   public static AsciiSet.Builder create() {<a name="line.42"></a>
+<span class="sourceLineNo">043</span>      return new Builder();<a name="line.43"></a>
 <span class="sourceLineNo">044</span>   }<a name="line.44"></a>
 <span class="sourceLineNo">045</span><a name="line.45"></a>
 <span class="sourceLineNo">046</span>   /**<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    * <a name="line.48"></a>
-<span class="sourceLineNo">049</span>    * @param c The character to check.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    */<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   public boolean contains(int c) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      if (c &lt; 0 || c &gt; 127)<a name="line.53"></a>
-<span class="sourceLineNo">054</span>         return false;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      return store[c];<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string contains at least one character in this set.<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * <a name="line.60"></a>
-<span class="sourceLineNo">061</span>    * @param s The string to test.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the string is not null and contains at least one character in this set.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   public boolean contains(CharSequence s) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      if (s == null)<a name="line.65"></a>
-<span class="sourceLineNo">066</span>         return false;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      for (int i = 0; i &lt; s.length(); i++)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>         if (contains(s.charAt(i)))<a name="line.68"></a>
-<span class="sourceLineNo">069</span>            return true;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      return false;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string contains only characters in this set.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    * <a name="line.75"></a>
-<span class="sourceLineNo">076</span>    * @param s The string to test.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    * @return <a name="line.77"></a>
-<span class="sourceLineNo">078</span>    *    &lt;jk&gt;true&lt;/jk&gt; if the string contains only characters in this set.<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    *    &lt;br&gt;Nulls always return &lt;jk&gt;false&lt;/jk&gt;.<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    *    &lt;br&gt;Blanks always return &lt;jk&gt;true&lt;/jk&gt;.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   public boolean containsOnly(String s) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      if (s == null)<a name="line.83"></a>
-<span class="sourceLineNo">084</span>         return false;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      for (int i = 0; i &lt; s.length(); i++)<a name="line.85"></a>
-<span class="sourceLineNo">086</span>         if (! contains(s.charAt(i)))<a name="line.86"></a>
-<span class="sourceLineNo">087</span>            return false;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      return true;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>}<a name="line.90"></a>
+<span class="sourceLineNo">047</span>    * Builder class for {@link AsciiSet} objects.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   public static class Builder {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      final boolean[] store = new boolean[128];<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      <a name="line.51"></a>
+<span class="sourceLineNo">052</span>      /**<a name="line.52"></a>
+<span class="sourceLineNo">053</span>       * Adds a range of characters to this set.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>       * <a name="line.54"></a>
+<span class="sourceLineNo">055</span>       * @param start The start character.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>       * @param end The end character.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>       * @return This object (for method chaining).<a name="line.57"></a>
+<span class="sourceLineNo">058</span>       */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      public AsciiSet.Builder range(char start, char end) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>         for (char c = start; c &lt;= end; c++)<a name="line.60"></a>
+<span class="sourceLineNo">061</span>            if (c &lt; 128)<a name="line.61"></a>
+<span class="sourceLineNo">062</span>               store[c] = true;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>         return this;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      }<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>       * Shortcut for calling multiple ranges.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>       * <a name="line.68"></a>
+<span class="sourceLineNo">069</span>       * @param s Strings of the form "A-Z" where A and Z represent the first and last characters in the range.<a name="line.69"></a>
+<span class="sourceLineNo">070</span>       * @return This object (for method chaining).<a name="line.70"></a>
+<span class="sourceLineNo">071</span>       */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      public AsciiSet.Builder ranges(String...s) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         for (String ss : s) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>            if (ss.length() != 3 || ss.charAt(1) != '-')<a name="line.74"></a>
+<span class="sourceLineNo">075</span>               throw new RuntimeException("Value passed to ranges() must be 3 characters");<a name="line.75"></a>
+<span class="sourceLineNo">076</span>            range(ss.charAt(0), ss.charAt(2));<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         }<a name="line.77"></a>
+<span class="sourceLineNo">078</span>         return this;<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 name="line.81"></a>
+<span class="sourceLineNo">082</span>       * Adds a set of characters to this set.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>       * <a name="line.83"></a>
+<span class="sourceLineNo">084</span>       * @param chars The characters to keep in this store.<a name="line.84"></a>
+<span class="sourceLineNo">085</span>       * @return This object (for method chaining).<a name="line.85"></a>
+<span class="sourceLineNo">086</span>       */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      public AsciiSet.Builder chars(String chars) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>         for (int i = 0; i &lt; chars.length(); i++) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>            char c = chars.charAt(i);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>            if (c &lt; 128)<a name="line.90"></a>
+<span class="sourceLineNo">091</span>               store[c] = true;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         }<a name="line.92"></a>
+<span class="sourceLineNo">093</span>         return this;<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>      /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span>       * Create a new {@link AsciiSet} object with the contents of this builder.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>       * <a name="line.98"></a>
+<span class="sourceLineNo">099</span>       * @return A new {link AsciiSet} object.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>       */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      public AsciiSet build() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>         return new AsciiSet(store);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   }<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   <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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * <a name="line.109"></a>
+<span class="sourceLineNo">110</span>    * @param c The character to check.<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    */<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   public boolean contains(char c) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      if (c &gt; 127)<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         return false;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      return store[c];<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>   /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    * <a name="line.121"></a>
+<span class="sourceLineNo">122</span>    * @param c The character to check.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified character is in this store.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    */<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   public boolean contains(int c) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      if (c &lt; 0 || c &gt; 127)<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         return false;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      return store[c];<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string contains at least one character in this set.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * <a name="line.133"></a>
+<span class="sourceLineNo">134</span>    * @param s The string to test.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the string is not null and contains at least one character in this set.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   public boolean contains(CharSequence s) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      if (s == null)<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         return false;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      for (int i = 0; i &lt; s.length(); i++)<a name="line.140"></a>
+<span class="sourceLineNo">141</span>         if (contains(s.charAt(i)))<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            return true;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      return false;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   }<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string contains only characters in this set.<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    * <a name="line.148"></a>
+<span class="sourceLineNo">149</span>    * @param s The string to test.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    * @return <a name="line.150"></a>
+<span class="sourceLineNo">151</span>    *    &lt;jk&gt;true&lt;/jk&gt; if the string contains only characters in this set.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    *    &lt;br&gt;Nulls always return &lt;jk&gt;false&lt;/jk&gt;.<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    *    &lt;br&gt;Blanks always return &lt;jk&gt;true&lt;/jk&gt;.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   public boolean containsOnly(String s) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      if (s == null)<a name="line.156"></a>
+<span class="sourceLineNo">157</span>         return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      for (int i = 0; i &lt; s.length(); i++)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>         if (! contains(s.charAt(i)))<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            return false;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      return true;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>}<a name="line.163"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html
index f74a275..05cd079 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/StringUtils.html
@@ -45,17 +45,17 @@
 <span class="sourceLineNo">037</span> */<a name="line.37"></a>
 <span class="sourceLineNo">038</span>public final class StringUtils {<a name="line.38"></a>
 <span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>   private static final AsciiSet numberChars = new AsciiSet("-xX.+-#pP0123456789abcdefABCDEF");<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   private static final AsciiSet firstNumberChars = new AsciiSet("+-.#0123456789");<a name="line.41"></a>
-<span class="sourceLineNo">042</span>   private static final AsciiSet octChars = new AsciiSet("01234567");<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   private static final AsciiSet decChars = new AsciiSet("0123456789");<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   private static final AsciiSet hexChars = new AsciiSet("0123456789abcdefABCDEF");<a name="line.44"></a>
+<span class="sourceLineNo">040</span>   private static final AsciiSet numberChars = AsciiSet.create("-xX.+-#pP0123456789abcdefABCDEF");<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   private static final AsciiSet firstNumberChars =AsciiSet.create("+-.#0123456789");<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   private static final AsciiSet octChars = AsciiSet.create("01234567");<a name="line.42"></a>
+<span class="sourceLineNo">043</span>   private static final AsciiSet decChars = AsciiSet.create("0123456789");<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   private static final AsciiSet hexChars = AsciiSet.create("0123456789abcdefABCDEF");<a name="line.44"></a>
 <span class="sourceLineNo">045</span><a name="line.45"></a>
 <span class="sourceLineNo">046</span>   // Maps 6-bit nibbles to BASE64 characters.<a name="line.46"></a>
 <span class="sourceLineNo">047</span>   private static final char[] base64m1 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray();<a name="line.47"></a>
 <span class="sourceLineNo">048</span><a name="line.48"></a>
 <span class="sourceLineNo">049</span>   // Characters that do not need to be URL-encoded<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.!~*'()\\");<a name="line.50"></a>
+<span class="sourceLineNo">050</span>   private static final AsciiSet unencodedChars = AsciiSet.create().ranges("a-z","A-Z","0-9").chars("-_.!~*'()\\").build();<a name="line.50"></a>
 <span class="sourceLineNo">051</span><a name="line.51"></a>
 <span class="sourceLineNo">052</span>   // Maps BASE64 characters to 6-bit nibbles.<a name="line.52"></a>
 <span class="sourceLineNo">053</span>   private static final byte[] base64m2 = new byte[128];<a name="line.53"></a>
@@ -1548,452 +1548,523 @@
 <span class="sourceLineNo">1540</span>      return null;<a name="line.1540"></a>
 <span class="sourceLineNo">1541</span>   }<a name="line.1541"></a>
 <span class="sourceLineNo">1542</span><a name="line.1542"></a>
-<span class="sourceLineNo">1543</span>   /**<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span>    * Decodes a &lt;code&gt;application/x-www-form-urlencoded&lt;/code&gt; string using &lt;code&gt;UTF-8&lt;/code&gt; encoding scheme.<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span>    * <a name="line.1545"></a>
-<span class="sourceLineNo">1546</span>    * @param s The string to decode.<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span>    * @return The decoded string, or &lt;jk&gt;null&lt;/jk&gt; if input is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span>    */<a name="line.1548"></a>
-<span class="sourceLineNo">1549</span>   public static String urlDecode(String s) {<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span>      if (s == null)<a name="line.1550"></a>
-<span class="sourceLineNo">1551</span>         return s;<a name="line.1551"></a>
-<span class="sourceLineNo">1552</span>      boolean needsDecode = false;<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span>      for (int i = 0; i &lt; s.length() &amp;&amp; ! needsDecode; i++) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span>         char c = s.charAt(i);<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span>         if (c == '+' || c == '%')<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span>            needsDecode = true;<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span>      }<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span>      if (needsDecode) {<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span>         try {<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span>            return URLDecoder.decode(s, "UTF-8");<a name="line.1560"></a>
-<span class="sourceLineNo">1561</span>         } catch (UnsupportedEncodingException e) {/* Won't happen */}<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span>      }<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span>      return s;<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>   }<a name="line.1564"></a>
-<span class="sourceLineNo">1565</span><a name="line.1565"></a>
-<span class="sourceLineNo">1566</span>   /**<a name="line.1566"></a>
-<span class="sourceLineNo">1567</span>    * Encodes a &lt;code&gt;application/x-www-form-urlencoded&lt;/code&gt; string using &lt;code&gt;UTF-8&lt;/code&gt; encoding scheme.<a name="line.1567"></a>
-<span class="sourceLineNo">1568</span>    * <a name="line.1568"></a>
-<span class="sourceLineNo">1569</span>    * @param s The string to encode.<a name="line.1569"></a>
-<span class="sourceLineNo">1570</span>    * @return The encoded string, or &lt;jk&gt;null&lt;/jk&gt; if input is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1570"></a>
-<span class="sourceLineNo">1571</span>    */<a name="line.1571"></a>
-<span class="sourceLineNo">1572</span>   public static String urlEncode(String s) {<a name="line.1572"></a>
-<span class="sourceLineNo">1573</span>      if (s == null)<a name="line.1573"></a>
-<span class="sourceLineNo">1574</span>         return null;<a name="line.1574"></a>
-<span class="sourceLineNo">1575</span>      boolean needsEncode = false;<a name="line.1575"></a>
-<span class="sourceLineNo">1576</span>      for (int i = 0; i &lt; s.length() &amp;&amp; ! needsEncode; i++)<a name="line.1576"></a>
-<span class="sourceLineNo">1577</span>         needsEncode |= (! unencodedChars.contains(s.charAt(i)));<a name="line.1577"></a>
-<span class="sourceLineNo">1578</span>      if (needsEncode) {<a name="line.1578"></a>
-<span class="sourceLineNo">1579</span>         try {<a name="line.1579"></a>
-<span class="sourceLineNo">1580</span>            return URLEncoder.encode(s, "UTF-8");<a name="line.1580"></a>
-<span class="sourceLineNo">1581</span>         } catch (UnsupportedEncodingException e) {/* Won't happen */}<a name="line.1581"></a>
-<span class="sourceLineNo">1582</span>      }<a name="line.1582"></a>
-<span class="sourceLineNo">1583</span>      return s;<a name="line.1583"></a>
-<span class="sourceLineNo">1584</span>   }<a name="line.1584"></a>
-<span class="sourceLineNo">1585</span>   <a name="line.1585"></a>
-<span class="sourceLineNo">1586</span>   /**<a name="line.1586"></a>
-<span class="sourceLineNo">1587</span>    * Splits a string into equally-sized parts.<a name="line.1587"></a>
-<span class="sourceLineNo">1588</span>    * <a name="line.1588"></a>
-<span class="sourceLineNo">1589</span>    * @param s The string to split.<a name="line.1589"></a>
-<span class="sourceLineNo">1590</span>    * @param size The token sizes.<a name="line.1590"></a>
-<span class="sourceLineNo">1591</span>    * @return The tokens, or &lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1591"></a>
-<span class="sourceLineNo">1592</span>    */<a name="line.1592"></a>
-<span class="sourceLineNo">1593</span>   public static List&lt;String&gt; splitEqually(String s, int size) {<a name="line.1593"></a>
-<span class="sourceLineNo">1594</span>      if (s == null)<a name="line.1594"></a>
-<span class="sourceLineNo">1595</span>         return null;<a name="line.1595"></a>
-<span class="sourceLineNo">1596</span>      if (size &lt;= 0) <a name="line.1596"></a>
-<span class="sourceLineNo">1597</span>         return Collections.singletonList(s);<a name="line.1597"></a>
-<span class="sourceLineNo">1598</span>      <a name="line.1598"></a>
-<span class="sourceLineNo">1599</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;((s.length() + size - 1) / size);<a name="line.1599"></a>
-<span class="sourceLineNo">1600</span><a name="line.1600"></a>
-<span class="sourceLineNo">1601</span>      for (int i = 0; i &lt; s.length(); i += size) <a name="line.1601"></a>
-<span class="sourceLineNo">1602</span>         l.add(s.substring(i, Math.min(s.length(), i + size)));<a name="line.1602"></a>
-<span class="sourceLineNo">1603</span><a name="line.1603"></a>
-<span class="sourceLineNo">1604</span>      return l;<a name="line.1604"></a>
-<span class="sourceLineNo">1605</span>   }<a name="line.1605"></a>
-<span class="sourceLineNo">1606</span><a name="line.1606"></a>
-<span class="sourceLineNo">1607</span>   /**<a name="line.1607"></a>
-<span class="sourceLineNo">1608</span>    * Returns the first non-whitespace character in the string.<a name="line.1608"></a>
-<span class="sourceLineNo">1609</span>    * <a name="line.1609"></a>
-<span class="sourceLineNo">1610</span>    * @param s The string to check.<a name="line.1610"></a>
-<span class="sourceLineNo">1611</span>    * @return<a name="line.1611"></a>
-<span class="sourceLineNo">1612</span>    *    The first non-whitespace character, or &lt;code&gt;0&lt;/code&gt; if the string is &lt;jk&gt;null&lt;/jk&gt;, empty, or composed<a name="line.1612"></a>
-<span class="sourceLineNo">1613</span>    *    of only whitespace.<a name="line.1613"></a>
-<span class="sourceLineNo">1614</span>    */<a name="line.1614"></a>
-<span class="sourceLineNo">1615</span>   public static char firstNonWhitespaceChar(String s) {<a name="line.1615"></a>
-<span class="sourceLineNo">1616</span>      if (s != null)<a name="line.1616"></a>
-<span class="sourceLineNo">1617</span>         for (int i = 0; i &lt; s.length(); i++)<a name="line.1617"></a>
-<span class="sourceLineNo">1618</span>            if (! Character.isWhitespace(s.charAt(i)))<a name="line.1618"></a>
-<span class="sourceLineNo">1619</span>               return s.charAt(i);<a name="line.1619"></a>
-<span class="sourceLineNo">1620</span>      return 0;<a name="line.1620"></a>
-<span class="sourceLineNo">1621</span>   }<a name="line.1621"></a>
-<span class="sourceLineNo">1622</span><a name="line.1622"></a>
-<span class="sourceLineNo">1623</span>   /**<a name="line.1623"></a>
-<span class="sourceLineNo">1624</span>    * Returns the last non-whitespace character in the string.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>    * <a name="line.1625"></a>
-<span class="sourceLineNo">1626</span>    * @param s The string to check.<a name="line.1626"></a>
-<span class="sourceLineNo">1627</span>    * @return<a name="line.1627"></a>
-<span class="sourceLineNo">1628</span>    *    The last non-whitespace character, or &lt;code&gt;0&lt;/code&gt; if the string is &lt;jk&gt;null&lt;/jk&gt;, empty, or composed<a name="line.1628"></a>
-<span class="sourceLineNo">1629</span>    *    of only whitespace.<a name="line.1629"></a>
-<span class="sourceLineNo">1630</span>    */<a name="line.1630"></a>
-<span class="sourceLineNo">1631</span>   public static char lastNonWhitespaceChar(String s) {<a name="line.1631"></a>
-<span class="sourceLineNo">1632</span>      if (s != null)<a name="line.1632"></a>
-<span class="sourceLineNo">1633</span>         for (int i = s.length()-1; i &gt;= 0; i--)<a name="line.1633"></a>
-<span class="sourceLineNo">1634</span>            if (! Character.isWhitespace(s.charAt(i)))<a name="line.1634"></a>
-<span class="sourceLineNo">1635</span>               return s.charAt(i);<a name="line.1635"></a>
-<span class="sourceLineNo">1636</span>      return 0;<a name="line.1636"></a>
-<span class="sourceLineNo">1637</span>   }<a name="line.1637"></a>
-<span class="sourceLineNo">1638</span><a name="line.1638"></a>
-<span class="sourceLineNo">1639</span>   /**<a name="line.1639"></a>
-<span class="sourceLineNo">1640</span>    * Returns the character at the specified index in the string without throwing exceptions.<a name="line.1640"></a>
-<span class="sourceLineNo">1641</span>    * <a name="line.1641"></a>
-<span class="sourceLineNo">1642</span>    * @param s The string.<a name="line.1642"></a>
-<span class="sourceLineNo">1643</span>    * @param i The index position.<a name="line.1643"></a>
-<span class="sourceLineNo">1644</span>    * @return<a name="line.1644"></a>
-<span class="sourceLineNo">1645</span>    *    The character at the specified index, or &lt;code&gt;0&lt;/code&gt; if the index is out-of-range or the string<a name="line.1645"></a>
-<span class="sourceLineNo">1646</span>    *    is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1646"></a>
-<span class="sourceLineNo">1647</span>    */<a name="line.1647"></a>
-<span class="sourceLineNo">1648</span>   public static char charAt(String s, int i) {<a name="line.1648"></a>
-<span class="sourceLineNo">1649</span>      if (s == null)<a name="line.1649"></a>
-<span class="sourceLineNo">1650</span>         return 0;<a name="line.1650"></a>
-<span class="sourceLineNo">1651</span>      if (i &lt; 0 || i &gt;= s.length())<a name="line.1651"></a>
-<span class="sourceLineNo">1652</span>         return 0;<a name="line.1652"></a>
-<span class="sourceLineNo">1653</span>      return s.charAt(i);<a name="line.1653"></a>
-<span class="sourceLineNo">1654</span>   }<a name="line.1654"></a>
-<span class="sourceLineNo">1655</span><a name="line.1655"></a>
-<span class="sourceLineNo">1656</span>   /**<a name="line.1656"></a>
-<span class="sourceLineNo">1657</span>    * Efficiently determines whether a URL is of the pattern "xxx://xxx"<a name="line.1657"></a>
-<span class="sourceLineNo">1658</span>    * <a name="line.1658"></a>
-<span class="sourceLineNo">1659</span>    * @param s The string to test.<a name="line.1659"></a>
-<span class="sourceLineNo">1660</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if it's an absolute path.<a name="line.1660"></a>
-<span class="sourceLineNo">1661</span>    */<a name="line.1661"></a>
-<span class="sourceLineNo">1662</span>   public static boolean isAbsoluteUri(String s) {<a name="line.1662"></a>
-<span class="sourceLineNo">1663</span><a name="line.1663"></a>
-<span class="sourceLineNo">1664</span>      if (isEmpty(s))<a name="line.1664"></a>
-<span class="sourceLineNo">1665</span>         return false;<a name="line.1665"></a>
-<span class="sourceLineNo">1666</span><a name="line.1666"></a>
-<span class="sourceLineNo">1667</span>      // Use a state machine for maximum performance.<a name="line.1667"></a>
-<span class="sourceLineNo">1668</span><a name="line.1668"></a>
-<span class="sourceLineNo">1669</span>      int S1 = 1;  // Looking for http<a name="line.1669"></a>
-<span class="sourceLineNo">1670</span>      int S2 = 2;  // Found http, looking for :<a name="line.1670"></a>
-<span class="sourceLineNo">1671</span>      int S3 = 3;  // Found :, looking for /<a name="line.1671"></a>
-<span class="sourceLineNo">1672</span>      int S4 = 4;  // Found /, looking for /<a name="line.1672"></a>
-<span class="sourceLineNo">1673</span>      int S5 = 5;  // Found /, looking for x<a name="line.1673"></a>
+<span class="sourceLineNo">1543</span>   private static final AsciiSet URL_ENCODE_PATHINFO_VALIDCHARS = <a name="line.1543"></a>
+<span class="sourceLineNo">1544</span>      AsciiSet.create().ranges("a-z","A-Z","0-9").chars("-_.*/()").build();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span>   <a name="line.1545"></a>
+<span class="sourceLineNo">1546</span>   /**<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span>    * Similar to {@link #urlEncode(Object)} but doesn't encode &lt;js&gt;"/"&lt;/js&gt; characters.<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span>    * <a name="line.1548"></a>
+<span class="sourceLineNo">1549</span>    * @param o The object to encode.<a name="line.1549"></a>
+<span class="sourceLineNo">1550</span>    * @return The URL encoded string, or &lt;jk&gt;null&lt;/jk&gt; if the object was null.<a name="line.1550"></a>
+<span class="sourceLineNo">1551</span>    */<a name="line.1551"></a>
+<span class="sourceLineNo">1552</span>   public static String urlEncodePath(Object o) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span>      if (o == null)<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span>         return null;<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span>      String s = asString(o);<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span><a name="line.1556"></a>
+<span class="sourceLineNo">1557</span>      boolean needsEncode = false;<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span>      for (int i = 0; i &lt; s.length() &amp;&amp; ! needsEncode; i++) <a name="line.1558"></a>
+<span class="sourceLineNo">1559</span>         needsEncode = URL_ENCODE_PATHINFO_VALIDCHARS.contains(s.charAt(i));<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span>      if (! needsEncode)<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span>         return s;<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span>      <a name="line.1562"></a>
+<span class="sourceLineNo">1563</span>      StringBuilder sb = new StringBuilder();<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span>      CharArrayWriter caw = new CharArrayWriter();<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span>      int caseDiff = ('a' - 'A');<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span>      <a name="line.1566"></a>
+<span class="sourceLineNo">1567</span>      for (int i = 0; i &lt; s.length();) {<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span>         char c = s.charAt(i);<a name="line.1568"></a>
+<span class="sourceLineNo">1569</span>         if (URL_ENCODE_PATHINFO_VALIDCHARS.contains(c)) {<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span>            sb.append(c);<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span>            i++;<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span>         } else {<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span>            if (c == ' ') {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span>               sb.append('+');<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span>               i++;<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span>            } else {<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span>               do {<a name="line.1577"></a>
+<span class="sourceLineNo">1578</span>                  caw.write(c);<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span>                  if (c &gt;= 0xD800 &amp;&amp; c &lt;= 0xDBFF) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span>                     if ( (i+1) &lt; s.length()) {<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>                        int d = s.charAt(i+1);<a name="line.1581"></a>
+<span class="sourceLineNo">1582</span>                        if (d &gt;= 0xDC00 &amp;&amp; d &lt;= 0xDFFF) {<a name="line.1582"></a>
+<span class="sourceLineNo">1583</span>                           caw.write(d);<a name="line.1583"></a>
+<span class="sourceLineNo">1584</span>                           i++;<a name="line.1584"></a>
+<span class="sourceLineNo">1585</span>                        }<a name="line.1585"></a>
+<span class="sourceLineNo">1586</span>                     }<a name="line.1586"></a>
+<span class="sourceLineNo">1587</span>                  }<a name="line.1587"></a>
+<span class="sourceLineNo">1588</span>                  i++;<a name="line.1588"></a>
+<span class="sourceLineNo">1589</span>               } while (i &lt; s.length() &amp;&amp; !URL_ENCODE_PATHINFO_VALIDCHARS.contains((c = s.charAt(i))));<a name="line.1589"></a>
+<span class="sourceLineNo">1590</span>               <a name="line.1590"></a>
+<span class="sourceLineNo">1591</span>               caw.flush();<a name="line.1591"></a>
+<span class="sourceLineNo">1592</span>               String s2 = new String(caw.toCharArray());<a name="line.1592"></a>
+<span class="sourceLineNo">1593</span>               byte[] ba = s2.getBytes(IOUtils.UTF8);<a name="line.1593"></a>
+<span class="sourceLineNo">1594</span>               for (int j = 0; j &lt; ba.length; j++) {<a name="line.1594"></a>
+<span class="sourceLineNo">1595</span>                  sb.append('%');<a name="line.1595"></a>
+<span class="sourceLineNo">1596</span>                  char ch = Character.forDigit((ba[j] &gt;&gt; 4) &amp; 0xF, 16);<a name="line.1596"></a>
+<span class="sourceLineNo">1597</span>                  if (Character.isLetter(ch)) {<a name="line.1597"></a>
+<span class="sourceLineNo">1598</span>                     ch -= caseDiff;<a name="line.1598"></a>
+<span class="sourceLineNo">1599</span>                  }<a name="line.1599"></a>
+<span class="sourceLineNo">1600</span>                  sb.append(ch);<a name="line.1600"></a>
+<span class="sourceLineNo">1601</span>                  ch = Character.forDigit(ba[j] &amp; 0xF, 16);<a name="line.1601"></a>
+<span class="sourceLineNo">1602</span>                  if (Character.isLetter(ch)) {<a name="line.1602"></a>
+<span class="sourceLineNo">1603</span>                     ch -= caseDiff;<a name="line.1603"></a>
+<span class="sourceLineNo">1604</span>                  }<a name="line.1604"></a>
+<span class="sourceLineNo">1605</span>                  sb.append(ch);<a name="line.1605"></a>
+<span class="sourceLineNo">1606</span>               }<a name="line.1606"></a>
+<span class="sourceLineNo">1607</span>               caw.reset();<a name="line.1607"></a>
+<span class="sourceLineNo">1608</span>            }<a name="line.1608"></a>
+<span class="sourceLineNo">1609</span>         }<a name="line.1609"></a>
+<span class="sourceLineNo">1610</span>      }<a name="line.1610"></a>
+<span class="sourceLineNo">1611</span>      return sb.toString();<a name="line.1611"></a>
+<span class="sourceLineNo">1612</span>   }<a name="line.1612"></a>
+<span class="sourceLineNo">1613</span>   <a name="line.1613"></a>
+<span class="sourceLineNo">1614</span>   /**<a name="line.1614"></a>
+<span class="sourceLineNo">1615</span>    * Decodes a &lt;code&gt;application/x-www-form-urlencoded&lt;/code&gt; string using &lt;code&gt;UTF-8&lt;/code&gt; encoding scheme.<a name="line.1615"></a>
+<span class="sourceLineNo">1616</span>    * <a name="line.1616"></a>
+<span class="sourceLineNo">1617</span>    * @param s The string to decode.<a name="line.1617"></a>
+<span class="sourceLineNo">1618</span>    * @return The decoded string, or &lt;jk&gt;null&lt;/jk&gt; if input is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1618"></a>
+<span class="sourceLineNo">1619</span>    */<a name="line.1619"></a>
+<span class="sourceLineNo">1620</span>   public static String urlDecode(String s) {<a name="line.1620"></a>
+<span class="sourceLineNo">1621</span>      if (s == null)<a name="line.1621"></a>
+<span class="sourceLineNo">1622</span>         return s;<a name="line.1622"></a>
+<span class="sourceLineNo">1623</span>      boolean needsDecode = false;<a name="line.1623"></a>
+<span class="sourceLineNo">1624</span>      for (int i = 0; i &lt; s.length() &amp;&amp; ! needsDecode; i++) {<a name="line.1624"></a>
+<span class="sourceLineNo">1625</span>         char c = s.charAt(i);<a name="line.1625"></a>
+<span class="sourceLineNo">1626</span>         if (c == '+' || c == '%')<a name="line.1626"></a>
+<span class="sourceLineNo">1627</span>            needsDecode = true;<a name="line.1627"></a>
+<span class="sourceLineNo">1628</span>      }<a name="line.1628"></a>
+<span class="sourceLineNo">1629</span>      if (needsDecode) {<a name="line.1629"></a>
+<span class="sourceLineNo">1630</span>         try {<a name="line.1630"></a>
+<span class="sourceLineNo">1631</span>            return URLDecoder.decode(s, "UTF-8");<a name="line.1631"></a>
+<span class="sourceLineNo">1632</span>         } catch (UnsupportedEncodingException e) {/* Won't happen */}<a name="line.1632"></a>
+<span class="sourceLineNo">1633</span>      }<a name="line.1633"></a>
+<span class="sourceLineNo">1634</span>      return s;<a name="line.1634"></a>
+<span class="sourceLineNo">1635</span>   }<a name="line.1635"></a>
+<span class="sourceLineNo">1636</span><a name="line.1636"></a>
+<span class="sourceLineNo">1637</span>   /**<a name="line.1637"></a>
+<span class="sourceLineNo">1638</span>    * Encodes a &lt;code&gt;application/x-www-form-urlencoded&lt;/code&gt; string using &lt;code&gt;UTF-8&lt;/code&gt; encoding scheme.<a name="line.1638"></a>
+<span class="sourceLineNo">1639</span>    * <a name="line.1639"></a>
+<span class="sourceLineNo">1640</span>    * @param s The string to encode.<a name="line.1640"></a>
+<span class="sourceLineNo">1641</span>    * @return The encoded string, or &lt;jk&gt;null&lt;/jk&gt; if input is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1641"></a>
+<span class="sourceLineNo">1642</span>    */<a name="line.1642"></a>
+<span class="sourceLineNo">1643</span>   public static String urlEncode(String s) {<a name="line.1643"></a>
+<span class="sourceLineNo">1644</span>      if (s == null)<a name="line.1644"></a>
+<span class="sourceLineNo">1645</span>         return null;<a name="line.1645"></a>
+<span class="sourceLineNo">1646</span>      boolean needsEncode = false;<a name="line.1646"></a>
+<span class="sourceLineNo">1647</span>      for (int i = 0; i &lt; s.length() &amp;&amp; ! needsEncode; i++)<a name="line.1647"></a>
+<span class="sourceLineNo">1648</span>         needsEncode |= (! unencodedChars.contains(s.charAt(i)));<a name="line.1648"></a>
+<span class="sourceLineNo">1649</span>      if (needsEncode) {<a name="line.1649"></a>
+<span class="sourceLineNo">1650</span>         try {<a name="line.1650"></a>
+<span class="sourceLineNo">1651</span>            return URLEncoder.encode(s, "UTF-8");<a name="line.1651"></a>
+<span class="sourceLineNo">1652</span>         } catch (UnsupportedEncodingException e) {/* Won't happen */}<a name="line.1652"></a>
+<span class="sourceLineNo">1653</span>      }<a name="line.1653"></a>
+<span class="sourceLineNo">1654</span>      return s;<a name="line.1654"></a>
+<span class="sourceLineNo">1655</span>   }<a name="line.1655"></a>
+<span class="sourceLineNo">1656</span>   <a name="line.1656"></a>
+<span class="sourceLineNo">1657</span>   /**<a name="line.1657"></a>
+<span class="sourceLineNo">1658</span>    * Splits a string into equally-sized parts.<a name="line.1658"></a>
+<span class="sourceLineNo">1659</span>    * <a name="line.1659"></a>
+<span class="sourceLineNo">1660</span>    * @param s The string to split.<a name="line.1660"></a>
+<span class="sourceLineNo">1661</span>    * @param size The token sizes.<a name="line.1661"></a>
+<span class="sourceLineNo">1662</span>    * @return The tokens, or &lt;jk&gt;null&lt;/jk&gt; if the input was &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1662"></a>
+<span class="sourceLineNo">1663</span>    */<a name="line.1663"></a>
+<span class="sourceLineNo">1664</span>   public static List&lt;String&gt; splitEqually(String s, int size) {<a name="line.1664"></a>
+<span class="sourceLineNo">1665</span>      if (s == null)<a name="line.1665"></a>
+<span class="sourceLineNo">1666</span>         return null;<a name="line.1666"></a>
+<span class="sourceLineNo">1667</span>      if (size &lt;= 0) <a name="line.1667"></a>
+<span class="sourceLineNo">1668</span>         return Collections.singletonList(s);<a name="line.1668"></a>
+<span class="sourceLineNo">1669</span>      <a name="line.1669"></a>
+<span class="sourceLineNo">1670</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;((s.length() + size - 1) / size);<a name="line.1670"></a>
+<span class="sourceLineNo">1671</span><a name="line.1671"></a>
+<span class="sourceLineNo">1672</span>      for (int i = 0; i &lt; s.length(); i += size) <a name="line.1672"></a>
+<span class="sourceLineNo">1673</span>         l.add(s.substring(i, Math.min(s.length(), i + size)));<a name="line.1673"></a>
 <span class="sourceLineNo">1674</span><a name="line.1674"></a>
-<span class="sourceLineNo">1675</span>      int state = S1;<a name="line.1675"></a>
-<span class="sourceLineNo">1676</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1676"></a>
-<span class="sourceLineNo">1677</span>         char c = s.charAt(i);<a name="line.1677"></a>
-<span class="sourceLineNo">1678</span>         if (state == S1) {<a name="line.1678"></a>
-<span class="sourceLineNo">1679</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1679"></a>
-<span class="sourceLineNo">1680</span>               state = S2;<a name="line.1680"></a>
-<span class="sourceLineNo">1681</span>            else<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>               return false;<a name="line.1682"></a>
-<span class="sourceLineNo">1683</span>         } else if (state == S2) {<a name="line.1683"></a>
-<span class="sourceLineNo">1684</span>            if (c == ':')<a name="line.1684"></a>
-<span class="sourceLineNo">1685</span>               state = S3;<a name="line.1685"></a>
-<span class="sourceLineNo">1686</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1686"></a>
-<span class="sourceLineNo">1687</span>               return false;<a name="line.1687"></a>
-<span class="sourceLineNo">1688</span>         } else if (state == S3) {<a name="line.1688"></a>
-<span class="sourceLineNo">1689</span>            if (c == '/')<a name="line.1689"></a>
-<span class="sourceLineNo">1690</span>               state = S4;<a name="line.1690"></a>
-<span class="sourceLineNo">1691</span>            else<a name="line.1691"></a>
-<span class="sourceLineNo">1692</span>               return false;<a name="line.1692"></a>
-<span class="sourceLineNo">1693</span>         } else if (state == S4) {<a name="line.1693"></a>
-<span class="sourceLineNo">1694</span>            if (c == '/')<a name="line.1694"></a>
-<span class="sourceLineNo">1695</span>               state = S5;<a name="line.1695"></a>
-<span class="sourceLineNo">1696</span>            else<a name="line.1696"></a>
-<span class="sourceLineNo">1697</span>               return false;<a name="line.1697"></a>
-<span class="sourceLineNo">1698</span>         } else if (state == S5) {<a name="line.1698"></a>
-<span class="sourceLineNo">1699</span>            return true;<a name="line.1699"></a>
-<span class="sourceLineNo">1700</span>         }<a name="line.1700"></a>
-<span class="sourceLineNo">1701</span>      }<a name="line.1701"></a>
-<span class="sourceLineNo">1702</span>      return false;<a name="line.1702"></a>
-<span class="sourceLineNo">1703</span>   }<a name="line.1703"></a>
-<span class="sourceLineNo">1704</span><a name="line.1704"></a>
-<span class="sourceLineNo">1705</span>   /**<a name="line.1705"></a>
-<span class="sourceLineNo">1706</span>    * Efficiently determines whether a URL is of the pattern "xxx:/xxx".<a name="line.1706"></a>
-<span class="sourceLineNo">1707</span>    * <a name="line.1707"></a>
-<span class="sourceLineNo">1708</span>    * &lt;p&gt;<a name="line.1708"></a>
-<span class="sourceLineNo">1709</span>    * The pattern matched is: &lt;code&gt;[a-z]{2,}\:\/.*&lt;/code&gt;<a name="line.1709"></a>
-<span class="sourceLineNo">1710</span>    * <a name="line.1710"></a>
-<span class="sourceLineNo">1711</span>    * &lt;p&gt;<a name="line.1711"></a>
-<span class="sourceLineNo">1712</span>    * Note that this excludes filesystem paths such as &lt;js&gt;"C:/temp"&lt;/js&gt;.<a name="line.1712"></a>
-<span class="sourceLineNo">1713</span>    * <a name="line.1713"></a>
-<span class="sourceLineNo">1714</span>    * @param s The string to test.<a name="line.1714"></a>
-<span class="sourceLineNo">1715</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if it's an absolute path.<a name="line.1715"></a>
-<span class="sourceLineNo">1716</span>    */<a name="line.1716"></a>
-<span class="sourceLineNo">1717</span>   public static boolean isUri(String s) {<a name="line.1717"></a>
-<span class="sourceLineNo">1718</span><a name="line.1718"></a>
-<span class="sourceLineNo">1719</span>      if (isEmpty(s))<a name="line.1719"></a>
-<span class="sourceLineNo">1720</span>         return false;<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span><a name="line.1721"></a>
-<span class="sourceLineNo">1722</span>      // Use a state machine for maximum performance.<a name="line.1722"></a>
-<span class="sourceLineNo">1723</span><a name="line.1723"></a>
-<span class="sourceLineNo">1724</span>      int S1 = 1;  // Looking for protocol char 1<a name="line.1724"></a>
-<span class="sourceLineNo">1725</span>      int S2 = 2;  // Found protocol char 1, looking for protocol char 2<a name="line.1725"></a>
-<span class="sourceLineNo">1726</span>      int S3 = 3;  // Found protocol char 2, looking for :<a name="line.1726"></a>
-<span class="sourceLineNo">1727</span>      int S4 = 4;  // Found :, looking for /<a name="line.1727"></a>
-<span class="sourceLineNo">1728</span><a name="line.1728"></a>
-<span class="sourceLineNo">1729</span><a name="line.1729"></a>
-<span class="sourceLineNo">1730</span>      int state = S1;<a name="line.1730"></a>
-<span class="sourceLineNo">1731</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1731"></a>
-<span class="sourceLineNo">1732</span>         char c = s.charAt(i);<a name="line.1732"></a>
-<span class="sourceLineNo">1733</span>         if (state == S1) {<a name="line.1733"></a>
-<span class="sourceLineNo">1734</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1734"></a>
-<span class="sourceLineNo">1735</span>               state = S2;<a name="line.1735"></a>
-<span class="sourceLineNo">1736</span>            else<a name="line.1736"></a>
-<span class="sourceLineNo">1737</span>               return false;<a name="line.1737"></a>
-<span class="sourceLineNo">1738</span>         } else if (state == S2) {<a name="line.1738"></a>
-<span class="sourceLineNo">1739</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1739"></a>
-<span class="sourceLineNo">1740</span>               state = S3;<a name="line.1740"></a>
-<span class="sourceLineNo">1741</span>            else<a name="line.1741"></a>
-<span class="sourceLineNo">1742</span>               return false;<a name="line.1742"></a>
-<span class="sourceLineNo">1743</span>         } else if (state == S3) {<a name="line.1743"></a>
-<span class="sourceLineNo">1744</span>            if (c == ':')<a name="line.1744"></a>
-<span class="sourceLineNo">1745</span>               state = S4;<a name="line.1745"></a>
-<span class="sourceLineNo">1746</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1746"></a>
-<span class="sourceLineNo">1747</span>               return false;<a name="line.1747"></a>
-<span class="sourceLineNo">1748</span>         } else if (state == S4) {<a name="line.1748"></a>
-<span class="sourceLineNo">1749</span>            if (c == '/')<a name="line.1749"></a>
-<span class="sourceLineNo">1750</span>               return true;<a name="line.1750"></a>
-<span class="sourceLineNo">1751</span>            return false;<a name="line.1751"></a>
-<span class="sourceLineNo">1752</span>         }<a name="line.1752"></a>
-<span class="sourceLineNo">1753</span>      }<a name="line.1753"></a>
-<span class="sourceLineNo">1754</span>      return false;<a name="line.1754"></a>
-<span class="sourceLineNo">1755</span>   }<a name="line.1755"></a>
-<span class="sourceLineNo">1756</span><a name="line.1756"></a>
-<span class="sourceLineNo">1757</span>   /**<a name="line.1757"></a>
-<span class="sourceLineNo">1758</span>    * Given an absolute URI, returns just the authority portion (e.g. &lt;js&gt;"http://hostname:port"&lt;/js&gt;)<a name="line.1758"></a>
-<span class="sourceLineNo">1759</span>    * <a name="line.1759"></a>
-<span class="sourceLineNo">1760</span>    * @param s The URI string.<a name="line.1760"></a>
-<span class="sourceLineNo">1761</span>    * @return Just the authority portion of the URI.<a name="line.1761"></a>
-<span class="sourceLineNo">1762</span>    */<a name="line.1762"></a>
-<span class="sourceLineNo">1763</span>   public static String getAuthorityUri(String s) {<a name="line.1763"></a>
-<span class="sourceLineNo">1764</span><a name="line.1764"></a>
-<span class="sourceLineNo">1765</span>      // Use a state machine for maximum performance.<a name="line.1765"></a>
-<span class="sourceLineNo">1766</span><a name="line.1766"></a>
-<span class="sourceLineNo">1767</span>      int S1 = 1;  // Looking for http<a name="line.1767"></a>
-<span class="sourceLineNo">1768</span>      int S2 = 2;  // Found http, looking for :<a name="line.1768"></a>
-<span class="sourceLineNo">1769</span>      int S3 = 3;  // Found :, looking for /<a name="line.1769"></a>
-<span class="sourceLineNo">1770</span>      int S4 = 4;  // Found /, looking for /<a name="line.1770"></a>
-<span class="sourceLineNo">1771</span>      int S5 = 5;  // Found /, looking for x<a name="line.1771"></a>
-<span class="sourceLineNo">1772</span>      int S6 = 6;  // Found x, looking for /<a name="line.1772"></a>
-<span class="sourceLineNo">1773</span><a name="line.1773"></a>
-<span class="sourceLineNo">1774</span>      int state = S1;<a name="line.1774"></a>
-<span class="sourceLineNo">1775</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1775"></a>
-<span class="sourceLineNo">1776</span>         char c = s.charAt(i);<a name="line.1776"></a>
-<span class="sourceLineNo">1777</span>         if (state == S1) {<a name="line.1777"></a>
-<span class="sourceLineNo">1778</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1778"></a>
-<span class="sourceLineNo">1779</span>               state = S2;<a name="line.1779"></a>
-<span class="sourceLineNo">1780</span>            else<a name="line.1780"></a>
-<span class="sourceLineNo">1781</span>               return s;<a name="line.1781"></a>
-<span class="sourceLineNo">1782</span>         } else if (state == S2) {<a name="line.1782"></a>
-<span class="sourceLineNo">1783</span>            if (c == ':')<a name="line.1783"></a>
-<span class="sourceLineNo">1784</span>               state = S3;<a name="line.1784"></a>
-<span class="sourceLineNo">1785</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1785"></a>
-<span class="sourceLineNo">1786</span>               return s;<a name="line.1786"></a>
-<span class="sourceLineNo">1787</span>         } else if (state == S3) {<a name="line.1787"></a>
-<span class="sourceLineNo">1788</span>            if (c == '/')<a name="line.1788"></a>
-<span class="sourceLineNo">1789</span>               state = S4;<a name="line.1789"></a>
-<span class="sourceLineNo">1790</span>            else<a name="line.1790"></a>
-<span class="sourceLineNo">1791</span>               return s;<a name="line.1791"></a>
-<span class="sourceLineNo">1792</span>         } else if (state == S4) {<a name="line.1792"></a>
-<span class="sourceLineNo">1793</span>            if (c == '/')<a name="line.1793"></a>
-<span class="sourceLineNo">1794</span>               state = S5;<a name="line.1794"></a>
-<span class="sourceLineNo">1795</span>            else<a name="line.1795"></a>
-<span class="sourceLineNo">1796</span>               return s;<a name="line.1796"></a>
-<span class="sourceLineNo">1797</span>         } else if (state == S5) {<a name="line.1797"></a>
-<span class="sourceLineNo">1798</span>            if (c != '/')<a name="line.1798"></a>
-<span class="sourceLineNo">1799</span>               state = S6;<a name="line.1799"></a>
-<span class="sourceLineNo">1800</span>            else<a name="line.1800"></a>
-<span class="sourceLineNo">1801</span>               return s;<a name="line.1801"></a>
-<span class="sourceLineNo">1802</span>         } else if (state == S6) {<a name="line.1802"></a>
-<span class="sourceLineNo">1803</span>            if (c == '/')<a name="line.1803"></a>
-<span class="sourceLineNo">1804</span>               return s.substring(0, i);<a name="line.1804"></a>
-<span class="sourceLineNo">1805</span>         }<a name="line.1805"></a>
-<span class="sourceLineNo">1806</span>      }<a name="line.1806"></a>
-<span class="sourceLineNo">1807</span>      return s;<a name="line.1807"></a>
-<span class="sourceLineNo">1808</span>   }<a name="line.1808"></a>
-<span class="sourceLineNo">1809</span><a name="line.1809"></a>
-<span class="sourceLineNo">1810</span>   /**<a name="line.1810"></a>
-<span class="sourceLineNo">1811</span>    * Converts the specified object to a URI.<a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>    * <a name="line.1812"></a>
-<span class="sourceLineNo">1813</span>    * @param o The object to convert to a URI.<a name="line.1813"></a>
-<span class="sourceLineNo">1814</span>    * @return A new URI, or the same object if the object was already a URI, or<a name="line.1814"></a>
-<span class="sourceLineNo">1815</span>    */<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span>   public static URI toURI(Object o) {<a name="line.1816"></a>
-<span class="sourceLineNo">1817</span>      if (o == null || o instanceof URI)<a name="line.1817"></a>
-<span class="sourceLineNo">1818</span>         return (URI)o;<a name="line.1818"></a>
-<span class="sourceLineNo">1819</span>      try {<a name="line.1819"></a>
-<span class="sourceLineNo">1820</span>         return new URI(o.toString());<a name="line.1820"></a>
-<span class="sourceLineNo">1821</span>      } catch (URISyntaxException e) {<a name="line.1821"></a>
-<span class="sourceLineNo">1822</span>         throw new RuntimeException(e);<a name="line.1822"></a>
-<span class="sourceLineNo">1823</span>      }<a name="line.1823"></a>
-<span class="sourceLineNo">1824</span>   }<a name="line.1824"></a>
-<span class="sourceLineNo">1825</span><a name="line.1825"></a>
-<span class="sourceLineNo">1826</span>   /**<a name="line.1826"></a>
-<span class="sourceLineNo">1827</span>    * Returns the first non-null, non-empty string in the list.<a name="line.1827"></a>
-<span class="sourceLineNo">1828</span>    * <a name="line.1828"></a>
-<span class="sourceLineNo">1829</span>    * @param s The strings to test.<a name="line.1829"></a>
-<span class="sourceLineNo">1830</span>    * @return The first non-empty string in the list, or &lt;jk&gt;null&lt;/jk&gt; if they were all &lt;jk&gt;null&lt;/jk&gt; or empty.<a name="line.1830"></a>
-<span class="sourceLineNo">1831</span>    */<a name="line.1831"></a>
-<span class="sourceLineNo">1832</span>   public static String firstNonEmpty(String...s) {<a name="line.1832"></a>
-<span class="sourceLineNo">1833</span>      for (String ss : s)<a name="line.1833"></a>
-<span class="sourceLineNo">1834</span>         if (! isEmpty(ss))<a name="line.1834"></a>
-<span class="sourceLineNo">1835</span>            return ss;<a name="line.1835"></a>
-<span class="sourceLineNo">1836</span>      return null;<a name="line.1836"></a>
-<span class="sourceLineNo">1837</span>   }<a name="line.1837"></a>
-<span class="sourceLineNo">1838</span><a name="line.1838"></a>
-<span class="sourceLineNo">1839</span>   /**<a name="line.1839"></a>
-<span class="sourceLineNo">1840</span>    * Same as {@link String#indexOf(int)} except allows you to check for multiple characters.<a name="line.1840"></a>
-<span class="sourceLineNo">1841</span>    * <a name="line.1841"></a>
-<span class="sourceLineNo">1842</span>    * @param s The string to check.<a name="line.1842"></a>
-<span class="sourceLineNo">1843</span>    * @param c The characters to check for.<a name="line.1843"></a>
-<span class="sourceLineNo">1844</span>    * @return The index into the string that is one of the specified characters.<a name="line.1844"></a>
-<span class="sourceLineNo">1845</span>    */<a name="line.1845"></a>
-<span class="sourceLineNo">1846</span>   public static int indexOf(String s, char...c) {<a name="line.1846"></a>
-<span class="sourceLineNo">1847</span>      if (s == null)<a name="line.1847"></a>
-<span class="sourceLineNo">1848</span>         return -1;<a name="line.1848"></a>
-<span class="sourceLineNo">1849</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1849"></a>
-<span class="sourceLineNo">1850</span>         char c2 = s.charAt(i);<a name="line.1850"></a>
-<span class="sourceLineNo">1851</span>         for (char cc : c)<a name="line.1851"></a>
-<span class="sourceLineNo">1852</span>            if (c2 == cc)<a name="line.1852"></a>
-<span class="sourceLineNo">1853</span>               return i;<a name="line.1853"></a>
-<span class="sourceLineNo">1854</span>      }<a name="line.1854"></a>
-<span class="sourceLineNo">1855</span>      return -1;<a name="line.1855"></a>
-<span class="sourceLineNo">1856</span>   }<a name="line.1856"></a>
-<span class="sourceLineNo">1857</span><a name="line.1857"></a>
-<span class="sourceLineNo">1858</span>   /**<a name="line.1858"></a>
-<span class="sourceLineNo">1859</span>    * Similar to {@link MessageFormat#format(String, Object...)} except allows you to specify POJO arguments.<a name="line.1859"></a>
-<span class="sourceLineNo">1860</span>    * <a name="line.1860"></a>
-<span class="sourceLineNo">1861</span>    * @param pattern The string pattern.<a name="line.1861"></a>
-<span class="sourceLineNo">1862</span>    * @param args The arguments.<a name="line.1862"></a>
-<span class="sourceLineNo">1863</span>    * @return The formatted string.<a name="line.1863"></a>
-<span class="sourceLineNo">1864</span>    */<a name="line.1864"></a>
-<span class="sourceLineNo">1865</span>   public static String format(String pattern, Object...args) {<a name="line.1865"></a>
-<span class="sourceLineNo">1866</span>      if (args == null || args.length == 0)<a name="line.1866"></a>
-<span class="sourceLineNo">1867</span>         return pattern;<a name="line.1867"></a>
-<span class="sourceLineNo">1868</span>      for (int i = 0; i &lt; args.length; i++)<a name="line.1868"></a>
-<span class="sourceLineNo">1869</span>         args[i] = convertToReadable(args[i]);<a name="line.1869"></a>
-<span class="sourceLineNo">1870</span>      return MessageFormat.format(pattern, args);<a name="line.1870"></a>
-<span class="sourceLineNo">1871</span>   }<a name="line.1871"></a>
-<span class="sourceLineNo">1872</span><a name="line.1872"></a>
-<span class="sourceLineNo">1873</span>   private static Object convertToReadable(Object o) {<a name="line.1873"></a>
-<span class="sourceLineNo">1874</span>      if (o == null)<a name="line.1874"></a>
-<span class="sourceLineNo">1875</span>         return null;<a name="line.1875"></a>
-<span class="sourceLineNo">1876</span>      if (o instanceof ClassMeta)<a name="line.1876"></a>
-<span class="sourceLineNo">1877</span>         return ((ClassMeta&lt;?&gt;)o).getReadableName();<a name="line.1877"></a>
-<span class="sourceLineNo">1878</span>      if (BeanContext.DEFAULT == null)<a name="line.1878"></a>
-<span class="sourceLineNo">1879</span>         return o.toString();<a name="line.1879"></a>
-<span class="sourceLineNo">1880</span>      ClassMeta&lt;?&gt; cm = BeanContext.DEFAULT.getClassMetaForObject(o);<a name="line.1880"></a>
-<span class="sourceLineNo">1881</span>      if (cm.isMapOrBean() || cm.isCollectionOrArray())<a name="line.1881"></a>
-<span class="sourceLineNo">1882</span>         return JsonSerializer.DEFAULT_LAX.toString(o);<a name="line.1882"></a>
-<span class="sourceLineNo">1883</span>      if (cm.isClass())<a name="line.1883"></a>
-<span class="sourceLineNo">1884</span>         return ((Class&lt;?&gt;)o).getName();<a name="line.1884"></a>
-<span class="sourceLineNo">1885</span>      if (cm.isMethod())<a name="line.1885"></a>
-<span class="sourceLineNo">1886</span>         return ClassUtils.toString((Method)o);<a name="line.1886"></a>
-<span class="sourceLineNo">1887</span>      return o.toString();<a name="line.1887"></a>
-<span class="sourceLineNo">1888</span>   }<a name="line.1888"></a>
-<span class="sourceLineNo">1889</span>   <a name="line.1889"></a>
-<span class="sourceLineNo">1890</span>   /**<a name="line.1890"></a>
-<span class="sourceLineNo">1891</span>    * Converts a string containing a possible multiplier suffix to an integer.<a name="line.1891"></a>
-<span class="sourceLineNo">1892</span>    * <a name="line.1892"></a>
-<span class="sourceLineNo">1893</span>    * &lt;p&gt;<a name="line.1893"></a>
-<span class="sourceLineNo">1894</span>    * The string can contain any of the following multiplier suffixes:<a name="line.1894"></a>
-<span class="sourceLineNo">1895</span>    * &lt;ul&gt;<a name="line.1895"></a>
-<span class="sourceLineNo">1896</span>    *    &lt;li&gt;&lt;js&gt;"K"&lt;/js&gt; - x 1024<a name="line.1896"></a>
-<span class="sourceLineNo">1897</span>    *    &lt;li&gt;&lt;js&gt;"M"&lt;/js&gt; - x 1024*1024<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>    *    &lt;li&gt;&lt;js&gt;"G"&lt;/js&gt; - x 1024*1024*1024<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>    * &lt;/ul&gt;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    * <a name="line.1900"></a>
-<span class="sourceLineNo">1901</span>    * @param s The string to parse.<a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    * @return The parsed value.<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    */<a name="line.1903"></a>
-<span class="sourceLineNo">1904</span>   public static int parseIntWithSuffix(String s) {<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>      assertFieldNotNull(s, "s");<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>      int m = 1;<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>      if (s.endsWith("G")) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>         m = 1024*1024*1024;<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>      } else if (s.endsWith("M")) {<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>         m = 1024*1024;<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>      } else if (s.endsWith("K")) {<a name="line.1913"></a>
-<span class="sourceLineNo">1914</span>         m = 1024;<a name="line.1914"></a>
-<span class="sourceLineNo">1915</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1915"></a>
-<span class="sourceLineNo">1916</span>      }<a name="line.1916"></a>
-<span class="sourceLineNo">1917</span>      return Integer.decode(s) * m;<a name="line.1917"></a>
-<span class="sourceLineNo">1918</span>   }<a name="line.1918"></a>
-<span class="sourceLineNo">1919</span>   <a name="line.1919"></a>
-<span class="sourceLineNo">1920</span>   /**<a name="line.1920"></a>
-<span class="sourceLineNo">1921</span>    * Converts a string containing a possible multiplier suffix to a long.<a name="line.1921"></a>
-<span class="sourceLineNo">1922</span>    * <a name="line.1922"></a>
-<span class="sourceLineNo">1923</span>    * &lt;p&gt;<a name="line.1923"></a>
-<span class="sourceLineNo">1924</span>    * The string can contain any of the following multiplier suffixes:<a name="line.1924"></a>
-<span class="sourceLineNo">1925</span>    * &lt;ul&gt;<a name="line.1925"></a>
-<span class="sourceLineNo">1926</span>    *    &lt;li&gt;&lt;js&gt;"K"&lt;/js&gt; - x 1024<a name="line.1926"></a>
-<span class="sourceLineNo">1927</span>    *    &lt;li&gt;&lt;js&gt;"M"&lt;/js&gt; - x 1024*1024<a name="line.1927"></a>
-<span class="sourceLineNo">1928</span>    *    &lt;li&gt;&lt;js&gt;"G"&lt;/js&gt; - x 1024*1024*1024<a name="line.1928"></a>
-<span class="sourceLineNo">1929</span>    * &lt;/ul&gt;<a name="line.1929"></a>
-<span class="sourceLineNo">1930</span>    * <a name="line.1930"></a>
-<span class="sourceLineNo">1931</span>    * @param s The string to parse.<a name="line.1931"></a>
-<span class="sourceLineNo">1932</span>    * @return The parsed value.<a name="line.1932"></a>
-<span class="sourceLineNo">1933</span>    */<a name="line.1933"></a>
-<span class="sourceLineNo">1934</span>   public static long parseLongWithSuffix(String s) {<a name="line.1934"></a>
-<span class="sourceLineNo">1935</span>      assertFieldNotNull(s, "s");<a name="line.1935"></a>
-<span class="sourceLineNo">1936</span>      int m = 1;<a name="line.1936"></a>
-<span class="sourceLineNo">1937</span>      if (s.endsWith("G")) {<a name="line.1937"></a>
-<span class="sourceLineNo">1938</span>         m = 1024*1024*1024;<a name="line.1938"></a>
-<span class="sourceLineNo">1939</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1939"></a>
-<span class="sourceLineNo">1940</span>      } else if (s.endsWith("M")) {<a name="line.1940"></a>
-<span class="sourceLineNo">1941</span>         m = 1024*1024;<a name="line.1941"></a>
-<span class="sourceLineNo">1942</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1942"></a>
-<span class="sourceLineNo">1943</span>      } else if (s.endsWith("K")) {<a name="line.1943"></a>
-<span class="sourceLineNo">1944</span>         m = 1024;<a name="line.1944"></a>
-<span class="sourceLineNo">1945</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1945"></a>
-<span class="sourceLineNo">1946</span>      }<a name="line.1946"></a>
-<span class="sourceLineNo">1947</span>      return Long.decode(s) * m;<a name="line.1947"></a>
-<span class="sourceLineNo">1948</span>   }<a name="line.1948"></a>
-<span class="sourceLineNo">1949</span>   <a name="line.1949"></a>
-<span class="sourceLineNo">1950</span>   /**<a name="line.1950"></a>
-<span class="sourceLineNo">1951</span>    * Same as {@link String#contains(CharSequence)} except returns &lt;jk&gt;null&lt;/jk&gt; if the value is null.<a name="line.1951"></a>
-<span class="sourceLineNo">1952</span>    * <a name="line.1952"></a>
-<span class="sourceLineNo">1953</span>    * @param value The string to check.<a name="line.1953"></a>
-<span class="sourceLineNo">1954</span>    * @param substring The value to check for.<a name="line.1954"></a>
-<span class="sourceLineNo">1955</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the value contains the specified substring.<a name="line.1955"></a>
-<span class="sourceLineNo">1956</span>    */<a name="line.1956"></a>
-<span class="sourceLineNo">1957</span>   public static boolean contains(String value, CharSequence substring) {<a name="line.1957"></a>
-<span class="sourceLineNo">1958</span>      return value == null ? false : value.contains(substring);<a name="line.1958"></a>
+<span class="sourceLineNo">1675</span>      return l;<a name="line.1675"></a>
+<span class="sourceLineNo">1676</span>   }<a name="line.1676"></a>
+<span class="sourceLineNo">1677</span><a name="line.1677"></a>
+<span class="sourceLineNo">1678</span>   /**<a name="line.1678"></a>
+<span class="sourceLineNo">1679</span>    * Returns the first non-whitespace character in the string.<a name="line.1679"></a>
+<span class="sourceLineNo">1680</span>    * <a name="line.1680"></a>
+<span class="sourceLineNo">1681</span>    * @param s The string to check.<a name="line.1681"></a>
+<span class="sourceLineNo">1682</span>    * @return<a name="line.1682"></a>
+<span class="sourceLineNo">1683</span>    *    The first non-whitespace character, or &lt;code&gt;0&lt;/code&gt; if the string is &lt;jk&gt;null&lt;/jk&gt;, empty, or composed<a name="line.1683"></a>
+<span class="sourceLineNo">1684</span>    *    of only whitespace.<a name="line.1684"></a>
+<span class="sourceLineNo">1685</span>    */<a name="line.1685"></a>
+<span class="sourceLineNo">1686</span>   public static char firstNonWhitespaceChar(String s) {<a name="line.1686"></a>
+<span class="sourceLineNo">1687</span>      if (s != null)<a name="line.1687"></a>
+<span class="sourceLineNo">1688</span>         for (int i = 0; i &lt; s.length(); i++)<a name="line.1688"></a>
+<span class="sourceLineNo">1689</span>            if (! Character.isWhitespace(s.charAt(i)))<a name="line.1689"></a>
+<span class="sourceLineNo">1690</span>               return s.charAt(i);<a name="line.1690"></a>
+<span class="sourceLineNo">1691</span>      return 0;<a name="line.1691"></a>
+<span class="sourceLineNo">1692</span>   }<a name="line.1692"></a>
+<span class="sourceLineNo">1693</span><a name="line.1693"></a>
+<span class="sourceLineNo">1694</span>   /**<a name="line.1694"></a>
+<span class="sourceLineNo">1695</span>    * Returns the last non-whitespace character in the string.<a name="line.1695"></a>
+<span class="sourceLineNo">1696</span>    * <a name="line.1696"></a>
+<span class="sourceLineNo">1697</span>    * @param s The string to check.<a name="line.1697"></a>
+<span class="sourceLineNo">1698</span>    * @return<a name="line.1698"></a>
+<span class="sourceLineNo">1699</span>    *    The last non-whitespace character, or &lt;code&gt;0&lt;/code&gt; if the string is &lt;jk&gt;null&lt;/jk&gt;, empty, or composed<a name="line.1699"></a>
+<span class="sourceLineNo">1700</span>    *    of only whitespace.<a name="line.1700"></a>
+<span class="sourceLineNo">1701</span>    */<a name="line.1701"></a>
+<span class="sourceLineNo">1702</span>   public static char lastNonWhitespaceChar(String s) {<a name="line.1702"></a>
+<span class="sourceLineNo">1703</span>      if (s != null)<a name="line.1703"></a>
+<span class="sourceLineNo">1704</span>         for (int i = s.length()-1; i &gt;= 0; i--)<a name="line.1704"></a>
+<span class="sourceLineNo">1705</span>            if (! Character.isWhitespace(s.charAt(i)))<a name="line.1705"></a>
+<span class="sourceLineNo">1706</span>               return s.charAt(i);<a name="line.1706"></a>
+<span class="sourceLineNo">1707</span>      return 0;<a name="line.1707"></a>
+<span class="sourceLineNo">1708</span>   }<a name="line.1708"></a>
+<span class="sourceLineNo">1709</span><a name="line.1709"></a>
+<span class="sourceLineNo">1710</span>   /**<a name="line.1710"></a>
+<span class="sourceLineNo">1711</span>    * Returns the character at the specified index in the string without throwing exceptions.<a name="line.1711"></a>
+<span class="sourceLineNo">1712</span>    * <a name="line.1712"></a>
+<span class="sourceLineNo">1713</span>    * @param s The string.<a name="line.1713"></a>
+<span class="sourceLineNo">1714</span>    * @param i The index position.<a name="line.1714"></a>
+<span class="sourceLineNo">1715</span>    * @return<a name="line.1715"></a>
+<span class="sourceLineNo">1716</span>    *    The character at the specified index, or &lt;code&gt;0&lt;/code&gt; if the index is out-of-range or the string<a name="line.1716"></a>
+<span class="sourceLineNo">1717</span>    *    is &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1717"></a>
+<span class="sourceLineNo">1718</span>    */<a name="line.1718"></a>
+<span class="sourceLineNo">1719</span>   public static char charAt(String s, int i) {<a name="line.1719"></a>
+<span class="sourceLineNo">1720</span>      if (s == null)<a name="line.1720"></a>
+<span class="sourceLineNo">1721</span>         return 0;<a name="line.1721"></a>
+<span class="sourceLineNo">1722</span>      if (i &lt; 0 || i &gt;= s.length())<a name="line.1722"></a>
+<span class="sourceLineNo">1723</span>         return 0;<a name="line.1723"></a>
+<span class="sourceLineNo">1724</span>      return s.charAt(i);<a name="line.1724"></a>
+<span class="sourceLineNo">1725</span>   }<a name="line.1725"></a>
+<span class="sourceLineNo">1726</span><a name="line.1726"></a>
+<span class="sourceLineNo">1727</span>   /**<a name="line.1727"></a>
+<span class="sourceLineNo">1728</span>    * Efficiently determines whether a URL is of the pattern "xxx://xxx"<a name="line.1728"></a>
+<span class="sourceLineNo">1729</span>    * <a name="line.1729"></a>
+<span class="sourceLineNo">1730</span>    * @param s The string to test.<a name="line.1730"></a>
+<span class="sourceLineNo">1731</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if it's an absolute path.<a name="line.1731"></a>
+<span class="sourceLineNo">1732</span>    */<a name="line.1732"></a>
+<span class="sourceLineNo">1733</span>   public static boolean isAbsoluteUri(String s) {<a name="line.1733"></a>
+<span class="sourceLineNo">1734</span><a name="line.1734"></a>
+<span class="sourceLineNo">1735</span>      if (isEmpty(s))<a name="line.1735"></a>
+<span class="sourceLineNo">1736</span>         return false;<a name="line.1736"></a>
+<span class="sourceLineNo">1737</span><a name="line.1737"></a>
+<span class="sourceLineNo">1738</span>      // Use a state machine for maximum performance.<a name="line.1738"></a>
+<span class="sourceLineNo">1739</span><a name="line.1739"></a>
+<span class="sourceLineNo">1740</span>      int S1 = 1;  // Looking for http<a name="line.1740"></a>
+<span class="sourceLineNo">1741</span>      int S2 = 2;  // Found http, looking for :<a name="line.1741"></a>
+<span class="sourceLineNo">1742</span>      int S3 = 3;  // Found :, looking for /<a name="line.1742"></a>
+<span class="sourceLineNo">1743</span>      int S4 = 4;  // Found /, looking for /<a name="line.1743"></a>
+<span class="sourceLineNo">1744</span>      int S5 = 5;  // Found /, looking for x<a name="line.1744"></a>
+<span class="sourceLineNo">1745</span><a name="line.1745"></a>
+<span class="sourceLineNo">1746</span>      int state = S1;<a name="line.1746"></a>
+<span class="sourceLineNo">1747</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1747"></a>
+<span class="sourceLineNo">1748</span>         char c = s.charAt(i);<a name="line.1748"></a>
+<span class="sourceLineNo">1749</span>         if (state == S1) {<a name="line.1749"></a>
+<span class="sourceLineNo">1750</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1750"></a>
+<span class="sourceLineNo">1751</span>               state = S2;<a name="line.1751"></a>
+<span class="sourceLineNo">1752</span>            else<a name="line.1752"></a>
+<span class="sourceLineNo">1753</span>               return false;<a name="line.1753"></a>
+<span class="sourceLineNo">1754</span>         } else if (state == S2) {<a name="line.1754"></a>
+<span class="sourceLineNo">1755</span>            if (c == ':')<a name="line.1755"></a>
+<span class="sourceLineNo">1756</span>               state = S3;<a name="line.1756"></a>
+<span class="sourceLineNo">1757</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1757"></a>
+<span class="sourceLineNo">1758</span>               return false;<a name="line.1758"></a>
+<span class="sourceLineNo">1759</span>         } else if (state == S3) {<a name="line.1759"></a>
+<span class="sourceLineNo">1760</span>            if (c == '/')<a name="line.1760"></a>
+<span class="sourceLineNo">1761</span>               state = S4;<a name="line.1761"></a>
+<span class="sourceLineNo">1762</span>            else<a name="line.1762"></a>
+<span class="sourceLineNo">1763</span>               return false;<a name="line.1763"></a>
+<span class="sourceLineNo">1764</span>         } else if (state == S4) {<a name="line.1764"></a>
+<span class="sourceLineNo">1765</span>            if (c == '/')<a name="line.1765"></a>
+<span class="sourceLineNo">1766</span>               state = S5;<a name="line.1766"></a>
+<span class="sourceLineNo">1767</span>            else<a name="line.1767"></a>
+<span class="sourceLineNo">1768</span>               return false;<a name="line.1768"></a>
+<span class="sourceLineNo">1769</span>         } else if (state == S5) {<a name="line.1769"></a>
+<span class="sourceLineNo">1770</span>            return true;<a name="line.1770"></a>
+<span class="sourceLineNo">1771</span>         }<a name="line.1771"></a>
+<span class="sourceLineNo">1772</span>      }<a name="line.1772"></a>
+<span class="sourceLineNo">1773</span>      return false;<a name="line.1773"></a>
+<span class="sourceLineNo">1774</span>   }<a name="line.1774"></a>
+<span class="sourceLineNo">1775</span><a name="line.1775"></a>
+<span class="sourceLineNo">1776</span>   /**<a name="line.1776"></a>
+<span class="sourceLineNo">1777</span>    * Efficiently determines whether a URL is of the pattern "xxx:/xxx".<a name="line.1777"></a>
+<span class="sourceLineNo">1778</span>    * <a name="line.1778"></a>
+<span class="sourceLineNo">1779</span>    * &lt;p&gt;<a name="line.1779"></a>
+<span class="sourceLineNo">1780</span>    * The pattern matched is: &lt;code&gt;[a-z]{2,}\:\/.*&lt;/code&gt;<a name="line.1780"></a>
+<span class="sourceLineNo">1781</span>    * <a name="line.1781"></a>
+<span class="sourceLineNo">1782</span>    * &lt;p&gt;<a name="line.1782"></a>
+<span class="sourceLineNo">1783</span>    * Note that this excludes filesystem paths such as &lt;js&gt;"C:/temp"&lt;/js&gt;.<a name="line.1783"></a>
+<span class="sourceLineNo">1784</span>    * <a name="line.1784"></a>
+<span class="sourceLineNo">1785</span>    * @param s The string to test.<a name="line.1785"></a>
+<span class="sourceLineNo">1786</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if it's an absolute path.<a name="line.1786"></a>
+<span class="sourceLineNo">1787</span>    */<a name="line.1787"></a>
+<span class="sourceLineNo">1788</span>   public static boolean isUri(String s) {<a name="line.1788"></a>
+<span class="sourceLineNo">1789</span><a name="line.1789"></a>
+<span class="sourceLineNo">1790</span>      if (isEmpty(s))<a name="line.1790"></a>
+<span class="sourceLineNo">1791</span>         return false;<a name="line.1791"></a>
+<span class="sourceLineNo">1792</span><a name="line.1792"></a>
+<span class="sourceLineNo">1793</span>      // Use a state machine for maximum performance.<a name="line.1793"></a>
+<span class="sourceLineNo">1794</span><a name="line.1794"></a>
+<span class="sourceLineNo">1795</span>      int S1 = 1;  // Looking for protocol char 1<a name="line.1795"></a>
+<span class="sourceLineNo">1796</span>      int S2 = 2;  // Found protocol char 1, looking for protocol char 2<a name="line.1796"></a>
+<span class="sourceLineNo">1797</span>      int S3 = 3;  // Found protocol char 2, looking for :<a name="line.1797"></a>
+<span class="sourceLineNo">1798</span>      int S4 = 4;  // Found :, looking for /<a name="line.1798"></a>
+<span class="sourceLineNo">1799</span><a name="line.1799"></a>
+<span class="sourceLineNo">1800</span><a name="line.1800"></a>
+<span class="sourceLineNo">1801</span>      int state = S1;<a name="line.1801"></a>
+<span class="sourceLineNo">1802</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1802"></a>
+<span class="sourceLineNo">1803</span>         char c = s.charAt(i);<a name="line.1803"></a>
+<span class="sourceLineNo">1804</span>         if (state == S1) {<a name="line.1804"></a>
+<span class="sourceLineNo">1805</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1805"></a>
+<span class="sourceLineNo">1806</span>               state = S2;<a name="line.1806"></a>
+<span class="sourceLineNo">1807</span>            else<a name="line.1807"></a>
+<span class="sourceLineNo">1808</span>               return false;<a name="line.1808"></a>
+<span class="sourceLineNo">1809</span>         } else if (state == S2) {<a name="line.1809"></a>
+<span class="sourceLineNo">1810</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1810"></a>
+<span class="sourceLineNo">1811</span>               state = S3;<a name="line.1811"></a>
+<span class="sourceLineNo">1812</span>            else<a name="line.1812"></a>
+<span class="sourceLineNo">1813</span>               return false;<a name="line.1813"></a>
+<span class="sourceLineNo">1814</span>         } else if (state == S3) {<a name="line.1814"></a>
+<span class="sourceLineNo">1815</span>            if (c == ':')<a name="line.1815"></a>
+<span class="sourceLineNo">1816</span>               state = S4;<a name="line.1816"></a>
+<span class="sourceLineNo">1817</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1817"></a>
+<span class="sourceLineNo">1818</span>               return false;<a name="line.1818"></a>
+<span class="sourceLineNo">1819</span>         } else if (state == S4) {<a name="line.1819"></a>
+<span class="sourceLineNo">1820</span>            if (c == '/')<a name="line.1820"></a>
+<span class="sourceLineNo">1821</span>               return true;<a name="line.1821"></a>
+<span class="sourceLineNo">1822</span>            return false;<a name="line.1822"></a>
+<span class="sourceLineNo">1823</span>         }<a name="line.1823"></a>
+<span class="sourceLineNo">1824</span>      }<a name="line.1824"></a>
+<span class="sourceLineNo">1825</span>      return false;<a name="line.1825"></a>
+<span class="sourceLineNo">1826</span>   }<a name="line.1826"></a>
+<span class="sourceLineNo">1827</span><a name="line.1827"></a>
+<span class="sourceLineNo">1828</span>   /**<a name="line.1828"></a>
+<span class="sourceLineNo">1829</span>    * Given an absolute URI, returns just the authority portion (e.g. &lt;js&gt;"http://hostname:port"&lt;/js&gt;)<a name="line.1829"></a>
+<span class="sourceLineNo">1830</span>    * <a name="line.1830"></a>
+<span class="sourceLineNo">1831</span>    * @param s The URI string.<a name="line.1831"></a>
+<span class="sourceLineNo">1832</span>    * @return Just the authority portion of the URI.<a name="line.1832"></a>
+<span class="sourceLineNo">1833</span>    */<a name="line.1833"></a>
+<span class="sourceLineNo">1834</span>   public static String getAuthorityUri(String s) {<a name="line.1834"></a>
+<span class="sourceLineNo">1835</span><a name="line.1835"></a>
+<span class="sourceLineNo">1836</span>      // Use a state machine for maximum performance.<a name="line.1836"></a>
+<span class="sourceLineNo">1837</span><a name="line.1837"></a>
+<span class="sourceLineNo">1838</span>      int S1 = 1;  // Looking for http<a name="line.1838"></a>
+<span class="sourceLineNo">1839</span>      int S2 = 2;  // Found http, looking for :<a name="line.1839"></a>
+<span class="sourceLineNo">1840</span>      int S3 = 3;  // Found :, looking for /<a name="line.1840"></a>
+<span class="sourceLineNo">1841</span>      int S4 = 4;  // Found /, looking for /<a name="line.1841"></a>
+<span class="sourceLineNo">1842</span>      int S5 = 5;  // Found /, looking for x<a name="line.1842"></a>
+<span class="sourceLineNo">1843</span>      int S6 = 6;  // Found x, looking for /<a name="line.1843"></a>
+<span class="sourceLineNo">1844</span><a name="line.1844"></a>
+<span class="sourceLineNo">1845</span>      int state = S1;<a name="line.1845"></a>
+<span class="sourceLineNo">1846</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1846"></a>
+<span class="sourceLineNo">1847</span>         char c = s.charAt(i);<a name="line.1847"></a>
+<span class="sourceLineNo">1848</span>         if (state == S1) {<a name="line.1848"></a>
+<span class="sourceLineNo">1849</span>            if (c &gt;= 'a' &amp;&amp; c &lt;= 'z')<a name="line.1849"></a>
+<span class="sourceLineNo">1850</span>               state = S2;<a name="line.1850"></a>
+<span class="sourceLineNo">1851</span>            else<a name="line.1851"></a>
+<span class="sourceLineNo">1852</span>               return s;<a name="line.1852"></a>
+<span class="sourceLineNo">1853</span>         } else if (state == S2) {<a name="line.1853"></a>
+<span class="sourceLineNo">1854</span>            if (c == ':')<a name="line.1854"></a>
+<span class="sourceLineNo">1855</span>               state = S3;<a name="line.1855"></a>
+<span class="sourceLineNo">1856</span>            else if (c &lt; 'a' || c &gt; 'z')<a name="line.1856"></a>
+<span class="sourceLineNo">1857</span>               return s;<a name="line.1857"></a>
+<span class="sourceLineNo">1858</span>         } else if (state == S3) {<a name="line.1858"></a>
+<span class="sourceLineNo">1859</span>            if (c == '/')<a name="line.1859"></a>
+<span class="sourceLineNo">1860</span>               state = S4;<a name="line.1860"></a>
+<span class="sourceLineNo">1861</span>            else<a name="line.1861"></a>
+<span class="sourceLineNo">1862</span>               return s;<a name="line.1862"></a>
+<span class="sourceLineNo">1863</span>         } else if (state == S4) {<a name="line.1863"></a>
+<span class="sourceLineNo">1864</span>            if (c == '/')<a name="line.1864"></a>
+<span class="sourceLineNo">1865</span>               state = S5;<a name="line.1865"></a>
+<span class="sourceLineNo">1866</span>            else<a name="line.1866"></a>
+<span class="sourceLineNo">1867</span>               return s;<a name="line.1867"></a>
+<span class="sourceLineNo">1868</span>         } else if (state == S5) {<a name="line.1868"></a>
+<span class="sourceLineNo">1869</span>            if (c != '/')<a name="line.1869"></a>
+<span class="sourceLineNo">1870</span>               state = S6;<a name="line.1870"></a>
+<span class="sourceLineNo">1871</span>            else<a name="line.1871"></a>
+<span class="sourceLineNo">1872</span>               return s;<a name="line.1872"></a>
+<span class="sourceLineNo">1873</span>         } else if (state == S6) {<a name="line.1873"></a>
+<span class="sourceLineNo">1874</span>            if (c == '/')<a name="line.1874"></a>
+<span class="sourceLineNo">1875</span>               return s.substring(0, i);<a name="line.1875"></a>
+<span class="sourceLineNo">1876</span>         }<a name="line.1876"></a>
+<span class="sourceLineNo">1877</span>      }<a name="line.1877"></a>
+<span class="sourceLineNo">1878</span>      return s;<a name="line.1878"></a>
+<span class="sourceLineNo">1879</span>   }<a name="line.1879"></a>
+<span class="sourceLineNo">1880</span><a name="line.1880"></a>
+<span class="sourceLineNo">1881</span>   /**<a name="line.1881"></a>
+<span class="sourceLineNo">1882</span>    * Converts the specified object to a URI.<a name="line.1882"></a>
+<span class="sourceLineNo">1883</span>    * <a name="line.1883"></a>
+<span class="sourceLineNo">1884</span>    * @param o The object to convert to a URI.<a name="line.1884"></a>
+<span class="sourceLineNo">1885</span>    * @return A new URI, or the same object if the object was already a URI, or<a name="line.1885"></a>
+<span class="sourceLineNo">1886</span>    */<a name="line.1886"></a>
+<span class="sourceLineNo">1887</span>   public static URI toURI(Object o) {<a name="line.1887"></a>
+<span class="sourceLineNo">1888</span>      if (o == null || o instanceof URI)<a name="line.1888"></a>
+<span class="sourceLineNo">1889</span>         return (URI)o;<a name="line.1889"></a>
+<span class="sourceLineNo">1890</span>      try {<a name="line.1890"></a>
+<span class="sourceLineNo">1891</span>         return new URI(o.toString());<a name="line.1891"></a>
+<span class="sourceLineNo">1892</span>      } catch (URISyntaxException e) {<a name="line.1892"></a>
+<span class="sourceLineNo">1893</span>         throw new RuntimeException(e);<a name="line.1893"></a>
+<span class="sourceLineNo">1894</span>      }<a name="line.1894"></a>
+<span class="sourceLineNo">1895</span>   }<a name="line.1895"></a>
+<span class="sourceLineNo">1896</span><a name="line.1896"></a>
+<span class="sourceLineNo">1897</span>   /**<a name="line.1897"></a>
+<span class="sourceLineNo">1898</span>    * Returns the first non-null, non-empty string in the list.<a name="line.1898"></a>
+<span class="sourceLineNo">1899</span>    * <a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>    * @param s The strings to test.<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>    * @return The first non-empty string in the list, or &lt;jk&gt;null&lt;/jk&gt; if they were all &lt;jk&gt;null&lt;/jk&gt; or empty.<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    */<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span>   public static String firstNonEmpty(String...s) {<a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>      for (String ss : s)<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>         if (! isEmpty(ss))<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>            return ss;<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>      return null;<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>   }<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span><a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>   /**<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>    * Same as {@link String#indexOf(int)} except allows you to check for multiple characters.<a name="line.1911"></a>
+<span class="sourceLineNo">1912</span>    * <a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>    * @param s The string to check.<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>    * @param c The characters to check for.<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>    * @return The index into the string that is one of the specified characters.<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>    */<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>   public static int indexOf(String s, char...c) {<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span>      if (s == null)<a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>         return -1;<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>      for (int i = 0; i &lt; s.length(); i++) {<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>         char c2 = s.charAt(i);<a name="line.1921"></a>
+<span class="sourceLineNo">1922</span>         for (char cc : c)<a name="line.1922"></a>
+<span class="sourceLineNo">1923</span>            if (c2 == cc)<a name="line.1923"></a>
+<span class="sourceLineNo">1924</span>               return i;<a name="line.1924"></a>
+<span class="sourceLineNo">1925</span>      }<a name="line.1925"></a>
+<span class="sourceLineNo">1926</span>      return -1;<a name="line.1926"></a>
+<span class="sourceLineNo">1927</span>   }<a name="line.1927"></a>
+<span class="sourceLineNo">1928</span><a name="line.1928"></a>
+<span class="sourceLineNo">1929</span>   /**<a name="line.1929"></a>
+<span class="sourceLineNo">1930</span>    * Similar to {@link MessageFormat#format(String, Object...)} except allows you to specify POJO arguments.<a name="line.1930"></a>
+<span class="sourceLineNo">1931</span>    * <a name="line.1931"></a>
+<span class="sourceLineNo">1932</span>    * @param pattern The string pattern.<a name="line.1932"></a>
+<span class="sourceLineNo">1933</span>    * @param args The arguments.<a name="line.1933"></a>
+<span class="sourceLineNo">1934</span>    * @return The formatted string.<a name="line.1934"></a>
+<span class="sourceLineNo">1935</span>    */<a name="line.1935"></a>
+<span class="sourceLineNo">1936</span>   public static String format(String pattern, Object...args) {<a name="line.1936"></a>
+<span class="sourceLineNo">1937</span>      if (args == null || args.length == 0)<a name="line.1937"></a>
+<span class="sourceLineNo">1938</span>         return pattern;<a name="line.1938"></a>
+<span class="sourceLineNo">1939</span>      for (int i = 0; i &lt; args.length; i++)<a name="line.1939"></a>
+<span class="sourceLineNo">1940</span>         args[i] = convertToReadable(args[i]);<a name="line.1940"></a>
+<span class="sourceLineNo">1941</span>      return MessageFormat.format(pattern, args);<a name="line.1941"></a>
+<span class="sourceLineNo">1942</span>   }<a name="line.1942"></a>
+<span class="sourceLineNo">1943</span><a name="line.1943"></a>
+<span class="sourceLineNo">1944</span>   private static Object convertToReadable(Object o) {<a name="line.1944"></a>
+<span class="sourceLineNo">1945</span>      if (o == null)<a name="line.1945"></a>
+<span class="sourceLineNo">1946</span>         return null;<a name="line.1946"></a>
+<span class="sourceLineNo">1947</span>      if (o instanceof ClassMeta)<a name="line.1947"></a>
+<span class="sourceLineNo">1948</span>         return ((ClassMeta&lt;?&gt;)o).getReadableName();<a name="line.1948"></a>
+<span class="sourceLineNo">1949</span>      if (BeanContext.DEFAULT == null)<a name="line.1949"></a>
+<span class="sourceLineNo">1950</span>         return o.toString();<a name="line.1950"></a>
+<span class="sourceLineNo">1951</span>      ClassMeta&lt;?&gt; cm = BeanContext.DEFAULT.getClassMetaForObject(o);<a name="line.1951"></a>
+<span class="sourceLineNo">1952</span>      if (cm.isMapOrBean() || cm.isCollectionOrArray())<a name="line.1952"></a>
+<span class="sourceLineNo">1953</span>         return JsonSerializer.DEFAULT_LAX.toString(o);<a name="line.1953"></a>
+<span class="sourceLineNo">1954</span>      if (cm.isClass())<a name="line.1954"></a>
+<span class="sourceLineNo">1955</span>         return ((Class&lt;?&gt;)o).getName();<a name="line.1955"></a>
+<span class="sourceLineNo">1956</span>      if (cm.isMethod())<a name="line.1956"></a>
+<span class="sourceLineNo">1957</span>         return ClassUtils.toString((Method)o);<a name="line.1957"></a>
+<span class="sourceLineNo">1958</span>      return o.toString();<a name="line.1958"></a>
 <span class="sourceLineNo">1959</span>   }<a name="line.1959"></a>
 <span class="sourceLineNo">1960</span>   <a name="line.1960"></a>
 <span class="sourceLineNo">1961</span>   /**<a name="line.1961"></a>
-<span class="sourceLineNo">1962</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be an JSON array.<a name="line.1962"></a>
+<span class="sourceLineNo">1962</span>    * Converts a string containing a possible multiplier suffix to an integer.<a name="line.1962"></a>
 <span class="sourceLineNo">1963</span>    * <a name="line.1963"></a>
-<span class="sourceLineNo">1964</span>    * @param o The object to test.<a name="line.1964"></a>
-<span class="sourceLineNo">1965</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be a JSON array.<a name="line.1965"></a>
-<span class="sourceLineNo">1966</span>    */<a name="line.1966"></a>
-<span class="sourceLineNo">1967</span>   public static boolean isObjectList(Object o) {<a name="line.1967"></a>
-<span class="sourceLineNo">1968</span>      if (o instanceof CharSequence) {<a name="line.1968"></a>
-<span class="sourceLineNo">1969</span>         String s = o.toString();<a name="line.1969"></a>
-<span class="sourceLineNo">1970</span>         return (s.startsWith("[") &amp;&amp; s.endsWith("]") &amp;&amp; BeanContext.DEFAULT != null);<a name="line.1970"></a>
-<span class="sourceLineNo">1971</span>      }<a name="line.1971"></a>
-<span class="sourceLineNo">1972</span>      return false;<a name="line.1972"></a>
-<span class="sourceLineNo">1973</span>   }<a name="line.1973"></a>
-<span class="sourceLineNo">1974</span><a name="line.1974"></a>
-<span class="sourceLineNo">1975</span>   /**<a name="line.1975"></a>
-<span class="sourceLineNo">1976</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be a JSON object.<a name="line.1976"></a>
-<span class="sourceLineNo">1977</span>    * <a name="line.1977"></a>
-<span class="sourceLineNo">1978</span>    * @param o The object to test.<a name="line.1978"></a>
-<span class="sourceLineNo">1979</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be a JSON object.<a name="line.1979"></a>
-<span class="sourceLineNo">1980</span>    */<a name="line.1980"></a>
-<span class="sourceLineNo">1981</span>   public static boolean isObjectMap(Object o) {<a name="line.1981"></a>
-<span class="sourceLineNo">1982</span>      if (o instanceof CharSequence) {<a name="line.1982"></a>
-<span class="sourceLineNo">1983</span>         String s = o.toString();<a name="line.1983"></a>
-<span class="sourceLineNo">1984</span>         return (s.startsWith("{") &amp;&amp; s.endsWith("}") &amp;&amp; BeanContext.DEFAULT != null);<a name="line.1984"></a>
-<span class="sourceLineNo">1985</span>      }<a name="line.1985"></a>
-<span class="sourceLineNo">1986</span>      return false;<a name="line.1986"></a>
-<span class="sourceLineNo">1987</span>   }<a name="line.1987"></a>
-<span class="sourceLineNo">1988</span>}<a name="line.1988"></a>
+<span class="sourceLineNo">1964</span>    * &lt;p&gt;<a name="line.1964"></a>
+<span class="sourceLineNo">1965</span>    * The string can contain any of the following multiplier suffixes:<a name="line.1965"></a>
+<span class="sourceLineNo">1966</span>    * &lt;ul&gt;<a name="line.1966"></a>
+<span class="sourceLineNo">1967</span>    *    &lt;li&gt;&lt;js&gt;"K"&lt;/js&gt; - x 1024<a name="line.1967"></a>
+<span class="sourceLineNo">1968</span>    *    &lt;li&gt;&lt;js&gt;"M"&lt;/js&gt; - x 1024*1024<a name="line.1968"></a>
+<span class="sourceLineNo">1969</span>    *    &lt;li&gt;&lt;js&gt;"G"&lt;/js&gt; - x 1024*1024*1024<a name="line.1969"></a>
+<span class="sourceLineNo">1970</span>    * &lt;/ul&gt;<a name="line.1970"></a>
+<span class="sourceLineNo">1971</span>    * <a name="line.1971"></a>
+<span class="sourceLineNo">1972</span>    * @param s The string to parse.<a name="line.1972"></a>
+<span class="sourceLineNo">1973</span>    * @return The parsed value.<a name="line.1973"></a>
+<span class="sourceLineNo">1974</span>    */<a name="line.1974"></a>
+<span class="sourceLineNo">1975</span>   public static int parseIntWithSuffix(String s) {<a name="line.1975"></a>
+<span class="sourceLineNo">1976</span>      assertFieldNotNull(s, "s");<a name="line.1976"></a>
+<span class="sourceLineNo">1977</span>      int m = 1;<a name="line.1977"></a>
+<span class="sourceLineNo">1978</span>      if (s.endsWith("G")) {<a name="line.1978"></a>
+<span class="sourceLineNo">1979</span>         m = 1024*1024*1024;<a name="line.1979"></a>
+<span class="sourceLineNo">1980</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1980"></a>
+<span class="sourceLineNo">1981</span>      } else if (s.endsWith("M")) {<a name="line.1981"></a>
+<span class="sourceLineNo">1982</span>         m = 1024*1024;<a name="line.1982"></a>
+<span class="sourceLineNo">1983</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1983"></a>
+<span class="sourceLineNo">1984</span>      } else if (s.endsWith("K")) {<a name="line.1984"></a>
+<span class="sourceLineNo">1985</span>         m = 1024;<a name="line.1985"></a>
+<span class="sourceLineNo">1986</span>         s = s.substring(0, s.length()-1).trim();<a name="line.1986"></a>
+<span class="sourceLineNo">1987</span>      }<a name="line.1987"></a>
+<span class="sourceLineNo">1988</span>      return Integer.decode(s) * m;<a name="line.1988"></a>
+<span class="sourceLineNo">1989</span>   }<a name="line.1989"></a>
+<span class="sourceLineNo">1990</span>   <a name="line.1990"></a>
+<span class="sourceLineNo">1991</span>   /**<a name="line.1991"></a>
+<span class="sourceLineNo">1992</span>    * Converts a string containing a possible multiplier suffix to a long.<a name="line.1992"></a>
+<span class="sourceLineNo">1993</span>    * <a name="line.1993"></a>
+<span class="sourceLineNo">1994</span>    * &lt;p&gt;<a name="line.1994"></a>
+<span class="sourceLineNo">1995</span>    * The string can contain any of the following multiplier suffixes:<a name="line.1995"></a>
+<span class="sourceLineNo">1996</span>    * &lt;ul&gt;<a name="line.1996"></a>
+<span class="sourceLineNo">1997</span>    *    &lt;li&gt;&lt;js&gt;"K"&lt;/js&gt; - x 1024<a name="line.1997"></a>
+<span class="sourceLineNo">1998</span>    *    &lt;li&gt;&lt;js&gt;"M"&lt;/js&gt; - x 1024*1024<a name="line.1998"></a>
+<span class="sourceLineNo">1999</span>    *    &lt;li&gt;&lt;js&gt;"G"&lt;/js&gt; - x 1024*1024*1024<a name="line.1999"></a>
+<span class="sourceLineNo">2000</span>    * &lt;/ul&gt;<a name="line.2000"></a>
+<span class="sourceLineNo">2001</span>    * <a name="line.2001"></a>
+<span class="sourceLineNo">2002</span>    * @param s The string to parse.<a name="line.2002"></a>
+<span class="sourceLineNo">2003</span>    * @return The parsed value.<a name="line.2003"></a>
+<span class="sourceLineNo">2004</span>    */<a name="line.2004"></a>
+<span class="sourceLineNo">2005</span>   public static long parseLongWithSuffix(String s) {<a name="line.2005"></a>
+<span class="sourceLineNo">2006</span>      assertFieldNotNull(s, "s");<a name="line.2006"></a>
+<span class="sourceLineNo">2007</span>      int m = 1;<a name="line.2007"></a>
+<span class="sourceLineNo">2008</span>      if (s.endsWith("G")) {<a name="line.2008"></a>
+<span class="sourceLineNo">2009</span>         m = 1024*1024*1024;<a name="line.2009"></a>
+<span class="sourceLineNo">2010</span>         s = s.substring(0, s.length()-1).trim();<a name="line.2010"></a>
+<span class="sourceLineNo">2011</span>      } else if (s.endsWith("M")) {<a name="line.2011"></a>
+<span class="sourceLineNo">2012</span>         m = 1024*1024;<a name="line.2012"></a>
+<span class="sourceLineNo">2013</span>         s = s.substring(0, s.length()-1).trim();<a name="line.2013"></a>
+<span class="sourceLineNo">2014</span>      } else if (s.endsWith("K")) {<a name="line.2014"></a>
+<span class="sourceLineNo">2015</span>         m = 1024;<a name="line.2015"></a>
+<span class="sourceLineNo">2016</span>         s = s.substring(0, s.length()-1).trim();<a name="line.2016"></a>
+<span class="sourceLineNo">2017</span>      }<a name="line.2017"></a>
+<span class="sourceLineNo">2018</span>      return Long.decode(s) * m;<a name="line.2018"></a>
+<span class="sourceLineNo">2019</span>   }<a name="line.2019"></a>
+<span class="sourceLineNo">2020</span>   <a name="line.2020"></a>
+<span class="sourceLineNo">2021</span>   /**<a name="line.2021"></a>
+<span class="sourceLineNo">2022</span>    * Same as {@link String#contains(CharSequence)} except returns &lt;jk&gt;null&lt;/jk&gt; if the value is null.<a name="line.2022"></a>
+<span class="sourceLineNo">2023</span>    * <a name="line.2023"></a>
+<span class="sourceLineNo">2024</span>    * @param value The string to check.<a name="line.2024"></a>
+<span class="sourceLineNo">2025</span>    * @param substring The value to check for.<a name="line.2025"></a>
+<span class="sourceLineNo">2026</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the value contains the specified substring.<a name="line.2026"></a>
+<span class="sourceLineNo">2027</span>    */<a name="line.2027"></a>
+<span class="sourceLineNo">2028</span>   public static boolean contains(String value, CharSequence substring) {<a name="line.2028"></a>
+<span class="sourceLineNo">2029</span>      return value == null ? false : value.contains(substring);<a name="line.2029"></a>
+<span class="sourceLineNo">2030</span>   }<a name="line.2030"></a>
+<span class="sourceLineNo">2031</span>   <a name="line.2031"></a>
+<span class="sourceLineNo">2032</span>   /**<a name="line.2032"></a>
+<span class="sourceLineNo">2033</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be an JSON array.<a name="line.2033"></a>
+<span class="sourceLineNo">2034</span>    * <a name="line.2034"></a>
+<span class="sourceLineNo">2035</span>    * @param o The object to test.<a name="line.2035"></a>
+<span class="sourceLineNo">2036</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be a JSON array.<a name="line.2036"></a>
+<span class="sourceLineNo">2037</span>    */<a name="line.2037"></a>
+<span class="sourceLineNo">2038</span>   public static boolean isObjectList(Object o) {<a name="line.2038"></a>
+<span class="sourceLineNo">2039</span>      if (o instanceof CharSequence) {<a name="line.2039"></a>
+<span class="sourceLineNo">2040</span>         String s = o.toString();<a name="line.2040"></a>
+<span class="sourceLineNo">2041</span>         return (s.startsWith("[") &amp;&amp; s.endsWith("]") &amp;&amp; BeanContext.DEFAULT != null);<a name="line.2041"></a>
+<span class="sourceLineNo">2042</span>      }<a name="line.2042"></a>
+<span class="sourceLineNo">2043</span>      return false;<a name="line.2043"></a>
+<span class="sourceLineNo">2044</span>   }<a name="line.2044"></a>
+<span class="sourceLineNo">2045</span><a name="line.2045"></a>
+<span class="sourceLineNo">2046</span>   /**<a name="line.2046"></a>
+<span class="sourceLineNo">2047</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be a JSON object.<a name="line.2047"></a>
+<span class="sourceLineNo">2048</span>    * <a name="line.2048"></a>
+<span class="sourceLineNo">2049</span>    * @param o The object to test.<a name="line.2049"></a>
+<span class="sourceLineNo">2050</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if the specified string appears to be a JSON object.<a name="line.2050"></a>
+<span class="sourceLineNo">2051</span>    */<a name="line.2051"></a>
+<span class="sourceLineNo">2052</span>   public static boolean isObjectMap(Object o) {<a name="line.2052"></a>
+<span class="sourceLineNo">2053</span>      if (o instanceof CharSequence) {<a name="line.2053"></a>
+<span class="sourceLineNo">2054</span>         String s = o.toString();<a name="line.2054"></a>
+<span class="sourceLineNo">2055</span>         return (s.startsWith("{") &amp;&amp; s.endsWith("}") &amp;&amp; BeanContext.DEFAULT != null);<a name="line.2055"></a>
+<span class="sourceLineNo">2056</span>      }<a name="line.2056"></a>
+<span class="sourceLineNo">2057</span>      return false;<a name="line.2057"></a>
+<span class="sourceLineNo">2058</span>   }<a name="line.2058"></a>
+<span class="sourceLineNo">2059</span>}<a name="line.2059"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html
index aa2337c..76d237e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html
@@ -42,7 +42,7 @@
 <span class="sourceLineNo">034</span>@SuppressWarnings({ "unchecked", "rawtypes" })<a name="line.34"></a>
 <span class="sourceLineNo">035</span>public final class JsonParserSession extends ReaderParserSession {<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>   private static final AsciiSet decChars = new AsciiSet("0123456789");<a name="line.37"></a>
+<span class="sourceLineNo">037</span>   private static final AsciiSet decChars = AsciiSet.create().ranges("0-9").build();<a name="line.37"></a>
 <span class="sourceLineNo">038</span>   <a name="line.38"></a>
 <span class="sourceLineNo">039</span>   private final boolean validateEnd; <a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html
index 826de95..7c192b0 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonWriter.html
@@ -41,8 +41,8 @@
 <span class="sourceLineNo">033</span><a name="line.33"></a>
 <span class="sourceLineNo">034</span>   // Characters that trigger special handling of serializing attribute values.<a name="line.34"></a>
 <span class="sourceLineNo">035</span>   private static final AsciiSet<a name="line.35"></a>
-<span class="sourceLineNo">036</span>      encodedChars = new AsciiSet("\n\t\b\f\r'\"\\"),<a name="line.36"></a>
-<span class="sourceLineNo">037</span>      encodedChars2 = new AsciiSet("\n\t\b\f\r'\"\\/");<a name="line.37"></a>
+<span class="sourceLineNo">036</span>      encodedChars = AsciiSet.create("\n\t\b\f\r'\"\\"),<a name="line.36"></a>
+<span class="sourceLineNo">037</span>      encodedChars2 = AsciiSet.create("\n\t\b\f\r'\"\\/");<a name="line.37"></a>
 <span class="sourceLineNo">038</span><a name="line.38"></a>
 <span class="sourceLineNo">039</span>   private static final KeywordSet reservedWords = new KeywordSet(<a name="line.39"></a>
 <span class="sourceLineNo">040</span>      "arguments","break","case","catch","class","const","continue","debugger","default","delete",<a name="line.40"></a>
@@ -57,8 +57,8 @@
 <span class="sourceLineNo">049</span>   // These are actually more strict than the actual Javascript specification, but<a name="line.49"></a>
 <span class="sourceLineNo">050</span>   // can be narrowed in the future if necessary.<a name="line.50"></a>
 <span class="sourceLineNo">051</span>   // For example, we quote attributes that start with $ even though we don't need to.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   private static final AsciiSet validAttrChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_");<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   private static final AsciiSet validFirstAttrChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_");<a name="line.53"></a>
+<span class="sourceLineNo">052</span>   private static final AsciiSet validAttrChars = AsciiSet.create().ranges("a-z","A-Z","0-9").chars("_").build();<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   private static final AsciiSet validFirstAttrChars = AsciiSet.create().ranges("a-z","A-Z").chars("_").build();<a name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
 <span class="sourceLineNo">055</span>   private final AsciiSet ec;<a name="line.55"></a>
 <span class="sourceLineNo">056</span><a name="line.56"></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 d4fc4c2..efe0688 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
@@ -42,1424 +42,1425 @@
 <span class="sourceLineNo">034</span>import org.apache.juneau.config.*;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import org.apache.juneau.dto.swagger.*;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import org.apache.juneau.http.*;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.juneau.parser.*;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.juneau.rest.annotation.*;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.juneau.rest.widget.*;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.juneau.serializer.*;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.juneau.svl.*;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.juneau.uon.*;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.juneau.utils.*;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>/**<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * Represents an HTTP request for a REST resource.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <a name="line.47"></a>
-<span class="sourceLineNo">048</span> * &lt;p&gt;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * Equivalent to {@link HttpServletRequest} except with some additional convenience methods.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <a name="line.50"></a>
-<span class="sourceLineNo">051</span> * &lt;p&gt;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * For reference, given the URL &lt;js&gt;"http://localhost:9080/contextRoot/servletPath/foo?bar=baz#qux"&lt;/js&gt;, the<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * following methods return the following values....<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * &lt;table class='styled'&gt;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> *    &lt;tr&gt;&lt;th&gt;Method&lt;/th&gt;&lt;th&gt;Value&lt;/th&gt;&lt;/tr&gt;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> *    &lt;tr&gt;&lt;td&gt;{@code getContextPath()}&lt;/td&gt;&lt;td&gt;{@code /contextRoot}&lt;/td&gt;&lt;/tr&gt;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *    &lt;tr&gt;&lt;td&gt;{@code getPathInfo()}&lt;/td&gt;&lt;td&gt;{@code /foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> *    &lt;tr&gt;&lt;td&gt;{@code getPathTranslated()}&lt;/td&gt;&lt;td&gt;{@code path-to-deployed-war-on-filesystem/foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> *    &lt;tr&gt;&lt;td&gt;{@code getQueryString()}&lt;/td&gt;&lt;td&gt;{@code bar=baz}&lt;/td&gt;&lt;/tr&gt;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> *    &lt;tr&gt;&lt;td&gt;{@code getRequestURI()}&lt;/td&gt;&lt;td&gt;{@code /contextRoot/servletPath/foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.60"></a>
-<span class="sourceLineNo">061</span> *    &lt;tr&gt;&lt;td&gt;{@code getRequestURL()}&lt;/td&gt;&lt;td&gt;{@code http://localhost:9080/contextRoot/servletPath/foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *    &lt;tr&gt;&lt;td&gt;{@code getServletPath()}&lt;/td&gt;&lt;td&gt;{@code /servletPath}&lt;/td&gt;&lt;/tr&gt;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * &lt;/table&gt;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * <a name="line.64"></a>
-<span class="sourceLineNo">065</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * &lt;ul&gt;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestRequest"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RestRequest&lt;/a&gt;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * &lt;/ul&gt;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>@SuppressWarnings({ "unchecked", "unused" })<a name="line.70"></a>
-<span class="sourceLineNo">071</span>public final class RestRequest extends HttpServletRequestWrapper {<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>   private final RestContext context;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   private RestJavaMethod restJavaMethod;<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>   private final String method;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   private RequestBody body;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   private Method javaMethod;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   private RequestProperties properties;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>   private final boolean debug;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   private BeanSession beanSession;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   private VarResolverSession varSession;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   private final RequestQuery queryParams;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   private RequestFormData formData;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   private RequestPathMatch pathParams;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   private boolean isPost;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   private UriContext uriContext;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   private String charset;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   private RequestHeaders headers;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   private Config cf;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   private Swagger swagger;<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>    * Constructor.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      super(req);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      this.context = context;<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>      try {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>         isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>         // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.103"></a>
-<span class="sourceLineNo">104</span>         // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>         queryParams = new RequestQuery();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>         if (isPost) <a name="line.106"></a>
-<span class="sourceLineNo">107</span>            RestUtils.parseQuery(getQueryString(), queryParams);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>         else<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            queryParams.putAll(req.getParameterMap());<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">037</span>import org.apache.juneau.internal.*;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.juneau.parser.*;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.juneau.rest.annotation.*;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.juneau.rest.widget.*;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.juneau.serializer.*;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.juneau.svl.*;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.juneau.uon.*;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.juneau.utils.*;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>/**<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Represents an HTTP request for a REST resource.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <a name="line.48"></a>
+<span class="sourceLineNo">049</span> * &lt;p&gt;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * Equivalent to {@link HttpServletRequest} except with some additional convenience methods.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <a name="line.51"></a>
+<span class="sourceLineNo">052</span> * &lt;p&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * For reference, given the URL &lt;js&gt;"http://localhost:9080/contextRoot/servletPath/foo?bar=baz#qux"&lt;/js&gt;, the<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * following methods return the following values....<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * &lt;table class='styled'&gt;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> *    &lt;tr&gt;&lt;th&gt;Method&lt;/th&gt;&lt;th&gt;Value&lt;/th&gt;&lt;/tr&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> *    &lt;tr&gt;&lt;td&gt;{@code getContextPath()}&lt;/td&gt;&lt;td&gt;{@code /contextRoot}&lt;/td&gt;&lt;/tr&gt;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *    &lt;tr&gt;&lt;td&gt;{@code getPathInfo()}&lt;/td&gt;&lt;td&gt;{@code /foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> *    &lt;tr&gt;&lt;td&gt;{@code getPathTranslated()}&lt;/td&gt;&lt;td&gt;{@code path-to-deployed-war-on-filesystem/foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *    &lt;tr&gt;&lt;td&gt;{@code getQueryString()}&lt;/td&gt;&lt;td&gt;{@code bar=baz}&lt;/td&gt;&lt;/tr&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *    &lt;tr&gt;&lt;td&gt;{@code getRequestURI()}&lt;/td&gt;&lt;td&gt;{@code /contextRoot/servletPath/foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> *    &lt;tr&gt;&lt;td&gt;{@code getRequestURL()}&lt;/td&gt;&lt;td&gt;{@code http://localhost:9080/contextRoot/servletPath/foo}&lt;/td&gt;&lt;/tr&gt;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *    &lt;tr&gt;&lt;td&gt;{@code getServletPath()}&lt;/td&gt;&lt;td&gt;{@code /servletPath}&lt;/td&gt;&lt;/tr&gt;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * &lt;/table&gt;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <a name="line.65"></a>
+<span class="sourceLineNo">066</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * &lt;ul&gt;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestRequest"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RestRequest&lt;/a&gt;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * &lt;/ul&gt;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>@SuppressWarnings({ "unchecked", "unused" })<a name="line.71"></a>
+<span class="sourceLineNo">072</span>public final class RestRequest extends HttpServletRequestWrapper {<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>   private final RestContext context;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   private RestJavaMethod restJavaMethod;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>   private final String method;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>   private RequestBody body;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   private Method javaMethod;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   private RequestProperties properties;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   private final boolean debug;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   private BeanSession beanSession;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   private VarResolverSession varSession;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   private final RequestQuery queryParams;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   private RequestFormData formData;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   private RequestPathMatch pathParams;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   private boolean isPost;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   private UriContext uriContext;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   private String charset;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   private RequestHeaders headers;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   private Config cf;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   private Swagger swagger;<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>    * Constructor.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      super(req);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      this.context = context;<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>      try {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>         isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>         // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.104"></a>
+<span class="sourceLineNo">105</span>         // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>         queryParams = new RequestQuery();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         if (isPost) <a name="line.107"></a>
+<span class="sourceLineNo">108</span>            RestUtils.parseQuery(getQueryString(), queryParams);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>         else<a name="line.109"></a>
+<span class="sourceLineNo">110</span>            queryParams.putAll(req.getParameterMap());<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>         // Get the HTTP method.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>         // Can be overridden through a "method" GET attribute.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>         String _method = super.getMethod();<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>         String m = getQuery().getString("method");<a name="line.116"></a>
-<span class="sourceLineNo">117</span>         if (context.allowMethodParam(m))<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            _method = m;<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>         method = _method;<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>         headers = new RequestHeaders();<a name="line.122"></a>
-<span class="sourceLineNo">123</span>         for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>            String name = e.nextElement();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>            headers.put(name, super.getHeaders(name));<a name="line.125"></a>
-<span class="sourceLineNo">126</span>         }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>         body = new RequestBody(this);<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>         if (context.isAllowBodyParam()) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>            String b = getQuery().getString("body");<a name="line.131"></a>
-<span class="sourceLineNo">132</span>            if (b != null) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>               headers.put("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.133"></a>
-<span class="sourceLineNo">134</span>               body.load(b.getBytes(UTF8));<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            }<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>         if (context.isAllowHeaderParams())<a name="line.138"></a>
-<span class="sourceLineNo">139</span>            headers.setQueryParams(queryParams);<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>         debug = "true".equals(getQuery().getString("debug", "false")) || "true".equals(getHeaders().getString("Debug", "false"));<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>         this.pathParams = new RequestPathMatch();<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>      } catch (RestException e) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>         throw e;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      } catch (Exception e) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>         throw new ServletException(e);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   }<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>    * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   final void init(RestJavaMethod rjm, RequestProperties properties) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      this.restJavaMethod = rjm;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      this.javaMethod = rjm.method;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      this.properties = properties;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      this.beanSession = rjm.beanContext.createSession();<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      this.pathParams<a name="line.160"></a>
-<span class="sourceLineNo">161</span>         .parser(rjm.partParser)<a name="line.161"></a>
-<span class="sourceLineNo">162</span>         .beanSession(beanSession);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      this.queryParams<a name="line.163"></a>
-<span class="sourceLineNo">164</span>         .addDefault(rjm.defaultQuery)<a name="line.164"></a>
-<span class="sourceLineNo">165</span>         .parser(rjm.partParser)<a name="line.165"></a>
-<span class="sourceLineNo">166</span>         .beanSession(beanSession);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      this.headers<a name="line.167"></a>
-<span class="sourceLineNo">168</span>         .addDefault(rjm.defaultRequestHeaders)<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         .addDefault(context.getDefaultRequestHeaders())<a name="line.169"></a>
-<span class="sourceLineNo">170</span>         .parser(rjm.partParser)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>         .beanSession(beanSession);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      this.body<a name="line.172"></a>
-<span class="sourceLineNo">173</span>         .encoders(rjm.encoders)<a name="line.173"></a>
-<span class="sourceLineNo">174</span>         .parsers(rjm.parsers)<a name="line.174"></a>
-<span class="sourceLineNo">175</span>         .headers(headers)<a name="line.175"></a>
-<span class="sourceLineNo">176</span>         .beanSession(beanSession)<a name="line.176"></a>
-<span class="sourceLineNo">177</span>         .maxInput(rjm.maxInput);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>      String stylesheet = getQuery().getString("stylesheet");<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      if (stylesheet != null)<a name="line.180"></a>
-<span class="sourceLineNo">181</span>         getSession().setAttribute("stylesheet", stylesheet.replace(' ', '$'));  // Prevent SVL insertion.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      stylesheet = (String)getSession().getAttribute("stylesheet");<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      if (stylesheet != null)<a name="line.183"></a>
-<span class="sourceLineNo">184</span>         properties.put(HTMLDOC_stylesheet, new String[]{stylesheet});<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>      if (debug) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>         String msg = ""<a name="line.187"></a>
-<span class="sourceLineNo">188</span>            + "\n=== HTTP Request (incoming) ===================================================="<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            + toString()<a name="line.189"></a>
-<span class="sourceLineNo">190</span>            + "\n=== END ========================================================================";<a name="line.190"></a>
-<span class="sourceLineNo">191</span>         context.getLogger().log(Level.WARNING, msg);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>      if (isPlainText())<a name="line.194"></a>
-<span class="sourceLineNo">195</span>         this.properties.put(SERIALIZER_useWhitespace, true);<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>    * Returns a string of the form &lt;js&gt;"HTTP method-name full-url"&lt;/js&gt;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    * <a name="line.200"></a>
-<span class="sourceLineNo">201</span>    * @return A description string of the request.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    */<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   public String getDescription() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      String qs = getQueryString();<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   }<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>    * Same as {@link #getAttribute(String)} but returns a default value if not found.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    * <a name="line.210"></a>
-<span class="sourceLineNo">211</span>    * @param name The request attribute name.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    * @param def The default value if the attribute doesn't exist.<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    * @return The request attribute value.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    */<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   public Object getAttribute(String name, Object def) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      Object o = super.getAttribute(name);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      return (o == null ? def : o);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>   /**<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    * Shorthand method for calling {@link #setAttribute(String, Object)} fluently.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    * <a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * @param name The request attribute name.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    * @param value The request attribute value.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    * @return This object (for method chaining).<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    */<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   public RestRequest attr(String name, Object value) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      setAttribute(name, value);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      return this;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>         // Get the HTTP method.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>         // Can be overridden through a "method" GET attribute.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         String _method = super.getMethod();<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>         String m = getQuery().getString("method");<a name="line.117"></a>
+<span class="sourceLineNo">118</span>         if (context.allowMethodParam(m))<a name="line.118"></a>
+<span class="sourceLineNo">119</span>            _method = m;<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>         method = _method;<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>         headers = new RequestHeaders();<a name="line.123"></a>
+<span class="sourceLineNo">124</span>         for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>            String name = e.nextElement();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>            headers.put(name, super.getHeaders(name));<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>         body = new RequestBody(this);<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>         if (context.isAllowBodyParam()) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>            String b = getQuery().getString("body");<a name="line.132"></a>
+<span class="sourceLineNo">133</span>            if (b != null) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>               headers.put("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.134"></a>
+<span class="sourceLineNo">135</span>               body.load(b.getBytes(UTF8));<a name="line.135"></a>
+<span class="sourceLineNo">136</span>            }<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>         if (context.isAllowHeaderParams())<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            headers.setQueryParams(queryParams);<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>         debug = "true".equals(getQuery().getString("debug", "false")) || "true".equals(getHeaders().getString("Debug", "false"));<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>         this.pathParams = new RequestPathMatch();<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>      } catch (RestException e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>         throw e;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      } catch (Exception e) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>         throw new ServletException(e);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      }<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>    * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   final void init(RestJavaMethod rjm, RequestProperties properties) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      this.restJavaMethod = rjm;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      this.javaMethod = rjm.method;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      this.properties = properties;<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      this.beanSession = rjm.beanContext.createSession();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      this.pathParams<a name="line.161"></a>
+<span class="sourceLineNo">162</span>         .parser(rjm.partParser)<a name="line.162"></a>
+<span class="sourceLineNo">163</span>         .beanSession(beanSession);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      this.queryParams<a name="line.164"></a>
+<span class="sourceLineNo">165</span>         .addDefault(rjm.defaultQuery)<a name="line.165"></a>
+<span class="sourceLineNo">166</span>         .parser(rjm.partParser)<a name="line.166"></a>
+<span class="sourceLineNo">167</span>         .beanSession(beanSession);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      this.headers<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         .addDefault(rjm.defaultRequestHeaders)<a name="line.169"></a>
+<span class="sourceLineNo">170</span>         .addDefault(context.getDefaultRequestHeaders())<a name="line.170"></a>
+<span class="sourceLineNo">171</span>         .parser(rjm.partParser)<a name="line.171"></a>
+<span class="sourceLineNo">172</span>         .beanSession(beanSession);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      this.body<a name="line.173"></a>
+<span class="sourceLineNo">174</span>         .encoders(rjm.encoders)<a name="line.174"></a>
+<span class="sourceLineNo">175</span>         .parsers(rjm.parsers)<a name="line.175"></a>
+<span class="sourceLineNo">176</span>         .headers(headers)<a name="line.176"></a>
+<span class="sourceLineNo">177</span>         .beanSession(beanSession)<a name="line.177"></a>
+<span class="sourceLineNo">178</span>         .maxInput(rjm.maxInput);<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>      String stylesheet = getQuery().getString("stylesheet");<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      if (stylesheet != null)<a name="line.181"></a>
+<span class="sourceLineNo">182</span>         getSession().setAttribute("stylesheet", stylesheet.replace(' ', '$'));  // Prevent SVL insertion.<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      stylesheet = (String)getSession().getAttribute("stylesheet");<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      if (stylesheet != null)<a name="line.184"></a>
+<span class="sourceLineNo">185</span>         properties.put(HTMLDOC_stylesheet, new String[]{stylesheet});<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>      if (debug) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>         String msg = ""<a name="line.188"></a>
+<span class="sourceLineNo">189</span>            + "\n=== HTTP Request (incoming) ===================================================="<a name="line.189"></a>
+<span class="sourceLineNo">190</span>            + toString()<a name="line.190"></a>
+<span class="sourceLineNo">191</span>            + "\n=== END ========================================================================";<a name="line.191"></a>
+<span class="sourceLineNo">192</span>         context.getLogger().log(Level.WARNING, msg);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>      if (isPlainText())<a name="line.195"></a>
+<span class="sourceLineNo">196</span>         this.properties.put(SERIALIZER_useWhitespace, true);<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>    * Returns a string of the form &lt;js&gt;"HTTP method-name full-url"&lt;/js&gt;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    * <a name="line.201"></a>
+<span class="sourceLineNo">202</span>    * @return A description string of the request.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   public String getDescription() {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      String qs = getQueryString();<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<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>   /**<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    * Same as {@link #getAttribute(String)} but returns a default value if not found.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    * <a name="line.211"></a>
+<span class="sourceLineNo">212</span>    * @param name The request attribute name.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    * @param def The default value if the attribute doesn't exist.<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    * @return The request attribute value.<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    */<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   public Object getAttribute(String name, Object def) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      Object o = super.getAttribute(name);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      return (o == null ? def : o);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   }<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>    * Shorthand method for calling {@link #setAttribute(String, Object)} fluently.<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    * <a name="line.223"></a>
+<span class="sourceLineNo">224</span>    * @param name The request attribute name.<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    * @param value The request attribute value.<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    * @return This object (for method chaining).<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   public RestRequest attr(String name, Object value) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      setAttribute(name, value);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      return this;<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>   // Properties<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   //--------------------------------------------------------------------------------<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>   /**<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    * Retrieve the properties active for this request.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    * <a name="line.239"></a>
-<span class="sourceLineNo">240</span>    * &lt;p&gt;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    * This contains all resource and method level properties from the following:<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    * &lt;ul&gt;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    *    &lt;li class='ja'&gt;{@link RestResource#properties()}<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    *    &lt;li class='ja'&gt;{@link RestMethod#properties()}<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    *    &lt;li class='jm'&gt;{@link RestContextBuilder#set(String, Object)}<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    * &lt;/ul&gt;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * <a name="line.247"></a>
-<span class="sourceLineNo">248</span>    * &lt;p&gt;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    * The returned object is modifiable and allows you to override session-level properties before<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    * they get passed to the serializers.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    * &lt;br&gt;However, properties are open-ended, and can be used for any purpose.<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    * <a name="line.252"></a>
-<span class="sourceLineNo">253</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * &lt;p class='bcode'&gt;<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    *       properties={<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    *          &lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;jsf&gt;SERIALIZER_sortMaps&lt;/jsf&gt;, value=&lt;js&gt;"false"&lt;/js&gt;)<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>    *    &lt;jk&gt;public&lt;/jk&gt; Map doGet(RestRequest req, &lt;ja&gt;@Query&lt;/ja&gt;(&lt;js&gt;"sortMaps"&lt;/js&gt;) Boolean sortMaps) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    *       <a name="line.261"></a>
-<span class="sourceLineNo">262</span>    *       &lt;jc&gt;// Override value if specified through query parameter.&lt;/jc&gt;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    *       &lt;jk&gt;if&lt;/jk&gt; (sortMaps != &lt;jk&gt;null&lt;/jk&gt;)<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    *          req.getProperties().put(&lt;jsf&gt;SERIALIZER_sortMaps&lt;/jsf&gt;, sortMaps);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    * <a name="line.265"></a>
-<span class="sourceLineNo">266</span>    *       &lt;jk&gt;return&lt;/jk&gt; &lt;jsm&gt;getMyMap&lt;/jsm&gt;();<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    *    }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    * &lt;/p&gt;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    * <a name="line.269"></a>
-<span class="sourceLineNo">270</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    * &lt;ul&gt;<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    *    &lt;li class='jm'&gt;{@link #prop(String, Object)}<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Properties"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Properties&lt;/a&gt;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    * &lt;/ul&gt;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    * <a name="line.275"></a>
-<span class="sourceLineNo">276</span>    * @return The properties active for this request.<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    */<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   public RequestProperties getProperties() {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      return this.properties;<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>    * Shortcut for calling &lt;code&gt;getProperties().append(name, value);&lt;/code&gt; fluently.<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    * <a name="line.284"></a>
-<span class="sourceLineNo">285</span>    * @param name The property name.<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    * @param value The property value.<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    * @return This object (for method chaining).<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    */<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   public RestRequest prop(String name, Object value) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      this.properties.append(name, value);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      return this;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>   }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>   //--------------------------------------------------------------------------------<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   // Properties<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   //--------------------------------------------------------------------------------<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>   /**<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    * Retrieve the properties active for this request.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    * <a name="line.240"></a>
+<span class="sourceLineNo">241</span>    * &lt;p&gt;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    * This contains all resource and method level properties from the following:<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    * &lt;ul&gt;<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    *    &lt;li class='ja'&gt;{@link RestResource#properties()}<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    *    &lt;li class='ja'&gt;{@link RestMethod#properties()}<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    *    &lt;li class='jm'&gt;{@link RestContextBuilder#set(String, Object)}<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    * &lt;/ul&gt;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    * <a name="line.248"></a>
+<span class="sourceLineNo">249</span>    * &lt;p&gt;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    * The returned object is modifiable and allows you to override session-level properties before<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    * they get passed to the serializers.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    * &lt;br&gt;However, properties are open-ended, and can be used for any purpose.<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    * <a name="line.253"></a>
+<span class="sourceLineNo">254</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    * &lt;p class='bcode'&gt;<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    *       properties={<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    *          &lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;jsf&gt;SERIALIZER_sortMaps&lt;/jsf&gt;, value=&lt;js&gt;"false"&lt;/js&gt;)<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>    *    &lt;jk&gt;public&lt;/jk&gt; Map doGet(RestRequest req, &lt;ja&gt;@Query&lt;/ja&gt;(&lt;js&gt;"sortMaps"&lt;/js&gt;) Boolean sortMaps) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    *       <a name="line.262"></a>
+<span class="sourceLineNo">263</span>    *       &lt;jc&gt;// Override value if specified through query parameter.&lt;/jc&gt;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    *       &lt;jk&gt;if&lt;/jk&gt; (sortMaps != &lt;jk&gt;null&lt;/jk&gt;)<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    *          req.getProperties().put(&lt;jsf&gt;SERIALIZER_sortMaps&lt;/jsf&gt;, sortMaps);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    * <a name="line.266"></a>
+<span class="sourceLineNo">267</span>    *       &lt;jk&gt;return&lt;/jk&gt; &lt;jsm&gt;getMyMap&lt;/jsm&gt;();<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    *    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    * &lt;/p&gt;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    * <a name="line.270"></a>
+<span class="sourceLineNo">271</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    * &lt;ul&gt;<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    *    &lt;li class='jm'&gt;{@link #prop(String, Object)}<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Properties"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Properties&lt;/a&gt;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    * &lt;/ul&gt;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    * <a name="line.276"></a>
+<span class="sourceLineNo">277</span>    * @return The properties active for this request.<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    */<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   public RequestProperties getProperties() {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      return this.properties;<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>   /**<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    * Shortcut for calling &lt;code&gt;getProperties().append(name, value);&lt;/code&gt; fluently.<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    * <a name="line.285"></a>
+<span class="sourceLineNo">286</span>    * @param name The property name.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    * @param value The property value.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    * @return This object (for method chaining).<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    */<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   public RestRequest prop(String name, Object value) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      this.properties.append(name, value);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      return this;<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>   //--------------------------------------------------------------------------------<a name="line.295"></a>
-<span class="sourceLineNo">296</span>   // Headers<a name="line.296"></a>
-<span class="sourceLineNo">297</span>   //--------------------------------------------------------------------------------<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>   /**<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    * Request headers.<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    * <a name="line.301"></a>
-<span class="sourceLineNo">302</span>    * &lt;p&gt;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    * Returns a {@link RequestHeaders} object that encapsulates access to HTTP headers on the request.<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    * <a name="line.304"></a>
-<span class="sourceLineNo">305</span>    * &lt;h5 class='section'&gt;Example:&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;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod(RestRequest req) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    * <a name="line.309"></a>
-<span class="sourceLineNo">310</span>    *       &lt;jc&gt;// Get access to headers.&lt;/jc&gt;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    *       RequestHeaders h = req.getHeaders();<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    * <a name="line.312"></a>
-<span class="sourceLineNo">313</span>    *       &lt;jc&gt;// Add a default value.&lt;/jc&gt;<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    *       h.addDefault(&lt;js&gt;"ETag"&lt;/js&gt;, &lt;jsf&gt;DEFAULT_UUID&lt;/jsf&gt;);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    * <a name="line.315"></a>
-<span class="sourceLineNo">316</span>    *       &lt;jc&gt;// Get a header value as a POJO.&lt;/jc&gt;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    *       UUID etag = h.get(&lt;js&gt;"ETag"&lt;/js&gt;, UUID.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    * <a name="line.318"></a>
-<span class="sourceLineNo">319</span>    *       &lt;jc&gt;// Get a standard header.&lt;/jc&gt;<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    *       CacheControl = h.getCacheControl();<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    *    }        <a name="line.321"></a>
-<span class="sourceLineNo">322</span>    * &lt;/p&gt;<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    * <a name="line.323"></a>
-<span class="sourceLineNo">324</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    * &lt;ul class='spaced-list'&gt;<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    *    &lt;li&gt;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    *       This object is modifiable.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    *    &lt;li&gt;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    *    &lt;li&gt;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    *       The {@link RequestHeaders} object can also be passed as a parameter on the method.<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    *    &lt;li&gt;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    *       The {@link Header @Header} annotation can be used to access individual header values.<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    * &lt;/ul&gt;<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    * <a name="line.335"></a>
-<span class="sourceLineNo">336</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    * &lt;ul&gt;<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestHeaders"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestHeaders&lt;/a&gt;<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    * &lt;/ul&gt;<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    * <a name="line.340"></a>
-<span class="sourceLineNo">341</span>    * @return <a name="line.341"></a>
-<span class="sourceLineNo">342</span>    *    The headers on this request.  <a name="line.342"></a>
-<span class="sourceLineNo">343</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    */<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   public RequestHeaders getHeaders() {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      return headers;<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>   @Override /* ServletRequest */<a name="line.349"></a>
-<span class="sourceLineNo">350</span>   public String getHeader(String name) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      return getHeaders().getString(name);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>   }<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>   @Override /* ServletRequest */<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   public Enumeration&lt;String&gt; getHeaders(String name) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      String[] v = headers.get(name);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      if (v == null || v.length == 0)<a name="line.357"></a>
-<span class="sourceLineNo">358</span>         return Collections.enumeration(Collections.EMPTY_LIST);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      return Collections.enumeration(Arrays.asList(v));<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   }<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>    * Returns the media types that are valid for &lt;code&gt;Accept&lt;/code&gt; headers on the request.<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    * <a name="line.364"></a>
-<span class="sourceLineNo">365</span>    * @return The set of media types registered in the serializer group of this request.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    */<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   public List&lt;MediaType&gt; getProduces() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>      return restJavaMethod.supportedAcceptTypes;<a name="line.368"></a>
-<span class="sourceLineNo">369</span>   }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>   /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    * Returns the media types that are valid for &lt;code&gt;Content-Type&lt;/code&gt; headers on the request.<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    * <a name="line.373"></a>
-<span class="sourceLineNo">374</span>    * @return The set of media types registered in the parser group of this request.<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    */<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   public List&lt;MediaType&gt; getConsumes() {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>      return restJavaMethod.supportedContentTypes;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>   /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    * Sets the charset to expect on the request body.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    */<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   @Override /* ServletRequest */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   public void setCharacterEncoding(String charset) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      this.charset = charset;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>   /**<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    * Returns the charset specified on the &lt;code&gt;Content-Type&lt;/code&gt; header, or &lt;js&gt;"UTF-8"&lt;/js&gt; if not specified.<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    */<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   @Override /* ServletRequest */<a name="line.391"></a>
-<span class="sourceLineNo">392</span>   public String getCharacterEncoding() {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      if (charset == null) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>         // Determine charset<a name="line.394"></a>
-<span class="sourceLineNo">395</span>         // NOTE:  Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.395"></a>
-<span class="sourceLineNo">396</span>         // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.396"></a>
-<span class="sourceLineNo">397</span>         String h = getHeader("Content-Type");<a name="line.397"></a>
-<span class="sourceLineNo">398</span>         if (h != null) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>            int i = h.indexOf(";charset=");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            if (i &gt; 0)<a name="line.400"></a>
-<span class="sourceLineNo">401</span>               charset = h.substring(i+9).trim();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>         }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>         if (charset == null)<a name="line.403"></a>
-<span class="sourceLineNo">404</span>            charset = restJavaMethod.defaultCharset;<a name="line.404"></a>
-<span class="sourceLineNo">405</span>         if (! Charset.isSupported(charset))<a name="line.405"></a>
-<span class="sourceLineNo">406</span>            throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      return charset;<a name="line.408"></a>
-<span class="sourceLineNo">409</span>   }<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span>   @Override /* ServletRequest */<a name="line.411"></a>
-<span class="sourceLineNo">412</span>   public Locale getLocale() {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      String h = headers.getString("Accept-Language");<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      if (h != null) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>         if (mr.length &gt; 0)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>            return toLocale(mr[0].getMediaType().getType());<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      return super.getLocale();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>   @Override /* ServletRequest */<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   public Enumeration&lt;Locale&gt; getLocales() {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>      String h = headers.getString("Accept-Language");<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      if (h != null) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>         if (mr.length &gt; 0) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>            List&lt;Locale&gt; l = new ArrayList&lt;Locale&gt;(mr.length);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>            for (MediaTypeRange r : mr)<a name="line.429"></a>
-<span class="sourceLineNo">430</span>               l.add(toLocale(r.getMediaType().getType()));<a name="line.430"></a>
-<span class="sourceLineNo">431</span>            return enumeration(l);<a name="line.431"></a>
-<span class="sourceLineNo">432</span>         }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      }<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      return super.getLocales();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>   //--------------------------------------------------------------------------------<a name="line.296"></a>
+<span class="sourceLineNo">297</span>   // Headers<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   //--------------------------------------------------------------------------------<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>    * Request headers.<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>    * Returns a {@link RequestHeaders} object that encapsulates access to HTTP headers on the request.<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    * <a name="line.305"></a>
+<span class="sourceLineNo">306</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    * &lt;p class='bcode'&gt;<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    *    &lt;jk&gt;public&lt;/jk&gt; Object myMethod(RestRequest req) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    * <a name="line.310"></a>
+<span class="sourceLineNo">311</span>    *       &lt;jc&gt;// Get access to headers.&lt;/jc&gt;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    *       RequestHeaders h = req.getHeaders();<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    * <a name="line.313"></a>
+<span class="sourceLineNo">314</span>    *       &lt;jc&gt;// Add a default value.&lt;/jc&gt;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    *       h.addDefault(&lt;js&gt;"ETag"&lt;/js&gt;, &lt;jsf&gt;DEFAULT_UUID&lt;/jsf&gt;);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    * <a name="line.316"></a>
+<span class="sourceLineNo">317</span>    *       &lt;jc&gt;// Get a header value as a POJO.&lt;/jc&gt;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    *       UUID etag = h.get(&lt;js&gt;"ETag"&lt;/js&gt;, UUID.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    * <a name="line.319"></a>
+<span class="sourceLineNo">320</span>    *       &lt;jc&gt;// Get a standard header.&lt;/jc&gt;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    *       CacheControl = h.getCacheControl();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    *    }        <a name="line.322"></a>
+<span class="sourceLineNo">323</span>    * &lt;/p&gt;<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    * <a name="line.324"></a>
+<span class="sourceLineNo">325</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    * &lt;ul class='spaced-list'&gt;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    *    &lt;li&gt;<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    *       This object is modifiable.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    *    &lt;li&gt;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    *    &lt;li&gt;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    *       The {@link RequestHeaders} object can also be passed as a parameter on the method.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    *    &lt;li&gt;<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    *       The {@link Header @Header} annotation can be used to access individual header values.<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    * &lt;/ul&gt;<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    * <a name="line.336"></a>
+<span class="sourceLineNo">337</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    * &lt;ul&gt;<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestHeaders"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestHeaders&lt;/a&gt;<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    * &lt;/ul&gt;<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    * <a name="line.341"></a>
+<span class="sourceLineNo">342</span>    * @return <a name="line.342"></a>
+<span class="sourceLineNo">343</span>    *    The headers on this request.  <a name="line.343"></a>
+<span class="sourceLineNo">344</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    */<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   public RequestHeaders getHeaders() {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      return headers;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>   @Override /* ServletRequest */<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   public String getHeader(String name) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      return getHeaders().getString(name);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>   }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span>   @Override /* ServletRequest */<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   public Enumeration&lt;String&gt; getHeaders(String name) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      String[] v = headers.get(name);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      if (v == null || v.length == 0)<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         return Collections.enumeration(Collections.EMPTY_LIST);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      return Collections.enumeration(Arrays.asList(v));<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 media types that are valid for &lt;code&gt;Accept&lt;/code&gt; headers on the request.<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    * <a name="line.365"></a>
+<span class="sourceLineNo">366</span>    * @return The set of media types registered in the serializer group of this request.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   public List&lt;MediaType&gt; getProduces() {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      return restJavaMethod.supportedAcceptTypes;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>   /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    * Returns the media types that are valid for &lt;code&gt;Content-Type&lt;/code&gt; headers on the request.<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    * <a name="line.374"></a>
+<span class="sourceLineNo">375</span>    * @return The set of media types registered in the parser group of this request.<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    */<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   public List&lt;MediaType&gt; getConsumes() {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      return restJavaMethod.supportedContentTypes;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>   /**<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    * Sets the charset to expect on the request body.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>   @Override /* ServletRequest */<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   public void setCharacterEncoding(String charset) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      this.charset = charset;<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   }<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span>   /**<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    * Returns the charset specified on the &lt;code&gt;Content-Type&lt;/code&gt; header, or &lt;js&gt;"UTF-8"&lt;/js&gt; if not specified.<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    */<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   @Override /* ServletRequest */<a name="line.392"></a>
+<span class="sourceLineNo">393</span>   public String getCharacterEncoding() {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>      if (charset == null) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>         // Determine charset<a name="line.395"></a>
+<span class="sourceLineNo">396</span>         // NOTE:  Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.396"></a>
+<span class="sourceLineNo">397</span>         // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>         String h = getHeader("Content-Type");<a name="line.398"></a>
+<span class="sourceLineNo">399</span>         if (h != null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>            int i = h.indexOf(";charset=");<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            if (i &gt; 0)<a name="line.401"></a>
+<span class="sourceLineNo">402</span>               charset = h.substring(i+9).trim();<a name="line.402"></a>
+<span class="sourceLineNo">403</span>         }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>         if (charset == null)<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            charset = restJavaMethod.defaultCharset;<a name="line.405"></a>
+<span class="sourceLineNo">406</span>         if (! Charset.isSupported(charset))<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      return charset;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>   }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>   @Override /* ServletRequest */<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   public Locale getLocale() {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      String h = headers.getString("Accept-Language");<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      if (h != null) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>         if (mr.length &gt; 0)<a name="line.417"></a>
+<span class="sourceLineNo">418</span>            return toLocale(mr[0].getMediaType().getType());<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      return super.getLocale();<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span>   @Override /* ServletRequest */<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   public Enumeration&lt;Locale&gt; getLocales() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      String h = headers.getString("Accept-Language");<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      if (h != null) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>         MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>         if (mr.length &gt; 0) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>            List&lt;Locale&gt; l = new ArrayList&lt;Locale&gt;(mr.length);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>            for (MediaTypeRange r : mr)<a name="line.430"></a>
+<span class="sourceLineNo">431</span>               l.add(toLocale(r.getMediaType().getType()));<a name="line.431"></a>
+<span class="sourceLineNo">432</span>            return enumeration(l);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>         }<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>      return super.getLocales();<a name="line.435"></a>
+<span class="sourceLineNo">436</span>   }<a name="line.436"></a>
 <span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>   //--------------------------------------------------------------------------------<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   // Query parameters<a name="line.439"></a>
-<span class="sourceLineNo">440</span>   //--------------------------------------------------------------------------------<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>   /**<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    * Query parameters. <a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * <a name="line.444"></a>
-<span class="sourceLineNo">445</span>    * &lt;p&gt;<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    * Returns a {@link RequestQuery} object that encapsulates access to URL GET parameters.<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    * <a name="line.447"></a>
-<span class="sourceLineNo">448</span>    * &lt;p&gt;<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    * Similar to {@link #getParameterMap()} but only looks for query parameters in the URL and not form posts.<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    * <a name="line.450"></a>
-<span class="sourceLineNo">451</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    * &lt;p class='bcode'&gt;<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    *    <a name="line.455"></a>
-<span class="sourceLineNo">456</span>    *       &lt;jc&gt;// Get access to query parameters on the URL.&lt;/jc&gt;<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    *       RequestQuery q = req.getQuery();<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    *    <a name="line.458"></a>
-<span class="sourceLineNo">459</span>    *       &lt;jc&gt;// Get query parameters converted to various types.&lt;/jc&gt;<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    *       &lt;jk&gt;int&lt;/jk&gt; p1 = q.get(&lt;js&gt;"p1"&lt;/js&gt;, 0, &lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    *       String p2 = q.get(&lt;js&gt;"p2"&lt;/js&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    *       UUID p3 = q.get(&lt;js&gt;"p3"&lt;/js&gt;, UUID.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    *    }<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    * &lt;/p&gt;<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    * <a name="line.465"></a>
-<span class="sourceLineNo">466</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    * &lt;ul class='spaced-list'&gt;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    *    &lt;li&gt;<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    *       This object is modifiable.<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    *    &lt;li&gt;<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    *       This method can be used to retrieve query parameters without triggering the underlying servlet API to load and parse the request body.<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    *    &lt;li&gt;<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    *    &lt;li&gt;<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    *       The {@link RequestQuery} object can also be passed as a parameter on the method.<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    *    &lt;li&gt;<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    *       The {@link Query @Query} annotation can be used to access individual query parameter values.<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    * &lt;/ul&gt;<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    * <a name="line.479"></a>
-<span class="sourceLineNo">480</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    * &lt;ul&gt;<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestQuery"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestQuery&lt;/a&gt;<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    * &lt;/ul&gt;<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    * <a name="line.484"></a>
-<span class="sourceLineNo">485</span>    * @return <a name="line.485"></a>
-<span class="sourceLineNo">486</span>    *    The query parameters as a modifiable map.<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>   public RequestQuery getQuery() {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      return queryParams;<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>    * Shortcut for calling &lt;code&gt;getQuery().getString(name)&lt;/code&gt;.<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    * <a name="line.495"></a>
-<span class="sourceLineNo">496</span>    * @param name The query parameter name.<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    * @return The query parameter value, or &lt;jk&gt;null&lt;/jk&gt; if not found.<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    */<a name="line.498"></a>
-<span class="sourceLineNo">499</span>   public String getQuery(String name) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      return getQuery().getString(name);<a name="line.500"></a>
-<span class="sourceLineNo">501</span>   }<a name="line.501"></a>
-<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>   //--------------------------------------------------------------------------------<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   // Query parameters<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   //--------------------------------------------------------------------------------<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>   /**<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    * Query parameters. <a name="line.444"></a>
+<span class="sourceLineNo">445</span>    * <a name="line.445"></a>
+<span class="sourceLineNo">446</span>    * &lt;p&gt;<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    * Returns a {@link RequestQuery} object that encapsulates access to URL GET parameters.<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    * <a name="line.448"></a>
+<span class="sourceLineNo">449</span>    * &lt;p&gt;<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    * Similar to {@link #getParameterMap()} but only looks for query parameters in the URL and not form posts.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    * <a name="line.451"></a>
+<span class="sourceLineNo">452</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    * &lt;p class='bcode'&gt;<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    *    <a name="line.456"></a>
+<span class="sourceLineNo">457</span>    *       &lt;jc&gt;// Get access to query parameters on the URL.&lt;/jc&gt;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    *       RequestQuery q = req.getQuery();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    *    <a name="line.459"></a>
+<span class="sourceLineNo">460</span>    *       &lt;jc&gt;// Get query parameters converted to various types.&lt;/jc&gt;<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    *       &lt;jk&gt;int&lt;/jk&gt; p1 = q.get(&lt;js&gt;"p1"&lt;/js&gt;, 0, &lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    *       String p2 = q.get(&lt;js&gt;"p2"&lt;/js&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    *       UUID p3 = q.get(&lt;js&gt;"p3"&lt;/js&gt;, UUID.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    *    }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    * &lt;/p&gt;<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    * <a name="line.466"></a>
+<span class="sourceLineNo">467</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    * &lt;ul class='spaced-list'&gt;<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    *    &lt;li&gt;<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    *       This object is modifiable.<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    *    &lt;li&gt;<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    *       This method can be used to retrieve query parameters without triggering the underlying servlet API to load and parse the request body.<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    *    &lt;li&gt;<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    *    &lt;li&gt;<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    *       The {@link RequestQuery} object can also be passed as a parameter on the method.<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    *    &lt;li&gt;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    *       The {@link Query @Query} annotation can be used to access individual query parameter values.<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    * &lt;/ul&gt;<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    * <a name="line.480"></a>
+<span class="sourceLineNo">481</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    * &lt;ul&gt;<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestQuery"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestQuery&lt;/a&gt;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>    * &lt;/ul&gt;<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    * <a name="line.485"></a>
+<span class="sourceLineNo">486</span>    * @return <a name="line.486"></a>
+<span class="sourceLineNo">487</span>    *    The query parameters as a modifiable map.<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    */<a name="line.489"></a>
+<span class="sourceLineNo">490</span>   public RequestQuery getQuery() {<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      return queryParams;<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>   /**<a name="line.494"></a>
+<span class="sourceLineNo">495</span>    * Shortcut for calling &lt;code&gt;getQuery().getString(name)&lt;/code&gt;.<a name="line.495"></a>
+<span class="sourceLineNo">496</span>    * <a name="line.496"></a>
+<span class="sourceLineNo">497</span>    * @param name The query parameter name.<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    * @return The query parameter value, or &lt;jk&gt;null&lt;/jk&gt; if not found.<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    */<a name="line.499"></a>
+<span class="sourceLineNo">500</span>   public String getQuery(String name) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      return getQuery().getString(name);<a name="line.501"></a>
+<span class="sourceLineNo">502</span>   }<a name="line.502"></a>
 <span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>   //--------------------------------------------------------------------------------<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   // Form data parameters<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   //--------------------------------------------------------------------------------<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span>   /**<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    * Form-data.<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    * <a name="line.510"></a>
-<span class="sourceLineNo">511</span>    * &lt;p&gt;<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    * Returns a {@link RequestFormData} object that encapsulates access to form post parameters.<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    * <a name="line.513"></a>
-<span class="sourceLineNo">514</span>    * &lt;p&gt;<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    * Similar to {@link #getParameterMap()}, but only looks for form data in the HTTP body.<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    * <a name="line.516"></a>
-<span class="sourceLineNo">517</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    * &lt;p class='bcode'&gt;<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doPost(RestRequest req) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    *    <a name="line.521"></a>
-<span class="sourceLineNo">522</span>    *       &lt;jc&gt;// Get access to parsed form data parameters.&lt;/jc&gt;<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    *       RequestFormData fd = req.getFormData();<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    *       <a name="line.524"></a>
-<span class="sourceLineNo">525</span>    *       &lt;jc&gt;// Get form data parameters converted to various types.&lt;/jc&gt;<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    *       &lt;jk&gt;int&lt;/jk&gt; p1 = fd.get(&lt;js&gt;"p1"&lt;/js&gt;, 0, &lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    *       String p2 = fd.get(&lt;js&gt;"p2"&lt;/js&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    *       UUID p3 = fd.get(&lt;js&gt;"p3"&lt;/js&gt;, UUID.&lt;jk&gt;class&lt;/jk&gt;);<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>    * <a name="line.531"></a>
-<span class="sourceLineNo">532</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    * &lt;ul class='spaced-list'&gt;<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    *    &lt;li&gt;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    *       This object is modifiable.<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    *    &lt;li&gt;<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    *    &lt;li&gt;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    *       The {@link RequestFormData} object can also be passed as a parameter on the method.<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    *    &lt;li&gt;<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    *       The {@link FormData @FormDAta} annotation can be used to access individual form data parameter values.<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    * &lt;/ul&gt;<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    * <a name="line.543"></a>
-<span class="sourceLineNo">544</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    * &lt;ul&gt;<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestFormData"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestFormData&lt;/a&gt;<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    * &lt;/ul&gt;<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    * <a name="line.548"></a>
-<span class="sourceLineNo">549</span>    * @return <a name="line.549"></a>
-<span class="sourceLineNo">550</span>    *    The URL-encoded form data from the request.<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    * @see org.apache.juneau.rest.annotation.FormData<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    */<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   public RequestFormData getFormData() {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      try {<a name="line.555"></a>
-<span class="sourceLineNo">556</span>         if (formData == null) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>            formData = new RequestFormData();<a name="line.557"></a>
-<span class="sourceLineNo">558</span>            formData.setParser(restJavaMethod.partParser).setBeanSession(beanSession);<a name="line.558"></a>
-<span class="sourceLineNo">559</span>            if (! body.isLoaded()) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>               formData.putAll(getParameterMap());<a name="line.560"></a>
-<span class="sourceLineNo">561</span>            } else {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>               Map&lt;String,String[]&gt; m = RestUtils.parseQuery(body.getReader());<a name="line.562"></a>
-<span class="sourceLineNo">563</span>               for (Map.Entry&lt;String,String[]&gt; e : m.entrySet()) {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>                  for (String v : e.getValue())<a name="line.564"></a>
-<span class="sourceLineNo">565</span>                     formData.put(e.getKey(), v);<a name="line.565"></a>
-<span class="sourceLineNo">566</span>               }<a name="line.566"></a>
-<span class="sourceLineNo">567</span>            }<a name="line.567"></a>
-<span class="sourceLineNo">568</span>         }<a name="line.568"></a>
-<span class="sourceLineNo">569</span>         formData.addDefault(restJavaMethod.defaultFormData);<a name="line.569"></a>
-<span class="sourceLineNo">570</span>         return formData;<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      } catch (Exception e) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      }<a name="line.573"></a>
-<span class="sourceLineNo">574</span>   }<a name="line.574"></a>
-<span class="sourceLineNo">575</span><a name="line.575"></a>
-<span class="sourceLineNo">576</span>   /**<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    * Shortcut for calling &lt;code&gt;getFormData().getString(name)&lt;/code&gt;.<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    * <a name="line.578"></a>
-<span class="sourceLineNo">579</span>    * @param name The form data parameter name.<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    * @return The form data parameter value, or &lt;jk&gt;null&lt;jk&gt; if not found.<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    */<a name="line.581"></a>
-<span class="sourceLineNo">582</span>   public String getFormData(String name) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      return getFormData().getString(name);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>   }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>   //--------------------------------------------------------------------------------<a name="line.505"></a>
+<span class="sourceLineNo">506</span>   // Form data parameters<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   //--------------------------------------------------------------------------------<a name="line.507"></a>
+<span class="sourceLineNo">508</span><a name="line.508"></a>
+<span class="sourceLineNo">509</span>   /**<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    * Form-data.<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    * <a name="line.511"></a>
+<span class="sourceLineNo">512</span>    * &lt;p&gt;<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    * Returns a {@link RequestFormData} object that encapsulates access to form post parameters.<a name="line.513"></a>
+<span class="sourceLineNo">514</span>    * <a name="line.514"></a>
+<span class="sourceLineNo">515</span>    * &lt;p&gt;<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    * Similar to {@link #getParameterMap()}, but only looks for form data in the HTTP body.<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    * <a name="line.517"></a>
+<span class="sourceLineNo">518</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.518"></a>
+<span class="sourceLineNo">519</span>    * &lt;p class='bcode'&gt;<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doPost(RestRequest req) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    *    <a name="line.522"></a>
+<span class="sourceLineNo">523</span>    *       &lt;jc&gt;// Get access to parsed form data parameters.&lt;/jc&gt;<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    *       RequestFormData fd = req.getFormData();<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    *       <a name="line.525"></a>
+<span class="sourceLineNo">526</span>    *       &lt;jc&gt;// Get form data parameters converted to various types.&lt;/jc&gt;<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    *       &lt;jk&gt;int&lt;/jk&gt; p1 = fd.get(&lt;js&gt;"p1"&lt;/js&gt;, 0, &lt;jk&gt;int&lt;/jk&gt;.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    *       String p2 = fd.get(&lt;js&gt;"p2"&lt;/js&gt;, String.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    *       UUID p3 = fd.get(&lt;js&gt;"p3"&lt;/js&gt;, UUID.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    *    }<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    * &lt;/p&gt;<a name="line.531"></a>
+<span class="sourceLineNo">532</span>    * <a name="line.532"></a>
+<span class="sourceLineNo">533</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.533"></a>
+<span class="sourceLineNo">534</span>    * &lt;ul class='spaced-list'&gt;<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    *    &lt;li&gt;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    *       This object is modifiable.<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    *    &lt;li&gt;<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    *    &lt;li&gt;<a name="line.539"></a>
+<span class="sourceLineNo">540</span>    *       The {@link RequestFormData} object can also be passed as a parameter on the method.<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    *    &lt;li&gt;<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    *       The {@link FormData @FormDAta} annotation can be used to access individual form data parameter values.<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    * &lt;/ul&gt;<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    * <a name="line.544"></a>
+<span class="sourceLineNo">545</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    * &lt;ul&gt;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestFormData"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestFormData&lt;/a&gt;<a name="line.547"></a>
+<span class="sourceLineNo">548</span>    * &lt;/ul&gt;<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    * <a name="line.549"></a>
+<span class="sourceLineNo">550</span>    * @return <a name="line.550"></a>
+<span class="sourceLineNo">551</span>    *    The URL-encoded form data from the request.<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.552"></a>
+<span class="sourceLineNo">553</span>    * @see org.apache.juneau.rest.annotation.FormData<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    */<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   public RequestFormData getFormData() {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      try {<a name="line.556"></a>
+<span class="sourceLineNo">557</span>         if (formData == null) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span>            formData = new RequestFormData();<a name="line.558"></a>
+<span class="sourceLineNo">559</span>            formData.setParser(restJavaMethod.partParser).setBeanSession(beanSession);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>            if (! body.isLoaded()) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>               formData.putAll(getParameterMap());<a name="line.561"></a>
+<span class="sourceLineNo">562</span>            } else {<a name="line.562"></a>
+<span class="sourceLineNo">563</span>               Map&lt;String,String[]&gt; m = RestUtils.parseQuery(body.getReader());<a name="line.563"></a>
+<span class="sourceLineNo">564</span>               for (Map.Entry&lt;String,String[]&gt; e : m.entrySet()) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>                  for (String v : e.getValue())<a name="line.565"></a>
+<span class="sourceLineNo">566</span>                     formData.put(e.getKey(), v);<a name="line.566"></a>
+<span class="sourceLineNo">567</span>               }<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            }<a name="line.568"></a>
+<span class="sourceLineNo">569</span>         }<a name="line.569"></a>
+<span class="sourceLineNo">570</span>         formData.addDefault(restJavaMethod.defaultFormData);<a name="line.570"></a>
+<span class="sourceLineNo">571</span>         return formData;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      } catch (Exception e) {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.573"></a>
+<span class="sourceLineNo">574</span>      }<a name="line.574"></a>
+<span class="sourceLineNo">575</span>   }<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span>   /**<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    * Shortcut for calling &lt;code&gt;getFormData().getString(name)&lt;/code&gt;.<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    * <a name="line.579"></a>
+<span class="sourceLineNo">580</span>    * @param name The form data parameter name.<a name="line.580"></a>
+<span class="sourceLineNo">581</span>    * @return The form data parameter value, or &lt;jk&gt;null&lt;jk&gt; if not found.<a name="line.581"></a>
+<span class="sourceLineNo">582</span>    */<a name="line.582"></a>
+<span class="sourceLineNo">583</span>   public String getFormData(String name) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      return getFormData().getString(name);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>   }<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>   // Path parameters<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   //--------------------------------------------------------------------------------<a name="line.589"></a>
-<span class="sourceLineNo">590</span><a name="line.590"></a>
-<span class="sourceLineNo">591</span>   /**<a name="line.591"></a>
-<span class="sourceLineNo">592</span>    * Request path match.<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>    * Returns a {@link RequestPathMatch} object that encapsulates access to everything related to the URL path.<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    * <a name="line.596"></a>
-<span class="sourceLineNo">597</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    * &lt;p class='bcode'&gt;<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(..., path=&lt;js&gt;"/{foo}/{bar}/{baz}/*"&lt;/js&gt;)<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    *    <a name="line.601"></a>
-<span class="sourceLineNo">602</span>    *       &lt;jc&gt;// Get access to path data.&lt;/jc&gt;<a name="line.602"></a>
-<span class="sourceLineNo">603</span>    *       RequestPathMatch pm = req.getPathMatch();<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    *       <a name="line.604"></a>
-<span class="sourceLineNo">605</span>    *       &lt;jc&gt;// Example URL:  /123/qux/true/quux&lt;/jc&gt;<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    *       <a name="line.606"></a>
-<span class="sourceLineNo">607</span>    *       &lt;jk&gt;int&lt;/jk&gt; foo = pm.getInt(&lt;js&gt;"foo"&lt;/js&gt;);  &lt;jc&gt;// =123&lt;/jc&gt;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    *       String bar = pm.getString(&lt;js&gt;"bar"&lt;/js&gt;);  &lt;jc&gt;// =qux&lt;/jc&gt;<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    *       &lt;jk&gt;boolean&lt;/jk&gt; baz = pm.getBoolean(&lt;js&gt;"baz"&lt;/js&gt;);  &lt;jc&gt;// =true&lt;/jc&gt;<a name="line.609"></a>
-<span class="sourceLineNo">610</span>    *       String remainder = pm.getRemainder();  &lt;jc&gt;// =quux&lt;/jc&gt;<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    *    }<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    * &lt;/p&gt;<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    * <a name="line.613"></a>
-<span class="sourceLineNo">614</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    * &lt;ul class='spaced-list'&gt;<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    *    &lt;li&gt;<a name="line.616"></a>
-<span class="sourceLineNo">617</span>    *       This object is modifiable.<a name="line.617"></a>
-<span class="sourceLineNo">618</span>    *    &lt;li&gt;<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    *    &lt;li&gt;<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    *       The {@link RequestPathMatch} object can also be passed as a parameter on the method.<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    *    &lt;li&gt;<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    *       The {@link Path @Path} and {@link PathRemainder @PathRemainder} annotations can be used to access individual values.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    * &lt;/ul&gt;<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    * <a name="line.625"></a>
-<span class="sourceLineNo">626</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    * &lt;ul&gt;<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestPathMatch"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestPathMatch&lt;/a&gt;<a name="line.628"></a>
-<span class="sourceLineNo">629</span>    * &lt;/ul&gt;<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    * <a name="line.630"></a>
-<span class="sourceLineNo">631</span>    * @return <a name="line.631"></a>
-<span class="sourceLineNo">632</span>    *    The path data from the URL.<a name="line.632"></a>
-<span class="sourceLineNo">633</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    */<a name="line.634"></a>
-<span class="sourceLineNo">635</span>   public RequestPathMatch getPathMatch() {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>      return pathParams;<a name="line.636"></a>
-<span class="sourceLineNo">637</span>   }<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span>   /**<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    * Shortcut for calling &lt;code&gt;getPathMatch().get(name)&lt;/code&gt;.<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    * <a name="line.641"></a>
-<span class="sourceLineNo">642</span>    * @param name The path variable name.<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    * @return The path variable value, or &lt;jk&gt;null&lt;/jk&gt; if not found.<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>   public String getPath(String name) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      return getPathMatch().get(name);<a name="line.646"></a>
-<span class="sourceLineNo">647</span>   }<a name="line.647"></a>
-<span class="sourceLineNo">648</span><a name="line.648"></a>
-<span class="sourceLineNo">649</span>   //--------------------------------------------------------------------------------<a name="line.649"></a>
-<span class="sourceLineNo">650</span>   // Body methods<a name="line.650"></a>
-<span class="sourceLineNo">651</span>   //--------------------------------------------------------------------------------<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span>   /**<a name="line.653"></a>
-<span class="sourceLineNo">654</span>    * Request body.<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    * <a name="line.655"></a>
-<span class="sourceLineNo">656</span>    * &lt;p&gt;<a name="line.656"></a>
-<span class="sourceLineNo">657</span>    * Returns a {@link RequestBody} object that encapsulates access to the HTTP request body.<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    * <a name="line.658"></a>
-<span class="sourceLineNo">659</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    * &lt;p class='bcode'&gt;<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doPost2(RestRequest req) {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>    *       <a name="line.663"></a>
-<span class="sourceLineNo">664</span>    *       &lt;jc&gt;// Convert body to a linked list of Person objects.&lt;/jc&gt;<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    *       List&amp;lt;Person&amp;gt; l = req.getBody().asType(LinkedList.&lt;jk&gt;class&lt;/jk&gt;, Person.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.665"></a>
-<span class="sourceLineNo">666</span>    *       ..<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    *    }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    * &lt;/p&gt;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    * <a name="line.669"></a>
-<span class="sourceLineNo">670</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    * &lt;ul class='spaced-list'&gt;<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    *    &lt;li&gt;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    *       The {@link RequestBody} object can also be passed as a parameter on the method.<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    *    &lt;li&gt;<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    *       The {@link Body @Body} annotation can be used to access the body as well.<a name="line.675"></a>
-<span class="sourceLineNo">676</span>    * &lt;/ul&gt;<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    * <a name="line.677"></a>
-<span class="sourceLineNo">678</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    * &lt;ul&gt;<a name="line.679"></a>
-<span class="sourceLineNo">680</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestBody"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestBody&lt;/a&gt;<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    * &lt;/ul&gt;<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    * <a name="line.682"></a>
-<span class="sourceLineNo">683</span>    * @return <a name="line.683"></a>
-<span class="sourceLineNo">684</span>    *    The body of this HTTP request.<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    */<a name="line.686"></a>
-<span class="sourceLineNo">687</span>   public RequestBody getBody() {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      return body;<a name="line.688"></a>
-<span class="sourceLineNo">689</span>   }<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>    * Returns the HTTP body content as a {@link Reader}.<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    * <a name="line.693"></a>
-<span class="sourceLineNo">694</span>    * &lt;p&gt;<a name="line.694"></a>
-<span class="sourceLineNo">695</span>    * If {@code allowHeaderParams} init parameter is true, then first looks for {@code &amp;body=xxx} in the URL query<a name="line.695"></a>
-<span class="sourceLineNo">696</span>    * string.<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    * <a name="line.697"></a>
-<span class="sourceLineNo">698</span>    * &lt;p&gt;<a name="line.698"></a>
-<span class="sourceLineNo">699</span>    * Automatically handles GZipped input streams.<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    */<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   @Override /* ServletRequest */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>   public BufferedReader getReader() throws IOException {<a name="line.702"></a>
-<span class="sourceLineNo">703</span>      return getBody().getReader();<a name="line.703"></a>
-<span class="sourceLineNo">704</span>   }<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span>   /**<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    * Returns the HTTP body content as an {@link InputStream}.<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    * <a name="line.708"></a>
-<span class="sourceLineNo">709</span>    * &lt;p&gt;<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    * Automatically handles GZipped input streams.<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    * <a name="line.711"></a>
-<span class="sourceLineNo">712</span>    * @return The negotiated input stream.<a name="line.712"></a>
-<span class="sourceLineNo">713</span>    * @throws IOException If any error occurred while trying to get the input stream or wrap it in the GZIP wrapper.<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    */<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   @Override /* ServletRequest */<a name="line.715"></a>
-<span class="sourceLineNo">716</span>   public ServletInputStream getInputStream() throws IOException {<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      return getBody().getInputStream();<a name="line.717"></a>
-<span class="sourceLineNo">718</span>   }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>   ServletInputStream getRawInputStream() throws IOException {<a name="line.720"></a>
-<span class="sourceLineNo">721</span>      return super.getInputStream();<a name="line.721"></a>
-<span class="sourceLineNo">722</span>   }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></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>   // Path parameters<a name="line.589"></a>
+<span class="sourceLineNo">590</span>   //--------------------------------------------------------------------------------<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>   /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span>    * Request path match.<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    * <a name="line.594"></a>
+<span class="sourceLineNo">595</span>    * &lt;p&gt;<a name="line.595"></a>
+<span class="sourceLineNo">596</span>    * Returns a {@link RequestPathMatch} object that encapsulates access to everything related to the URL path.<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    * <a name="line.597"></a>
+<span class="sourceLineNo">598</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    * &lt;p class='bcode'&gt;<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(..., path=&lt;js&gt;"/{foo}/{bar}/{baz}/*"&lt;/js&gt;)<a name="line.600"></a>
+<span class="sourceLineNo">601</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>    *    <a name="line.602"></a>
+<span class="sourceLineNo">603</span>    *       &lt;jc&gt;// Get access to path data.&lt;/jc&gt;<a name="line.603"></a>
+<span class="sourceLineNo">604</span>    *       RequestPathMatch pm = req.getPathMatch();<a name="line.604"></a>
+<span class="sourceLineNo">605</span>    *       <a name="line.605"></a>
+<span class="sourceLineNo">606</span>    *       &lt;jc&gt;// Example URL:  /123/qux/true/quux&lt;/jc&gt;<a name="line.606"></a>
+<span class="sourceLineNo">607</span>    *       <a name="line.607"></a>
+<span class="sourceLineNo">608</span>    *       &lt;jk&gt;int&lt;/jk&gt; foo = pm.getInt(&lt;js&gt;"foo"&lt;/js&gt;);  &lt;jc&gt;// =123&lt;/jc&gt;<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    *       String bar = pm.getString(&lt;js&gt;"bar"&lt;/js&gt;);  &lt;jc&gt;// =qux&lt;/jc&gt;<a name="line.609"></a>
+<span class="sourceLineNo">610</span>    *       &lt;jk&gt;boolean&lt;/jk&gt; baz = pm.getBoolean(&lt;js&gt;"baz"&lt;/js&gt;);  &lt;jc&gt;// =true&lt;/jc&gt;<a name="line.610"></a>
+<span class="sourceLineNo">611</span>    *       String remainder = pm.getRemainder();  &lt;jc&gt;// =quux&lt;/jc&gt;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    *    }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    * &lt;/p&gt;<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    * <a name="line.614"></a>
+<span class="sourceLineNo">615</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.615"></a>
+<span class="sourceLineNo">616</span>    * &lt;ul class='spaced-list'&gt;<a name="line.616"></a>
+<span class="sourceLineNo">617</span>    *    &lt;li&gt;<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    *       This object is modifiable.<a name="line.618"></a>
+<span class="sourceLineNo">619</span>    *    &lt;li&gt;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    *       Values are converted from strings using the registered {@link RestContext#REST_partParser part-parser} on the resource class.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    *    &lt;li&gt;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    *       The {@link RequestPathMatch} object can also be passed as a parameter on the method.<a name="line.622"></a>
+<span class="sourceLineNo">623</span>    *    &lt;li&gt;<a name="line.623"></a>
+<span class="sourceLineNo">624</span>    *       The {@link Path @Path} and {@link PathRemainder @PathRemainder} annotations can be used to access individual values.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    * &lt;/ul&gt;<a name="line.625"></a>
+<span class="sourceLineNo">626</span>    * <a name="line.626"></a>
+<span class="sourceLineNo">627</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    * &lt;ul&gt;<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestPathMatch"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestPathMatch&lt;/a&gt;<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    * &lt;/ul&gt;<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    * <a name="line.631"></a>
+<span class="sourceLineNo">632</span>    * @return <a name="line.632"></a>
+<span class="sourceLineNo">633</span>    *    The path data from the URL.<a name="line.633"></a>
+<span class="sourceLineNo">634</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.634"></a>
+<span class="sourceLineNo">635</span>    */<a name="line.635"></a>
+<span class="sourceLineNo">636</span>   public RequestPathMatch getPathMatch() {<a name="line.636"></a>
+<span class="sourceLineNo">637</span>      return pathParams;<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   }<a name="line.638"></a>
+<span class="sourceLineNo">639</span><a name="line.639"></a>
+<span class="sourceLineNo">640</span>   /**<a name="line.640"></a>
+<span class="sourceLineNo">641</span>    * Shortcut for calling &lt;code&gt;getPathMatch().get(name)&lt;/code&gt;.<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    * <a name="line.642"></a>
+<span class="sourceLineNo">643</span>    * @param name The path variable name.<a name="line.643"></a>
+<span class="sourceLineNo">644</span>    * @return The path variable value, or &lt;jk&gt;null&lt;/jk&gt; if not found.<a name="line.644"></a>
+<span class="sourceLineNo">645</span>    */<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   public String getPath(String name) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      return getPathMatch().get(name);<a name="line.647"></a>
+<span class="sourceLineNo">648</span>   }<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span>   //--------------------------------------------------------------------------------<a name="line.650"></a>
+<span class="sourceLineNo">651</span>   // Body methods<a name="line.651"></a>
+<span class="sourceLineNo">652</span>   //--------------------------------------------------------------------------------<a name="line.652"></a>
+<span class="sourceLineNo">653</span><a name="line.653"></a>
+<span class="sourceLineNo">654</span>   /**<a name="line.654"></a>
+<span class="sourceLineNo">655</span>    * Request body.<a name="line.655"></a>
+<span class="sourceLineNo">656</span>    * <a name="line.656"></a>
+<span class="sourceLineNo">657</span>    * &lt;p&gt;<a name="line.657"></a>
+<span class="sourceLineNo">658</span>    * Returns a {@link RequestBody} object that encapsulates access to the HTTP request body.<a name="line.658"></a>
+<span class="sourceLineNo">659</span>    * <a name="line.659"></a>
+<span class="sourceLineNo">660</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.660"></a>
+<span class="sourceLineNo">661</span>    * &lt;p class='bcode'&gt;<a name="line.661"></a>
+<span class="sourceLineNo">662</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.662"></a>
+<span class="sourceLineNo">663</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doPost2(RestRequest req) {<a name="line.663"></a>
+<span class="sourceLineNo">664</span>    *       <a name="line.664"></a>
+<span class="sourceLineNo">665</span>    *       &lt;jc&gt;// Convert body to a linked list of Person objects.&lt;/jc&gt;<a name="line.665"></a>
+<span class="sourceLineNo">666</span>    *       List&amp;lt;Person&amp;gt; l = req.getBody().asType(LinkedList.&lt;jk&gt;class&lt;/jk&gt;, Person.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.666"></a>
+<span class="sourceLineNo">667</span>    *       ..<a name="line.667"></a>
+<span class="sourceLineNo">668</span>    *    }<a name="line.668"></a>
+<span class="sourceLineNo">669</span>    * &lt;/p&gt;<a name="line.669"></a>
+<span class="sourceLineNo">670</span>    * <a name="line.670"></a>
+<span class="sourceLineNo">671</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.671"></a>
+<span class="sourceLineNo">672</span>    * &lt;ul class='spaced-list'&gt;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>    *    &lt;li&gt;<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    *       The {@link RequestBody} object can also be passed as a parameter on the method.<a name="line.674"></a>
+<span class="sourceLineNo">675</span>    *    &lt;li&gt;<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    *       The {@link Body @Body} annotation can be used to access the body as well.<a name="line.676"></a>
+<span class="sourceLineNo">677</span>    * &lt;/ul&gt;<a name="line.677"></a>
+<span class="sourceLineNo">678</span>    * <a name="line.678"></a>
+<span class="sourceLineNo">679</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.679"></a>
+<span class="sourceLineNo">680</span>    * &lt;ul&gt;<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestBody"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; RequestBody&lt;/a&gt;<a name="line.681"></a>
+<span class="sourceLineNo">682</span>    * &lt;/ul&gt;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>    * <a name="line.683"></a>
+<span class="sourceLineNo">684</span>    * @return <a name="line.684"></a>
+<span class="sourceLineNo">685</span>    *    The body of this HTTP request.<a name="line.685"></a>
+<span class="sourceLineNo">686</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.686"></a>
+<span class="sourceLineNo">687</span>    */<a name="line.687"></a>
+<span class="sourceLineNo">688</span>   public RequestBody getBody() {<a name="line.688"></a>
+<span class="sourceLineNo">689</span>      return body;<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>   /**<a name="line.692"></a>
+<span class="sourceLineNo">693</span>    * Returns the HTTP body content as a {@link Reader}.<a name="line.693"></a>
+<span class="sourceLineNo">694</span>    * <a name="line.694"></a>
+<span class="sourceLineNo">695</span>    * &lt;p&gt;<a name="line.695"></a>
+<span class="sourceLineNo">696</span>    * If {@code allowHeaderParams} init parameter is true, then first looks for {@code &amp;body=xxx} in the URL query<a name="line.696"></a>
+<span class="sourceLineNo">697</span>    * string.<a name="line.697"></a>
+<span class="sourceLineNo">698</span>    * <a name="line.698"></a>
+<span class="sourceLineNo">699</span>    * &lt;p&gt;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>    * Automatically handles GZipped input streams.<a name="line.700"></a>
+<span class="sourceLineNo">701</span>    */<a name="line.701"></a>
+<span class="sourceLineNo">702</span>   @Override /* ServletRequest */<a name="line.702"></a>
+<span class="sourceLineNo">703</span>   public BufferedReader getReader() throws IOException {<a name="line.703"></a>
+<span class="sourceLineNo">704</span>      return getBody().getReader();<a name="line.704"></a>
+<span class="sourceLineNo">705</span>   }<a name="line.705"></a>
+<span class="sourceLineNo">706</span><a name="line.706"></a>
+<span class="sourceLineNo">707</span>   /**<a name="line.707"></a>
+<span class="sourceLineNo">708</span>    * Returns the HTTP body content as an {@link InputStream}.<a name="line.708"></a>
+<span class="sourceLineNo">709</span>    * <a name="line.709"></a>
+<span class="sourceLineNo">710</span>    * &lt;p&gt;<a name="line.710"></a>
+<span class="sourceLineNo">711</span>    * Automatically handles GZipped input streams.<a name="line.711"></a>
+<span class="sourceLineNo">712</span>    * <a name="line.712"></a>
+<span class="sourceLineNo">713</span>    * @return The negotiated input stream.<a name="line.713"></a>
+<span class="sourceLineNo">714</span>    * @throws IOException If any error occurred while trying to get the input stream or wrap it in the GZIP wrapper.<a name="line.714"></a>
+<span class="sourceLineNo">715</span>    */<a name="line.715"></a>
+<span class="sourceLineNo">716</span>   @Override /* ServletRequest */<a name="line.716"></a>
+<span class="sourceLineNo">717</span>   public ServletInputStream getInputStream() throws IOException {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>      return getBody().getInputStream();<a name="line.718"></a>
+<span class="sourceLineNo">719</span>   }<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>   ServletInputStream getRawInputStream() throws IOException {<a name="line.721"></a>
+<span class="sourceLineNo">722</span>      return super.getInputStream();<a name="line.722"></a>
+<span class="sourceLineNo">723</span>   }<a name="line.723"></a>
 <span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>   //--------------------------------------------------------------------------------<a name="line.725"></a>
-<span class="sourceLineNo">726</span>   // URI-related methods<a name="line.726"></a>
-<span class="sourceLineNo">727</span>   //--------------------------------------------------------------------------------<a name="line.727"></a>
-<span class="sourceLineNo">728</span><a name="line.728"></a>
-<span class="sourceLineNo">729</span>   @Override /* HttpServletRequest */<a name="line.729"></a>
-<span class="sourceLineNo">730</span>   public String getContextPath() {<a name="line.730"></a>
-<span class="sourceLineNo">731</span>      String cp = context.getContextPath();<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      return cp == null ? super.getContextPath() : cp;<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   }<a name="line.733"></a>
-<span class="sourceLineNo">734</span><a name="line.734"></a>
-<span class="sourceLineNo">735</span>   @Override /* HttpServletRequest */<a name="line.735"></a>
-<span class="sourceLineNo">736</span>   public String getServletPath() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>      String cp = context.getContextPath();<a name="line.737"></a>
-<span class="sourceLineNo">738</span>      String sp = super.getServletPath();<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      return cp == null || ! sp.startsWith(cp) ? sp : sp.substring(cp.length());<a name="line.739"></a>
-<span class="sourceLineNo">740</span>   }<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>   /**<a name="line.742"></a>
-<span class="sourceLineNo">743</span>    * Returns the URI context of the request.<a name="line.743"></a>
-<span class="sourceLineNo">744</span>    * <a name="line.744"></a>
-<span class="sourceLineNo">745</span>    * &lt;p&gt;<a name="line.745"></a>
-<span class="sourceLineNo">746</span>    * The URI context contains all the information about the URI of the request, such as the servlet URI, context<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    * path, etc...<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    * <a name="line.748"></a>
-<span class="sourceLineNo">749</span>    * @return The URI context of the request.<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    */<a name="line.750"></a>
-<span class="sourceLineNo">751</span>   public UriContext getUriContext() {<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      if (uriContext == null) {<a name="line.752"></a>
-<span class="sourceLineNo">753</span>         String scheme = getScheme();<a name="line.753"></a>
-<span class="sourceLineNo">754</span>         int port = getServerPort();<a name="line.754"></a>
-<span class="sourceLineNo">755</span>         StringBuilder authority = new StringBuilder(getScheme()).append("://").append(getServerName());<a name="line.755"></a>
-<span class="sourceLineNo">756</span>         if (! (port == 80 &amp;&amp; "http".equals(scheme) || port == 443 &amp;&amp; "https".equals(scheme)))<a name="line.756"></a>
-<span class="sourceLineNo">757</span>            authority.append(':').append(port);<a name="line.757"></a>
-<span class="sourceLineNo">758</span>         uriContext = new UriContext(authority.toString(), getContextPath(), getServletPath(), super.getPathInfo());<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      }<a name="line.759"></a>
-<span class="sourceLineNo">760</span>      return uriContext;<a name="line.760"></a>
-<span class="sourceLineNo">761</span>   }<a name="line.761"></a>
-<span class="sourceLineNo">762</span><a name="line.762"></a>
-<span class="sourceLineNo">763</span>   /**<a name="line.763"></a>
-<span class="sourceLineNo">764</span>    * Returns a URI resolver that can be used to convert URIs to absolute or root-relative form.<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    * <a name="line.765"></a>
-<span class="sourceLineNo">766</span>    * @param resolution The URI resolution rule.<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    * @param relativity The relative URI relativity rule.<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    * @return The URI resolver for this request.<a name="line.768"></a>
-<span class="sourceLineNo">769</span>    */<a name="line.769"></a>
-<span class="sourceLineNo">770</span>   public UriResolver getUriResolver(UriResolution resolution, UriRelativity relativity) {<a name="line.770"></a>
-<span class="sourceLineNo">771</span>      return new UriResolver(resolution, relativity, getUriContext());<a name="line.771"></a>
-<span class="sourceLineNo">772</span>   }<a name="line.772"></a>
-<span class="sourceLineNo">773</span><a name="line.773"></a>
-<span class="sourceLineNo">774</span>   /**<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    * Shortcut for calling {@link #getUriResolver()} using {@link UriResolution#ROOT_RELATIVE} and<a name="line.775"></a>
-<span class="sourceLineNo">776</span>    * {@link UriRelativity#RESOURCE}<a name="line.776"></a>
-<span class="sourceLineNo">777</span>    * <a name="line.777"></a>
-<span class="sourceLineNo">778</span>    * @return The URI resolver for this request.<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    */<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   public UriResolver getUriResolver() {<a name="line.780"></a>
-<span class="sourceLineNo">781</span>      return new UriResolver(UriResolution.ROOT_RELATIVE, UriRelativity.RESOURCE, getUriContext());<a name="line.781"></a>
-<span class="sourceLineNo">782</span>   }<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span>   /**<a name="line.784"></a>
-<span class="sourceLineNo">785</span>    * Returns the URI for this request.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>    * <a name="line.786"></a>
-<span class="sourceLineNo">787</span>    * &lt;p&gt;<a name="line.787"></a>
-<span class="sourceLineNo">788</span>    * Similar to {@link #getRequestURI()} but returns the value as a {@link URI}.<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    * It also gives you the capability to override the query parameters (e.g. add new query parameters to the existing<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    * URI).<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    * <a name="line.791"></a>
-<span class="sourceLineNo">792</span>    * @param includeQuery If &lt;jk&gt;true&lt;/jk&gt; include the query parameters on the request.<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    * @param addQueryParams Augment the request URI with the specified query parameters.<a name="line.793"></a>
-<span class="sourceLineNo">794</span>    * @return A new URI.<a name="line.794"></a>
-<span class="sourceLineNo">795</span>    */<a name="line.795"></a>
-<span class="sourceLineNo">796</span>   public URI getUri(boolean includeQuery, Map&lt;String,?&gt; addQueryParams) {<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      String uri = getRequestURI();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      if (includeQuery || addQueryParams != null) {<a name="line.798"></a>
-<span class="sourceLineNo">799</span>         StringBuilder sb = new StringBuilder(uri);<a name="line.799"></a>
-<span class="sourceLineNo">800</span>         RequestQuery rq = this.queryParams.copy();<a name="line.800"></a>
-<span class="sourceLineNo">801</span>         if (addQueryParams != null)<a name="line.801"></a>
-<span class="sourceLineNo">802</span>            for (Map.Entry&lt;String,?&gt; e : addQueryParams.entrySet())<a name="line.802"></a>
-<span class="sourceLineNo">803</span>               rq.put(e.getKey(), e.getValue());<a name="line.803"></a>
-<span class="sourceLineNo">804</span>         if (! rq.isEmpty())<a name="line.804"></a>
-<span class="sourceLineNo">805</span>            sb.append('?').append(rq.toQueryString());<a name="line.805"></a>
-<span class="sourceLineNo">806</span>         uri = sb.toString();<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      }<a name="line.807"></a>
-<span class="sourceLineNo">808</span>      try {<a name="line.808"></a>
-<span class="sourceLineNo">809</span>         return new URI(uri);<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      } catch (URISyntaxException e) {<a name="line.810"></a>
-<span class="sourceLineNo">811</span>         // Shouldn't happen.<a name="line.811"></a>
-<span class="sourceLineNo">812</span>         throw new RuntimeException(e);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      }<a name="line.813"></a>
-<span class="sourceLineNo">814</span>   }<a name="line.814"></a>
-<span class="sourceLineNo">815</span><a name="line.815"></a>
-<span class="sourceLineNo">816</span>   //--------------------------------------------------------------------------------<a name="line.816"></a>
-<span class="sourceLineNo">817</span>   // Labels<a name="line.817"></a>
-<span class="sourceLineNo">818</span>   //--------------------------------------------------------------------------------<a name="line.818"></a>
-<span class="sourceLineNo">819</span><a name="line.819"></a>
-<span class="sourceLineNo">820</span>   /**<a name="line.820"></a>
-<span class="sourceLineNo">821</span>    * Resource information provider.<a name="line.821"></a>
-<span class="sourceLineNo">822</span>    * <a name="line.822"></a>
-<span class="sourceLineNo">823</span>    * &lt;p&gt;<a name="line.823"></a>
-<span class="sourceLineNo">824</span>    * Returns a {@link RestInfoProvider} object that encapsulates all the textual meta-data on this resource such as<a name="line.824"></a>
-<span class="sourceLineNo">825</span>    * descriptions, titles, and Swagger documentation.<a name="line.825"></a>
-<span class="sourceLineNo">826</span>    * <a name="line.826"></a>
-<span class="sourceLineNo">827</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.827"></a>
-<span class="sourceLineNo">828</span>    * &lt;p class='bcode'&gt;<a name="line.828"></a>
-<span class="sourceLineNo">829</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.829"></a>
-<span class="sourceLineNo">830</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    * <a name="line.831"></a>
-<span class="sourceLineNo">832</span>    *       &lt;jc&gt;// Get information provider.&lt;/jc&gt;<a name="line.832"></a>
-<span class="sourceLineNo">833</span>    *       RestInfoProvider p = req.getInfoProvider();<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    *       <a name="line.834"></a>
-<span class="sourceLineNo">835</span>    *       &lt;jc&gt;// Get localized strings.&lt;/jc&gt;<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    *       String resourceTitle = p.getTitle(req);<a name="line.836"></a>
-<span class="sourceLineNo">837</span>    *       String methodDescription = p.getMethodDescription(req.getMethod(), req);<a name="line.837"></a>
-<span class="sourceLineNo">838</span>    *       Contact contact = p.getContact(req);<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    *       ..<a name="line.839"></a>
-<span class="sourceLineNo">840</span>    *    }<a name="line.840"></a>
-<span class="sourceLineNo">841</span>    * &lt;/p&gt;<a name="line.841"></a>
-<span class="sourceLineNo">842</span>    * <a name="line.842"></a>
-<span class="sourceLineNo">843</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    * &lt;ul class='spaced-list'&gt;<a name="line.844"></a>
-<span class="sourceLineNo">845</span>    *    &lt;li&gt;<a name="line.845"></a>
-<span class="sourceLineNo">846</span>    *       The {@link RestInfoProvider} object can also be passed as a parameter on the method.<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    * &lt;/ul&gt;<a name="line.847"></a>
-<span class="sourceLineNo">848</span>    * <a name="line.848"></a>
-<span class="sourceLineNo">849</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.849"></a>
-<span class="sourceLineNo">850</span>    * &lt;ul&gt;<a name="line.850"></a>
-<span class="sourceLineNo">851</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_infoProvider}<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    *    &lt;li class='jic'&gt;{@link org.apache.juneau.rest.RestInfoProvider}<a name="line.852"></a>
-<span class="sourceLineNo">853</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getSiteName()}<a name="line.853"></a>
-<span class="sourceLineNo">854</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getResourceTitle()}<a name="line.854"></a>
-<span class="sourceLineNo">855</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getResourceDescription()}<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getMethodSummary()}<a name="line.856"></a>
-<span class="sourceLineNo">857</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getMethodDescription()}<a name="line.857"></a>
-<span class="sourceLineNo">858</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.858"></a>
-<span class="sourceLineNo">859</span>    * &lt;/ul&gt;<a name="line.859"></a>
-<span class="sourceLineNo">860</span>    * <a name="line.860"></a>
-<span class="sourceLineNo">861</span>    * @return <a name="line.861"></a>
-<span class="sourceLineNo">862</span>    *    The info provider on the resource.<a name="line.862"></a>
-<span class="sourceLineNo">863</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.863"></a>
-<span class="sourceLineNo">864</span>    */<a name="line.864"></a>
-<span class="sourceLineNo">865</span>   public RestInfoProvider getInfoProvider() {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>      return context.getInfoProvider();<a name="line.866"></a>
-<span class="sourceLineNo">867</span>   }<a name="line.867"></a>
-<span class="sourceLineNo">868</span>   <a name="line.868"></a>
-<span class="sourceLineNo">869</span>   /**<a name="line.869"></a>
-<span class="sourceLineNo">870</span>    * Returns the localized swagger associated with the resource.<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    * <a name="line.871"></a>
-<span class="sourceLineNo">872</span>    * &lt;p&gt;<a name="line.872"></a>
-<span class="sourceLineNo">873</span>    * A shortcut for calling &lt;code&gt;getInfoProvider().getSwagger(request);&lt;/code&gt;<a name="line.873"></a>
-<span class="sourceLineNo">874</span>    * <a name="line.874"></a>
-<span class="sourceLineNo">875</span>    * &lt;h5 class='section'&gt;Example:&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;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.877"></a>
-<span class="sourceLineNo">878</span>    *    &lt;jk&gt;public&lt;/jk&gt; List&amp;lt;Tag&amp;gt; getSwaggerTags(RestRequest req) {<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    *       &lt;jk&gt;return&lt;/jk&gt; req.getSwagger().getTags();<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    *    }<a name="line.880"></a>
-<span class="sourceLineNo">881</span>    * &lt;/p&gt;<a name="line.881"></a>
-<span class="sourceLineNo">882</span>    * <a name="line.882"></a>
-<span class="sourceLineNo">883</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.883"></a>
-<span class="sourceLineNo">884</span>    * &lt;ul class='spaced-list'&gt;<a name="line.884"></a>
-<span class="sourceLineNo">885</span>    *    &lt;li&gt;<a name="line.885"></a>
-<span class="sourceLineNo">886</span>    *       The {@link Swagger} object can also be passed as a parameter on the method.<a name="line.886"></a>
-<span class="sourceLineNo">887</span>    * &lt;/ul&gt;<a name="line.887"></a>
-<span class="sourceLineNo">888</span>    * <a name="line.888"></a>
-<span class="sourceLineNo">889</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.889"></a>
-<span class="sourceLineNo">890</span>    * &lt;ul&gt;<a name="line.890"></a>
-<span class="sourceLineNo">891</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_infoProvider}<a name="line.891"></a>
-<span class="sourceLineNo">892</span>    *    &lt;li class='jic'&gt;{@link org.apache.juneau.rest.RestInfoProvider}<a name="line.892"></a>
-<span class="sourceLineNo">893</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getInfoProvider()}<a name="line.893"></a>
-<span class="sourceLineNo">894</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.894"></a>
-<span class="sourceLineNo">895</span>    * &lt;/ul&gt;<a name="line.895"></a>
-<span class="sourceLineNo">896</span>    * <a name="line.896"></a>
-<span class="sourceLineNo">897</span>    * @return<a name="line.897"></a>
-<span class="sourceLineNo">898</span>    *    The swagger associated with the resource.<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    */<a name="line.900"></a>
-<span class="sourceLineNo">901</span>   public Swagger getSwagger() {<a name="line.901"></a>
-<span class="sourceLineNo">902</span>      try {<a name="line.902"></a>
-<span class="sourceLineNo">903</span>         if (swagger == null)<a name="line.903"></a>
-<span class="sourceLineNo">904</span>            swagger = context.getInfoProvider().getSwagger(this);<a name="line.904"></a>
-<span class="sourceLineNo">905</span>         return swagger;<a name="line.905"></a>
-<span class="sourceLineNo">906</span>      } catch (RestException e) {<a name="line.906"></a>
-<span class="sourceLineNo">907</span>         throw e;<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      } catch (Exception e) {<a name="line.908"></a>
-<span class="sourceLineNo">909</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.909"></a>
-<span class="sourceLineNo">910</span>      }<a name="line.910"></a>
-<span class="sourceLineNo">911</span>   }<a name="line.911"></a>
-<span class="sourceLineNo">912</span><a name="line.912"></a>
-<span class="sourceLineNo">913</span>   /**<a name="line.913"></a>
-<span class="sourceLineNo">914</span>    * Returns the localized site name.<a name="line.914"></a>
-<span class="sourceLineNo">915</span>    * <a name="line.915"></a>
-<span class="sourceLineNo">916</span>    * &lt;p&gt;<a name="line.916"></a>
-<span class="sourceLineNo">917</span>    * The site name is intended to be a title that can be applied to the entire site.<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    * <a name="line.918"></a>
-<span class="sourceLineNo">919</span>    * &lt;p&gt;<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    * One possible use is if you want to add the same title to the top of all pages by defining a header on a<a name="line.920"></a>
-<span class="sourceLineNo">921</span>    * common parent class like so:<a name="line.921"></a>
-<span class="sourceLineNo">922</span>    * &lt;p class='bcode'&gt;<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    *    htmldoc=&lt;ja&gt;@HtmlDoc&lt;/ja&gt;(<a name="line.923"></a>
-<span class="sourceLineNo">924</span>    *       header={<a name="line.924"></a>
-<span class="sourceLineNo">925</span>    *          &lt;js&gt;"&amp;lt;h1&amp;gt;$R{siteName}&amp;lt;/h1&amp;gt;"&lt;/js&gt;,<a name="line.925"></a>
-<span class="sourceLineNo">926</span>    *          &lt;js&gt;"&amp;lt;h2&amp;gt;$R{resourceTitle}&amp;lt;/h2&amp;gt;"&lt;/js&gt;<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    *       }<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    *    )<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    * &lt;/p&gt;<a name="line.929"></a>
-<span class="sourceLineNo">930</span>    * <a name="line.930"></a>
-<span class="sourceLineNo">931</span>    * &lt;p&gt;<a name="line.931"></a>
-<span class="sourceLineNo">932</span>    * Equivalent to calling {@link RestInfoProvider#getSiteName(RestRequest)} with this object.<a name="line.932"></a>
-<span class="sourceLineNo">933</span>    * <a name="line.933"></a>
-<span class="sourceLineNo">934</span>    * @return The localized site name.<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    */<a name="line.935"></a>
-<span class="sourceLineNo">936</span>   public String getSiteName() {<a name="line.936"></a>
-<span class="sourceLineNo">937</span>      try {<a name="line.937"></a>
-<span class="sourceLineNo">938</span>         return context.getInfoProvider().getSiteName(this);<a name="line.938"></a>
-<span class="sourceLineNo">939</span>      } catch (RestException e) {<a name="line.939"></a>
-<span class="sourceLineNo">940</span>         throw e;<a name="line.940"></a>
-<span class="sourceLineNo">941</span>      } catch (Exception e) {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.942"></a>
-<span class="sourceLineNo">943</span>      }<a name="line.943"></a>
-<span class="sourceLineNo">944</span>   }<a name="line.944"></a>
-<span class="sourceLineNo">945</span><a name="line.945"></a>
-<span class="sourceLineNo">946</span>   /**<a name="line.946"></a>
-<span class="sourceLineNo">947</span>    * Returns the localized resource title.<a name="line.947"></a>
-<span class="sourceLineNo">948</span>    * <a name="line.948"></a>
-<span class="sourceLineNo">949</span>    * &lt;p&gt;<a name="line.949"></a>
-<span class="sourceLineNo">950</span>    * Equivalent to calling {@link RestInfoProvider#getTitle(RestRequest)} with this object.<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    * <a name="line.951"></a>
-<span class="sourceLineNo">952</span>    * @return The localized resource title.<a name="line.952"></a>
-<span class="sourceLineNo">953</span>    */<a name="line.953"></a>
-<span class="sourceLineNo">954</span>   public String getResourceTitle() {<a name="line.954"></a>
-<span class="sourceLineNo">955</span>      try {<a name="line.955"></a>
-<span class="sourceLineNo">956</span>         return context.getInfoProvider().getTitle(this);<a name="line.956"></a>
-<span class="sourceLineNo">957</span>      } catch (RestException e) {<a name="line.957"></a>
-<span class="sourceLineNo">958</span>         throw e;<a name="line.958"></a>
-<span class="sourceLineNo">959</span>      } catch (Exception e) {<a name="line.959"></a>
-<span class="sourceLineNo">960</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.960"></a>
-<span class="sourceLineNo">961</span>      }<a name="line.961"></a>
-<span class="sourceLineNo">962</span>   }<a name="line.962"></a>
-<span class="sourceLineNo">963</span><a name="line.963"></a>
-<span class="sourceLineNo">964</span>   /**<a name="line.964"></a>
-<span class="sourceLineNo">965</span>    * Returns the localized resource description.<a name="line.965"></a>
-<span class="sourceLineNo">966</span>    * <a name="line.966"></a>
-<span class="sourceLineNo">967</span>    * &lt;p&gt;<a name="line.967"></a>
-<span class="sourceLineNo">968</span>    * Equivalent to calling {@link RestInfoProvider#getDescription(RestRequest)} with this object.<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    * <a name="line.969"></a>
-<span class="sourceLineNo">970</span>    * @return The localized resource description.<a name="line.970"></a>
-<span class="sourceLineNo">971</span>    */<a name="line.971"></a>
-<span class="sourceLineNo">972</span>   public String getResourceDescription() {<a name="line.972"></a>
-<span class="sourceLineNo">973</span>      try {<a name="line.973"></a>
-<span class="sourceLineNo">974</span>         return context.getInfoProvider().getDescription(this);<a name="line.974"></a>
-<span class="sourceLineNo">975</span>      } catch (RestException e) {<a name="line.975"></a>
-<span class="sourceLineNo">976</span>         throw e;<a name="line.976"></a>
-<span class="sourceLineNo">977</span>      } catch (Exception e) {<a name="line.977"></a>
-<span class="sourceLineNo">978</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      }<a name="line.979"></a>
-<span class="sourceLineNo">980</span>   }<a name="line.980"></a>
-<span class="sourceLineNo">981</span><a name="line.981"></a>
-<span class="sourceLineNo">982</span>   /**<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    * Returns the localized method summary.<a name="line.983"></a>
-<span class="sourceLineNo">984</span>    * <a name="line.984"></a>
-<span class="sourceLineNo">985</span>    * &lt;p&gt;<a name="line.985"></a>
-<span class="sourceLineNo">986</span>    * Equivalent to calling {@link RestInfoProvider#getMethodSummary(Method, RestRequest)} with this object.<a name="line.986"></a>
-<span class="sourceLineNo">987</span>    * <a name="line.987"></a>
-<span class="sourceLineNo">988</span>    * @return The localized method description.<a name="line.988"></a>
-<span class="sourceLineNo">989</span>    */<a name="line.989"></a>
-<span class="sourceLineNo">990</span>   public String getMethodSummary() {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      try {<a name="line.991"></a>
-<span class="sourceLineNo">992</span>         return context.getInfoProvider().getMethodSummary(javaMethod, this);<a name="line.992"></a>
-<span class="sourceLineNo">993</span>      } catch (RestException e) {<a name="line.993"></a>
-<span class="sourceLineNo">994</span>         throw e;<a name="line.994"></a>
-<span class="sourceLineNo">995</span>      } catch (Exception e) {<a name="line.995"></a>
-<span class="sourceLineNo">996</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.996"></a>
-<span class="sourceLineNo">997</span>      }<a name="line.997"></a>
-<span class="sourceLineNo">998</span>   }<a name="line.998"></a>
-<span class="sourceLineNo">999</span><a name="line.999"></a>
-<span class="sourceLineNo">1000</span>   /**<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span>    * Returns the localized method description.<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>    * <a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    * &lt;p&gt;<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    * Equivalent to calling {@link RestInfoProvider#getMethodDescription(Method, RestRequest)} with this object.<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    * <a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>    * @return The localized method description.<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>    */<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>   public String getMethodDescription() {<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>      try {<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>         return context.getInfoProvider().getMethodDescription(javaMethod, this);<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>      } catch (RestException e) {<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>         throw e;<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>      } catch (Exception e) {<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>      }<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>   }<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span><a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>   //--------------------------------------------------------------------------------<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>   // Other methods<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>   //--------------------------------------------------------------------------------<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span><a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>   /**<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>    * Returns the serializers associated with this request.<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>    * <a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>    * &lt;ul&gt;<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Serializers"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Serializers&lt;/a&gt;<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>    * &lt;/ul&gt;<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>    * <a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>    * @return The serializers associated with this request.<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span>    */<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>   public SerializerGroup getSerializers() {<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>      return restJavaMethod.serializers;<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span>   }<a name="line.1034"></a>
-<span class="sourceLineNo">1035</span><a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>   /**<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>    * Returns the parsers associated with this request.<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>    * <a name="line.1038"></a>
-<span class="sourceLineNo">1039</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>    * &lt;ul&gt;<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Parsers"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Parsers&lt;/a&gt;<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    * &lt;/ul&gt;<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>    * <a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>    * @return The parsers associated with this request.<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>    */<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span>   public ParserGroup getParsers() {<a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>      return restJavaMethod.parsers;<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>   }<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span><a name="line.1049"></a>
+<span class="sourceLineNo">725</span><a name="line.725"></a>
+<span class="sourceLineNo">726</span>   //--------------------------------------------------------------------------------<a name="line.726"></a>
+<span class="sourceLineNo">727</span>   // URI-related methods<a name="line.727"></a>
+<span class="sourceLineNo">728</span>   //--------------------------------------------------------------------------------<a name="line.728"></a>
+<span class="sourceLineNo">729</span><a name="line.729"></a>
+<span class="sourceLineNo">730</span>   @Override /* HttpServletRequest */<a name="line.730"></a>
+<span class="sourceLineNo">731</span>   public String getContextPath() {<a name="line.731"></a>
+<span class="sourceLineNo">732</span>      String cp = context.getContextPath();<a name="line.732"></a>
+<span class="sourceLineNo">733</span>      return cp == null ? super.getContextPath() : cp;<a name="line.733"></a>
+<span class="sourceLineNo">734</span>   }<a name="line.734"></a>
+<span class="sourceLineNo">735</span><a name="line.735"></a>
+<span class="sourceLineNo">736</span>   @Override /* HttpServletRequest */<a name="line.736"></a>
+<span class="sourceLineNo">737</span>   public String getServletPath() {<a name="line.737"></a>
+<span class="sourceLineNo">738</span>      String cp = context.getContextPath();<a name="line.738"></a>
+<span class="sourceLineNo">739</span>      String sp = super.getServletPath();<a name="line.739"></a>
+<span class="sourceLineNo">740</span>      return cp == null || ! sp.startsWith(cp) ? sp : sp.substring(cp.length());<a name="line.740"></a>
+<span class="sourceLineNo">741</span>   }<a name="line.741"></a>
+<span class="sourceLineNo">742</span><a name="line.742"></a>
+<span class="sourceLineNo">743</span>   /**<a name="line.743"></a>
+<span class="sourceLineNo">744</span>    * Returns the URI context of the request.<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 URI context contains all the information about the URI of the request, such as the servlet URI, context<a name="line.747"></a>
+<span class="sourceLineNo">748</span>    * path, etc...<a name="line.748"></a>
+<span class="sourceLineNo">749</span>    * <a name="line.749"></a>
+<span class="sourceLineNo">750</span>    * @return The URI context of the request.<a name="line.750"></a>
+<span class="sourceLineNo">751</span>    */<a name="line.751"></a>
+<span class="sourceLineNo">752</span>   public UriContext getUriContext() {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      if (uriContext == null) {<a name="line.753"></a>
+<span class="sourceLineNo">754</span>         String scheme = getScheme();<a name="line.754"></a>
+<span class="sourceLineNo">755</span>         int port = getServerPort();<a name="line.755"></a>
+<span class="sourceLineNo">756</span>         StringBuilder authority = new StringBuilder(getScheme()).append("://").append(getServerName());<a name="line.756"></a>
+<span class="sourceLineNo">757</span>         if (! (port == 80 &amp;&amp; "http".equals(scheme) || port == 443 &amp;&amp; "https".equals(scheme)))<a name="line.757"></a>
+<span class="sourceLineNo">758</span>            authority.append(':').append(port);<a name="line.758"></a>
+<span class="sourceLineNo">759</span>         uriContext = new UriContext(authority.toString(), getContextPath(), getServletPath(), StringUtils.urlEncodePath(super.getPathInfo()));<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      }<a name="line.760"></a>
+<span class="sourceLineNo">761</span>      return uriContext;<a name="line.761"></a>
+<span class="sourceLineNo">762</span>   }<a name="line.762"></a>
+<span class="sourceLineNo">763</span><a name="line.763"></a>
+<span class="sourceLineNo">764</span>   /**<a name="line.764"></a>
+<span class="sourceLineNo">765</span>    * Returns a URI resolver that can be used to convert URIs to absolute or root-relative form.<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    * <a name="line.766"></a>
+<span class="sourceLineNo">767</span>    * @param resolution The URI resolution rule.<a name="line.767"></a>
+<span class="sourceLineNo">768</span>    * @param relativity The relative URI relativity rule.<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    * @return The URI resolver for this request.<a name="line.769"></a>
+<span class="sourceLineNo">770</span>    */<a name="line.770"></a>
+<span class="sourceLineNo">771</span>   public UriResolver getUriResolver(UriResolution resolution, UriRelativity relativity) {<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      return new UriResolver(resolution, relativity, getUriContext());<a name="line.772"></a>
+<span class="sourceLineNo">773</span>   }<a name="line.773"></a>
+<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">775</span>   /**<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    * Shortcut for calling {@link #getUriResolver()} using {@link UriResolution#ROOT_RELATIVE} and<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    * {@link UriRelativity#RESOURCE}<a name="line.777"></a>
+<span class="sourceLineNo">778</span>    * <a name="line.778"></a>
+<span class="sourceLineNo">779</span>    * @return The URI resolver for this request.<a name="line.779"></a>
+<span class="sourceLineNo">780</span>    */<a name="line.780"></a>
+<span class="sourceLineNo">781</span>   public UriResolver getUriResolver() {<a name="line.781"></a>
+<span class="sourceLineNo">782</span>      return new UriResolver(UriResolution.ROOT_RELATIVE, UriRelativity.RESOURCE, getUriContext());<a name="line.782"></a>
+<span class="sourceLineNo">783</span>   }<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>    * Returns the URI for this request.<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    * <a name="line.787"></a>
+<span class="sourceLineNo">788</span>    * &lt;p&gt;<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    * Similar to {@link #getRequestURI()} but returns the value as a {@link URI}.<a name="line.789"></a>
+<span class="sourceLineNo">790</span>    * It also gives you the capability to override the query parameters (e.g. add new query parameters to the existing<a name="line.790"></a>
+<span class="sourceLineNo">791</span>    * URI).<a name="line.791"></a>
+<span class="sourceLineNo">792</span>    * <a name="line.792"></a>
+<span class="sourceLineNo">793</span>    * @param includeQuery If &lt;jk&gt;true&lt;/jk&gt; include the query parameters on the request.<a name="line.793"></a>
+<span class="sourceLineNo">794</span>    * @param addQueryParams Augment the request URI with the specified query parameters.<a name="line.794"></a>
+<span class="sourceLineNo">795</span>    * @return A new URI.<a name="line.795"></a>
+<span class="sourceLineNo">796</span>    */<a name="line.796"></a>
+<span class="sourceLineNo">797</span>   public URI getUri(boolean includeQuery, Map&lt;String,?&gt; addQueryParams) {<a name="line.797"></a>
+<span class="sourceLineNo">798</span>      String uri = getRequestURI();<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      if (includeQuery || addQueryParams != null) {<a name="line.799"></a>
+<span class="sourceLineNo">800</span>         StringBuilder sb = new StringBuilder(uri);<a name="line.800"></a>
+<span class="sourceLineNo">801</span>         RequestQuery rq = this.queryParams.copy();<a name="line.801"></a>
+<span class="sourceLineNo">802</span>         if (addQueryParams != null)<a name="line.802"></a>
+<span class="sourceLineNo">803</span>            for (Map.Entry&lt;String,?&gt; e : addQueryParams.entrySet())<a name="line.803"></a>
+<span class="sourceLineNo">804</span>               rq.put(e.getKey(), e.getValue());<a name="line.804"></a>
+<span class="sourceLineNo">805</span>         if (! rq.isEmpty())<a name="line.805"></a>
+<span class="sourceLineNo">806</span>            sb.append('?').append(rq.toQueryString());<a name="line.806"></a>
+<span class="sourceLineNo">807</span>         uri = sb.toString();<a name="line.807"></a>
+<span class="sourceLineNo">808</span>      }<a name="line.808"></a>
+<span class="sourceLineNo">809</span>      try {<a name="line.809"></a>
+<span class="sourceLineNo">810</span>         return new URI(uri);<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      } catch (URISyntaxException e) {<a name="line.811"></a>
+<span class="sourceLineNo">812</span>         // Shouldn't happen.<a name="line.812"></a>
+<span class="sourceLineNo">813</span>         throw new RuntimeException(e);<a name="line.813"></a>
+<span class="sourceLineNo">814</span>      }<a name="line.814"></a>
+<span class="sourceLineNo">815</span>   }<a name="line.815"></a>
+<span class="sourceLineNo">816</span><a name="line.816"></a>
+<span class="sourceLineNo">817</span>   //--------------------------------------------------------------------------------<a name="line.817"></a>
+<span class="sourceLineNo">818</span>   // Labels<a name="line.818"></a>
+<span class="sourceLineNo">819</span>   //--------------------------------------------------------------------------------<a name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span>   /**<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    * Resource information provider.<a name="line.822"></a>
+<span class="sourceLineNo">823</span>    * <a name="line.823"></a>
+<span class="sourceLineNo">824</span>    * &lt;p&gt;<a name="line.824"></a>
+<span class="sourceLineNo">825</span>    * Returns a {@link RestInfoProvider} object that encapsulates all the textual meta-data on this resource such as<a name="line.825"></a>
+<span class="sourceLineNo">826</span>    * descriptions, titles, and Swagger documentation.<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    * <a name="line.827"></a>
+<span class="sourceLineNo">828</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.828"></a>
+<span class="sourceLineNo">829</span>    * &lt;p class='bcode'&gt;<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.830"></a>
+<span class="sourceLineNo">831</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    * <a name="line.832"></a>
+<span class="sourceLineNo">833</span>    *       &lt;jc&gt;// Get information provider.&lt;/jc&gt;<a name="line.833"></a>
+<span class="sourceLineNo">834</span>    *       RestInfoProvider p = req.getInfoProvider();<a name="line.834"></a>
+<span class="sourceLineNo">835</span>    *       <a name="line.835"></a>
+<span class="sourceLineNo">836</span>    *       &lt;jc&gt;// Get localized strings.&lt;/jc&gt;<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    *       String resourceTitle = p.getTitle(req);<a name="line.837"></a>
+<span class="sourceLineNo">838</span>    *       String methodDescription = p.getMethodDescription(req.getMethod(), req);<a name="line.838"></a>
+<span class="sourceLineNo">839</span>    *       Contact contact = p.getContact(req);<a name="line.839"></a>
+<span class="sourceLineNo">840</span>    *       ..<a name="line.840"></a>
+<span class="sourceLineNo">841</span>    *    }<a name="line.841"></a>
+<span class="sourceLineNo">842</span>    * &lt;/p&gt;<a name="line.842"></a>
+<span class="sourceLineNo">843</span>    * <a name="line.843"></a>
+<span class="sourceLineNo">844</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.844"></a>
+<span class="sourceLineNo">845</span>    * &lt;ul class='spaced-list'&gt;<a name="line.845"></a>
+<span class="sourceLineNo">846</span>    *    &lt;li&gt;<a name="line.846"></a>
+<span class="sourceLineNo">847</span>    *       The {@link RestInfoProvider} object can also be passed as a parameter on the method.<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    * &lt;/ul&gt;<a name="line.848"></a>
+<span class="sourceLineNo">849</span>    * <a name="line.849"></a>
+<span class="sourceLineNo">850</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.850"></a>
+<span class="sourceLineNo">851</span>    * &lt;ul&gt;<a name="line.851"></a>
+<span class="sourceLineNo">852</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_infoProvider}<a name="line.852"></a>
+<span class="sourceLineNo">853</span>    *    &lt;li class='jic'&gt;{@link org.apache.juneau.rest.RestInfoProvider}<a name="line.853"></a>
+<span class="sourceLineNo">854</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getSiteName()}<a name="line.854"></a>
+<span class="sourceLineNo">855</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getResourceTitle()}<a name="line.855"></a>
+<span class="sourceLineNo">856</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getResourceDescription()}<a name="line.856"></a>
+<span class="sourceLineNo">857</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getMethodSummary()}<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getMethodDescription()}<a name="line.858"></a>
+<span class="sourceLineNo">859</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.859"></a>
+<span class="sourceLineNo">860</span>    * &lt;/ul&gt;<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    * <a name="line.861"></a>
+<span class="sourceLineNo">862</span>    * @return <a name="line.862"></a>
+<span class="sourceLineNo">863</span>    *    The info provider on the resource.<a name="line.863"></a>
+<span class="sourceLineNo">864</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.864"></a>
+<span class="sourceLineNo">865</span>    */<a name="line.865"></a>
+<span class="sourceLineNo">866</span>   public RestInfoProvider getInfoProvider() {<a name="line.866"></a>
+<span class="sourceLineNo">867</span>      return context.getInfoProvider();<a name="line.867"></a>
+<span class="sourceLineNo">868</span>   }<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>    * Returns the localized swagger associated with the resource.<a name="line.871"></a>
+<span class="sourceLineNo">872</span>    * <a name="line.872"></a>
+<span class="sourceLineNo">873</span>    * &lt;p&gt;<a name="line.873"></a>
+<span class="sourceLineNo">874</span>    * A shortcut for calling &lt;code&gt;getInfoProvider().getSwagger(request);&lt;/code&gt;<a name="line.874"></a>
+<span class="sourceLineNo">875</span>    * <a name="line.875"></a>
+<span class="sourceLineNo">876</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.876"></a>
+<span class="sourceLineNo">877</span>    * &lt;p class='bcode'&gt;<a name="line.877"></a>
+<span class="sourceLineNo">878</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.878"></a>
+<span class="sourceLineNo">879</span>    *    &lt;jk&gt;public&lt;/jk&gt; List&amp;lt;Tag&amp;gt; getSwaggerTags(RestRequest req) {<a name="line.879"></a>
+<span class="sourceLineNo">880</span>    *       &lt;jk&gt;return&lt;/jk&gt; req.getSwagger().getTags();<a name="line.880"></a>
+<span class="sourceLineNo">881</span>    *    }<a name="line.881"></a>
+<span class="sourceLineNo">882</span>    * &lt;/p&gt;<a name="line.882"></a>
+<span class="sourceLineNo">883</span>    * <a name="line.883"></a>
+<span class="sourceLineNo">884</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    * &lt;ul class='spaced-list'&gt;<a name="line.885"></a>
+<span class="sourceLineNo">886</span>    *    &lt;li&gt;<a name="line.886"></a>
+<span class="sourceLineNo">887</span>    *       The {@link Swagger} object can also be passed as a parameter on the method.<a name="line.887"></a>
+<span class="sourceLineNo">888</span>    * &lt;/ul&gt;<a name="line.888"></a>
+<span class="sourceLineNo">889</span>    * <a name="line.889"></a>
+<span class="sourceLineNo">890</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.890"></a>
+<span class="sourceLineNo">891</span>    * &lt;ul&gt;<a name="line.891"></a>
+<span class="sourceLineNo">892</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_infoProvider}<a name="line.892"></a>
+<span class="sourceLineNo">893</span>    *    &lt;li class='jic'&gt;{@link org.apache.juneau.rest.RestInfoProvider}<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getInfoProvider()}<a name="line.894"></a>
+<span class="sourceLineNo">895</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.895"></a>
+<span class="sourceLineNo">896</span>    * &lt;/ul&gt;<a name="line.896"></a>
+<span class="sourceLineNo">897</span>    * <a name="line.897"></a>
+<span class="sourceLineNo">898</span>    * @return<a name="line.898"></a>
+<span class="sourceLineNo">899</span>    *    The swagger associated with the resource.<a name="line.899"></a>
+<span class="sourceLineNo">900</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.900"></a>
+<span class="sourceLineNo">901</span>    */<a name="line.901"></a>
+<span class="sourceLineNo">902</span>   public Swagger getSwagger() {<a name="line.902"></a>
+<span class="sourceLineNo">903</span>      try {<a name="line.903"></a>
+<span class="sourceLineNo">904</span>         if (swagger == null)<a name="line.904"></a>
+<span class="sourceLineNo">905</span>            swagger = context.getInfoProvider().getSwagger(this);<a name="line.905"></a>
+<span class="sourceLineNo">906</span>         return swagger;<a name="line.906"></a>
+<span class="sourceLineNo">907</span>      } catch (RestException e) {<a name="line.907"></a>
+<span class="sourceLineNo">908</span>         throw e;<a name="line.908"></a>
+<span class="sourceLineNo">909</span>      } catch (Exception e) {<a name="line.909"></a>
+<span class="sourceLineNo">910</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.910"></a>
+<span class="sourceLineNo">911</span>      }<a name="line.911"></a>
+<span class="sourceLineNo">912</span>   }<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>    * Returns the localized site name.<a name="line.915"></a>
+<span class="sourceLineNo">916</span>    * <a name="line.916"></a>
+<span class="sourceLineNo">917</span>    * &lt;p&gt;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    * The site name is intended to be a title that can be applied to the entire site.<a name="line.918"></a>
+<span class="sourceLineNo">919</span>    * <a name="line.919"></a>
+<span class="sourceLineNo">920</span>    * &lt;p&gt;<a name="line.920"></a>
+<span class="sourceLineNo">921</span>    * One possible use is if you want to add the same title to the top of all pages by defining a header on a<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    * common parent class like so:<a name="line.922"></a>
+<span class="sourceLineNo">923</span>    * &lt;p class='bcode'&gt;<a name="line.923"></a>
+<span class="sourceLineNo">924</span>    *    htmldoc=&lt;ja&gt;@HtmlDoc&lt;/ja&gt;(<a name="line.924"></a>
+<span class="sourceLineNo">925</span>    *       header={<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    *          &lt;js&gt;"&amp;lt;h1&amp;gt;$R{siteName}&amp;lt;/h1&amp;gt;"&lt;/js&gt;,<a name="line.926"></a>
+<span class="sourceLineNo">927</span>    *          &lt;js&gt;"&amp;lt;h2&amp;gt;$R{resourceTitle}&amp;lt;/h2&amp;gt;"&lt;/js&gt;<a name="line.927"></a>
+<span class="sourceLineNo">928</span>    *       }<a name="line.928"></a>
+<span class="sourceLineNo">929</span>    *    )<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    * &lt;/p&gt;<a name="line.930"></a>
+<span class="sourceLineNo">931</span>    * <a name="line.931"></a>
+<span class="sourceLineNo">932</span>    * &lt;p&gt;<a name="line.932"></a>
+<span class="sourceLineNo">933</span>    * Equivalent to calling {@link RestInfoProvider#getSiteName(RestRequest)} with this object.<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    * <a name="line.934"></a>
+<span class="sourceLineNo">935</span>    * @return The localized site name.<a name="line.935"></a>
+<span class="sourceLineNo">936</span>    */<a name="line.936"></a>
+<span class="sourceLineNo">937</span>   public String getSiteName() {<a name="line.937"></a>
+<span class="sourceLineNo">938</span>      try {<a name="line.938"></a>
+<span class="sourceLineNo">939</span>         return context.getInfoProvider().getSiteName(this);<a name="line.939"></a>
+<span class="sourceLineNo">940</span>      } catch (RestException e) {<a name="line.940"></a>
+<span class="sourceLineNo">941</span>         throw e;<a name="line.941"></a>
+<span class="sourceLineNo">942</span>      } catch (Exception e) {<a name="line.942"></a>
+<span class="sourceLineNo">943</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.943"></a>
+<span class="sourceLineNo">944</span>      }<a name="line.944"></a>
+<span class="sourceLineNo">945</span>   }<a name="line.945"></a>
+<span class="sourceLineNo">946</span><a name="line.946"></a>
+<span class="sourceLineNo">947</span>   /**<a name="line.947"></a>
+<span class="sourceLineNo">948</span>    * Returns the localized resource title.<a name="line.948"></a>
+<span class="sourceLineNo">949</span>    * <a name="line.949"></a>
+<span class="sourceLineNo">950</span>    * &lt;p&gt;<a name="line.950"></a>
+<span class="sourceLineNo">951</span>    * Equivalent to calling {@link RestInfoProvider#getTitle(RestRequest)} with this object.<a name="line.951"></a>
+<span class="sourceLineNo">952</span>    * <a name="line.952"></a>
+<span class="sourceLineNo">953</span>    * @return The localized resource title.<a name="line.953"></a>
+<span class="sourceLineNo">954</span>    */<a name="line.954"></a>
+<span class="sourceLineNo">955</span>   public String getResourceTitle() {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>      try {<a name="line.956"></a>
+<span class="sourceLineNo">957</span>         return context.getInfoProvider().getTitle(this);<a name="line.957"></a>
+<span class="sourceLineNo">958</span>      } catch (RestException e) {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>         throw e;<a name="line.959"></a>
+<span class="sourceLineNo">960</span>      } catch (Exception e) {<a name="line.960"></a>
+<span class="sourceLineNo">961</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.961"></a>
+<span class="sourceLineNo">962</span>      }<a name="line.962"></a>
+<span class="sourceLineNo">963</span>   }<a name="line.963"></a>
+<span class="sourceLineNo">964</span><a name="line.964"></a>
+<span class="sourceLineNo">965</span>   /**<a name="line.965"></a>
+<span class="sourceLineNo">966</span>    * Returns the localized resource description.<a name="line.966"></a>
+<span class="sourceLineNo">967</span>    * <a name="line.967"></a>
+<span class="sourceLineNo">968</span>    * &lt;p&gt;<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    * Equivalent to calling {@link RestInfoProvider#getDescription(RestRequest)} with this object.<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    * <a name="line.970"></a>
+<span class="sourceLineNo">971</span>    * @return The localized resource description.<a name="line.971"></a>
+<span class="sourceLineNo">972</span>    */<a name="line.972"></a>
+<span class="sourceLineNo">973</span>   public String getResourceDescription() {<a name="line.973"></a>
+<span class="sourceLineNo">974</span>      try {<a name="line.974"></a>
+<span class="sourceLineNo">975</span>         return context.getInfoProvider().getDescription(this);<a name="line.975"></a>
+<span class="sourceLineNo">976</span>      } catch (RestException e) {<a name="line.976"></a>
+<span class="sourceLineNo">977</span>         throw e;<a name="line.977"></a>
+<span class="sourceLineNo">978</span>      } catch (Exception e) {<a name="line.978"></a>
+<span class="sourceLineNo">979</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.979"></a>
+<span class="sourceLineNo">980</span>      }<a name="line.980"></a>
+<span class="sourceLineNo">981</span>   }<a name="line.981"></a>
+<span class="sourceLineNo">982</span><a name="line.982"></a>
+<span class="sourceLineNo">983</span>   /**<a name="line.983"></a>
+<span class="sourceLineNo">984</span>    * Returns the localized method summary.<a name="line.984"></a>
+<span class="sourceLineNo">985</span>    * <a name="line.985"></a>
+<span class="sourceLineNo">986</span>    * &lt;p&gt;<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    * Equivalent to calling {@link RestInfoProvider#getMethodSummary(Method, RestRequest)} with this object.<a name="line.987"></a>
+<span class="sourceLineNo">988</span>    * <a name="line.988"></a>
+<span class="sourceLineNo">989</span>    * @return The localized method description.<a name="line.989"></a>
+<span class="sourceLineNo">990</span>    */<a name="line.990"></a>
+<span class="sourceLineNo">991</span>   public String getMethodSummary() {<a name="line.991"></a>
+<span class="sourceLineNo">992</span>      try {<a name="line.992"></a>
+<span class="sourceLineNo">993</span>         return context.getInfoProvider().getMethodSummary(javaMethod, this);<a name="line.993"></a>
+<span class="sourceLineNo">994</span>      } catch (RestException e) {<a name="line.994"></a>
+<span class="sourceLineNo">995</span>         throw e;<a name="line.995"></a>
+<span class="sourceLineNo">996</span>      } catch (Exception e) {<a name="line.996"></a>
+<span class="sourceLineNo">997</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.997"></a>
+<span class="sourceLineNo">998</span>      }<a name="line.998"></a>
+<span class="sourceLineNo">999</span>   }<a name="line.999"></a>
+<span class="sourceLineNo">1000</span><a name="line.1000"></a>
+<span class="sourceLineNo">1001</span>   /**<a name="line.1001"></a>
+<span class="sourceLineNo">1002</span>    * Returns the localized method description.<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span>    * <a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    * &lt;p&gt;<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>    * Equivalent to calling {@link RestInfoProvider#getMethodDescription(Method, RestRequest)} with this object.<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>    * <a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>    * @return The localized method description.<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    */<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span>   public String getMethodDescription() {<a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>      try {<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>         return context.getInfoProvider().getMethodDescription(javaMethod, this);<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>      } catch (RestException e) {<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span>         throw e;<a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>      } catch (Exception e) {<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span>         throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>      }<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>   }<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span><a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>   //--------------------------------------------------------------------------------<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>   // Other methods<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>   //--------------------------------------------------------------------------------<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span><a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>   /**<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>    * Returns the serializers associated with this request.<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>    * <a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span>    * &lt;ul&gt;<a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Serializers"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Serializers&lt;/a&gt;<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>    * &lt;/ul&gt;<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>    * <a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>    * @return The serializers associated with this request.<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>    */<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>   public SerializerGroup getSerializers() {<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>      return restJavaMethod.serializers;<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span>   }<a name="line.1035"></a>
+<span class="sourceLineNo">1036</span><a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>   /**<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>    * Returns the parsers associated with this request.<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>    * <a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>    * &lt;ul&gt;<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Parsers"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Parsers&lt;/a&gt;<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>    * &lt;/ul&gt;<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>    * <a name="line.1044"></a>
+<span class="sourceLineNo">1045</span>    * @return The parsers associated with this request.<a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>    */<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>   public ParserGroup getParsers() {<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span>      return restJavaMethod.parsers;<a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>   }<a name="line.1049"></a>
 <span class="sourceLineNo">1050</span><a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>   /**<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>    * Returns the method of this request.<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span>    * <a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>    * &lt;p&gt;<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>    * If &lt;code&gt;allowHeaderParams&lt;/code&gt; init parameter is &lt;jk&gt;true&lt;/jk&gt;, then first looks for<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>    * &lt;code&gt;&amp;amp;method=xxx&lt;/code&gt; in the URL query string.<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>    */<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span>   @Override /* ServletRequest */<a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>   public String getMethod() {<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>      return method;<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>   }<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span><a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>   /**<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>    * Returns the HTTP 1.1 method name of the request as an enum.<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>    * <a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>    * &lt;p&gt;<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span>    * Note that non-RFC2616 method names resolve as {@link HttpMethod#OTHER}.<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>    * <a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>    * @return The HTTP method.<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>    */<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>   public HttpMethod getHttpMethod() {<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>      return HttpMethod.forString(method);<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>   }<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span><a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>   @Override /* ServletRequest */<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>   public int getContentLength() {<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span>      return getBody().getContentLength();<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>   }<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span><a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>   int getRawContentLength() {<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>      return super.getContentLength();<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span>   }<a name="line.1082"></a>
-<span class="sourceLineNo">1083</span><a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>   /**<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if &lt;code&gt;&amp;amp;plainText=true&lt;/code&gt; was specified as a URL parameter.<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>    * <a name="line.1086"></a>
-<span class="sourceLineNo">1087</span>    * &lt;p&gt;<a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>    * This indicates that the &lt;code&gt;Content-Type&lt;/code&gt; of the output should always be set to &lt;js&gt;"text/plain"&lt;/js&gt;<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>    * to make it easy to render in a browser.<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>    * <a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>    * &lt;p&gt;<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span>    * This feature is useful for debugging.<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>    * <a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if {@code &amp;amp;plainText=true} was specified as a URL parameter<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>    */<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>   public boolean isPlainText() {<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span>      return "true".equals(getQuery().getString("plainText", "false"));<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>   }<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span><a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>   /**<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>    * Returns the resource bundle for the request locale.<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>    * <a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>    * &lt;p class='bcode'&gt;<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>    *    &lt;jk&gt;public&lt;/jk&gt; String sayHello(RestRequest req, &lt;ja&gt;@Query&lt;/ja&gt;(&lt;js&gt;"user"&lt;/js&gt;) String user) {<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>    * <a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>    *       &lt;jc&gt;// Get message bundle.&lt;/jc&gt;<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>    *       MessageBundle mb = req.getMessageBundle();<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span>    * <a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>    *       &lt;jc&gt;// Return a localized message.&lt;/jc&gt;<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>    *       &lt;jk&gt;return&lt;/jk&gt; mb.getString(&lt;js&gt;"hello.message"&lt;/js&gt;, user);<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span>    *    }<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>    * &lt;/p&gt;<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>    * <a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>    *    &lt;li&gt;<a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>    *       The {@link MessageBundle} object can also be passed as a parameter on the method.<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>    * &lt;/ul&gt;<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span>    * <a name="line.1121"></a>
-<span class="sourceLineNo">1122</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span>    * &lt;ul&gt;<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_messages}<a name="line.1124"></a>
-<span class="sourceLineNo">1125</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getMessage(String,Object...)}<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Messages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Messages&lt;/a&gt;<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>    * &lt;/ul&gt;<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span>    * <a name="line.1128"></a>
-<span class="sourceLineNo">1129</span>    * @return <a name="line.1129"></a>
-<span class="sourceLineNo">1130</span>    *    The resource bundle.  <a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>    */<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span>   public MessageBundle getMessageBundle() {<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>      return context.getMessages().getBundle(getLocale());<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>   }<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span><a name="line.1136"></a>
-<span class="sourceLineNo">1137</span>   /**<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>    * Shortcut method for calling {@link MessageBundle#getString(Locale, String, Object...)} based on the request locale.<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span>    * <a name="line.1139"></a>
-<span class="sourceLineNo">1140</span>    * @param key The message key.<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>    * @param args Optional {@link MessageFormat}-style arguments.<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span>    * @return The localized message.<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span>    */<a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>   public String getMessage(String key, Object...args) {<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>      return context.getMessages().getString(getLocale(), key, args);<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>   }<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span><a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>   /**<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>    * Returns the resource context handling the request.<a name="line.1149"></a>
-<span class="sourceLineNo">1150</span>    * <a name="line.1150"></a>
-<span class="sourceLineNo">1151</span>    * &lt;p&gt;<a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>    * Can be used to access servlet-init parameters or annotations during requests, such as in calls to<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}..<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>    * <a name="line.1154"></a>
-<span class="sourceLineNo">1155</span>    * @return The resource context handling the request.<a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>    */<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>   public RestContext getContext() {<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>      return context;<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span>   }<a name="line.1159"></a>
-<span class="sourceLineNo">1160</span><a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>   /**<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>    * Returns the java method handling the request.<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>    * <a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>    * &lt;p&gt;<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>    * Can be used to access the method name or method annotations during requests, such as in calls to<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}.<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>    * <a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span>    *    &lt;li&gt;<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span>    *       This returns &lt;jk&gt;null&lt;/jk&gt; when evaluating servlet-level guards since the method has not been resolved at that<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span>    *       point of execution.<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>    * &lt;/ul&gt;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>    * <a name="line.1174"></a>
-<span class="sourceLineNo">1175</span>    * @return The Java method handling the request, or &lt;code&gt;null&lt;/code&gt; if the method has not yet been resolved.<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>    */<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span>   public Method getJavaMethod() {<a name="line.1177"></a>
-<span class="sourceLineNo">1178</span>      return javaMethod;<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>   }<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span><a name="line.1180"></a>
-<span class="sourceLineNo">1181</span>   /**<a name="line.1181"></a>
-<span class="sourceLineNo">1182</span>    * Returns the {@link BeanSession} associated with this request.<a name="line.1182"></a>
-<span class="sourceLineNo">1183</span>    * <a name="line.1183"></a>
-<span class="sourceLineNo">1184</span>    * @return The request bean session.<a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>    */<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span>   public BeanSession getBeanSession() {<a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>      return beanSession;<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span>   }<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span><a name="line.1189"></a>
-<span class="sourceLineNo">1190</span>   /**<a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>    * Request-level variable resolver session.<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span>    * <a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>    * &lt;p&gt;<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>    * Used to resolve SVL variables in text.<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span>    * <a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>    * &lt;p class='bcode'&gt;<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span>    *    &lt;jk&gt;public&lt;/jk&gt; String sayHello(RestRequest req) {<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span>    * <a name="line.1200"></a>
-<span class="sourceLineNo">1201</span>    *       &lt;jc&gt;// Get var resolver session.&lt;/jc&gt;<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span>    *       VarResolverSession session = getVarResolverSession();<a name="line.1202"></a>
-<span class="sourceLineNo">1203</span>    * <a name="line.1203"></a>
-<span class="sourceLineNo">1204</span>    *       &lt;jc&gt;// Use it to construct a customized message from a query parameter.&lt;/jc&gt;<a name="line.1204"></a>
-<span class="sourceLineNo">1205</span>    *       &lt;jk&gt;return&lt;/jk&gt; session.resolve(&lt;js&gt;"Hello $RQ{user}!"&lt;/js&gt;);<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span>    *    }<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span>    * &lt;/p&gt;<a name="line.1207"></a>
-<span class="sourceLineNo">1208</span>    * <a name="line.1208"></a>
-<span class="sourceLineNo">1209</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1210"></a>
-<span class="sourceLineNo">1211</span>    *    &lt;li&gt;<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span>    *       The {@link VarResolverSession} object can also be passed as a parameter on the method.<a name="line.1212"></a>
-<span class="sourceLineNo">1213</span>    * &lt;/ul&gt;<a name="line.1213"></a>
-<span class="sourceLineNo">1214</span>    * <a name="line.1214"></a>
-<span class="sourceLineNo">1215</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1215"></a>
-<span class="sourceLineNo">1216</span>    * &lt;ul&gt;<a name="line.1216"></a>
-<span class="sourceLineNo">1217</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestContext#getVarResolver()}<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.SvlVariables"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; SVL Variables&lt;/a&gt;<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span>    * &lt;/ul&gt;<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span>    * <a name="line.1220"></a>
-<span class="sourceLineNo">1221</span>    * @return The variable resolver for this request.<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span>    */<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span>   public VarResolverSession getVarResolverSession() {<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span>      if (varSession == null)<a name="line.1224"></a>
-<span class="sourceLineNo">1225</span>         varSession = context.getVarResolver().createSession(context.getCallHandler().getSessionObjects(this));<a name="line.1225"></a>
-<span class="sourceLineNo">1226</span>      return varSession;<a name="line.1226"></a>
-<span class="sourceLineNo">1227</span>   }<a name="line.1227"></a>
-<span class="sourceLineNo">1228</span><a name="line.1228"></a>
-<span class="sourceLineNo">1229</span>   /**<a name="line.1229"></a>
-<span class="sourceLineNo">1230</span>    * Returns an instance of a {@link ReaderResource} that represents the contents of a resource text file from the<a name="line.1230"></a>
-<span class="sourceLineNo">1231</span>    * classpath.<a name="line.1231"></a>
-<span class="sourceLineNo">1232</span>    * <a name="line.1232"></a>
-<span class="sourceLineNo">1233</span>    * &lt;p&gt;<a name="line.1233"></a>
-<span class="sourceLineNo">1234</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1234"></a>
-<span class="sourceLineNo">1235</span>    * &lt;p class='bcode'&gt;<a name="line.1235"></a>
-<span class="sourceLineNo">1236</span>    *    &lt;jc&gt;// A rest method that (unsafely!) returns the contents of a localized file &lt;/jc&gt;<a name="line.1236"></a>
-<span class="sourceLineNo">1237</span>    * &lt;jc&gt;// from the classpath and resolves any SVL variables embedded in it.&lt;/jc&gt;<a name="line.1237"></a>
-<span class="sourceLineNo">1238</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1238"></a>
-<span class="sourceLineNo">1239</span>    *    &lt;jk&gt;public&lt;/jk&gt; String myMethod(RestRequest req, &lt;ja&gt;@Query&lt;/ja&gt;(&lt;js&gt;"file"&lt;/js&gt;) String file) {<a name="line.1239"></a>
-<span class="sourceLineNo">1240</span>    *       &lt;jk&gt;return&lt;/jk&gt; req.getClasspathResourceAsString(file, &lt;jk&gt;true&lt;/jk&gt;);<a name="line.1240"></a>
-<span class="sourceLineNo">1241</span>    *    }<a name="line.1241"></a>
-<span class="sourceLineNo">1242</span>    * &lt;/p&gt;<a name="line.1242"></a>
-<span class="sourceLineNo">1243</span>    * <a name="line.1243"></a>
-<span class="sourceLineNo">1244</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1244"></a>
-<span class="sourceLineNo">1245</span>    * &lt;ul&gt;<a name="line.1245"></a>
-<span class="sourceLineNo">1246</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_classpathResourceFinder}<a name="line.1246"></a>
-<span class="sourceLineNo">1247</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getClasspathReaderResource(String, boolean)}<a name="line.1247"></a>
-<span class="sourceLineNo">1248</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getClasspathReaderResource(String)}<a name="line.1248"></a>
-<span class="sourceLineNo">1249</span>    * &lt;/ul&gt;<a name="line.1249"></a>
-<span class="sourceLineNo">1250</span>    * <a name="line.1250"></a>
-<span class="sourceLineNo">1251</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1251"></a>
-<span class="sourceLineNo">1252</span>    * @param resolveVars<a name="line.1252"></a>
-<span class="sourceLineNo">1253</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter @Parameter} variables will be<a name="line.1253"></a>
-<span class="sourceLineNo">1254</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1254"></a>
-<span class="sourceLineNo">1255</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1255"></a>
-<span class="sourceLineNo">1256</span>    * @param mediaType The value to set as the &lt;js&gt;"Content-Type"&lt;/js&gt; header for this object.<a name="line.1256"></a>
-<span class="sourceLineNo">1257</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1257"></a>
-<span class="sourceLineNo">1258</span>    * @throws IOException<a name="line.1258"></a>
-<span class="sourceLineNo">1259</span>    */<a name="line.1259"></a>
-<span class="sourceLineNo">1260</span>   public ReaderResource getClasspathReaderResource(String name, boolean resolveVars, MediaType mediaType) throws IOException {<a name="line.1260"></a>
-<span class="sourceLineNo">1261</span>      String s = context.getClasspathResourceAsString(name, getLocale());<a name="line.1261"></a>
-<span class="sourceLineNo">1262</span>      if (s == null)<a name="line.1262"></a>
-<span class="sourceLineNo">1263</span>         return null;<a name="line.1263"></a>
-<span class="sourceLineNo">1264</span>      ReaderResourceBuilder b = new ReaderResourceBuilder().mediaType(mediaType).contents(s);<a name="line.1264"></a>
-<span class="sourceLineNo">1265</span>      if (resolveVars)<a name="line.1265"></a>
-<span class="sourceLineNo">1266</span>         b.varResolver(getVarResolverSession());<a name="line.1266"></a>
-<span class="sourceLineNo">1267</span>      return b.build();<a name="line.1267"></a>
-<span class="sourceLineNo">1268</span>   }<a name="line.1268"></a>
-<span class="sourceLineNo">1269</span><a name="line.1269"></a>
-<span class="sourceLineNo">1270</span>   /**<a name="line.1270"></a>
-<span class="sourceLineNo">1271</span>    * Same as {@link #getClasspathReaderResource(String, boolean, MediaType)} except uses the resource mime-type map<a name="line.1271"></a>
-<span class="sourceLineNo">1272</span>    * constructed using {@link RestContextBuilder#mimeTypes(String...)} to determine the media type.<a name="line.1272"></a>
-<span class="sourceLineNo">1273</span>    * <a name="line.1273"></a>
-<span class="sourceLineNo">1274</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span>    * @param resolveVars<a name="line.1275"></a>
-<span class="sourceLineNo">1276</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter @Parameter} variables will be<a name="line.1276"></a>
-<span class="sourceLineNo">1277</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1277"></a>
-<span class="sourceLineNo">1278</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1278"></a>
-<span class="sourceLineNo">1279</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1279"></a>
-<span class="sourceLineNo">1280</span>    * @throws IOException<a name="line.1280"></a>
-<span class="sourceLineNo">1281</span>    */<a name="line.1281"></a>
-<span class="sourceLineNo">1282</span>   public ReaderResource getClasspathReaderResource(String name, boolean resolveVars) throws IOException {<a name="line.1282"></a>
-<span class="sourceLineNo">1283</span>      return getClasspathReaderResource(name, resolveVars, MediaType.forString(context.getMediaTypeForName(name)));<a name="line.1283"></a>
-<span class="sourceLineNo">1284</span>   }<a name="line.1284"></a>
-<span class="sourceLineNo">1285</span><a name="line.1285"></a>
-<span class="sourceLineNo">1286</span>   /**<a name="line.1286"></a>
-<span class="sourceLineNo">1287</span>    * Same as {@link #getClasspathReaderResource(String, boolean)} with &lt;code&gt;resolveVars == &lt;jk&gt;false&lt;/jk&gt;&lt;/code&gt;<a name="line.1287"></a>
-<span class="sourceLineNo">1288</span>    * <a name="line.1288"></a>
-<span class="sourceLineNo">1289</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1289"></a>
-<span class="sourceLineNo">1290</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1290"></a>
-<span class="sourceLineNo">1291</span>    * @throws IOException<a name="line.1291"></a>
-<span class="sourceLineNo">1292</span>    */<a name="line.1292"></a>
-<span class="sourceLineNo">1293</span>   public ReaderResource getClasspathReaderResource(String name) throws IOException {<a name="line.1293"></a>
-<span class="sourceLineNo">1294</span>      return getClasspathReaderResource(name, false, MediaType.forString(context.getMediaTypeForName(name)));<a name="line.1294"></a>
-<span class="sourceLineNo">1295</span>   }<a name="line.1295"></a>
-<span class="sourceLineNo">1296</span><a name="line.1296"></a>
-<span class="sourceLineNo">1297</span>   /**<a name="line.1297"></a>
-<span class="sourceLineNo">1298</span>    * Config file associated with the resource.<a name="line.1298"></a>
-<span class="sourceLineNo">1299</span>    * <a name="line.1299"></a>
-<span class="sourceLineNo">1300</span>    * &lt;p&gt;<a name="line.1300"></a>
-<span class="sourceLineNo">1301</span>    * Returns a config file with session-level variable resolution.<a name="line.1301"></a>
-<span class="sourceLineNo">1302</span>    * <a name="line.1302"></a>
-<span class="sourceLineNo">1303</span>    * The config file is identified via one of the following:<a name="line.1303"></a>
-<span class="sourceLineNo">1304</span>    * &lt;ul&gt;<a name="line.1304"></a>
-<span class="sourceLineNo">1305</span>    *    &lt;li class='ja'&gt;{@link RestResource#config()}<a name="line.1305"></a>
-<span class="sourceLineNo">1306</span>    *    &lt;li class='jm'&gt;{@link RestContextBuilder#config(Config)}<a name="line.1306"></a>
-<span class="sourceLineNo">1307</span>    * &lt;/ul&gt;<a name="line.1307"></a>
-<span class="sourceLineNo">1308</span>    * <a name="line.1308"></a>
-<span class="sourceLineNo">1309</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1309"></a>
-<span class="sourceLineNo">1310</span>    * &lt;p class='bcode'&gt;<a name="line.1310"></a>
-<span class="sourceLineNo">1311</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1311"></a>
-<span class="sourceLineNo">1312</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.1312"></a>
-<span class="sourceLineNo">1313</span>    * <a name="line.1313"></a>
-<span class="sourceLineNo">1314</span>    *       &lt;jc&gt;// Get config file.&lt;/jc&gt;<a name="line.1314"></a>
-<span class="sourceLineNo">1315</span>    *       Config cf = req.getConfig();<a name="line.1315"></a>
-<span class="sourceLineNo">1316</span>    * <a name="line.1316"></a>
-<span class="sourceLineNo">1317</span>    *       &lt;jc&gt;// Get simple values from config file.&lt;/jc&gt;<a name="line.1317"></a>
-<span class="sourceLineNo">1318</span>    *       &lt;jk&gt;int&lt;/jk&gt; timeout = cf.getInt(&lt;js&gt;"MyResource/timeout"&lt;/js&gt;, 10000);<a name="line.1318"></a>
-<span class="sourceLineNo">1319</span>    * <a name="line.1319"></a>
-<span class="sourceLineNo">1320</span>    *       &lt;jc&gt;// Get complex values from config file.&lt;/jc&gt;<a name="line.1320"></a>
-<span class="sourceLineNo">1321</span>    *       MyBean b = cf.getObject(&lt;js&gt;"MyResource/myBean"&lt;/js&gt;, MyBean.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.1321"></a>
-<span class="sourceLineNo">1322</span>    *    }<a name="line.1322"></a>
-<span class="sourceLineNo">1323</span>    * &lt;/p&gt;<a name="line.1323"></a>
-<span class="sourceLineNo">1324</span>    * <a name="line.1324"></a>
-<span class="sourceLineNo">1325</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1325"></a>
-<span class="sourceLineNo">1326</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1326"></a>
-<span class="sourceLineNo">1327</span>    *    &lt;li&gt;<a name="line.1327"></a>
-<span class="sourceLineNo">1328</span>    *       The {@link Config} object can also be passed as a parameter on the method.<a name="line.1328"></a>
-<span class="sourceLineNo">1329</span>    * &lt;/ul&gt;<a name="line.1329"></a>
-<span class="sourceLineNo">1330</span>    * <a name="line.1330"></a>
-<span class="sourceLineNo">1331</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1331"></a>
-<span class="sourceLineNo">1332</span>    * &lt;ul&gt;<a name="line.1332"></a>
-<span class="sourceLineNo">1333</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.ConfigurationFiles"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Configuration Files&lt;/a&gt;<a name="line.1333"></a>
-<span class="sourceLineNo">1334</span>    * &lt;/ul&gt;<a name="line.1334"></a>
-<span class="sourceLineNo">1335</span>    * <a name="line.1335"></a>
-<span class="sourceLineNo">1336</span>    * @return<a name="line.1336"></a>
-<span class="sourceLineNo">1337</span>    *    The config file associated with the resource, or &lt;jk&gt;null&lt;/jk&gt; if resource does not have a config file<a name="line.1337"></a>
-<span class="sourceLineNo">1338</span>    *    associated with it.<a name="line.1338"></a>
-<span class="sourceLineNo">1339</span>    */<a name="line.1339"></a>
-<span class="sourceLineNo">1340</span>   public Config getConfig() {<a name="line.1340"></a>
-<span class="sourceLineNo">1341</span>      if (cf == null)<a name="line.1341"></a>
-<span class="sourceLineNo">1342</span>         cf = context.getConfig().resolving(getVarResolverSession());<a name="line.1342"></a>
-<span class="sourceLineNo">1343</span>      return cf;<a name="line.1343"></a>
-<span class="sourceLineNo">1344</span>   }<a name="line.1344"></a>
-<span class="sourceLineNo">1345</span><a name="line.1345"></a>
-<span class="sourceLineNo">1346</span>   /**<a name="line.1346"></a>
-<span class="sourceLineNo">1347</span>    * Returns the widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1347"></a>
-<span class="sourceLineNo">1348</span>    * <a name="line.1348"></a>
-<span class="sourceLineNo">1349</span>    * @return<a name="line.1349"></a>
-<span class="sourceLineNo">1350</span>    *    The widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1350"></a>
-<span class="sourceLineNo">1351</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1351"></a>
-<span class="sourceLineNo">1352</span>    */<a name="line.1352"></a>
-<span class="sourceLineNo">1353</span>   public Map&lt;String,Widget&gt; getWidgets() {<a name="line.1353"></a>
-<span class="sourceLineNo">1354</span>      return restJavaMethod.widgets;<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>   @Override /* Object */<a name="line.1357"></a>
-<span class="sourceLineNo">1358</span>   public String toString() {<a name="line.1358"></a>
-<span class="sourceLineNo">1359</span>      StringBuilder sb = new StringBuilder("\n").append(getDescription()).append("\n");<a name="line.1359"></a>
-<span class="sourceLineNo">1360</span>      sb.append("---Headers---\n");<a name="line.1360"></a>
-<span class="sourceLineNo">1361</span>      for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.1361"></a>
-<span class="sourceLineNo">1362</span>         String h = e.nextElement();<a name="line.1362"></a>
-<span class="sourceLineNo">1363</span>         sb.append("\t").append(h).append(": ").append(getHeader(h)).append("\n");<a name="line.1363"></a>
-<span class="sourceLineNo">1364</span>      }<a name="line.1364"></a>
-<span class="sourceLineNo">1365</span>      sb.append("---Default Servlet Headers---\n");<a name="line.1365"></a>
-<span class="sourceLineNo">1366</span>      for (Map.Entry&lt;String,Object&gt; e : context.getDefaultRequestHeaders().entrySet()) {<a name="line.1366"></a>
-<span class="sourceLineNo">1367</span>         sb.append("\t").append(e.getKey()).append(": ").append(e.getValue()).append("\n");<a name="line.1367"></a>
-<span class="sourceLineNo">1368</span>      }<a name="line.1368"></a>
-<span class="sourceLineNo">1369</span>      if (javaMethod == null) {<a name="line.1369"></a>
-<span class="sourceLineNo">1370</span>         sb.append("***init() not called yet!***\n");<a name="line.1370"></a>
-<span class="sourceLineNo">1371</span>      } else if (method.equals("PUT") || method.equals("POST")) {<a name="line.1371"></a>
-<span class="sourceLineNo">1372</span>         try {<a name="line.1372"></a>
-<span class="sourceLineNo">1373</span>            sb.append("---Body UTF-8---\n");<a name="line.1373"></a>
-<span class="sourceLineNo">1374</span>            sb.append(body.asString()).append("\n");<a name="line.1374"></a>
-<span class="sourceLineNo">1375</span>            sb.append("---Body Hex---\n");<a name="line.1375"></a>
-<span class="sourceLineNo">1376</span>            sb.append(body.asSpacedHex()).append("\n");<a name="line.1376"></a>
-<span class="sourceLineNo">1377</span>         } catch (Exception e1) {<a name="line.1377"></a>
-<span class="sourceLineNo">1378</span>            sb.append(e1.getLocalizedMessage());<a name="line.1378"></a>
-<span class="sourceLineNo">1379</span>            context.getLogger().log(WARNING, e1, "Error occurred while trying to read debug input.");<a name="line.1379"></a>
-<span class="sourceLineNo">1380</span>         }<a name="line.1380"></a>
-<span class="sourceLineNo">1381</span>      }<a name="line.1381"></a>
-<span class="sourceLineNo">1382</span>      return sb.toString();<a name="line.1382"></a>
-<span class="sourceLineNo">1383</span>   }<a name="line.1383"></a>
-<span class="sourceLineNo">1384</span><a name="line.1384"></a>
-<span class="sourceLineNo">1385</span>   /**<a name="line.1385"></a>
-<span class="sourceLineNo">1386</span>    * Logger.<a name="line.1386"></a>
-<span class="sourceLineNo">1387</span>    * <a name="line.1387"></a>
-<span class="sourceLineNo">1388</span>    * &lt;p&gt;<a name="line.1388"></a>
-<span class="sourceLineNo">1389</span>    * Shortcut for calling &lt;code&gt;getContext().getLogger()&lt;/code&gt;.<a name="line.1389"></a>
-<span class="sourceLineNo">1390</span>    * <a name="line.1390"></a>
-<span class="sourceLineNo">1391</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1391"></a>
-<span class="sourceLineNo">1392</span>    * &lt;p class='bcode'&gt;<a name="line.1392"></a>
-<span class="sourceLineNo">1393</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1393"></a>
-<span class="sourceLineNo">1394</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.1394"></a>
-<span class="sourceLineNo">1395</span>    * <a name="line.1395"></a>
-<span class="sourceLineNo">1396</span>    *       req.getLogger().logObjects(&lt;jsf&gt;FINE&lt;/jsf&gt;, &lt;js&gt;"Request query parameters = {0}"&lt;/js&gt;, req.getQuery());     <a name="line.1396"></a>
-<span class="sourceLineNo">1397</span>    *    }<a name="line.1397"></a>
-<span class="sourceLineNo">1398</span>    * &lt;/p&gt;<a name="line.1398"></a>
-<span class="sourceLineNo">1399</span>    * <a name="line.1399"></a>
-<span class="sourceLineNo">1400</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1400"></a>
-<span class="sourceLineNo">1401</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1401"></a>
-<span class="sourceLineNo">1402</span>    *    &lt;li&gt;<a name="line.1402"></a>
-<span class="sourceLineNo">1403</span>    *       The {@link RestLogger} object can also be passed as a parameter on the method.<a name="line.1403"></a>
-<span class="sourceLineNo">1404</span>    * &lt;/ul&gt;<a name="line.1404"></a>
-<span class="sourceLineNo">1405</span>    * <a name="line.1405"></a>
-<span class="sourceLineNo">1406</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1406"></a>
-<span class="sourceLineNo">1407</span>    * &lt;ul&gt;<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_logger}<a name="line.1408"></a>
-<span class="sourceLineNo">1409</span>    *    &lt;li class='jac'&gt;{@link org.apache.juneau.rest.RestLogger}<a name="line.1409"></a>
-<span class="sourceLineNo">1410</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestServlet#log(Level, String, Object...)}<a name="line.1410"></a>
-<span class="sourceLineNo">1411</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestServlet#logObjects(Level, String, Object...)}<a name="line.1411"></a>
-<span class="sourceLineNo">1412</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Logging and Error Handling&lt;/a&gt;<a name="line.1412"></a>
-<span class="sourceLineNo">1413</span>    * &lt;/ul&gt;<a name="line.1413"></a>
-<span class="sourceLineNo">1414</span>    * <a name="line.1414"></a>
-<span class="sourceLineNo">1415</span>    * @return <a name="line.1415"></a>
-<span class="sourceLineNo">1416</span>    *    The logger associated with the resource context.<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1417"></a>
-<span class="sourceLineNo">1418</span>    */<a name="line.1418"></a>
-<span class="sourceLineNo">1419</span>   public RestLogger getLogger() {<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span>      return context.getLogger();<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>   void close() {<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span>      if (cf != null) {<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span>         try {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span>            cf.close();<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span>         } catch (IOException e) {<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span>            e.printStackTrace();<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span>         }<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span>      }<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span>   }<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>   // Utility methods<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">1437</span>   /*<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span>    * Converts an Accept-Language value entry to a Locale.<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span>    */<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span>   private static Locale toLocale(String lang) {<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span>      String country = "";<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span>      int i = lang.indexOf('-');<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span>      if (i &gt; -1) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span>         country = lang.substring(i+1).trim();<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span>         lang = lang.substring(0,i).trim();<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span>      }<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span>      return new Locale(lang, country);<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span>   }<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span><a name="line.1449"></a>
+<span class="sourceLineNo">1051</span><a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>   /**<a name="line.1052"></a>
+<span class="sourceLineNo">1053</span>    * Returns the method of this request.<a name="line.1053"></a>
+<span class="sourceLineNo">1054</span>    * <a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>    * &lt;p&gt;<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>    * If &lt;code&gt;allowHeaderParams&lt;/code&gt; init parameter is &lt;jk&gt;true&lt;/jk&gt;, then first looks for<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>    * &lt;code&gt;&amp;amp;method=xxx&lt;/code&gt; in the URL query string.<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>    */<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>   @Override /* ServletRequest */<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span>   public String getMethod() {<a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>      return method;<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span>   }<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span><a name="line.1063"></a>
+<span class="sourceLineNo">1064</span>   /**<a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    * Returns the HTTP 1.1 method name of the request as an enum.<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>    * <a name="line.1066"></a>
+<span class="sourceLineNo">1067</span>    * &lt;p&gt;<a name="line.1067"></a>
+<span class="sourceLineNo">1068</span>    * Note that non-RFC2616 method names resolve as {@link HttpMethod#OTHER}.<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>    * <a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>    * @return The HTTP method.<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>    */<a name="line.1071"></a>
+<span class="sourceLineNo">1072</span>   public HttpMethod getHttpMethod() {<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span>      return HttpMethod.forString(method);<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>   }<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span><a name="line.1075"></a>
+<span class="sourceLineNo">1076</span>   @Override /* ServletRequest */<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>   public int getContentLength() {<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>      return getBody().getContentLength();<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>   }<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span><a name="line.1080"></a>
+<span class="sourceLineNo">1081</span>   int getRawContentLength() {<a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>      return super.getContentLength();<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>   }<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span><a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>   /**<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; if &lt;code&gt;&amp;amp;plainText=true&lt;/code&gt; was specified as a URL parameter.<a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>    * <a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>    * &lt;p&gt;<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>    * This indicates that the &lt;code&gt;Content-Type&lt;/code&gt; of the output should always be set to &lt;js&gt;"text/plain"&lt;/js&gt;<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>    * to make it easy to render in a browser.<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span>    * <a name="line.1091"></a>
+<span class="sourceLineNo">1092</span>    * &lt;p&gt;<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>    * This feature is useful for debugging.<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>    * <a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if {@code &amp;amp;plainText=true} was specified as a URL parameter<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span>    */<a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>   public boolean isPlainText() {<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>      return "true".equals(getQuery().getString("plainText", "false"));<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>   }<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span><a name="line.1100"></a>
+<span class="sourceLineNo">1101</span>   /**<a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>    * Returns the resource bundle for the request locale.<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>    * <a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>    * &lt;p class='bcode'&gt;<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>    *    &lt;jk&gt;public&lt;/jk&gt; String sayHello(RestRequest req, &lt;ja&gt;@Query&lt;/ja&gt;(&lt;js&gt;"user"&lt;/js&gt;) String user) {<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>    * <a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>    *       &lt;jc&gt;// Get message bundle.&lt;/jc&gt;<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>    *       MessageBundle mb = req.getMessageBundle();<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span>    * <a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>    *       &lt;jc&gt;// Return a localized message.&lt;/jc&gt;<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>    *       &lt;jk&gt;return&lt;/jk&gt; mb.getString(&lt;js&gt;"hello.message"&lt;/js&gt;, user);<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>    *    }<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>    * &lt;/p&gt;<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>    * <a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>    *    &lt;li&gt;<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>    *       The {@link MessageBundle} object can also be passed as a parameter on the method.<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>    * &lt;/ul&gt;<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span>    * <a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>    * &lt;ul&gt;<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_messages}<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getMessage(String,Object...)}<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Messages"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Messages&lt;/a&gt;<a name="line.1127"></a>
+<span class="sourceLineNo">1128</span>    * &lt;/ul&gt;<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>    * <a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>    * @return <a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>    *    The resource bundle.  <a name="line.1131"></a>
+<span class="sourceLineNo">1132</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1132"></a>
+<span class="sourceLineNo">1133</span>    */<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>   public MessageBundle getMessageBundle() {<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>      return context.getMessages().getBundle(getLocale());<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>   }<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span><a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>   /**<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span>    * Shortcut method for calling {@link MessageBundle#getString(Locale, String, Object...)} based on the request locale.<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span>    * <a name="line.1140"></a>
+<span class="sourceLineNo">1141</span>    * @param key The message key.<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>    * @param args Optional {@link MessageFormat}-style arguments.<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span>    * @return The localized message.<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span>    */<a name="line.1144"></a>
+<span class="sourceLineNo">1145</span>   public String getMessage(String key, Object...args) {<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span>      return context.getMessages().getString(getLocale(), key, args);<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span>   }<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span><a name="line.1148"></a>
+<span class="sourceLineNo">1149</span>   /**<a name="line.1149"></a>
+<span class="sourceLineNo">1150</span>    * Returns the resource context handling the request.<a name="line.1150"></a>
+<span class="sourceLineNo">1151</span>    * <a name="line.1151"></a>
+<span class="sourceLineNo">1152</span>    * &lt;p&gt;<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span>    * Can be used to access servlet-init parameters or annotations during requests, such as in calls to<a name="line.1153"></a>
+<span class="sourceLineNo">1154</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}..<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span>    * <a name="line.1155"></a>
+<span class="sourceLineNo">1156</span>    * @return The resource context handling the request.<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span>    */<a name="line.1157"></a>
+<span class="sourceLineNo">1158</span>   public RestContext getContext() {<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span>      return context;<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span>   }<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span><a name="line.1161"></a>
+<span class="sourceLineNo">1162</span>   /**<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span>    * Returns the java method handling the request.<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span>    * <a name="line.1164"></a>
+<span class="sourceLineNo">1165</span>    * &lt;p&gt;<a name="line.1165"></a>
+<span class="sourceLineNo">1166</span>    * Can be used to access the method name or method annotations during requests, such as in calls to<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}.<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span>    * <a name="line.1168"></a>
+<span class="sourceLineNo">1169</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1169"></a>
+<span class="sourceLineNo">1170</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span>    *    &lt;li&gt;<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span>    *       This returns &lt;jk&gt;null&lt;/jk&gt; when evaluating servlet-level guards since the method has not been resolved at that<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span>    *       point of execution.<a name="line.1173"></a>
+<span class="sourceLineNo">1174</span>    * &lt;/ul&gt;<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span>    * <a name="line.1175"></a>
+<span class="sourceLineNo">1176</span>    * @return The Java method handling the request, or &lt;code&gt;null&lt;/code&gt; if the method has not yet been resolved.<a name="line.1176"></a>
+<span class="sourceLineNo">1177</span>    */<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span>   public Method getJavaMethod() {<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span>      return javaMethod;<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span>   }<a name="line.1180"></a>
+<span class="sourceLineNo">1181</span><a name="line.1181"></a>
+<span class="sourceLineNo">1182</span>   /**<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span>    * Returns the {@link BeanSession} associated with this request.<a name="line.1183"></a>
+<span class="sourceLineNo">1184</span>    * <a name="line.1184"></a>
+<span class="sourceLineNo">1185</span>    * @return The request bean session.<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span>    */<a name="line.1186"></a>
+<span class="sourceLineNo">1187</span>   public BeanSession getBeanSession() {<a name="line.1187"></a>
+<span class="sourceLineNo">1188</span>      return beanSession;<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span>   }<a name="line.1189"></a>
+<span class="sourceLineNo">1190</span><a name="line.1190"></a>
+<span class="sourceLineNo">1191</span>   /**<a name="line.1191"></a>
+<span class="sourceLineNo">1192</span>    * Request-level variable resolver session.<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span>    * <a name="line.1193"></a>
+<span class="sourceLineNo">1194</span>    * &lt;p&gt;<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span>    * Used to resolve SVL variables in text.<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span>    * <a name="line.1196"></a>
+<span class="sourceLineNo">1197</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span>    * &lt;p class='bcode'&gt;<a name="line.1198"></a>
+<span class="sourceLineNo">1199</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1199"></a>
+<span class="sourceLineNo">1200</span>    *    &lt;jk&gt;public&lt;/jk&gt; String sayHello(RestRequest req) {<a name="line.1200"></a>
+<span class="sourceLineNo">1201</span>    * <a name="line.1201"></a>
+<span class="sourceLineNo">1202</span>    *       &lt;jc&gt;// Get var resolver session.&lt;/jc&gt;<a name="line.1202"></a>
+<span class="sourceLineNo">1203</span>    *       VarResolverSession session = getVarResolverSession();<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span>    * <a name="line.1204"></a>
+<span class="sourceLineNo">1205</span>    *       &lt;jc&gt;// Use it to construct a customized message from a query parameter.&lt;/jc&gt;<a name="line.1205"></a>
+<span class="sourceLineNo">1206</span>    *       &lt;jk&gt;return&lt;/jk&gt; session.resolve(&lt;js&gt;"Hello $RQ{user}!"&lt;/js&gt;);<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span>    *    }<a name="line.1207"></a>
+<span class="sourceLineNo">1208</span>    * &lt;/p&gt;<a name="line.1208"></a>
+<span class="sourceLineNo">1209</span>    * <a name="line.1209"></a>
+<span class="sourceLineNo">1210</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1210"></a>
+<span class="sourceLineNo">1211</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1211"></a>
+<span class="sourceLineNo">1212</span>    *    &lt;li&gt;<a name="line.1212"></a>
+<span class="sourceLineNo">1213</span>    *       The {@link VarResolverSession} object can also be passed as a parameter on the method.<a name="line.1213"></a>
+<span class="sourceLineNo">1214</span>    * &lt;/ul&gt;<a name="line.1214"></a>
+<span class="sourceLineNo">1215</span>    * <a name="line.1215"></a>
+<span class="sourceLineNo">1216</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1216"></a>
+<span class="sourceLineNo">1217</span>    * &lt;ul&gt;<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestContext#getVarResolver()}<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.SvlVariables"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; SVL Variables&lt;/a&gt;<a name="line.1219"></a>
+<span class="sourceLineNo">1220</span>    * &lt;/ul&gt;<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span>    * <a name="line.1221"></a>
+<span class="sourceLineNo">1222</span>    * @return The variable resolver for this request.<a name="line.1222"></a>
+<span class="sourceLineNo">1223</span>    */<a name="line.1223"></a>
+<span class="sourceLineNo">1224</span>   public VarResolverSession getVarResolverSession() {<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span>      if (varSession == null)<a name="line.1225"></a>
+<span class="sourceLineNo">1226</span>         varSession = context.getVarResolver().createSession(context.getCallHandler().getSessionObjects(this));<a name="line.1226"></a>
+<span class="sourceLineNo">1227</span>      return varSession;<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span>   }<a name="line.1228"></a>
+<span class="sourceLineNo">1229</span><a name="line.1229"></a>
+<span class="sourceLineNo">1230</span>   /**<a name="line.1230"></a>
+<span class="sourceLineNo">1231</span>    * Returns an instance of a {@link ReaderResource} that represents the contents of a resource text file from the<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span>    * classpath.<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span>    * <a name="line.1233"></a>
+<span class="sourceLineNo">1234</span>    * &lt;p&gt;<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span>    * &lt;p class='bcode'&gt;<a name="line.1236"></a>
+<span class="sourceLineNo">1237</span>    *    &lt;jc&gt;// A rest method that (unsafely!) returns the contents of a localized file &lt;/jc&gt;<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span>    * &lt;jc&gt;// from the classpath and resolves any SVL variables embedded in it.&lt;/jc&gt;<a name="line.1238"></a>
+<span class="sourceLineNo">1239</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1239"></a>
+<span class="sourceLineNo">1240</span>    *    &lt;jk&gt;public&lt;/jk&gt; String myMethod(RestRequest req, &lt;ja&gt;@Query&lt;/ja&gt;(&lt;js&gt;"file"&lt;/js&gt;) String file) {<a name="line.1240"></a>
+<span class="sourceLineNo">1241</span>    *       &lt;jk&gt;return&lt;/jk&gt; req.getClasspathResourceAsString(file, &lt;jk&gt;true&lt;/jk&gt;);<a name="line.1241"></a>
+<span class="sourceLineNo">1242</span>    *    }<a name="line.1242"></a>
+<span class="sourceLineNo">1243</span>    * &lt;/p&gt;<a name="line.1243"></a>
+<span class="sourceLineNo">1244</span>    * <a name="line.1244"></a>
+<span class="sourceLineNo">1245</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1245"></a>
+<span class="sourceLineNo">1246</span>    * &lt;ul&gt;<a name="line.1246"></a>
+<span class="sourceLineNo">1247</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_classpathResourceFinder}<a name="line.1247"></a>
+<span class="sourceLineNo">1248</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getClasspathReaderResource(String, boolean)}<a name="line.1248"></a>
+<span class="sourceLineNo">1249</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestRequest#getClasspathReaderResource(String)}<a name="line.1249"></a>
+<span class="sourceLineNo">1250</span>    * &lt;/ul&gt;<a name="line.1250"></a>
+<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">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>
+<span class="sourceLineNo">1258</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1258"></a>
+<span class="sourceLineNo">1259</span>    * @throws IOException<a name="line.1259"></a>
+<span class="sourceLineNo">1260</span>    */<a name="line.1260"></a>
+<span class="sourceLineNo">1261</span>   public ReaderResource getClasspathReaderResource(String name, boolean resolveVars, MediaType mediaType) throws IOException {<a name="line.1261"></a>
+<span class="sourceLineNo">1262</span>      String s = context.getClasspathResourceAsString(name, getLocale());<a name="line.1262"></a>
+<span class="sourceLineNo">1263</span>      if (s == null)<a name="line.1263"></a>
+<span class="sourceLineNo">1264</span>         return null;<a name="line.1264"></a>
+<span class="sourceLineNo">1265</span>      ReaderResourceBuilder b = new ReaderResourceBuilder().mediaType(mediaType).contents(s);<a name="line.1265"></a>
+<span class="sourceLineNo">1266</span>      if (resolveVars)<a name="line.1266"></a>
+<span class="sourceLineNo">1267</span>         b.varResolver(getVarResolverSession());<a name="line.1267"></a>
+<span class="sourceLineNo">1268</span>      return b.build();<a name="line.1268"></a>
+<span class="sourceLineNo">1269</span>   }<a name="line.1269"></a>
+<span class="sourceLineNo">1270</span><a name="line.1270"></a>
+<span class="sourceLineNo">1271</span>   /**<a name="line.1271"></a>
+<span class="sourceLineNo">1272</span>    * Same as {@link #getClasspathReaderResource(String, boolean, MediaType)} except uses the resource mime-type map<a name="line.1272"></a>
+<span class="sourceLineNo">1273</span>    * constructed using {@link RestContextBuilder#mimeTypes(String...)} to determine the media type.<a name="line.1273"></a>
+<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">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>
+<span class="sourceLineNo">1281</span>    * @throws IOException<a name="line.1281"></a>
+<span class="sourceLineNo">1282</span>    */<a name="line.1282"></a>
+<span class="sourceLineNo">1283</span>   public ReaderResource getClasspathReaderResource(String name, boolean resolveVars) throws IOException {<a name="line.1283"></a>
+<span class="sourceLineNo">1284</span>      return getClasspathReaderResource(name, resolveVars, MediaType.forString(context.getMediaTypeForName(name)));<a name="line.1284"></a>
+<span class="sourceLineNo">1285</span>   }<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>    * Same as {@link #getClasspathReaderResource(String, boolean)} with &lt;code&gt;resolveVars == &lt;jk&gt;false&lt;/jk&gt;&lt;/code&gt;<a name="line.1288"></a>
+<span class="sourceLineNo">1289</span>    * <a name="line.1289"></a>
+<span class="sourceLineNo">1290</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1290"></a>
+<span class="sourceLineNo">1291</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1291"></a>
+<span class="sourceLineNo">1292</span>    * @throws IOException<a name="line.1292"></a>
+<span class="sourceLineNo">1293</span>    */<a name="line.1293"></a>
+<span class="sourceLineNo">1294</span>   public ReaderResource getClasspathReaderResource(String name) throws IOException {<a name="line.1294"></a>
+<span class="sourceLineNo">1295</span>      return getClasspathReaderResource(name, false, MediaType.forString(context.getMediaTypeForName(name)));<a name="line.1295"></a>
+<span class="sourceLineNo">1296</span>   }<a name="line.1296"></a>
+<span class="sourceLineNo">1297</span><a name="line.1297"></a>
+<span class="sourceLineNo">1298</span>   /**<a name="line.1298"></a>
+<span class="sourceLineNo">1299</span>    * Config file associated with the resource.<a name="line.1299"></a>
+<span class="sourceLineNo">1300</span>    * <a name="line.1300"></a>
+<span class="sourceLineNo">1301</span>    * &lt;p&gt;<a name="line.1301"></a>
+<span class="sourceLineNo">1302</span>    * Returns a config file with session-level variable resolution.<a name="line.1302"></a>
+<span class="sourceLineNo">1303</span>    * <a name="line.1303"></a>
+<span class="sourceLineNo">1304</span>    * The config file is identified via one of the following:<a name="line.1304"></a>
+<span class="sourceLineNo">1305</span>    * &lt;ul&gt;<a name="line.1305"></a>
+<span class="sourceLineNo">1306</span>    *    &lt;li class='ja'&gt;{@link RestResource#config()}<a name="line.1306"></a>
+<span class="sourceLineNo">1307</span>    *    &lt;li class='jm'&gt;{@link RestContextBuilder#config(Config)}<a name="line.1307"></a>
+<span class="sourceLineNo">1308</span>    * &lt;/ul&gt;<a name="line.1308"></a>
+<span class="sourceLineNo">1309</span>    * <a name="line.1309"></a>
+<span class="sourceLineNo">1310</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1310"></a>
+<span class="sourceLineNo">1311</span>    * &lt;p class='bcode'&gt;<a name="line.1311"></a>
+<span class="sourceLineNo">1312</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1312"></a>
+<span class="sourceLineNo">1313</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.1313"></a>
+<span class="sourceLineNo">1314</span>    * <a name="line.1314"></a>
+<span class="sourceLineNo">1315</span>    *       &lt;jc&gt;// Get config file.&lt;/jc&gt;<a name="line.1315"></a>
+<span class="sourceLineNo">1316</span>    *       Config cf = req.getConfig();<a name="line.1316"></a>
+<span class="sourceLineNo">1317</span>    * <a name="line.1317"></a>
+<span class="sourceLineNo">1318</span>    *       &lt;jc&gt;// Get simple values from config file.&lt;/jc&gt;<a name="line.1318"></a>
+<span class="sourceLineNo">1319</span>    *       &lt;jk&gt;int&lt;/jk&gt; timeout = cf.getInt(&lt;js&gt;"MyResource/timeout"&lt;/js&gt;, 10000);<a name="line.1319"></a>
+<span class="sourceLineNo">1320</span>    * <a name="line.1320"></a>
+<span class="sourceLineNo">1321</span>    *       &lt;jc&gt;// Get complex values from config file.&lt;/jc&gt;<a name="line.1321"></a>
+<span class="sourceLineNo">1322</span>    *       MyBean b = cf.getObject(&lt;js&gt;"MyResource/myBean"&lt;/js&gt;, MyBean.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.1322"></a>
+<span class="sourceLineNo">1323</span>    *    }<a name="line.1323"></a>
+<span class="sourceLineNo">1324</span>    * &lt;/p&gt;<a name="line.1324"></a>
+<span class="sourceLineNo">1325</span>    * <a name="line.1325"></a>
+<span class="sourceLineNo">1326</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1326"></a>
+<span class="sourceLineNo">1327</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1327"></a>
+<span class="sourceLineNo">1328</span>    *    &lt;li&gt;<a name="line.1328"></a>
+<span class="sourceLineNo">1329</span>    *       The {@link Config} object can also be passed as a parameter on the method.<a name="line.1329"></a>
+<span class="sourceLineNo">1330</span>    * &lt;/ul&gt;<a name="line.1330"></a>
+<span class="sourceLineNo">1331</span>    * <a name="line.1331"></a>
+<span class="sourceLineNo">1332</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1332"></a>
+<span class="sourceLineNo">1333</span>    * &lt;ul&gt;<a name="line.1333"></a>
+<span class="sourceLineNo">1334</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.ConfigurationFiles"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Configuration Files&lt;/a&gt;<a name="line.1334"></a>
+<span class="sourceLineNo">1335</span>    * &lt;/ul&gt;<a name="line.1335"></a>
+<span class="sourceLineNo">1336</span>    * <a name="line.1336"></a>
+<span class="sourceLineNo">1337</span>    * @return<a name="line.1337"></a>
+<span class="sourceLineNo">1338</span>    *    The config file associated with the resource, or &lt;jk&gt;null&lt;/jk&gt; if resource does not have a config file<a name="line.1338"></a>
+<span class="sourceLineNo">1339</span>    *    associated with it.<a name="line.1339"></a>
+<span class="sourceLineNo">1340</span>    */<a name="line.1340"></a>
+<span class="sourceLineNo">1341</span>   public Config getConfig() {<a name="line.1341"></a>
+<span class="sourceLineNo">1342</span>      if (cf == null)<a name="line.1342"></a>
+<span class="sourceLineNo">1343</span>         cf = context.getConfig().resolving(getVarResolverSession());<a name="line.1343"></a>
+<span class="sourceLineNo">1344</span>      return cf;<a name="line.1344"></a>
+<span class="sourceLineNo">1345</span>   }<a name="line.1345"></a>
+<span class="sourceLineNo">1346</span><a name="line.1346"></a>
+<span class="sourceLineNo">1347</span>   /**<a name="line.1347"></a>
+<span class="sourceLineNo">1348</span>    * Returns the widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1348"></a>
+<span class="sourceLineNo">1349</span>    * <a name="line.1349"></a>
+<span class="sourceLineNo">1350</span>    * @return<a name="line.1350"></a>
+<span class="sourceLineNo">1351</span>    *    The widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1351"></a>
+<span class="sourceLineNo">1352</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1352"></a>
+<span class="sourceLineNo">1353</span>    */<a name="line.1353"></a>
+<span class="sourceLineNo">1354</span>   public Map&lt;String,Widget&gt; getWidgets() {<a name="line.1354"></a>
+<span class="sourceLineNo">1355</span>      return restJavaMethod.widgets;<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>   @Override /* Object */<a name="line.1358"></a>
+<span class="sourceLineNo">1359</span>   public String toString() {<a name="line.1359"></a>
+<span class="sourceLineNo">1360</span>      StringBuilder sb = new StringBuilder("\n").append(getDescription()).append("\n");<a name="line.1360"></a>
+<span class="sourceLineNo">1361</span>      sb.append("---Headers---\n");<a name="line.1361"></a>
+<span class="sourceLineNo">1362</span>      for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.1362"></a>
+<span class="sourceLineNo">1363</span>         String h = e.nextElement();<a name="line.1363"></a>
+<span class="sourceLineNo">1364</span>         sb.append("\t").append(h).append(": ").append(getHeader(h)).append("\n");<a name="line.1364"></a>
+<span class="sourceLineNo">1365</span>      }<a name="line.1365"></a>
+<span class="sourceLineNo">1366</span>      sb.append("---Default Servlet Headers---\n");<a name="line.1366"></a>
+<span class="sourceLineNo">1367</span>      for (Map.Entry&lt;String,Object&gt; e : context.getDefaultRequestHeaders().entrySet()) {<a name="line.1367"></a>
+<span class="sourceLineNo">1368</span>         sb.append("\t").append(e.getKey()).append(": ").append(e.getValue()).append("\n");<a name="line.1368"></a>
+<span class="sourceLineNo">1369</span>      }<a name="line.1369"></a>
+<span class="sourceLineNo">1370</span>      if (javaMethod == null) {<a name="line.1370"></a>
+<span class="sourceLineNo">1371</span>         sb.append("***init() not called yet!***\n");<a name="line.1371"></a>
+<span class="sourceLineNo">1372</span>      } else if (method.equals("PUT") || method.equals("POST")) {<a name="line.1372"></a>
+<span class="sourceLineNo">1373</span>         try {<a name="line.1373"></a>
+<span class="sourceLineNo">1374</span>            sb.append("---Body UTF-8---\n");<a name="line.1374"></a>
+<span class="sourceLineNo">1375</span>            sb.append(body.asString()).append("\n");<a name="line.1375"></a>
+<span class="sourceLineNo">1376</span>            sb.append("---Body Hex---\n");<a name="line.1376"></a>
+<span class="sourceLineNo">1377</span>            sb.append(body.asSpacedHex()).append("\n");<a name="line.1377"></a>
+<span class="sourceLineNo">1378</span>         } catch (Exception e1) {<a name="line.1378"></a>
+<span class="sourceLineNo">1379</span>            sb.append(e1.getLocalizedMessage());<a name="line.1379"></a>
+<span class="sourceLineNo">1380</span>            context.getLogger().log(WARNING, e1, "Error occurred while trying to read debug input.");<a name="line.1380"></a>
+<span class="sourceLineNo">1381</span>         }<a name="line.1381"></a>
+<span class="sourceLineNo">1382</span>      }<a name="line.1382"></a>
+<span class="sourceLineNo">1383</span>      return sb.toString();<a name="line.1383"></a>
+<span class="sourceLineNo">1384</span>   }<a name="line.1384"></a>
+<span class="sourceLineNo">1385</span><a name="line.1385"></a>
+<span class="sourceLineNo">1386</span>   /**<a name="line.1386"></a>
+<span class="sourceLineNo">1387</span>    * Logger.<a name="line.1387"></a>
+<span class="sourceLineNo">1388</span>    * <a name="line.1388"></a>
+<span class="sourceLineNo">1389</span>    * &lt;p&gt;<a name="line.1389"></a>
+<span class="sourceLineNo">1390</span>    * Shortcut for calling &lt;code&gt;getContext().getLogger()&lt;/code&gt;.<a name="line.1390"></a>
+<span class="sourceLineNo">1391</span>    * <a name="line.1391"></a>
+<span class="sourceLineNo">1392</span>    * &lt;h5 class='section'&gt;Example:&lt;/h5&gt;<a name="line.1392"></a>
+<span class="sourceLineNo">1393</span>    * &lt;p class='bcode'&gt;<a name="line.1393"></a>
+<span class="sourceLineNo">1394</span>    *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(...)<a name="line.1394"></a>
+<span class="sourceLineNo">1395</span>    *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req) {<a name="line.1395"></a>
+<span class="sourceLineNo">1396</span>    * <a name="line.1396"></a>
+<span class="sourceLineNo">1397</span>    *       req.getLogger().logObjects(&lt;jsf&gt;FINE&lt;/jsf&gt;, &lt;js&gt;"Request query parameters = {0}"&lt;/js&gt;, req.getQuery());     <a name="line.1397"></a>
+<span class="sourceLineNo">1398</span>    *    }<a name="line.1398"></a>
+<span class="sourceLineNo">1399</span>    * &lt;/p&gt;<a name="line.1399"></a>
+<span class="sourceLineNo">1400</span>    * <a name="line.1400"></a>
+<span class="sourceLineNo">1401</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1401"></a>
+<span class="sourceLineNo">1402</span>    * &lt;ul class='spaced-list'&gt;<a name="line.1402"></a>
+<span class="sourceLineNo">1403</span>    *    &lt;li&gt;<a name="line.1403"></a>
+<span class="sourceLineNo">1404</span>    *       The {@link RestLogger} object can also be passed as a parameter on the method.<a name="line.1404"></a>
+<span class="sourceLineNo">1405</span>    * &lt;/ul&gt;<a name="line.1405"></a>
+<span class="sourceLineNo">1406</span>    * <a name="line.1406"></a>
+<span class="sourceLineNo">1407</span>    * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.1407"></a>
+<span class="sourceLineNo">1408</span>    * &lt;ul&gt;<a name="line.1408"></a>
+<span class="sourceLineNo">1409</span>    *    &lt;li class='jf'&gt;{@link org.apache.juneau.rest.RestContext#REST_logger}<a name="line.1409"></a>
+<span class="sourceLineNo">1410</span>    *    &lt;li class='jac'&gt;{@link org.apache.juneau.rest.RestLogger}<a name="line.1410"></a>
+<span class="sourceLineNo">1411</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestServlet#log(Level, String, Object...)}<a name="line.1411"></a>
+<span class="sourceLineNo">1412</span>    *    &lt;li class='jm'&gt;{@link org.apache.juneau.rest.RestServlet#logObjects(Level, String, Object...)}<a name="line.1412"></a>
+<span class="sourceLineNo">1413</span>    *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Logging and Error Handling&lt;/a&gt;<a name="line.1413"></a>
+<span class="sourceLineNo">1414</span>    * &lt;/ul&gt;<a name="line.1414"></a>
+<span class="sourceLineNo">1415</span>    * <a name="line.1415"></a>
+<span class="sourceLineNo">1416</span>    * @return <a name="line.1416"></a>
+<span class="sourceLineNo">1417</span>    *    The logger associated with the resource context.<a name="line.1417"></a>
+<span class="sourceLineNo">1418</span>    *    &lt;br&gt;Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1418"></a>
+<span class="sourceLineNo">1419</span>    */<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span>   public RestLogger getLogger() {<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span>      return context.getLogger();<a name="line.1421"></a>
+<span class="sourceLineNo">1422</span>   }<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span>   <a name="line.1423"></a>
+<span class="sourceLineNo">1424</span>   void close() {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span>      if (cf != null) {<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span>         try {<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span>            cf.close();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span>         } catch (IOException e) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span>            e.printStackTrace();<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span>         }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span>      }<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>   //--------------------------------------------------------------------------------<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span>   // Utility methods<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span>   //--------------------------------------------------------------------------------<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span><a name="line.1437"></a>
+<span class="sourceLineNo">1438</span>   /*<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span>    * Converts an Accept-Language value entry to a Locale.<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span>    */<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span>   private static Locale toLocale(String lang) {<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span>      String country = "";<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span>      int i = lang.indexOf('-');<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span>      if (i &gt; -1) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span>         country = lang.substring(i+1).trim();<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span>         lang = lang.substring(0,i).trim();<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span>      }<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span>      return new Locale(lang, country);<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span>   }<a name="line.1449"></a>
 <span class="sourceLineNo">1450</span><a name="line.1450"></a>
-<span class="sourceLineNo">1451</span>   void setJavaMethod(Method method) {<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span>      this.javaMethod = method;<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span>   }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span>}<a name="line.1454"></a>
+<span class="sourceLineNo">1451</span><a name="line.1451"></a>
+<span class="sourceLineNo">1452</span>   void setJavaMethod(Method method) {<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span>      this.javaMethod = method;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span>   }<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span>}<a name="line.1455"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html b/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html
index 8a62642..426e555 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/remoteable/RemoteableServlet.html
@@ -21,150 +21,204 @@
 <span class="sourceLineNo">013</span>package org.apache.juneau.rest.remoteable;<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.http.HttpMethodName.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.util.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.util.concurrent.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.dto.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.parser.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.rest.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.rest.annotation.*;<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> * Abstract class for defining Remoteable services.<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> * Remoteable services are POJOs whose methods can be invoked remotely through proxy interfaces.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <a name="line.32"></a>
-<span class="sourceLineNo">033</span> * &lt;p&gt;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * To implement a remoteable service, developers must simply subclass from this class and implement the<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * {@link #getServiceMap()} method that maps java interfaces to POJO instances.<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='link'&gt;&lt;a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RemoteableProxies"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Remoteable Proxies&lt;/a&gt;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * &lt;/ul&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> */<a name="line.41"></a>
-<span class="sourceLineNo">042</span>@SuppressWarnings("serial")<a name="line.42"></a>
-<span class="sourceLineNo">043</span>public abstract class RemoteableServlet extends BasicRestServlet {<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   private final Map&lt;String,Class&lt;?&gt;&gt; classNameMap = new ConcurrentHashMap&lt;&gt;();<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>   //--------------------------------------------------------------------------------<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   // Abstract methods<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   //--------------------------------------------------------------------------------<a name="line.49"></a>
+<span class="sourceLineNo">016</span>import static org.apache.juneau.dto.html5.HtmlBuilder.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span>import static org.apache.juneau.http.HttpMethodName.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.lang.reflect.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Map;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.concurrent.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.dto.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.dto.html5.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.internal.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.parser.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.rest.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.rest.annotation.*;<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> * Abstract class for defining Remoteable services.<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <a name="line.35"></a>
+<span class="sourceLineNo">036</span> * &lt;p&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * Remoteable services are POJOs whose methods can be invoked remotely through proxy interfaces.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <a name="line.38"></a>
+<span class="sourceLineNo">039</span> * &lt;p&gt;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * To implement a remoteable service, developers must simply subclass from this class and implement the<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * {@link #getServiceMap()} method that maps java interfaces to POJO instances.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <a name="line.42"></a>
+<span class="sourceLineNo">043</span> * &lt;h5 class='section'&gt;See Also:&lt;/h5&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * &lt;ul&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *    &lt;li class='link'&gt;&lt;a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RemoteableProxies"&gt;Overview &amp;gt; juneau-rest-server &amp;gt; Remoteable Proxies&lt;/a&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>@SuppressWarnings("serial")<a name="line.48"></a>
+<span class="sourceLineNo">049</span>public abstract class RemoteableServlet extends BasicRestServlet {<a name="line.49"></a>
 <span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>   /**<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * Returns the list of interfaces to their implementation objects.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * <a name="line.53"></a>
-<span class="sourceLineNo">054</span>    * &lt;p&gt;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    * This class is called often and not cached, so any caching should occur in the subclass if necessary.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    * <a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * @return The service map.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * @throws Exception<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   protected abstract Map&lt;Class&lt;?&gt;,Object&gt; getServiceMap() throws Exception;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>   //--------------------------------------------------------------------------------<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   // REST methods<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   //--------------------------------------------------------------------------------<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>    * [GET /] - Get the list of all remote interfaces.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    * <a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * @param req The HTTP servlet request.<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    * @return The list of links to the remote interfaces.<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    * @throws Exception<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    */<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   @RestMethod(name=GET, path="/")<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   public List&lt;LinkString&gt; getInterfaces(RestRequest req) throws Exception {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      List&lt;LinkString&gt; l = new LinkedList&lt;&gt;();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      boolean useAll = ! useOnlyAnnotated();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      for (Class&lt;?&gt; c : getServiceMap().keySet()) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         if (useAll || getContext().getBeanContext().getClassMeta(c).isRemoteable())<a name="line.78"></a>
-<span class="sourceLineNo">079</span>            l.add(new LinkString(c.getName(), "{0}/{1}", req.getRequestURI(), c.getName()));<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      }<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return l;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>   /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    * [GET /{javaInterface] - Get the list of all remoteable methods on the specified interface name.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    * <a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * @param javaInterface The Java interface name.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * @return The methods defined on the interface.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    * @throws Exception<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   @RestMethod(name=GET, path="/{javaInterface}")<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   public Collection&lt;String&gt; listMethods(@Path String javaInterface) throws Exception {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return getMethods(javaInterface).keySet();<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>   /**<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    * [POST /{javaInterface}/{javaMethod}] - Invoke the specified service method.<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    * <a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * @param req The HTTP request.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * @param javaInterface The Java interface name.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    * @param javaMethod The Java method name or signature.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * @return The results from invoking the specified Java method.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * @throws Exception<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   @RestMethod(name=POST, path="/{javaInterface}/{javaMethod}")<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   public Object invoke(RestRequest req, @Path String javaInterface, @Path String javaMethod) throws Exception {<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span>      // Find the parser.<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      ReaderParser p = req.getBody().getReaderParser();<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      if (p == null)<a name="line.110"></a>
-<span class="sourceLineNo">111</span>         throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Could not find parser for media type ''{0}''", req.getHeaders().getContentType());<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      Class&lt;?&gt; c = getInterfaceClass(javaInterface);<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // Find the service.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      Object service = getServiceMap().get(c);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      if (service == null)<a name="line.116"></a>
-<span class="sourceLineNo">117</span>         throw new RestException(SC_NOT_FOUND, "Service not found");<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">051</span>   private final Map&lt;String,Class&lt;?&gt;&gt; classNameMap = 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>   // Abstract methods<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>   /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    * Returns the list of interfaces to their implementation objects.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * <a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * &lt;p&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    * This class is called often and not cached, so any caching should occur in the subclass if necessary.<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * <a name="line.62"></a>
+<span class="sourceLineNo">063</span>    * @return The service map.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * @throws Exception<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   protected abstract Map&lt;Class&lt;?&gt;,Object&gt; getServiceMap() throws Exception;<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>   //--------------------------------------------------------------------------------<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   // REST methods<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   //--------------------------------------------------------------------------------<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>   /**<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    * [GET /] - Get the list of all remote interfaces.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    * <a name="line.74"></a>
+<span class="sourceLineNo">075</span>    * @param req The HTTP servlet request.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    * @return The list of links to the remote interfaces.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    * @throws Exception<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    */<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   @RestMethod(name=GET, path="/")<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   public List&lt;LinkString&gt; getInterfaces(RestRequest req) throws Exception {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      List&lt;LinkString&gt; l = new LinkedList&lt;&gt;();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      boolean useAll = ! useOnlyAnnotated();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      for (Class&lt;?&gt; c : getServiceMap().keySet()) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         if (useAll || getContext().getBeanContext().getClassMeta(c).isRemoteable())<a name="line.84"></a>
+<span class="sourceLineNo">085</span>            l.add(new LinkString(c.getName(), "{0}/{1}", req.getRequestURI(), urlEncode(c.getName())));<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      return l;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>   /**<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    * [GET /{javaInterface] - Get the list of all remoteable methods on the specified interface name.<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    * <a name="line.92"></a>
+<span class="sourceLineNo">093</span>    * @param req The HTTP servlet request.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    * @param javaInterface The Java interface name.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    * @return The methods defined on the interface.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    * @throws Exception<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   @RestMethod(name=GET, path="/{javaInterface}", summary="List of available methods on $RP{javaInterface}.")<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   public Collection&lt;LinkString&gt; listMethods(RestRequest req, @Path("javaInterface") String javaInterface) throws Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      List&lt;LinkString&gt; l = new ArrayList&lt;&gt;();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      for (String s : getMethods(javaInterface).keySet()) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>         l.add(new LinkString(s, "{0}/{1}", req.getRequestURI(), urlEncode(s)));<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      return l;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   }<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>    * [GET /{javaInterface] - Get the list of all remoteable methods on the specified interface name.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * <a name="line.109"></a>
+<span class="sourceLineNo">110</span>    * @param req The HTTP servlet request.<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    * @param javaInterface The Java interface name.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    * @param javaMethod The Java method name or signature.<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    * @return A simple form entry page for invoking a remoteable method.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    * @throws Exception<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    */<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   @RestMethod(name=GET, path="/{javaInterface}/{javaMethod}", summary="Form entry for method $RP{javaMethod} on interface $RP{javaInterface}")<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   public Div showEntryForm(RestRequest req, @Path("javaInterface") String javaInterface, @Path("javaMethod") String javaMethod) throws Exception {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      <a name="line.118"></a>
 <span class="sourceLineNo">119</span>      // Find the method.<a name="line.119"></a>
 <span class="sourceLineNo">120</span>      java.lang.reflect.Method m = getMethods(javaInterface).get(javaMethod);<a name="line.120"></a>
 <span class="sourceLineNo">121</span>      if (m == null)<a name="line.121"></a>
 <span class="sourceLineNo">122</span>         throw new RestException(SC_NOT_FOUND, "Method not found");<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>      // Parse the args and invoke the method.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      Object[] params = p.parseArgs(req.getReader(), m.getGenericParameterTypes());<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      return m.invoke(service, params);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   }<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>   // Other methods<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>   private boolean useOnlyAnnotated() {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      return getProperties().getBoolean(RemoteableServiceProperties.REMOTEABLE_includeOnlyRemotableMethods, false);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>   private Map&lt;String,java.lang.reflect.Method&gt; getMethods(String javaInterface) throws Exception {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      Class&lt;?&gt; c = getInterfaceClass(javaInterface);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      ClassMeta&lt;?&gt; cm = getContext().getBeanContext().getClassMeta(c);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      return (useOnlyAnnotated() ? cm.getRemoteableMethods() : cm.getPublicMethods());<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>    * Return the &lt;code&gt;Class&lt;/code&gt; given it's name if it exists in the services map.<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   private Class&lt;?&gt; getInterfaceClass(String javaInterface) throws Exception {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      Class&lt;?&gt; c = classNameMap.get(javaInterface);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      if (c == null) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>         for (Class&lt;?&gt; c2 : getServiceMap().keySet())<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            if (c2.getName().equals(javaInterface)) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>               classNameMap.put(javaInterface, c2);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>               return c2;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>            }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>         throw new RestException(SC_NOT_FOUND, "Interface class not found");<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return c;<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">124</span>      Table t = table();<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      <a name="line.125"></a>
+<span class="sourceLineNo">126</span>      Type[] types = m.getGenericParameterTypes();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      if (types.length == 0) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>         t.child(tr(td("No arguments").colspan(3).style("text-align:center")));<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      } else {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>         t.child(tr(th("Index"),th("Type"),th("Value")));<a name="line.130"></a>
+<span class="sourceLineNo">131</span>         for (int i = 0; i &lt; types.length; i++) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>            String type = ClassUtils.toString(types[i]);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>            t.child(tr(td(i), td(type), td(input().name(String.valueOf(i)).type("text"))));<a name="line.133"></a>
+<span class="sourceLineNo">134</span>         }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      <a name="line.136"></a>
+<span class="sourceLineNo">137</span>      t.child(<a name="line.137"></a>
+<span class="sourceLineNo">138</span>         tr(<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            td().colspan(3).style("text-align:right").children(<a name="line.139"></a>
+<span class="sourceLineNo">140</span>               types.length == 0 ? null : button("reset", "Reset"),<a name="line.140"></a>
+<span class="sourceLineNo">141</span>               button("button","Cancel").onclick("window.location.href='/'"),<a name="line.141"></a>
+<span class="sourceLineNo">142</span>               button("submit", "Submit")<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>      );<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>      return div(form().id("form").action("request:/").method(POST).children(t));<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   } <a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>   /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    * [POST /{javaInterface}/{javaMethod}] - Invoke the specified service method.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    * <a name="line.152"></a>
+<span class="sourceLineNo">153</span>    * @param req The HTTP request.<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    * @param javaInterface The Java interface name.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    * @param javaMethod The Java method name or signature.<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    * @return The results from invoking the specified Java method.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    * @throws Exception<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    */<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   @RestMethod(name=POST, path="/{javaInterface}/{javaMethod}")<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   public Object invoke(RestRequest req, @Path String javaInterface, @Path String javaMethod) throws Exception {<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>      // Find the parser.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      ReaderParser p = req.getBody().getReaderParser();<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      if (p == null)<a name="line.164"></a>
+<span class="sourceLineNo">165</span>         throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Could not find parser for media type ''{0}''", req.getHeaders().getContentType());<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      Class&lt;?&gt; c = getInterfaceClass(javaInterface);<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>      // Find the service.<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      Object service = getServiceMap().get(c);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      if (service == null)<a name="line.170"></a>
+<span class="sourceLineNo">171</span>         throw new RestException(SC_NOT_FOUND, "Service not found");<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>      // Find the method.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      java.lang.reflect.Method m = getMethods(javaInterface).get(javaMethod);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      if (m == null)<a name="line.175"></a>
+<span class="sourceLineNo">176</span>         throw new RestException(SC_NOT_FOUND, "Method not found");<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>      // Parse the args and invoke the method.<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      Object[] params = p.parseArgs(req.getReader(), m.getGenericParameterTypes());<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      return m.invoke(service, params);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   }<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>   // Other methods<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   //--------------------------------------------------------------------------------<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>   private boolean useOnlyAnnotated() {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      return getProperties().getBoolean(RemoteableServiceProperties.REMOTEABLE_includeOnlyRemotableMethods, false);<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>   private Map&lt;String,java.lang.reflect.Method&gt; getMethods(String javaInterface) throws Exception {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      Class&lt;?&gt; c = getInterfaceClass(javaInterface);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      ClassMeta&lt;?&gt; cm = getContext().getBeanContext().getClassMeta(c);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return (useOnlyAnnotated() ? cm.getRemoteableMethods() : cm.getPublicMethods());<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>    * Return the &lt;code&gt;Class&lt;/code&gt; given it's name if it exists in the services map.<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   private Class&lt;?&gt; getInterfaceClass(String javaInterface) throws Exception {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      Class&lt;?&gt; c = classNameMap.get(javaInterface);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      if (c == null) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>         for (Class&lt;?&gt; c2 : getServiceMap().keySet())<a name="line.204"></a>
+<span class="sourceLineNo">205</span>            if (c2.getName().equals(javaInterface)) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>               classNameMap.put(javaInterface, c2);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>               return c2;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>            }<a name="line.208"></a>
+<span class="sourceLineNo">209</span>         throw new RestException(SC_NOT_FOUND, "Interface class not found");<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      }<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      return c;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>}<a name="line.213"></a>
 
 
 
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html
index 6c80362..f265a16 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParserSession.html
@@ -43,7 +43,7 @@
 <span class="sourceLineNo">035</span>public class UonParserSession extends ReaderParserSession {<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
 <span class="sourceLineNo">037</span>   // Characters that need to be preceded with an escape character.<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   private static final AsciiSet escapedChars = new AsciiSet("~'\u0001\u0002");<a name="line.38"></a>
+<span class="sourceLineNo">038</span>   private static final AsciiSet escapedChars = AsciiSet.create("~'\u0001\u0002");<a name="line.38"></a>
 <span class="sourceLineNo">039</span><a name="line.39"></a>
 <span class="sourceLineNo">040</span>   private static final char AMP='\u0001', EQ='\u0002';  // Flags set in reader to denote &amp; and = characters.<a name="line.40"></a>
 <span class="sourceLineNo">041</span><a name="line.41"></a>
@@ -700,7 +700,7 @@
 <span class="sourceLineNo">692</span>      return ("null".equals(s) ? null : trim(s));<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>   private static final AsciiSet endCharsParam = new AsciiSet(""+AMP), endCharsNormal = new AsciiSet(",)"+AMP);<a name="line.695"></a>
+<span class="sourceLineNo">695</span>   private static final AsciiSet endCharsParam = AsciiSet.create(""+AMP), endCharsNormal = AsciiSet.create(",)"+AMP);<a name="line.695"></a>
 <span class="sourceLineNo">696</span><a name="line.696"></a>
 <span class="sourceLineNo">697</span><a name="line.697"></a>
 <span class="sourceLineNo">698</span>   /*<a name="line.698"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html
index 86b5db4..e8df103 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html
@@ -29,8 +29,8 @@
 <span class="sourceLineNo">021</span> */<a name="line.21"></a>
 <span class="sourceLineNo">022</span>public final class UonUtils {<a name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>   private static final AsciiSet needsQuoteChars = new AsciiSet("),=\n\t\r\b\f ");<a name="line.24"></a>
-<span class="sourceLineNo">025</span>   private static final AsciiSet maybeNeedsQuotesFirstChar = new AsciiSet("),=\n\t\r\b\f tfn+-.#0123456789");<a name="line.25"></a>
+<span class="sourceLineNo">024</span>   private static final AsciiSet needsQuoteChars = AsciiSet.create("),=\n\t\r\b\f ");<a name="line.24"></a>
+<span class="sourceLineNo">025</span>   private static final AsciiSet maybeNeedsQuotesFirstChar = AsciiSet.create("),=\n\t\r\b\f tfn+-.#0123456789");<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if the specified string needs to be quoted per UON notation.<a name="line.28"></a>
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
index 4f55052..503a800 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
@@ -41,16 +41,16 @@
 <span class="sourceLineNo">033</span>   private final boolean encodeChars, plainTextParams;<a name="line.33"></a>
 <span class="sourceLineNo">034</span><a name="line.34"></a>
 <span class="sourceLineNo">035</span>   // Characters that do not need to be URL-encoded in strings.<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~=");<a name="line.36"></a>
+<span class="sourceLineNo">036</span>   private static final AsciiSet unencodedChars = AsciiSet.create().ranges("a-z","A-Z","0-9").chars(";/?:@-_.!*'$(),~=").build();<a name="line.36"></a>
 <span class="sourceLineNo">037</span><a name="line.37"></a>
 <span class="sourceLineNo">038</span>   // Characters that do not need to be URL-encoded in attribute names.<a name="line.38"></a>
 <span class="sourceLineNo">039</span>   // Identical to unencodedChars, but excludes '='.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   private static final AsciiSet unencodedCharsAttrName = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~");<a name="line.40"></a>
+<span class="sourceLineNo">040</span>   private static final AsciiSet unencodedCharsAttrName = AsciiSet.create().ranges("a-z","A-Z","0-9").chars(";/?:@-_.!*'$(),~").build();<a name="line.40"></a>
 <span class="sourceLineNo">041</span><a name="line.41"></a>
 <span class="sourceLineNo">042</span>   // Characters that need to be preceded with an escape character.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   private static final AsciiSet escapedChars = new AsciiSet("~'");<a name="line.43"></a>
+<span class="sourceLineNo">043</span>   private static final AsciiSet escapedChars = AsciiSet.create("~'");<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   private static final AsciiSet noChars = new AsciiSet("");<a name="line.45"></a>
+<span class="sourceLineNo">045</span>   private static final AsciiSet noChars = AsciiSet.create("");<a name="line.45"></a>
 <span class="sourceLineNo">046</span><a name="line.46"></a>
 <span class="sourceLineNo">047</span>   private static char[] hexArray = "0123456789ABCDEF".toCharArray();<a name="line.47"></a>
 <span class="sourceLineNo">048</span><a name="line.48"></a>

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

Mime
View raw message