You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/08/22 22:15:44 UTC

[04/25] incubator-juneau-website git commit: Update javadocs.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/fe5928f7/content/site/apidocs/src-html/org/apache/juneau/rest/RestRequest.html
----------------------------------------------------------------------
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 878cd28..326f4a9 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
@@ -732,484 +732,497 @@
 <span class="sourceLineNo">724</span>   // URI-related methods<a name="line.724"></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>   /**<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    * Returns the URI context of the request.<a name="line.728"></a>
-<span class="sourceLineNo">729</span>    *<a name="line.729"></a>
-<span class="sourceLineNo">730</span>    * &lt;p&gt;<a name="line.730"></a>
-<span class="sourceLineNo">731</span>    * The URI context contains all the information about the URI of the request, such as the servlet URI, context<a name="line.731"></a>
-<span class="sourceLineNo">732</span>    * path, etc...<a name="line.732"></a>
-<span class="sourceLineNo">733</span>    *<a name="line.733"></a>
-<span class="sourceLineNo">734</span>    * @return The URI context of the request.<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    */<a name="line.735"></a>
-<span class="sourceLineNo">736</span>   public UriContext getUriContext() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>      if (uriContext == null) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span>         String scheme = getScheme();<a name="line.738"></a>
-<span class="sourceLineNo">739</span>         int port = getServerPort();<a name="line.739"></a>
-<span class="sourceLineNo">740</span>         StringBuilder authority = new StringBuilder(getScheme()).append("://").append(getServerName());<a name="line.740"></a>
-<span class="sourceLineNo">741</span>         if (! (port == 80 &amp;&amp; "http".equals(scheme) || port == 443 &amp;&amp; "https".equals(scheme)))<a name="line.741"></a>
-<span class="sourceLineNo">742</span>            authority.append(':').append(port);<a name="line.742"></a>
-<span class="sourceLineNo">743</span>         uriContext = new UriContext(authority.toString(), super.getContextPath(), super.getServletPath(), super.getPathInfo());<a name="line.743"></a>
-<span class="sourceLineNo">744</span>      }<a name="line.744"></a>
-<span class="sourceLineNo">745</span>      return uriContext;<a name="line.745"></a>
-<span class="sourceLineNo">746</span>   }<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span>   /**<a name="line.748"></a>
-<span class="sourceLineNo">749</span>    * Returns a URI resolver that can be used to convert URIs to absolute or root-relative form.<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    *<a name="line.750"></a>
-<span class="sourceLineNo">751</span>    * @param resolution The URI resolution rule.<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    * @param relativity The relative URI relativity rule.<a name="line.752"></a>
-<span class="sourceLineNo">753</span>    * @return The URI resolver for this request.<a name="line.753"></a>
-<span class="sourceLineNo">754</span>    */<a name="line.754"></a>
-<span class="sourceLineNo">755</span>   public UriResolver getUriResolver(UriResolution resolution, UriRelativity relativity) {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>      return new UriResolver(resolution, relativity, getUriContext());<a name="line.756"></a>
-<span class="sourceLineNo">757</span>   }<a name="line.757"></a>
-<span class="sourceLineNo">758</span><a name="line.758"></a>
-<span class="sourceLineNo">759</span>   /**<a name="line.759"></a>
-<span class="sourceLineNo">760</span>    * Shortcut for calling {@link #getUriResolver()} using {@link UriResolution#ROOT_RELATIVE} and<a name="line.760"></a>
-<span class="sourceLineNo">761</span>    * {@link UriRelativity#RESOURCE}<a name="line.761"></a>
-<span class="sourceLineNo">762</span>    *<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    * @return The URI resolver for this request.<a name="line.763"></a>
-<span class="sourceLineNo">764</span>    */<a name="line.764"></a>
-<span class="sourceLineNo">765</span>   public UriResolver getUriResolver() {<a name="line.765"></a>
-<span class="sourceLineNo">766</span>      return new UriResolver(UriResolution.ROOT_RELATIVE, UriRelativity.RESOURCE, getUriContext());<a name="line.766"></a>
-<span class="sourceLineNo">767</span>   }<a name="line.767"></a>
-<span class="sourceLineNo">768</span><a name="line.768"></a>
-<span class="sourceLineNo">769</span>   /**<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    * Returns the URI for this request.<a name="line.770"></a>
-<span class="sourceLineNo">771</span>    *<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    * &lt;p&gt;<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    * Similar to {@link #getRequestURI()} but returns the value as a {@link URI}.<a name="line.773"></a>
-<span class="sourceLineNo">774</span>    * It also gives you the capability to override the query parameters (e.g. add new query parameters to the existing<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    * URI).<a name="line.775"></a>
-<span class="sourceLineNo">776</span>    *<a name="line.776"></a>
-<span class="sourceLineNo">777</span>    * @param includeQuery If &lt;jk&gt;true&lt;/jk&gt; include the query parameters on the request.<a name="line.777"></a>
-<span class="sourceLineNo">778</span>    * @param addQueryParams Augment the request URI with the specified query parameters.<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    * @return A new URI.<a name="line.779"></a>
-<span class="sourceLineNo">780</span>    */<a name="line.780"></a>
-<span class="sourceLineNo">781</span>   public URI getUri(boolean includeQuery, Map&lt;String,?&gt; addQueryParams) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      String uri = getRequestURI();<a name="line.782"></a>
-<span class="sourceLineNo">783</span>      if (includeQuery || addQueryParams != null) {<a name="line.783"></a>
-<span class="sourceLineNo">784</span>         StringBuilder sb = new StringBuilder(uri);<a name="line.784"></a>
-<span class="sourceLineNo">785</span>         RequestQuery rq = this.queryParams.copy();<a name="line.785"></a>
-<span class="sourceLineNo">786</span>         if (addQueryParams != null)<a name="line.786"></a>
-<span class="sourceLineNo">787</span>            for (Map.Entry&lt;String,?&gt; e : addQueryParams.entrySet())<a name="line.787"></a>
-<span class="sourceLineNo">788</span>               rq.put(e.getKey(), e.getValue());<a name="line.788"></a>
-<span class="sourceLineNo">789</span>         if (! rq.isEmpty())<a name="line.789"></a>
-<span class="sourceLineNo">790</span>            sb.append('?').append(rq.toQueryString());<a name="line.790"></a>
-<span class="sourceLineNo">791</span>         uri = sb.toString();<a name="line.791"></a>
-<span class="sourceLineNo">792</span>      }<a name="line.792"></a>
-<span class="sourceLineNo">793</span>      try {<a name="line.793"></a>
-<span class="sourceLineNo">794</span>         return new URI(uri);<a name="line.794"></a>
-<span class="sourceLineNo">795</span>      } catch (URISyntaxException e) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>         // Shouldn't happen.<a name="line.796"></a>
-<span class="sourceLineNo">797</span>         throw new RuntimeException(e);<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      }<a name="line.798"></a>
-<span class="sourceLineNo">799</span>   }<a name="line.799"></a>
-<span class="sourceLineNo">800</span><a name="line.800"></a>
-<span class="sourceLineNo">801</span>   //--------------------------------------------------------------------------------<a name="line.801"></a>
-<span class="sourceLineNo">802</span>   // Labels<a name="line.802"></a>
-<span class="sourceLineNo">803</span>   //--------------------------------------------------------------------------------<a name="line.803"></a>
-<span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span>   /**<a name="line.805"></a>
-<span class="sourceLineNo">806</span>    * Returns the localized site name.<a name="line.806"></a>
-<span class="sourceLineNo">807</span>    *<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    * &lt;p&gt;<a name="line.808"></a>
-<span class="sourceLineNo">809</span>    * The site name is intended to be a title that can be applied to the entire site.<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    *<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    * &lt;p&gt;<a name="line.811"></a>
-<span class="sourceLineNo">812</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.812"></a>
-<span class="sourceLineNo">813</span>    * common parent class like so:<a name="line.813"></a>
-<span class="sourceLineNo">814</span>    * &lt;p class='bcode'&gt;<a name="line.814"></a>
-<span class="sourceLineNo">815</span>    *    htmldoc=&lt;ja&gt;@HtmlDoc&lt;/ja&gt;(<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    *       header={<a name="line.816"></a>
-<span class="sourceLineNo">817</span>    *          &lt;js&gt;"&amp;lt;h1&amp;gt;$R{siteName}&amp;lt;/h1&amp;gt;"&lt;/js&gt;,<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    *          &lt;js&gt;"&amp;lt;h2&amp;gt;$R{servletTitle}&amp;lt;/h2&amp;gt;"&lt;/js&gt;<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>    * &lt;/p&gt;<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>    * Equivalent to calling {@link RestInfoProvider#getSiteName(RestRequest)} with this object.<a name="line.824"></a>
-<span class="sourceLineNo">825</span>    *<a name="line.825"></a>
-<span class="sourceLineNo">826</span>    * @return The localized servlet label.<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    */<a name="line.827"></a>
-<span class="sourceLineNo">828</span>   public String getSiteName() {<a name="line.828"></a>
-<span class="sourceLineNo">829</span>      return context.getInfoProvider().getSiteName(this);<a name="line.829"></a>
-<span class="sourceLineNo">830</span>   }<a name="line.830"></a>
-<span class="sourceLineNo">831</span><a name="line.831"></a>
-<span class="sourceLineNo">832</span>   /**<a name="line.832"></a>
-<span class="sourceLineNo">833</span>    * Returns the localized servlet title.<a name="line.833"></a>
-<span class="sourceLineNo">834</span>    *<a name="line.834"></a>
-<span class="sourceLineNo">835</span>    * &lt;p&gt;<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    * Equivalent to calling {@link RestInfoProvider#getTitle(RestRequest)} with this object.<a name="line.836"></a>
-<span class="sourceLineNo">837</span>    *<a name="line.837"></a>
-<span class="sourceLineNo">838</span>    * @return The localized servlet label.<a name="line.838"></a>
-<span class="sourceLineNo">839</span>    */<a name="line.839"></a>
-<span class="sourceLineNo">840</span>   public String getServletTitle() {<a name="line.840"></a>
-<span class="sourceLineNo">841</span>      return context.getInfoProvider().getTitle(this);<a name="line.841"></a>
-<span class="sourceLineNo">842</span>   }<a name="line.842"></a>
-<span class="sourceLineNo">843</span><a name="line.843"></a>
-<span class="sourceLineNo">844</span>   /**<a name="line.844"></a>
-<span class="sourceLineNo">845</span>    * Returns the localized servlet description.<a name="line.845"></a>
-<span class="sourceLineNo">846</span>    *<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    * &lt;p&gt;<a name="line.847"></a>
-<span class="sourceLineNo">848</span>    * Equivalent to calling {@link RestInfoProvider#getDescription(RestRequest)} with this object.<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    *<a name="line.849"></a>
-<span class="sourceLineNo">850</span>    * @return The localized servlet description.<a name="line.850"></a>
-<span class="sourceLineNo">851</span>    */<a name="line.851"></a>
-<span class="sourceLineNo">852</span>   public String getServletDescription() {<a name="line.852"></a>
-<span class="sourceLineNo">853</span>      return context.getInfoProvider().getDescription(this);<a name="line.853"></a>
-<span class="sourceLineNo">854</span>   }<a name="line.854"></a>
-<span class="sourceLineNo">855</span><a name="line.855"></a>
-<span class="sourceLineNo">856</span>   /**<a name="line.856"></a>
-<span class="sourceLineNo">857</span>    * Returns the localized method summary.<a name="line.857"></a>
-<span class="sourceLineNo">858</span>    *<a name="line.858"></a>
-<span class="sourceLineNo">859</span>    * &lt;p&gt;<a name="line.859"></a>
-<span class="sourceLineNo">860</span>    * Equivalent to calling {@link RestInfoProvider#getMethodSummary(String, RestRequest)} with this object.<a name="line.860"></a>
-<span class="sourceLineNo">861</span>    *<a name="line.861"></a>
-<span class="sourceLineNo">862</span>    * @return The localized method description.<a name="line.862"></a>
-<span class="sourceLineNo">863</span>    */<a name="line.863"></a>
-<span class="sourceLineNo">864</span>   public String getMethodSummary() {<a name="line.864"></a>
-<span class="sourceLineNo">865</span>      return context.getInfoProvider().getMethodSummary(javaMethod.getName(), this);<a name="line.865"></a>
-<span class="sourceLineNo">866</span>   }<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>    * Returns the localized method description.<a name="line.869"></a>
-<span class="sourceLineNo">870</span>    *<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    * &lt;p&gt;<a name="line.871"></a>
-<span class="sourceLineNo">872</span>    * Equivalent to calling {@link RestInfoProvider#getMethodDescription(String, RestRequest)} with this object.<a name="line.872"></a>
-<span class="sourceLineNo">873</span>    *<a name="line.873"></a>
-<span class="sourceLineNo">874</span>    * @return The localized method description.<a name="line.874"></a>
-<span class="sourceLineNo">875</span>    */<a name="line.875"></a>
-<span class="sourceLineNo">876</span>   public String getMethodDescription() {<a name="line.876"></a>
-<span class="sourceLineNo">877</span>      return context.getInfoProvider().getMethodDescription(javaMethod.getName(), this);<a name="line.877"></a>
-<span class="sourceLineNo">878</span>   }<a name="line.878"></a>
-<span class="sourceLineNo">879</span><a name="line.879"></a>
-<span class="sourceLineNo">880</span>   //--------------------------------------------------------------------------------<a name="line.880"></a>
-<span class="sourceLineNo">881</span>   // Other methods<a name="line.881"></a>
-<span class="sourceLineNo">882</span>   //--------------------------------------------------------------------------------<a name="line.882"></a>
-<span class="sourceLineNo">883</span><a name="line.883"></a>
-<span class="sourceLineNo">884</span>   /**<a name="line.884"></a>
-<span class="sourceLineNo">885</span>    * Returns the value of the &lt;jk&gt;"stylesheet"&lt;/js&gt; parameter.<a name="line.885"></a>
+<span class="sourceLineNo">727</span>   @Override /* HttpServletRequest */<a name="line.727"></a>
+<span class="sourceLineNo">728</span>   public String getContextPath() {<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      String cp = context.getContextPath();<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      return cp == null ? super.getContextPath() : cp;<a name="line.730"></a>
+<span class="sourceLineNo">731</span>   }<a name="line.731"></a>
+<span class="sourceLineNo">732</span><a name="line.732"></a>
+<span class="sourceLineNo">733</span>   @Override /* HttpServletRequest */<a name="line.733"></a>
+<span class="sourceLineNo">734</span>   public String getServletPath() {<a name="line.734"></a>
+<span class="sourceLineNo">735</span>      String cp = context.getContextPath();<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      String sp = super.getServletPath();<a name="line.736"></a>
+<span class="sourceLineNo">737</span>      return cp == null || ! sp.startsWith(cp) ? sp : sp.substring(cp.length());<a name="line.737"></a>
+<span class="sourceLineNo">738</span>   }<a name="line.738"></a>
+<span class="sourceLineNo">739</span><a name="line.739"></a>
+<span class="sourceLineNo">740</span>   /**<a name="line.740"></a>
+<span class="sourceLineNo">741</span>    * Returns the URI context of the request.<a name="line.741"></a>
+<span class="sourceLineNo">742</span>    *<a name="line.742"></a>
+<span class="sourceLineNo">743</span>    * &lt;p&gt;<a name="line.743"></a>
+<span class="sourceLineNo">744</span>    * The URI context contains all the information about the URI of the request, such as the servlet URI, context<a name="line.744"></a>
+<span class="sourceLineNo">745</span>    * path, etc...<a name="line.745"></a>
+<span class="sourceLineNo">746</span>    *<a name="line.746"></a>
+<span class="sourceLineNo">747</span>    * @return The URI context of the request.<a name="line.747"></a>
+<span class="sourceLineNo">748</span>    */<a name="line.748"></a>
+<span class="sourceLineNo">749</span>   public UriContext getUriContext() {<a name="line.749"></a>
+<span class="sourceLineNo">750</span>      if (uriContext == null) {<a name="line.750"></a>
+<span class="sourceLineNo">751</span>         String scheme = getScheme();<a name="line.751"></a>
+<span class="sourceLineNo">752</span>         int port = getServerPort();<a name="line.752"></a>
+<span class="sourceLineNo">753</span>         StringBuilder authority = new StringBuilder(getScheme()).append("://").append(getServerName());<a name="line.753"></a>
+<span class="sourceLineNo">754</span>         if (! (port == 80 &amp;&amp; "http".equals(scheme) || port == 443 &amp;&amp; "https".equals(scheme)))<a name="line.754"></a>
+<span class="sourceLineNo">755</span>            authority.append(':').append(port);<a name="line.755"></a>
+<span class="sourceLineNo">756</span>         uriContext = new UriContext(authority.toString(), getContextPath(), getServletPath(), super.getPathInfo());<a name="line.756"></a>
+<span class="sourceLineNo">757</span>      }<a name="line.757"></a>
+<span class="sourceLineNo">758</span>      return uriContext;<a name="line.758"></a>
+<span class="sourceLineNo">759</span>   }<a name="line.759"></a>
+<span class="sourceLineNo">760</span><a name="line.760"></a>
+<span class="sourceLineNo">761</span>   /**<a name="line.761"></a>
+<span class="sourceLineNo">762</span>    * Returns a URI resolver that can be used to convert URIs to absolute or root-relative form.<a name="line.762"></a>
+<span class="sourceLineNo">763</span>    *<a name="line.763"></a>
+<span class="sourceLineNo">764</span>    * @param resolution The URI resolution rule.<a name="line.764"></a>
+<span class="sourceLineNo">765</span>    * @param relativity The relative URI relativity rule.<a name="line.765"></a>
+<span class="sourceLineNo">766</span>    * @return The URI resolver for this request.<a name="line.766"></a>
+<span class="sourceLineNo">767</span>    */<a name="line.767"></a>
+<span class="sourceLineNo">768</span>   public UriResolver getUriResolver(UriResolution resolution, UriRelativity relativity) {<a name="line.768"></a>
+<span class="sourceLineNo">769</span>      return new UriResolver(resolution, relativity, getUriContext());<a name="line.769"></a>
+<span class="sourceLineNo">770</span>   }<a name="line.770"></a>
+<span class="sourceLineNo">771</span><a name="line.771"></a>
+<span class="sourceLineNo">772</span>   /**<a name="line.772"></a>
+<span class="sourceLineNo">773</span>    * Shortcut for calling {@link #getUriResolver()} using {@link UriResolution#ROOT_RELATIVE} and<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    * {@link UriRelativity#RESOURCE}<a name="line.774"></a>
+<span class="sourceLineNo">775</span>    *<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    * @return The URI resolver for this request.<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    */<a name="line.777"></a>
+<span class="sourceLineNo">778</span>   public UriResolver getUriResolver() {<a name="line.778"></a>
+<span class="sourceLineNo">779</span>      return new UriResolver(UriResolution.ROOT_RELATIVE, UriRelativity.RESOURCE, getUriContext());<a name="line.779"></a>
+<span class="sourceLineNo">780</span>   }<a name="line.780"></a>
+<span class="sourceLineNo">781</span><a name="line.781"></a>
+<span class="sourceLineNo">782</span>   /**<a name="line.782"></a>
+<span class="sourceLineNo">783</span>    * Returns the URI for this request.<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    *<a name="line.784"></a>
+<span class="sourceLineNo">785</span>    * &lt;p&gt;<a name="line.785"></a>
+<span class="sourceLineNo">786</span>    * Similar to {@link #getRequestURI()} but returns the value as a {@link URI}.<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    * It also gives you the capability to override the query parameters (e.g. add new query parameters to the existing<a name="line.787"></a>
+<span class="sourceLineNo">788</span>    * URI).<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    *<a name="line.789"></a>
+<span class="sourceLineNo">790</span>    * @param includeQuery If &lt;jk&gt;true&lt;/jk&gt; include the query parameters on the request.<a name="line.790"></a>
+<span class="sourceLineNo">791</span>    * @param addQueryParams Augment the request URI with the specified query parameters.<a name="line.791"></a>
+<span class="sourceLineNo">792</span>    * @return A new URI.<a name="line.792"></a>
+<span class="sourceLineNo">793</span>    */<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   public URI getUri(boolean includeQuery, Map&lt;String,?&gt; addQueryParams) {<a name="line.794"></a>
+<span class="sourceLineNo">795</span>      String uri = getRequestURI();<a name="line.795"></a>
+<span class="sourceLineNo">796</span>      if (includeQuery || addQueryParams != null) {<a name="line.796"></a>
+<span class="sourceLineNo">797</span>         StringBuilder sb = new StringBuilder(uri);<a name="line.797"></a>
+<span class="sourceLineNo">798</span>         RequestQuery rq = this.queryParams.copy();<a name="line.798"></a>
+<span class="sourceLineNo">799</span>         if (addQueryParams != null)<a name="line.799"></a>
+<span class="sourceLineNo">800</span>            for (Map.Entry&lt;String,?&gt; e : addQueryParams.entrySet())<a name="line.800"></a>
+<span class="sourceLineNo">801</span>               rq.put(e.getKey(), e.getValue());<a name="line.801"></a>
+<span class="sourceLineNo">802</span>         if (! rq.isEmpty())<a name="line.802"></a>
+<span class="sourceLineNo">803</span>            sb.append('?').append(rq.toQueryString());<a name="line.803"></a>
+<span class="sourceLineNo">804</span>         uri = sb.toString();<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      }<a name="line.805"></a>
+<span class="sourceLineNo">806</span>      try {<a name="line.806"></a>
+<span class="sourceLineNo">807</span>         return new URI(uri);<a name="line.807"></a>
+<span class="sourceLineNo">808</span>      } catch (URISyntaxException e) {<a name="line.808"></a>
+<span class="sourceLineNo">809</span>         // Shouldn't happen.<a name="line.809"></a>
+<span class="sourceLineNo">810</span>         throw new RuntimeException(e);<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      }<a name="line.811"></a>
+<span class="sourceLineNo">812</span>   }<a name="line.812"></a>
+<span class="sourceLineNo">813</span><a name="line.813"></a>
+<span class="sourceLineNo">814</span>   //--------------------------------------------------------------------------------<a name="line.814"></a>
+<span class="sourceLineNo">815</span>   // Labels<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>   /**<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    * Returns the localized site name.<a name="line.819"></a>
+<span class="sourceLineNo">820</span>    *<a name="line.820"></a>
+<span class="sourceLineNo">821</span>    * &lt;p&gt;<a name="line.821"></a>
+<span class="sourceLineNo">822</span>    * The site name is intended to be a title that can be applied to the entire site.<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>    * 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.825"></a>
+<span class="sourceLineNo">826</span>    * common parent class like so:<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    * &lt;p class='bcode'&gt;<a name="line.827"></a>
+<span class="sourceLineNo">828</span>    *    htmldoc=&lt;ja&gt;@HtmlDoc&lt;/ja&gt;(<a name="line.828"></a>
+<span class="sourceLineNo">829</span>    *       header={<a name="line.829"></a>
+<span class="sourceLineNo">830</span>    *          &lt;js&gt;"&amp;lt;h1&amp;gt;$R{siteName}&amp;lt;/h1&amp;gt;"&lt;/js&gt;,<a name="line.830"></a>
+<span class="sourceLineNo">831</span>    *          &lt;js&gt;"&amp;lt;h2&amp;gt;$R{servletTitle}&amp;lt;/h2&amp;gt;"&lt;/js&gt;<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    *       }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>    *    )<a name="line.833"></a>
+<span class="sourceLineNo">834</span>    * &lt;/p&gt;<a name="line.834"></a>
+<span class="sourceLineNo">835</span>    *<a name="line.835"></a>
+<span class="sourceLineNo">836</span>    * &lt;p&gt;<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    * Equivalent to calling {@link RestInfoProvider#getSiteName(RestRequest)} with this object.<a name="line.837"></a>
+<span class="sourceLineNo">838</span>    *<a name="line.838"></a>
+<span class="sourceLineNo">839</span>    * @return The localized servlet label.<a name="line.839"></a>
+<span class="sourceLineNo">840</span>    */<a name="line.840"></a>
+<span class="sourceLineNo">841</span>   public String getSiteName() {<a name="line.841"></a>
+<span class="sourceLineNo">842</span>      return context.getInfoProvider().getSiteName(this);<a name="line.842"></a>
+<span class="sourceLineNo">843</span>   }<a name="line.843"></a>
+<span class="sourceLineNo">844</span><a name="line.844"></a>
+<span class="sourceLineNo">845</span>   /**<a name="line.845"></a>
+<span class="sourceLineNo">846</span>    * Returns the localized servlet title.<a name="line.846"></a>
+<span class="sourceLineNo">847</span>    *<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    * &lt;p&gt;<a name="line.848"></a>
+<span class="sourceLineNo">849</span>    * Equivalent to calling {@link RestInfoProvider#getTitle(RestRequest)} with this object.<a name="line.849"></a>
+<span class="sourceLineNo">850</span>    *<a name="line.850"></a>
+<span class="sourceLineNo">851</span>    * @return The localized servlet label.<a name="line.851"></a>
+<span class="sourceLineNo">852</span>    */<a name="line.852"></a>
+<span class="sourceLineNo">853</span>   public String getServletTitle() {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>      return context.getInfoProvider().getTitle(this);<a name="line.854"></a>
+<span class="sourceLineNo">855</span>   }<a name="line.855"></a>
+<span class="sourceLineNo">856</span><a name="line.856"></a>
+<span class="sourceLineNo">857</span>   /**<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    * Returns the localized servlet description.<a name="line.858"></a>
+<span class="sourceLineNo">859</span>    *<a name="line.859"></a>
+<span class="sourceLineNo">860</span>    * &lt;p&gt;<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    * Equivalent to calling {@link RestInfoProvider#getDescription(RestRequest)} with this object.<a name="line.861"></a>
+<span class="sourceLineNo">862</span>    *<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    * @return The localized servlet description.<a name="line.863"></a>
+<span class="sourceLineNo">864</span>    */<a name="line.864"></a>
+<span class="sourceLineNo">865</span>   public String getServletDescription() {<a name="line.865"></a>
+<span class="sourceLineNo">866</span>      return context.getInfoProvider().getDescription(this);<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 method summary.<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>    * Equivalent to calling {@link RestInfoProvider#getMethodSummary(String, RestRequest)} with this object.<a name="line.873"></a>
+<span class="sourceLineNo">874</span>    *<a name="line.874"></a>
+<span class="sourceLineNo">875</span>    * @return The localized method description.<a name="line.875"></a>
+<span class="sourceLineNo">876</span>    */<a name="line.876"></a>
+<span class="sourceLineNo">877</span>   public String getMethodSummary() {<a name="line.877"></a>
+<span class="sourceLineNo">878</span>      return context.getInfoProvider().getMethodSummary(javaMethod.getName(), this);<a name="line.878"></a>
+<span class="sourceLineNo">879</span>   }<a name="line.879"></a>
+<span class="sourceLineNo">880</span><a name="line.880"></a>
+<span class="sourceLineNo">881</span>   /**<a name="line.881"></a>
+<span class="sourceLineNo">882</span>    * Returns the localized method description.<a name="line.882"></a>
+<span class="sourceLineNo">883</span>    *<a name="line.883"></a>
+<span class="sourceLineNo">884</span>    * &lt;p&gt;<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    * Equivalent to calling {@link RestInfoProvider#getMethodDescription(String, RestRequest)} with this object.<a name="line.885"></a>
 <span class="sourceLineNo">886</span>    *<a name="line.886"></a>
-<span class="sourceLineNo">887</span>    * @return The value of the &lt;jk&gt;"stylesheet"&lt;/js&gt; parameter, or &lt;jk&gt;null&lt;/jk&gt; if it wasn't specified.<a name="line.887"></a>
+<span class="sourceLineNo">887</span>    * @return The localized method description.<a name="line.887"></a>
 <span class="sourceLineNo">888</span>    */<a name="line.888"></a>
-<span class="sourceLineNo">889</span>   protected String getStylesheet() {<a name="line.889"></a>
-<span class="sourceLineNo">890</span>      return stylesheet;<a name="line.890"></a>
+<span class="sourceLineNo">889</span>   public String getMethodDescription() {<a name="line.889"></a>
+<span class="sourceLineNo">890</span>      return context.getInfoProvider().getMethodDescription(javaMethod.getName(), this);<a name="line.890"></a>
 <span class="sourceLineNo">891</span>   }<a name="line.891"></a>
 <span class="sourceLineNo">892</span><a name="line.892"></a>
-<span class="sourceLineNo">893</span>   /**<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    * Returns the serializers associated with this request.<a name="line.894"></a>
-<span class="sourceLineNo">895</span>    *<a name="line.895"></a>
-<span class="sourceLineNo">896</span>    * @return The serializers associated with this request.<a name="line.896"></a>
-<span class="sourceLineNo">897</span>    */<a name="line.897"></a>
-<span class="sourceLineNo">898</span>   public SerializerGroup getSerializerGroup() {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>      return serializerGroup;<a name="line.899"></a>
-<span class="sourceLineNo">900</span>   }<a name="line.900"></a>
-<span class="sourceLineNo">901</span><a name="line.901"></a>
-<span class="sourceLineNo">902</span>   /**<a name="line.902"></a>
-<span class="sourceLineNo">903</span>    * Returns the parsers associated with this request.<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    *<a name="line.904"></a>
-<span class="sourceLineNo">905</span>    * @return The parsers associated with this request.<a name="line.905"></a>
-<span class="sourceLineNo">906</span>    */<a name="line.906"></a>
-<span class="sourceLineNo">907</span>   public ParserGroup getParserGroup() {<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      return parserGroup;<a name="line.908"></a>
-<span class="sourceLineNo">909</span>   }<a name="line.909"></a>
-<span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span><a name="line.911"></a>
-<span class="sourceLineNo">912</span>   /**<a name="line.912"></a>
-<span class="sourceLineNo">913</span>    * Returns the method of this request.<a name="line.913"></a>
-<span class="sourceLineNo">914</span>    *<a name="line.914"></a>
-<span class="sourceLineNo">915</span>    * &lt;p&gt;<a name="line.915"></a>
-<span class="sourceLineNo">916</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.916"></a>
-<span class="sourceLineNo">917</span>    * &lt;code&gt;&amp;amp;method=xxx&lt;/code&gt; in the URL query string.<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    */<a name="line.918"></a>
-<span class="sourceLineNo">919</span>   @Override /* ServletRequest */<a name="line.919"></a>
-<span class="sourceLineNo">920</span>   public String getMethod() {<a name="line.920"></a>
-<span class="sourceLineNo">921</span>      return method;<a name="line.921"></a>
+<span class="sourceLineNo">893</span>   //--------------------------------------------------------------------------------<a name="line.893"></a>
+<span class="sourceLineNo">894</span>   // Other methods<a name="line.894"></a>
+<span class="sourceLineNo">895</span>   //--------------------------------------------------------------------------------<a name="line.895"></a>
+<span class="sourceLineNo">896</span><a name="line.896"></a>
+<span class="sourceLineNo">897</span>   /**<a name="line.897"></a>
+<span class="sourceLineNo">898</span>    * Returns the value of the &lt;jk&gt;"stylesheet"&lt;/js&gt; parameter.<a name="line.898"></a>
+<span class="sourceLineNo">899</span>    *<a name="line.899"></a>
+<span class="sourceLineNo">900</span>    * @return The value of the &lt;jk&gt;"stylesheet"&lt;/js&gt; parameter, or &lt;jk&gt;null&lt;/jk&gt; if it wasn't specified.<a name="line.900"></a>
+<span class="sourceLineNo">901</span>    */<a name="line.901"></a>
+<span class="sourceLineNo">902</span>   protected String getStylesheet() {<a name="line.902"></a>
+<span class="sourceLineNo">903</span>      return stylesheet;<a name="line.903"></a>
+<span class="sourceLineNo">904</span>   }<a name="line.904"></a>
+<span class="sourceLineNo">905</span><a name="line.905"></a>
+<span class="sourceLineNo">906</span>   /**<a name="line.906"></a>
+<span class="sourceLineNo">907</span>    * Returns the serializers associated with this request.<a name="line.907"></a>
+<span class="sourceLineNo">908</span>    *<a name="line.908"></a>
+<span class="sourceLineNo">909</span>    * @return The serializers associated with this request.<a name="line.909"></a>
+<span class="sourceLineNo">910</span>    */<a name="line.910"></a>
+<span class="sourceLineNo">911</span>   public SerializerGroup getSerializerGroup() {<a name="line.911"></a>
+<span class="sourceLineNo">912</span>      return serializerGroup;<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>   /**<a name="line.915"></a>
+<span class="sourceLineNo">916</span>    * Returns the parsers associated with this request.<a name="line.916"></a>
+<span class="sourceLineNo">917</span>    *<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    * @return The parsers associated with this request.<a name="line.918"></a>
+<span class="sourceLineNo">919</span>    */<a name="line.919"></a>
+<span class="sourceLineNo">920</span>   public ParserGroup getParserGroup() {<a name="line.920"></a>
+<span class="sourceLineNo">921</span>      return parserGroup;<a name="line.921"></a>
 <span class="sourceLineNo">922</span>   }<a name="line.922"></a>
 <span class="sourceLineNo">923</span><a name="line.923"></a>
-<span class="sourceLineNo">924</span>   /**<a name="line.924"></a>
-<span class="sourceLineNo">925</span>    * Returns the HTTP 1.1 method name of the request as an enum.<a name="line.925"></a>
-<span class="sourceLineNo">926</span>    *<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    * &lt;p&gt;<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    * Note that non-RFC2616 method names resolve as {@link HttpMethod#OTHER}.<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    *<a name="line.929"></a>
-<span class="sourceLineNo">930</span>    * @return The HTTP method.<a name="line.930"></a>
+<span class="sourceLineNo">924</span><a name="line.924"></a>
+<span class="sourceLineNo">925</span>   /**<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    * Returns the method of this request.<a name="line.926"></a>
+<span class="sourceLineNo">927</span>    *<a name="line.927"></a>
+<span class="sourceLineNo">928</span>    * &lt;p&gt;<a name="line.928"></a>
+<span class="sourceLineNo">929</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.929"></a>
+<span class="sourceLineNo">930</span>    * &lt;code&gt;&amp;amp;method=xxx&lt;/code&gt; in the URL query string.<a name="line.930"></a>
 <span class="sourceLineNo">931</span>    */<a name="line.931"></a>
-<span class="sourceLineNo">932</span>   public HttpMethod getHttpMethod() {<a name="line.932"></a>
-<span class="sourceLineNo">933</span>      return HttpMethod.forString(method);<a name="line.933"></a>
-<span class="sourceLineNo">934</span>   }<a name="line.934"></a>
-<span class="sourceLineNo">935</span><a name="line.935"></a>
-<span class="sourceLineNo">936</span>   @Override /* ServletRequest */<a name="line.936"></a>
-<span class="sourceLineNo">937</span>   public int getContentLength() {<a name="line.937"></a>
-<span class="sourceLineNo">938</span>      return getBody().getContentLength();<a name="line.938"></a>
-<span class="sourceLineNo">939</span>   }<a name="line.939"></a>
-<span class="sourceLineNo">940</span><a name="line.940"></a>
-<span class="sourceLineNo">941</span>   int getRawContentLength() {<a name="line.941"></a>
-<span class="sourceLineNo">942</span>      return super.getContentLength();<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>    * 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.946"></a>
-<span class="sourceLineNo">947</span>    *<a name="line.947"></a>
-<span class="sourceLineNo">948</span>    * &lt;p&gt;<a name="line.948"></a>
-<span class="sourceLineNo">949</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.949"></a>
-<span class="sourceLineNo">950</span>    * to make it easy to render in a browser.<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    *<a name="line.951"></a>
-<span class="sourceLineNo">952</span>    * &lt;p&gt;<a name="line.952"></a>
-<span class="sourceLineNo">953</span>    * This feature is useful for debugging.<a name="line.953"></a>
-<span class="sourceLineNo">954</span>    *<a name="line.954"></a>
-<span class="sourceLineNo">955</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if {@code &amp;amp;plainText=true} was specified as a URL parameter<a name="line.955"></a>
-<span class="sourceLineNo">956</span>    */<a name="line.956"></a>
-<span class="sourceLineNo">957</span>   public boolean isPlainText() {<a name="line.957"></a>
-<span class="sourceLineNo">958</span>      return "true".equals(getQuery().getString("plainText", "false"));<a name="line.958"></a>
-<span class="sourceLineNo">959</span>   }<a name="line.959"></a>
-<span class="sourceLineNo">960</span><a name="line.960"></a>
-<span class="sourceLineNo">961</span>   /**<a name="line.961"></a>
-<span class="sourceLineNo">962</span>    * Shortcut method for calling {@link MessageBundle#getString(Locale, String, Object...)} based on the request locale.<a name="line.962"></a>
-<span class="sourceLineNo">963</span>    *<a name="line.963"></a>
-<span class="sourceLineNo">964</span>    * @param key The message key.<a name="line.964"></a>
-<span class="sourceLineNo">965</span>    * @param args Optional {@link MessageFormat}-style arguments.<a name="line.965"></a>
-<span class="sourceLineNo">966</span>    * @return The localized message.<a name="line.966"></a>
-<span class="sourceLineNo">967</span>    */<a name="line.967"></a>
-<span class="sourceLineNo">968</span>   public String getMessage(String key, Object...args) {<a name="line.968"></a>
-<span class="sourceLineNo">969</span>      return context.getMessages().getString(getLocale(), key, args);<a name="line.969"></a>
-<span class="sourceLineNo">970</span>   }<a name="line.970"></a>
-<span class="sourceLineNo">971</span><a name="line.971"></a>
-<span class="sourceLineNo">972</span>   /**<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    * Returns the resource bundle for the request locale.<a name="line.973"></a>
-<span class="sourceLineNo">974</span>    *<a name="line.974"></a>
-<span class="sourceLineNo">975</span>    * @return The resource bundle.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.975"></a>
-<span class="sourceLineNo">976</span>    */<a name="line.976"></a>
-<span class="sourceLineNo">977</span>   public MessageBundle getResourceBundle() {<a name="line.977"></a>
-<span class="sourceLineNo">978</span>      return context.getMessages().getBundle(getLocale());<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>    * Returns the servlet handling the request.<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    *<a name="line.983"></a>
-<span class="sourceLineNo">984</span>    * &lt;p&gt;<a name="line.984"></a>
-<span class="sourceLineNo">985</span>    * Can be used to access servlet-init parameters or annotations during requests, such as in calls to<a name="line.985"></a>
-<span class="sourceLineNo">986</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}..<a name="line.986"></a>
+<span class="sourceLineNo">932</span>   @Override /* ServletRequest */<a name="line.932"></a>
+<span class="sourceLineNo">933</span>   public String getMethod() {<a name="line.933"></a>
+<span class="sourceLineNo">934</span>      return method;<a name="line.934"></a>
+<span class="sourceLineNo">935</span>   }<a name="line.935"></a>
+<span class="sourceLineNo">936</span><a name="line.936"></a>
+<span class="sourceLineNo">937</span>   /**<a name="line.937"></a>
+<span class="sourceLineNo">938</span>    * Returns the HTTP 1.1 method name of the request as an enum.<a name="line.938"></a>
+<span class="sourceLineNo">939</span>    *<a name="line.939"></a>
+<span class="sourceLineNo">940</span>    * &lt;p&gt;<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    * Note that non-RFC2616 method names resolve as {@link HttpMethod#OTHER}.<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    *<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    * @return The HTTP method.<a name="line.943"></a>
+<span class="sourceLineNo">944</span>    */<a name="line.944"></a>
+<span class="sourceLineNo">945</span>   public HttpMethod getHttpMethod() {<a name="line.945"></a>
+<span class="sourceLineNo">946</span>      return HttpMethod.forString(method);<a name="line.946"></a>
+<span class="sourceLineNo">947</span>   }<a name="line.947"></a>
+<span class="sourceLineNo">948</span><a name="line.948"></a>
+<span class="sourceLineNo">949</span>   @Override /* ServletRequest */<a name="line.949"></a>
+<span class="sourceLineNo">950</span>   public int getContentLength() {<a name="line.950"></a>
+<span class="sourceLineNo">951</span>      return getBody().getContentLength();<a name="line.951"></a>
+<span class="sourceLineNo">952</span>   }<a name="line.952"></a>
+<span class="sourceLineNo">953</span><a name="line.953"></a>
+<span class="sourceLineNo">954</span>   int getRawContentLength() {<a name="line.954"></a>
+<span class="sourceLineNo">955</span>      return super.getContentLength();<a name="line.955"></a>
+<span class="sourceLineNo">956</span>   }<a name="line.956"></a>
+<span class="sourceLineNo">957</span><a name="line.957"></a>
+<span class="sourceLineNo">958</span>   /**<a name="line.958"></a>
+<span class="sourceLineNo">959</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.959"></a>
+<span class="sourceLineNo">960</span>    *<a name="line.960"></a>
+<span class="sourceLineNo">961</span>    * &lt;p&gt;<a name="line.961"></a>
+<span class="sourceLineNo">962</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.962"></a>
+<span class="sourceLineNo">963</span>    * to make it easy to render in a browser.<a name="line.963"></a>
+<span class="sourceLineNo">964</span>    *<a name="line.964"></a>
+<span class="sourceLineNo">965</span>    * &lt;p&gt;<a name="line.965"></a>
+<span class="sourceLineNo">966</span>    * This feature is useful for debugging.<a name="line.966"></a>
+<span class="sourceLineNo">967</span>    *<a name="line.967"></a>
+<span class="sourceLineNo">968</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if {@code &amp;amp;plainText=true} was specified as a URL parameter<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    */<a name="line.969"></a>
+<span class="sourceLineNo">970</span>   public boolean isPlainText() {<a name="line.970"></a>
+<span class="sourceLineNo">971</span>      return "true".equals(getQuery().getString("plainText", "false"));<a name="line.971"></a>
+<span class="sourceLineNo">972</span>   }<a name="line.972"></a>
+<span class="sourceLineNo">973</span><a name="line.973"></a>
+<span class="sourceLineNo">974</span>   /**<a name="line.974"></a>
+<span class="sourceLineNo">975</span>    * Shortcut method for calling {@link MessageBundle#getString(Locale, String, Object...)} based on the request locale.<a name="line.975"></a>
+<span class="sourceLineNo">976</span>    *<a name="line.976"></a>
+<span class="sourceLineNo">977</span>    * @param key The message key.<a name="line.977"></a>
+<span class="sourceLineNo">978</span>    * @param args Optional {@link MessageFormat}-style arguments.<a name="line.978"></a>
+<span class="sourceLineNo">979</span>    * @return The localized message.<a name="line.979"></a>
+<span class="sourceLineNo">980</span>    */<a name="line.980"></a>
+<span class="sourceLineNo">981</span>   public String getMessage(String key, Object...args) {<a name="line.981"></a>
+<span class="sourceLineNo">982</span>      return context.getMessages().getString(getLocale(), key, args);<a name="line.982"></a>
+<span class="sourceLineNo">983</span>   }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span>   /**<a name="line.985"></a>
+<span class="sourceLineNo">986</span>    * Returns the resource bundle for the request locale.<a name="line.986"></a>
 <span class="sourceLineNo">987</span>    *<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    * @return The servlet handling the request.<a name="line.988"></a>
+<span class="sourceLineNo">988</span>    * @return The resource bundle.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.988"></a>
 <span class="sourceLineNo">989</span>    */<a name="line.989"></a>
-<span class="sourceLineNo">990</span>   public RestContext getContext() {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      return context;<a name="line.991"></a>
+<span class="sourceLineNo">990</span>   public MessageBundle getResourceBundle() {<a name="line.990"></a>
+<span class="sourceLineNo">991</span>      return context.getMessages().getBundle(getLocale());<a name="line.991"></a>
 <span class="sourceLineNo">992</span>   }<a name="line.992"></a>
 <span class="sourceLineNo">993</span><a name="line.993"></a>
 <span class="sourceLineNo">994</span>   /**<a name="line.994"></a>
-<span class="sourceLineNo">995</span>    * Returns the java method handling the request.<a name="line.995"></a>
+<span class="sourceLineNo">995</span>    * Returns the servlet handling the request.<a name="line.995"></a>
 <span class="sourceLineNo">996</span>    *<a name="line.996"></a>
 <span class="sourceLineNo">997</span>    * &lt;p&gt;<a name="line.997"></a>
-<span class="sourceLineNo">998</span>    * Can be used to access the method name or method annotations during requests, such as in calls to<a name="line.998"></a>
-<span class="sourceLineNo">999</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}.<a name="line.999"></a>
+<span class="sourceLineNo">998</span>    * Can be used to access servlet-init parameters or annotations during requests, such as in calls to<a name="line.998"></a>
+<span class="sourceLineNo">999</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}..<a name="line.999"></a>
 <span class="sourceLineNo">1000</span>    *<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>    * &lt;ul&gt;<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>    *    &lt;li&gt;This returns null when evaluating servlet-level guards since the method has not been resolved at that<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    *       point of execution.<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    * &lt;/ul&gt;<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>    *<a name="line.1006"></a>
-<span class="sourceLineNo">1007</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.1007"></a>
-<span class="sourceLineNo">1008</span>    */<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>   public Method getJavaMethod() {<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>      return javaMethod;<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>   }<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span><a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>   /**<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>    * Returns the {@link BeanSession} associated with this request.<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>    *<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>    * @return The request bean session.<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>    */<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span>   public BeanSession getBeanSession() {<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>      return beanSession;<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 variable resolver session for this request using session objects created by<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>    * {@link RestCallHandler#getSessionObjects(RestRequest)}.<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>    *<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>    * &lt;p&gt;<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>    * See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1027"></a>
+<span class="sourceLineNo">1001</span>    * @return The servlet handling the request.<a name="line.1001"></a>
+<span class="sourceLineNo">1002</span>    */<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span>   public RestContext getContext() {<a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>      return context;<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>   }<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span><a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>   /**<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    * Returns the java method handling the request.<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span>    *<a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>    * &lt;p&gt;<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>    * Can be used to access the method name or method annotations during requests, such as in calls to<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>    * {@link RestGuard#guard(RestRequest, RestResponse)}.<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span>    *<a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>    * &lt;h5 class='section'&gt;Notes:&lt;/h5&gt;<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span>    * &lt;ul&gt;<a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>    *    &lt;li&gt;This returns null when evaluating servlet-level guards since the method has not been resolved at that<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>    *       point of execution.<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>    * &lt;/ul&gt;<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>    *<a name="line.1019"></a>
+<span class="sourceLineNo">1020</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.1020"></a>
+<span class="sourceLineNo">1021</span>    */<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>   public Method getJavaMethod() {<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>      return javaMethod;<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>   }<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span><a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>   /**<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span>    * Returns the {@link BeanSession} associated with this request.<a name="line.1027"></a>
 <span class="sourceLineNo">1028</span>    *<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>    * @return The variable resolver for this request.<a name="line.1029"></a>
+<span class="sourceLineNo">1029</span>    * @return The request bean session.<a name="line.1029"></a>
 <span class="sourceLineNo">1030</span>    */<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span>   public VarResolverSession getVarResolverSession() {<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>      if (varSession == null)<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>         varSession = context.getVarResolver().createSession(context.getCallHandler().getSessionObjects(this));<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span>      return varSession;<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>    * Shortcut for calling &lt;code&gt;getVarResolverSession().resolve(input)&lt;/code&gt;.<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span>    *<a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>    * @param input The input string to resolve variables in.<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>    * @return The string with variables resolved, or &lt;jk&gt;null&lt;/jk&gt; if input is null.<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    */<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>   public String resolveVars(String input) {<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>      return getVarResolverSession().resolve(input);<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>   }<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span><a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>   /**<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>    * Returns an instance of a {@link ReaderResource} that represents the contents of a resource text file from the<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>    * classpath.<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span>    *<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>    * @param resolveVars<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter} variables will be<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>    * @param mediaType The value to set as the &lt;js&gt;"Content-Type"&lt;/js&gt; header for this object.<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span>    * @throws IOException<a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>    */<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>   public ReaderResource getReaderResource(String name, boolean resolveVars, MediaType mediaType) throws IOException {<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>      String s = context.getResourceAsString(name, getLocale());<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>      if (s == null)<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>         return null;<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>      ReaderResource.Builder b = new ReaderResource.Builder().mediaType(mediaType).contents(s);<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>      if (resolveVars)<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>         b.varResolver(getVarResolverSession());<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span>      return b.build();<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>   }<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span><a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>   /**<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>    * Same as {@link #getReaderResource(String, boolean, MediaType)} except uses the resource mime-type map<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>    * constructed using {@link RestConfig#addMimeTypes(String...)} to determine the media type.<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>    *<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>    * @param resolveVars<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter} variables will be<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>    * @throws IOException<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>    */<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span>   public ReaderResource getReaderResource(String name, boolean resolveVars) throws IOException {<a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>      return getReaderResource(name, resolveVars, MediaType.forString(context.getMediaTypeForName(name)));<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>   /**<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span>    * Same as {@link #getReaderResource(String, boolean)} with &lt;code&gt;resolveVars == &lt;jk&gt;false&lt;/jk&gt;&lt;/code&gt;<a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>    *<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>    * @throws IOException<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span>    */<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>   public ReaderResource getReaderResource(String name) throws IOException {<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>      return getReaderResource(name, false, MediaType.forString(context.getMediaTypeForName(name)));<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>   }<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span><a name="line.1096"></a>
-<span class="sourceLineNo">1097</span>   /**<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>    * Returns the config file associated with the servlet.<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>    *<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>    * @return<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>    *    The config file associated with the servlet, or &lt;jk&gt;null&lt;/jk&gt; if servlet does not have a config file<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>    *    associated with it.<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>    */<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span>   public ConfigFile getConfigFile() {<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>      if (cf == null)<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>         cf = context.getConfigFile().getResolving(getVarResolverSession());<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>      return cf;<a name="line.1107"></a>
+<span class="sourceLineNo">1031</span>   public BeanSession getBeanSession() {<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>      return beanSession;<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>   }<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>    * Returns the variable resolver session for this request using session objects created by<a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>    * {@link RestCallHandler#getSessionObjects(RestRequest)}.<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>    *<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>    * &lt;p&gt;<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>    * See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>    *<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>    * @return The variable resolver for this request.<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>    */<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>   public VarResolverSession getVarResolverSession() {<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span>      if (varSession == null)<a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>         varSession = context.getVarResolver().createSession(context.getCallHandler().getSessionObjects(this));<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>      return varSession;<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">1050</span>   /**<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span>    * Shortcut for calling &lt;code&gt;getVarResolverSession().resolve(input)&lt;/code&gt;.<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>    *<a name="line.1052"></a>
+<span class="sourceLineNo">1053</span>    * @param input The input string to resolve variables in.<a name="line.1053"></a>
+<span class="sourceLineNo">1054</span>    * @return The string with variables resolved, or &lt;jk&gt;null&lt;/jk&gt; if input is null.<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>    */<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>   public String resolveVars(String input) {<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>      return getVarResolverSession().resolve(input);<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>   }<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span><a name="line.1059"></a>
+<span class="sourceLineNo">1060</span>   /**<a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>    * Returns an instance of a {@link ReaderResource} that represents the contents of a resource text file from the<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span>    * classpath.<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>    *<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    * @param resolveVars<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter} variables will be<a name="line.1066"></a>
+<span class="sourceLineNo">1067</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1067"></a>
+<span class="sourceLineNo">1068</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>    * @param mediaType The value to set as the &lt;js&gt;"Content-Type"&lt;/js&gt; header for this object.<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>    * @throws IOException<a name="line.1071"></a>
+<span class="sourceLineNo">1072</span>    */<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span>   public ReaderResource getReaderResource(String name, boolean resolveVars, MediaType mediaType) throws IOException {<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>      String s = context.getResourceAsString(name, getLocale());<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>      if (s == null)<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span>         return null;<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>      ReaderResource.Builder b = new ReaderResource.Builder().mediaType(mediaType).contents(s);<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>      if (resolveVars)<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>         b.varResolver(getVarResolverSession());<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>      return b.build();<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span>   }<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>    * Same as {@link #getReaderResource(String, boolean, MediaType)} except uses the resource mime-type map<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>    * constructed using {@link RestConfig#addMimeTypes(String...)} to determine the media type.<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span>    *<a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>    * @param resolveVars<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>    *    If &lt;jk&gt;true&lt;/jk&gt;, any {@link org.apache.juneau.rest.annotation.Parameter} variables will be<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>    *    resolved by the variable resolver returned by {@link #getVarResolverSession()}.<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span>    *    &lt;br&gt;See {@link RestContext#getVarResolver()} for the list of supported variables.<a name="line.1091"></a>
+<span class="sourceLineNo">1092</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>    * @throws IOException<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>    */<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>   public ReaderResource getReaderResource(String name, boolean resolveVars) throws IOException {<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span>      return getReaderResource(name, resolveVars, MediaType.forString(context.getMediaTypeForName(name)));<a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>   }<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>    * Same as {@link #getReaderResource(String, boolean)} with &lt;code&gt;resolveVars == &lt;jk&gt;false&lt;/jk&gt;&lt;/code&gt;<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span>    *<a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>    * @param name The name of the resource (i.e. the value normally passed to {@link Class#getResourceAsStream(String)}.<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>    * @return A new reader resource, or &lt;jk&gt;null&lt;/jk&gt; if resource could not be found.<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>    * @throws IOException<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>    */<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span>   public ReaderResource getReaderResource(String name) throws IOException {<a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>      return getReaderResource(name, false, MediaType.forString(context.getMediaTypeForName(name)));<a name="line.1107"></a>
 <span class="sourceLineNo">1108</span>   }<a name="line.1108"></a>
 <span class="sourceLineNo">1109</span><a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>   /**<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>    * Returns the localized swagger associated with the servlet.<a name="line.1111"></a>
+<span class="sourceLineNo">1111</span>    * Returns the config file associated with the servlet.<a name="line.1111"></a>
 <span class="sourceLineNo">1112</span>    *<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>    * @return<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>    *    The swagger associated with the servlet.<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1115"></a>
+<span class="sourceLineNo">1114</span>    *    The config file associated with the servlet, or &lt;jk&gt;null&lt;/jk&gt; if servlet does not have a config file<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>    *    associated with it.<a name="line.1115"></a>
 <span class="sourceLineNo">1116</span>    */<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>   public Swagger getSwagger() {<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>      if (swagger == null)<a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>         swagger = context.getInfoProvider().getSwagger(this);<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>      return swagger;<a name="line.1120"></a>
+<span class="sourceLineNo">1117</span>   public ConfigFile getConfigFile() {<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>      if (cf == null)<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>         cf = context.getConfigFile().getResolving(getVarResolverSession());<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>      return cf;<a name="line.1120"></a>
 <span class="sourceLineNo">1121</span>   }<a name="line.1121"></a>
 <span class="sourceLineNo">1122</span><a name="line.1122"></a>
 <span class="sourceLineNo">1123</span>   /**<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span>    * Returns the widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1124"></a>
+<span class="sourceLineNo">1124</span>    * Returns the localized swagger associated with the servlet.<a name="line.1124"></a>
 <span class="sourceLineNo">1125</span>    *<a name="line.1125"></a>
 <span class="sourceLineNo">1126</span>    * @return<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span>    *    The widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1127"></a>
+<span class="sourceLineNo">1127</span>    *    The swagger associated with the servlet.<a name="line.1127"></a>
 <span class="sourceLineNo">1128</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1128"></a>
 <span class="sourceLineNo">1129</span>    */<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span>   public Map&lt;String,Widget&gt; getWidgets() {<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span>      return widgets;<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>   }<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span><a name="line.1133"></a>
-<span class="sourceLineNo">1134</span>   /**<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span>    * Returns the localized Swagger from the file system.<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span>    *<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span>    * &lt;p&gt;<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span>    * Looks for a file called &lt;js&gt;"{ServletClass}_{locale}.json"&lt;/js&gt; in the same package as this servlet and returns<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span>    * it as a parsed {@link Swagger} object.<a name="line.1139"></a>
-<span class="sourceLineNo">1140</span>    *<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span>    * &lt;p&gt;<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span>    * Returned objects are cached for later quick-lookup.<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span>    *<a name="line.1143"></a>
-<span class="sourceLineNo">1144</span>    * @return The parsed swagger object, or &lt;jk&gt;null&lt;/jk&gt; if the swagger file could not be found.<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span>    */<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span>   protected Swagger getSwaggerFromFile() {<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span>      if (fileSwagger == null)<a name="line.1147"></a>
-<span class="sourceLineNo">1148</span>         fileSwagger = context.getInfoProvider().getSwaggerFromFile(this.getLocale());<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>      if (fileSwagger == null)<a name="line.1149"></a>
-<span class="sourceLineNo">1150</span>         fileSwagger = Swagger.NULL;<a name="line.1150"></a>
-<span class="sourceLineNo">1151</span>      return fileSwagger == Swagger.NULL ? null : fileSwagger;<a name="line.1151"></a>
-<span class="sourceLineNo">1152</span>   }<a name="line.1152"></a>
-<span class="sourceLineNo">1153</span><a name="line.1153"></a>
-<span class="sourceLineNo">1154</span>   @Override /* Object */<a name="line.1154"></a>
-<span class="sourceLineNo">1155</span>   public String toString() {<a name="line.1155"></a>
-<span class="sourceLineNo">1156</span>      StringBuilder sb = new StringBuilder("\n").append(getDescription()).append("\n");<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span>      sb.append("---Headers---\n");<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span>      for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span>         String h = e.nextElement();<a name="line.1159"></a>
-<span class="sourceLineNo">1160</span>         sb.append("\t").append(h).append(": ").append(getHeader(h)).append("\n");<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span>      }<a name="line.1161"></a>
-<span class="sourceLineNo">1162</span>      sb.append("---Default Servlet Headers---\n");<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span>      for (Map.Entry&lt;String,String&gt; e : context.getDefaultRequestHeaders().entrySet()) {<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span>         sb.append("\t").append(e.getKey()).append(": ").append(e.getValue()).append("\n");<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span>      }<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span>      if (javaMethod == null) {<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span>         sb.append("***init() not called yet!***\n");<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span>      } else if (method.equals("PUT") || method.equals("POST")) {<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span>         try {<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span>            sb.append("---Body UTF-8---\n");<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span>            sb.append(body.asString()).append("\n");<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span>            sb.append("---Body Hex---\n");<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span>            sb.append(body.asHex()).append("\n");<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span>         } catch (Exception e1) {<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span>            sb.append(e1.getLocalizedMessage());<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span>            context.getLogger().log(WARNING, e1, "Error occurred while trying to read debug input.");<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span>         }<a name="line.1177"></a>
+<span class="sourceLineNo">1130</span>   public Swagger getSwagger() {<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>      if (swagger == null)<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span>         swagger = context.getInfoProvider().getSwagger(this);<a name="line.1132"></a>
+<span class="sourceLineNo">1133</span>      return swagger;<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>   }<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>    * Returns the widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>    *<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span>    * @return<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span>    *    The widgets used for resolving &lt;js&gt;"$W{...}"&lt;/js&gt; string variables.<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>    */<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span>   public Map&lt;String,Widget&gt; getWidgets() {<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span>      return widgets;<a name="line.1144"></a>
+<span class="sourceLineNo">1145</span>   }<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>    * Returns the localized Swagger from the file system.<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span>    *<a name="line.1149"></a>
+<span class="sourceLineNo">1150</span>    * &lt;p&gt;<a name="line.1150"></a>
+<span class="sourceLineNo">1151</span>    * Looks for a file called &lt;js&gt;"{ServletClass}_{locale}.json"&lt;/js&gt; in the same package as this servlet and returns<a name="line.1151"></a>
+<span class="sourceLineNo">1152</span>    * it as a parsed {@link Swagger} object.<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span>    *<a name="line.1153"></a>
+<span class="sourceLineNo">1154</span>    * &lt;p&gt;<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span>    * Returned objects are cached for later quick-lookup.<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span>    *<a name="line.1156"></a>
+<span class="sourceLineNo">1157</span>    * @return The parsed swagger object, or &lt;jk&gt;null&lt;/jk&gt; if the swagger file could not be found.<a name="line.1157"></a>
+<span class="sourceLineNo">1158</span>    */<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span>   protected Swagger getSwaggerFromFile() {<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span>      if (fileSwagger == null)<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span>         fileSwagger = context.getInfoProvider().getSwaggerFromFile(this.getLocale());<a name="line.1161"></a>
+<span class="sourceLineNo">1162</span>      if (fileSwagger == null)<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span>         fileSwagger = Swagger.NULL;<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span>      return fileSwagger == Swagger.NULL ? null : fileSwagger;<a name="line.1164"></a>
+<span class="sourceLineNo">1165</span>   }<a name="line.1165"></a>
+<span class="sourceLineNo">1166</span><a name="line.1166"></a>
+<span class="sourceLineNo">1167</span>   @Override /* Object */<a name="line.1167"></a>
+<span class="sourceLineNo">1168</span>   public String toString() {<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span>      StringBuilder sb = new StringBuilder("\n").append(getDescription()).append("\n");<a name="line.1169"></a>
+<span class="sourceLineNo">1170</span>      sb.append("---Headers---\n");<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span>      for (Enumeration&lt;String&gt; e = getHeaderNames(); e.hasMoreElements();) {<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span>         String h = e.nextElement();<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span>         sb.append("\t").append(h).append(": ").append(getHeader(h)).append("\n");<a name="line.1173"></a>
+<span class="sourceLineNo">1174</span>      }<a name="line.1174"></a>
+<span class="sourceLineNo">1175</span>      sb.append("---Default Servlet Headers---\n");<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span>      for (Map.Entry&lt;String,String&gt; e : context.getDefaultRequestHeaders().entrySet()) {<a name="line.1176"></a>
+<span class="sourceLineNo">1177</span>         sb.append("\t").append(e.getKey()).append(": ").append(e.getValue()).append("\n");<a name="line.1177"></a>
 <span class="sourceLineNo">1178</span>      }<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span>      return sb.toString();<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>   //--------------------------------------------------------------------------------<a name="line.1183"></a>
-<span class="sourceLineNo">1184</span>   // Utility methods<a name="line.1184"></a>
-<span class="sourceLineNo">1185</span>   //--------------------------------------------------------------------------------<a name="line.1185"></a>
-<span class="sourceLineNo">1186</span><a name="line.1186"></a>
-<span class="sourceLineNo">1187</span>   /*<a name="line.1187"></a>
-<span class="sourceLineNo">1188</span>    * Converts an Accept-Language value entry to a Locale.<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span>    */<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span>   private static Locale toLocale(String lang) {<a name="line.1190"></a>
-<span class="sourceLineNo">1191</span>      String country = "";<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span>      int i = lang.indexOf('-');<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span>      if (i &gt; -1) {<a name="line.1193"></a>
-<span class="sourceLineNo">1194</span>         country = lang.substring(i+1).trim();<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span>         lang = lang.substring(0,i).trim();<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span>      }<a name="line.1196"></a>
-<span class="sourceLineNo">1197</span>      return new Locale(lang, country);<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span>   }<a name="line.1198"></a>
+<span class="sourceLineNo">1179</span>      if (javaMethod == null) {<a name="lin

<TRUNCATED>