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/05/08 15:32:34 UTC
[04/51] [partial] incubator-juneau-website git commit: Support for
passing in more class types to REST methods.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/f1f17bc3/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 16b04fe..1c3df04 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
@@ -39,2064 +39,1129 @@
<span class="sourceLineNo">031</span>import org.apache.juneau.*;<a name="line.31"></a>
<span class="sourceLineNo">032</span>import org.apache.juneau.dto.swagger.*;<a name="line.32"></a>
<span class="sourceLineNo">033</span>import org.apache.juneau.encoders.*;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.juneau.encoders.Encoder;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.juneau.http.*;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.juneau.ini.*;<a name="line.36"></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.parser.ParseException;<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.urlencoding.*;<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">034</span>import org.apache.juneau.http.*;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.juneau.ini.*;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.juneau.internal.*;<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.serializer.*;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.juneau.svl.*;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.juneau.uon.*;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.juneau.urlencoding.*;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.juneau.utils.*;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>/**<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * Represents an HTTP request for a REST resource.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Equivalent to {@link HttpServletRequest} except with some additional convenience methods.<a name="line.47"></a>
<span class="sourceLineNo">048</span> * <p><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> * <p><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * For reference, given the URL <js>"http://localhost:9080/contextRoot/servletPath/foo?bar=baz#qux"</js>, the<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * following methods return the following values....<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <table class='styled'><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * <tr><th>Method</th><th>Value</th></tr><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <tr><td>{@code getContextPath()}</td><td>{@code /contextRoot}</td></tr><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <tr><td>{@code getPathInfo()}</td><td>{@code /foo}</td></tr><a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <tr><td>{@code getPathTranslated()}</td><td>{@code path-to-deployed-war-on-filesystem/foo}</td></tr><a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <tr><td>{@code getQueryString()}</td><td>{@code bar=baz}</td></tr><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <tr><td>{@code getRequestURI()}</td><td>{@code /contextRoot/servletPath/foo}</td></tr><a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <tr><td>{@code getRequestURL()}</td><td>{@code http://localhost:9080/contextRoot/servletPath/foo}</td></tr><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <tr><td>{@code getServletPath()}</td><td>{@code /servletPath}</td></tr><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * </table><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>@SuppressWarnings("unchecked")<a name="line.66"></a>
-<span class="sourceLineNo">067</span>public final class RestRequest extends HttpServletRequestWrapper {<a name="line.67"></a>
+<span class="sourceLineNo">049</span> * For reference, given the URL <js>"http://localhost:9080/contextRoot/servletPath/foo?bar=baz#qux"</js>, the<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * following methods return the following values....<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <table class='styled'><a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <tr><th>Method</th><th>Value</th></tr><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <tr><td>{@code getContextPath()}</td><td>{@code /contextRoot}</td></tr><a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <tr><td>{@code getPathInfo()}</td><td>{@code /foo}</td></tr><a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <tr><td>{@code getPathTranslated()}</td><td>{@code path-to-deployed-war-on-filesystem/foo}</td></tr><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <tr><td>{@code getQueryString()}</td><td>{@code bar=baz}</td></tr><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <tr><td>{@code getRequestURI()}</td><td>{@code /contextRoot/servletPath/foo}</td></tr><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <tr><td>{@code getRequestURL()}</td><td>{@code http://localhost:9080/contextRoot/servletPath/foo}</td></tr><a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <tr><td>{@code getServletPath()}</td><td>{@code /servletPath}</td></tr><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * </table><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <p><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this class.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>@SuppressWarnings("unchecked")<a name="line.64"></a>
+<span class="sourceLineNo">065</span>public final class RestRequest extends HttpServletRequestWrapper {<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> private final RestContext context;<a name="line.67"></a>
<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> private final RestContext context;<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> private final String method;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private String pathRemainder;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private byte[] body;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private Method javaMethod;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private ObjectMap properties;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> private SerializerGroup serializerGroup;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private ParserGroup parserGroup;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private EncoderGroup encoders;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private Encoder encoder;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private int contentLength;<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 UrlEncodingParser urlEncodingParser; // The parser used to parse URL attributes and parameters (beanContext also used to parse headers)<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private BeanSession beanSession;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private VarResolverSession varSession;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> private final Map<String,String[]> queryParams;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> private Map<String,String> formData;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> private final Map<String,String> defaultServletHeaders;<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private Map<String,String> defaultMethodHeaders, overriddenHeaders, overriddenQueryParams, overriddenFormDataParams, pathParameters;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> private boolean isPost;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> private String servletURI, relativeServletURI;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> private String charset, defaultCharset;<a name="line.91"></a>
-<span class="sourceLineNo">092</span> private ObjectMap headers;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> private ConfigFile cf;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> private Swagger swagger, fileSwagger;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> private String pageTitle, pageText, pageLinks;<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Constructor.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> super(req);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> this.context = context;<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> try {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (isPost)<a name="line.109"></a>
-<span class="sourceLineNo">110</span> queryParams = context.getUrlEncodingParser().parseIntoSimpleMap(getQueryString());<a name="line.110"></a>
-<span class="sourceLineNo">111</span> else {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> queryParams = req.getParameterMap();<a name="line.112"></a>
-<span class="sourceLineNo">113</span> }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> // Get the HTTP method.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> // Can be overridden through a "method" GET attribute.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> String _method = super.getMethod();<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> String m = getQueryParameter("method");<a name="line.119"></a>
-<span class="sourceLineNo">120</span> if (context.allowMethodParam(m))<a name="line.120"></a>
-<span class="sourceLineNo">121</span> _method = m;<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> method = _method;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> if (context.isAllowBodyParam()) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> String b = getQueryParameter("body");<a name="line.126"></a>
-<span class="sourceLineNo">127</span> if (b != null) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> setHeader("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.128"></a>
-<span class="sourceLineNo">129</span> this.body = b.getBytes(IOUtils.UTF8);<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><a name="line.132"></a>
-<span class="sourceLineNo">133</span> defaultServletHeaders = context.getDefaultRequestHeaders();<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> debug = "true".equals(getQueryParameter("debug", "false")) || "true".equals(getHeader("Debug", "false"));<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> } catch (RestException e) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> throw e;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> } catch (Exception e) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> throw new ServletException(e);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> /*<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> */<a name="line.146"></a>
-<span class="sourceLineNo">147</span> @SuppressWarnings("hiding")<a name="line.147"></a>
-<span class="sourceLineNo">148</span> final void init(Method javaMethod, String pathRemainder, ObjectMap properties, Map<String,String> mDefaultRequestHeaders, String defaultCharset, SerializerGroup mSerializers, ParserGroup mParsers, UrlEncodingParser mUrlEncodingParser, EncoderGroup encoders, String pageTitle, String pageText, String pageLinks) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> this.javaMethod = javaMethod;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> this.pathRemainder = pathRemainder;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> this.properties = properties;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> this.defaultMethodHeaders = mDefaultRequestHeaders;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> this.serializerGroup = mSerializers;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> this.parserGroup = mParsers;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> this.urlEncodingParser = mUrlEncodingParser;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> this.beanSession = urlEncodingParser.getBeanContext().createSession();<a name="line.156"></a>
-<span class="sourceLineNo">157</span> this.defaultCharset = defaultCharset;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> this.encoders = encoders;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> this.pageTitle = pageTitle;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> this.pageText = pageText;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> this.pageLinks = pageLinks;<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> if (debug) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> String msg = ""<a name="line.164"></a>
-<span class="sourceLineNo">165</span> + "\n=== HTTP Request (incoming) ===================================================="<a name="line.165"></a>
-<span class="sourceLineNo">166</span> + toString()<a name="line.166"></a>
-<span class="sourceLineNo">167</span> + "\n=== END ========================================================================";<a name="line.167"></a>
-<span class="sourceLineNo">168</span> context.getLogger().log(Level.WARNING, msg);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * Returns a string of the form <js>"HTTP method-name full-url"</js><a name="line.173"></a>
-<span class="sourceLineNo">174</span> *<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * @return A description of the request.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> */<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public String getDescription() {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> String qs = getQueryString();<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<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> // Properties<a name="line.184"></a>
-<span class="sourceLineNo">185</span> //--------------------------------------------------------------------------------<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> /**<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * Servlet calls this method to initialize the properties.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> */<a name="line.189"></a>
-<span class="sourceLineNo">190</span> RestRequest setProperties(ObjectMap properties) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> this.properties = properties;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> return this;<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> /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * Retrieve the properties active for this request.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <p><a name="line.197"></a>
-<span class="sourceLineNo">198</span> * These properties can be modified by the request.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> *<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * @return The properties active for this request.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> */<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public ObjectMap getProperties() {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> return this.properties;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> //--------------------------------------------------------------------------------<a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Headers<a name="line.208"></a>
-<span class="sourceLineNo">209</span> //--------------------------------------------------------------------------------<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> /**<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * Sets a request header value.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> *<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @param name The header name.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * @param value The header value.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> */<a name="line.216"></a>
-<span class="sourceLineNo">217</span> public void setHeader(String name, Object value) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> if (overriddenHeaders == null)<a name="line.218"></a>
-<span class="sourceLineNo">219</span> overriddenHeaders = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> overriddenHeaders.put(name, StringUtils.toString(value));<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> /**<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * Returns the specified header value, or <jk>null</jk> if the header doesn't exist.<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * <p><a name="line.226"></a>
-<span class="sourceLineNo">227</span> * If {@code allowHeaderParams} init parameter is <jk>true</jk>, then first looks for {@code &HeaderName=x} in the URL query string.<a name="line.227"></a>
-<span class="sourceLineNo">228</span> */<a name="line.228"></a>
-<span class="sourceLineNo">229</span> @Override /* ServletRequest */<a name="line.229"></a>
-<span class="sourceLineNo">230</span> public String getHeader(String name) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> return getHeader(name, (String)null);<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> /**<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * Returns the specified header value, or a default value if the header doesn't exist.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * <p><a name="line.236"></a>
-<span class="sourceLineNo">237</span> * If {@code allowHeaderParams} init parameter is <jk>true</jk>, then first looks for {@code &HeaderName=x} in the URL query string.<a name="line.237"></a>
-<span class="sourceLineNo">238</span> *<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * @param name The HTTP header name.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * @param def The default value to return if the header value isn't found.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * @return The header value, or the default value if the header isn't present.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> */<a name="line.242"></a>
-<span class="sourceLineNo">243</span> public String getHeader(String name, String def) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> String h = getOverriddenHeader(name);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (h != null)<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return h;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> h = super.getHeader(name);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> if (h != null && ! h.isEmpty())<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return h;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (defaultMethodHeaders != null) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> h = defaultMethodHeaders.get(name);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> if (h != null)<a name="line.252"></a>
-<span class="sourceLineNo">253</span> return h;<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> h = defaultServletHeaders.get(name);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (h != null)<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return h;<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return def;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * Returns the specified header value converted to a POJO.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * <p><a name="line.263"></a>
-<span class="sourceLineNo">264</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.264"></a>
-<span class="sourceLineNo">265</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * <p><a name="line.266"></a>
-<span class="sourceLineNo">267</span> * <h5 class='section'>Examples:</h5><a name="line.267"></a>
-<span class="sourceLineNo">268</span> * <p class='bcode'><a name="line.268"></a>
-<span class="sourceLineNo">269</span> * <jc>// Parse into an integer.</jc><a name="line.269"></a>
-<span class="sourceLineNo">270</span> * <jk>int</jk> myheader = req.getHeader(<js>"My-Header"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> *<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * <jc>// Parse a UUID.</jc><a name="line.272"></a>
-<span class="sourceLineNo">273</span> * UUID myheader = req.getHeader(<js>"My-Header"</js>, UUID.<jk>class</jk>);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * </p><a name="line.274"></a>
-<span class="sourceLineNo">275</span> *<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * @param name The HTTP header name.<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * @param type The class type to convert the header value to.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * @param <T> The class type to convert the header value to.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * @return The parameter value converted to the specified class type.<a name="line.279"></a>
-<span class="sourceLineNo">280</span> */<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public <T> T getHeader(String name, Class<T> type) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> String h = getHeader(name);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return beanSession.convertToType(h, type);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> /**<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * Same as {@link #getHeader(String, Class)} but returns a default value if not found.<a name="line.287"></a>
-<span class="sourceLineNo">288</span> *<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * @param name The HTTP header name.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * @param def The default value if the header was not specified or is <jk>null</jk>.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * @param type The class type to convert the header value to.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * @param <T> The class type to convert the header value to.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * @return The parameter value converted to the specified class type.<a name="line.293"></a>
-<span class="sourceLineNo">294</span> */<a name="line.294"></a>
-<span class="sourceLineNo">295</span> public <T> T getHeader(String name, T def, Class<T> type) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> String h = getHeader(name);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> if (h == null)<a name="line.297"></a>
-<span class="sourceLineNo">298</span> return def;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return beanSession.convertToType(h, type);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> /**<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * Returns the specified header value converted to a POJO.<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * <p><a name="line.304"></a>
-<span class="sourceLineNo">305</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.305"></a>
-<span class="sourceLineNo">306</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * <p><a name="line.307"></a>
-<span class="sourceLineNo">308</span> * <h5 class='section'>Examples:</h5><a name="line.308"></a>
-<span class="sourceLineNo">309</span> * <p class='bcode'><a name="line.309"></a>
-<span class="sourceLineNo">310</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.310"></a>
-<span class="sourceLineNo">311</span> * List&lt;String&gt; myheader = req.getHeader(<js>"My-Header"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * </p><a name="line.312"></a>
-<span class="sourceLineNo">313</span> *<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @param name The HTTP header name.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * @param type The type of object to create.<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.318"></a>
-<span class="sourceLineNo">319</span> * <br>Ignored if the main type is not a map or collection.<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * @param <T> The class type to convert the header value to.<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * @return The parameter value converted to the specified class type.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * @throws ParseException If the header could not be converted to the specified type.<a name="line.322"></a>
-<span class="sourceLineNo">323</span> */<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public <T> T getHeader(String name, Type type, Type...args) throws ParseException {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> String h = getHeader(name);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> return urlEncodingParser.parsePart(h, type, args);<a name="line.326"></a>
+<span class="sourceLineNo">069</span> private final String method;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private String pathRemainder;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private RequestBody body;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private Method javaMethod;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private ObjectMap properties;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> private SerializerGroup serializerGroup;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> private ParserGroup parserGroup;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> private final boolean debug;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> private UrlEncodingParser urlEncodingParser; // The parser used to parse URL attributes and parameters (beanContext also used to parse headers)<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private BeanSession beanSession;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private VarResolverSession varSession;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private final RequestQuery queryParams;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private RequestFormData formData;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private RequestPathParams pathParams;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> private boolean isPost;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private String servletURI, relativeServletURI;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private String charset, defaultCharset;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> private RequestHeaders headers;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> private ConfigFile cf;<a name="line.87"></a>
+<span class="sourceLineNo">088</span> private Swagger swagger, fileSwagger;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> private String pageTitle, pageText, pageLinks;<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * Constructor.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span class="sourceLineNo">094</span> RestRequest(RestContext context, HttpServletRequest req) throws ServletException {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> super(req);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> this.context = context;<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span> try {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> isPost = req.getMethod().equalsIgnoreCase("POST");<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> // If this is a POST, we want to parse the query parameters ourselves to prevent<a name="line.101"></a>
+<span class="sourceLineNo">102</span> // the servlet code from processing the HTTP body as URL-Encoded parameters.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> queryParams = new RequestQuery();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> if (isPost)<a name="line.104"></a>
+<span class="sourceLineNo">105</span> context.getUrlEncodingParser().parseIntoSimpleMap(getQueryString(), queryParams);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> else<a name="line.106"></a>
+<span class="sourceLineNo">107</span> queryParams.putAll(req.getParameterMap());<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> // Get the HTTP method.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> // Can be overridden through a "method" GET attribute.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> String _method = super.getMethod();<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> String m = getQuery("method");<a name="line.114"></a>
+<span class="sourceLineNo">115</span> if (context.allowMethodParam(m))<a name="line.115"></a>
+<span class="sourceLineNo">116</span> _method = m;<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> method = _method;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> headers = new RequestHeaders();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> for (Enumeration<String> e = getHeaderNames(); e.hasMoreElements();) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> String name = e.nextElement();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> headers.put(name, super.getHeaders(name));<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> body = new RequestBody(this);<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> if (context.isAllowBodyParam()) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> String b = getQuery("body");<a name="line.129"></a>
+<span class="sourceLineNo">130</span> if (b != null) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> headers.put("Content-Type", UonSerializer.DEFAULT.getResponseContentType());<a name="line.131"></a>
+<span class="sourceLineNo">132</span> body.load(b.getBytes(IOUtils.UTF8));<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (context.isAllowHeaderParams())<a name="line.136"></a>
+<span class="sourceLineNo">137</span> headers.setQueryParams(queryParams);<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> debug = "true".equals(getQuery("debug", "false")) || "true".equals(getHeader("Debug", "false"));<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> this.pathParams = new RequestPathParams();<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> } catch (RestException e) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> throw e;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> } catch (Exception e) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> throw new ServletException(e);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<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> * Called from RestServlet after a match has been made but before the guard or method invocation.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> */<a name="line.152"></a>
+<span class="sourceLineNo">153</span> @SuppressWarnings("hiding")<a name="line.153"></a>
+<span class="sourceLineNo">154</span> final void init(Method javaMethod, String pathRemainder, ObjectMap properties, Map<String,String> mDefaultRequestHeaders, String defaultCharset, SerializerGroup mSerializers, ParserGroup mParsers, UrlEncodingParser mUrlEncodingParser, EncoderGroup encoders, String pageTitle, String pageText, String pageLinks) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> this.javaMethod = javaMethod;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> this.pathRemainder = pathRemainder;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> this.properties = properties;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.urlEncodingParser = mUrlEncodingParser;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> this.beanSession = urlEncodingParser.getBeanContext().createSession();<a name="line.159"></a>
+<span class="sourceLineNo">160</span> this.pathParams<a name="line.160"></a>
+<span class="sourceLineNo">161</span> .setParser(urlEncodingParser)<a name="line.161"></a>
+<span class="sourceLineNo">162</span> .setBeanSession(beanSession);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> this.queryParams<a name="line.163"></a>
+<span class="sourceLineNo">164</span> .setParser(urlEncodingParser)<a name="line.164"></a>
+<span class="sourceLineNo">165</span> .setBeanSession(beanSession);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> this.headers<a name="line.166"></a>
+<span class="sourceLineNo">167</span> .addDefault(mDefaultRequestHeaders)<a name="line.167"></a>
+<span class="sourceLineNo">168</span> .addDefault(context.getDefaultRequestHeaders())<a name="line.168"></a>
+<span class="sourceLineNo">169</span> .setParser(urlEncodingParser)<a name="line.169"></a>
+<span class="sourceLineNo">170</span> .setBeanSession(beanSession);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> this.body<a name="line.171"></a>
+<span class="sourceLineNo">172</span> .setEncoders(encoders)<a name="line.172"></a>
+<span class="sourceLineNo">173</span> .setParsers(mParsers)<a name="line.173"></a>
+<span class="sourceLineNo">174</span> .setHeaders(headers)<a name="line.174"></a>
+<span class="sourceLineNo">175</span> .setBeanSession(beanSession)<a name="line.175"></a>
+<span class="sourceLineNo">176</span> .setUrlEncodingParser(mUrlEncodingParser);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> this.serializerGroup = mSerializers;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> this.parserGroup = mParsers;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> this.defaultCharset = defaultCharset;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> this.pageTitle = pageTitle;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> this.pageText = pageText;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> this.pageLinks = pageLinks;<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (debug) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> String msg = ""<a name="line.185"></a>
+<span class="sourceLineNo">186</span> + "\n=== HTTP Request (incoming) ===================================================="<a name="line.186"></a>
+<span class="sourceLineNo">187</span> + toString()<a name="line.187"></a>
+<span class="sourceLineNo">188</span> + "\n=== END ========================================================================";<a name="line.188"></a>
+<span class="sourceLineNo">189</span> context.getLogger().log(Level.WARNING, msg);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * Returns a string of the form <js>"HTTP method-name full-url"</js><a name="line.194"></a>
+<span class="sourceLineNo">195</span> *<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @return A description of the request.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> */<a name="line.197"></a>
+<span class="sourceLineNo">198</span> public String getDescription() {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> String qs = getQueryString();<a name="line.199"></a>
+<span class="sourceLineNo">200</span> return "HTTP " + getMethod() + " " + getRequestURI() + (qs == null ? "" : "?" + qs);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> //--------------------------------------------------------------------------------<a name="line.204"></a>
+<span class="sourceLineNo">205</span> // Properties<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> * Servlet calls this method to initialize the properties.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> RestRequest setProperties(ObjectMap properties) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> this.properties = properties;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return this;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> /**<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * Retrieve the properties active for this request.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <p><a name="line.218"></a>
+<span class="sourceLineNo">219</span> * These properties can be modified by the request.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> *<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * @return The properties active for this request.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> */<a name="line.222"></a>
+<span class="sourceLineNo">223</span> public ObjectMap getProperties() {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> return this.properties;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> //--------------------------------------------------------------------------------<a name="line.228"></a>
+<span class="sourceLineNo">229</span> // Headers<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">232</span> /**<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * Returns the headers on this request.<a name="line.233"></a>
+<span class="sourceLineNo">234</span> *<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @return The headers on this request. Never <jk>null</jk>.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> */<a name="line.236"></a>
+<span class="sourceLineNo">237</span> public RequestHeaders getHeaders() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return headers;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> /**<a name="line.241"></a>
+<span class="sourceLineNo">242</span> * Convenience method for calling <code>getHeaders().put(name, value);</code><a name="line.242"></a>
+<span class="sourceLineNo">243</span> *<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * @param name The header name.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * @param value The header value.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> */<a name="line.246"></a>
+<span class="sourceLineNo">247</span> public void setHeader(String name, Object value) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> getHeaders().put(name, value);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> /**<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * Convenience method for calling <code>getHeaders().getFirst(name);</code><a name="line.252"></a>
+<span class="sourceLineNo">253</span> */<a name="line.253"></a>
+<span class="sourceLineNo">254</span> @Override /* ServletRequest */<a name="line.254"></a>
+<span class="sourceLineNo">255</span> public String getHeader(String name) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> return getHeaders().getFirst(name);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> /**<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * Convenience method for calling <code>getHeaders().getFirst(name, def);</code><a name="line.260"></a>
+<span class="sourceLineNo">261</span> *<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @param name The HTTP header name.<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * @param def The default value to return if the header value isn't found.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @return The header value, or the default value if the header isn't present.<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> public String getHeader(String name, String def) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return getHeaders().getFirst(name, def);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> @Override /* ServletRequest */<a name="line.270"></a>
+<span class="sourceLineNo">271</span> public Enumeration<String> getHeaders(String name) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> String[] v = headers.get(name);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> if (v == null || v.length == 0)<a name="line.273"></a>
+<span class="sourceLineNo">274</span> return Collections.enumeration(Collections.EMPTY_LIST);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return Collections.enumeration(Arrays.asList(v));<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * Returns the media types that are valid for <code>Content-Type</code> headers on the request.<a name="line.279"></a>
+<span class="sourceLineNo">280</span> *<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * @return The set of media types registered in the parser group of this request.<a name="line.281"></a>
+<span class="sourceLineNo">282</span> */<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return parserGroup.getSupportedMediaTypes();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> /**<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * Sets the charset to expect on the request body.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> */<a name="line.289"></a>
+<span class="sourceLineNo">290</span> @Override /* ServletRequest */<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public void setCharacterEncoding(String charset) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> this.charset = charset;<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> * Returns the charset specified on the <code>Content-Type</code> header, or <js>"UTF-8"</js> if not specified.<a name="line.296"></a>
+<span class="sourceLineNo">297</span> */<a name="line.297"></a>
+<span class="sourceLineNo">298</span> @Override /* ServletRequest */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> public String getCharacterEncoding() {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (charset == null) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> // Determine charset<a name="line.301"></a>
+<span class="sourceLineNo">302</span> // NOTE: Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.302"></a>
+<span class="sourceLineNo">303</span> // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.303"></a>
+<span class="sourceLineNo">304</span> String h = getHeader("Content-Type");<a name="line.304"></a>
+<span class="sourceLineNo">305</span> if (h != null) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> int i = h.indexOf(";charset=");<a name="line.306"></a>
+<span class="sourceLineNo">307</span> if (i > 0)<a name="line.307"></a>
+<span class="sourceLineNo">308</span> charset = h.substring(i+9).trim();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if (charset == null)<a name="line.310"></a>
+<span class="sourceLineNo">311</span> charset = defaultCharset;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> if (! Charset.isSupported(charset))<a name="line.312"></a>
+<span class="sourceLineNo">313</span> throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span> return charset;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span> @Override /* ServletRequest */<a name="line.318"></a>
+<span class="sourceLineNo">319</span> public Locale getLocale() {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> String h = headers.getFirst("Accept-Language");<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (h != null) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (mr.length > 0)<a name="line.323"></a>
+<span class="sourceLineNo">324</span> return toLocale(mr[0].getMediaType().getType());<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> return super.getLocale();<a name="line.326"></a>
<span class="sourceLineNo">327</span> }<a name="line.327"></a>
<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span> /**<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * Returns all the request headers as an {@link ObjectMap}.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * <p><a name="line.331"></a>
-<span class="sourceLineNo">332</span> * Altering entries in this map does not alter headers in the underlying request.<a name="line.332"></a>
-<span class="sourceLineNo">333</span> *<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * @return The request headers. Never <jk>null</jk>.<a name="line.334"></a>
-<span class="sourceLineNo">335</span> */<a name="line.335"></a>
-<span class="sourceLineNo">336</span> public ObjectMap getHeaders() {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (headers == null) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> headers = new ObjectMap();<a name="line.338"></a>
-<span class="sourceLineNo">339</span> for (Enumeration<String> e = getHeaderNames(); e.hasMoreElements();) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> String key = e.nextElement();<a name="line.340"></a>
-<span class="sourceLineNo">341</span> headers.put(key, getHeader(key));<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return headers;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> @Override /* ServletRequest */<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public Enumeration<String> getHeaders(String name) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> String h = getOverriddenHeader(name);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> if (h != null)<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return enumeration(singleton(h));<a name="line.351"></a>
-<span class="sourceLineNo">352</span> return super.getHeaders(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> /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span> * Returns the <code>Accept</code> header on the request.<a name="line.356"></a>
-<span class="sourceLineNo">357</span> *<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * @return The parsed <code>Accept</code> header on the request, or <jk>null</jk> if not found.<a name="line.358"></a>
-<span class="sourceLineNo">359</span> */<a name="line.359"></a>
-<span class="sourceLineNo">360</span> public Accept getAcceptHeader() {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> return getHeader("Accept", Accept.class);<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> /**<a name="line.364"></a>
-<span class="sourceLineNo">365</span> * Returns the <code>Content-Type</code> header on the request.<a name="line.365"></a>
-<span class="sourceLineNo">366</span> *<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * @return The parsed <code>Content-Type</code> header on the request, or <jk>null</jk> if not found.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> */<a name="line.368"></a>
-<span class="sourceLineNo">369</span> public ContentType getContentTypeHeader() {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> return getHeader("Content-Type", ContentType.class);<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> /**<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * Returns the <code>Accept-Encoding</code> header on the request.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> *<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * @return The parsed <code>Accept-Encoding</code> header on the request, or <jk>null</jk> if not found.<a name="line.376"></a>
+<span class="sourceLineNo">329</span> @Override /* ServletRequest */<a name="line.329"></a>
+<span class="sourceLineNo">330</span> public Enumeration<Locale> getLocales() {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> String h = headers.getFirst("Accept-Language");<a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (h != null) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> if (mr.length > 0) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> List<Locale> l = new ArrayList<Locale>(mr.length);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> for (MediaTypeRange r : mr)<a name="line.336"></a>
+<span class="sourceLineNo">337</span> l.add(toLocale(r.getMediaType().getType()));<a name="line.337"></a>
+<span class="sourceLineNo">338</span> return enumeration(l);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span> return super.getLocales();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> //--------------------------------------------------------------------------------<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // Query parameters<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> /**<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * Equivalent to {@link #getParameterMap()}, but only looks for query parameters in the URL, not form posts.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * <p><a name="line.351"></a>
+<span class="sourceLineNo">352</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.352"></a>
+<span class="sourceLineNo">353</span> * <p><a name="line.353"></a>
+<span class="sourceLineNo">354</span> * This object is modifiable.<a name="line.354"></a>
+<span class="sourceLineNo">355</span> *<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * @return The query parameters as a modifiable map.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public RequestQuery getQuery() {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return queryParams;<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> * Convenience method for calling <code>getQueryParams().put(name, value);</code>.<a name="line.363"></a>
+<span class="sourceLineNo">364</span> *<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * @param name The parameter name.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * @param value The parameter value.<a name="line.366"></a>
+<span class="sourceLineNo">367</span> */<a name="line.367"></a>
+<span class="sourceLineNo">368</span> public void setQuery(String name, Object value) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> queryParams.put(name, value);<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> * Convenience method for calling <code>getQueryParams().getFirst(name);</code><a name="line.373"></a>
+<span class="sourceLineNo">374</span> *<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * @param name The URL parameter name.<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * @return The parameter value, or <jk>null</jk> if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.376"></a>
<span class="sourceLineNo">377</span> */<a name="line.377"></a>
-<span class="sourceLineNo">378</span> public AcceptEncoding getAcceptEncodingHeader() {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return getHeader("Accept-Encoding", AcceptEncoding.class);<a name="line.379"></a>
+<span class="sourceLineNo">378</span> public String getQuery(String name) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span> return getQuery().getFirst(name);<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> /**<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * Returns the <code>Time-Zone</code> header value on the request if there is one.<a name="line.383"></a>
-<span class="sourceLineNo">384</span> * <p><a name="line.384"></a>
-<span class="sourceLineNo">385</span> * Example: <js>"GMT"</js>.<a name="line.385"></a>
-<span class="sourceLineNo">386</span> *<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * @return The <code>Time-Zone</code> header value on the request, or <jk>null</jk> if not present.<a name="line.387"></a>
+<span class="sourceLineNo">383</span> * Convenience method for calling <code>getQueryParams().getFirst(name, def);</code><a name="line.383"></a>
+<span class="sourceLineNo">384</span> *<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * @param name The URL parameter name.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * @param def The default value.<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * @return The parameter value, or the default value if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.387"></a>
<span class="sourceLineNo">388</span> */<a name="line.388"></a>
-<span class="sourceLineNo">389</span> public TimeZone getTimeZone() {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> String tz = getHeader("Time-Zone");<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (tz != null)<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return TimeZone.getTimeZone(tz);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> return null;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> /**<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * Returns the media types that are valid for <code>Content-Type</code> headers on the request.<a name="line.397"></a>
-<span class="sourceLineNo">398</span> *<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * @return The set of media types registered in the parser group of this request.<a name="line.399"></a>
-<span class="sourceLineNo">400</span> */<a name="line.400"></a>
-<span class="sourceLineNo">401</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> return parserGroup.getSupportedMediaTypes();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> }<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span> /**<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * Sets the charset to expect on the request body.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> @Override /* ServletRequest */<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public void setCharacterEncoding(String charset) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> this.charset = charset;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span> /**<a name="line.413"></a>
-<span class="sourceLineNo">414</span> * Returns the charset specified on the <code>Content-Type</code> header, or <js>"UTF-8"</js> if not specified.<a name="line.414"></a>
-<span class="sourceLineNo">415</span> */<a name="line.415"></a>
-<span class="sourceLineNo">416</span> @Override /* ServletRequest */<a name="line.416"></a>
-<span class="sourceLineNo">417</span> public String getCharacterEncoding() {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (charset == null) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> // Determine charset<a name="line.419"></a>
-<span class="sourceLineNo">420</span> // NOTE: Don't use super.getCharacterEncoding() because the spec is implemented inconsistently.<a name="line.420"></a>
-<span class="sourceLineNo">421</span> // Jetty returns the default charset instead of null if the character is not specified on the request.<a name="line.421"></a>
-<span class="sourceLineNo">422</span> String h = getHeader("Content-Type");<a name="line.422"></a>
-<span class="sourceLineNo">423</span> if (h != null) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> int i = h.indexOf(";charset=");<a name="line.424"></a>
-<span class="sourceLineNo">425</span> if (i > 0)<a name="line.425"></a>
-<span class="sourceLineNo">426</span> charset = h.substring(i+9).trim();<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span> if (charset == null)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> charset = defaultCharset;<a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (! Charset.isSupported(charset))<a name="line.430"></a>
-<span class="sourceLineNo">431</span> throw new RestException(SC_UNSUPPORTED_MEDIA_TYPE, "Unsupported charset in header ''Content-Type'': ''{0}''", h);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return charset;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> @Override /* ServletRequest */<a name="line.436"></a>
-<span class="sourceLineNo">437</span> public Locale getLocale() {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> String h = getOverriddenHeader("Accept-Language");<a name="line.438"></a>
-<span class="sourceLineNo">439</span> if (h != null) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (mr.length > 0)<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return toLocale(mr[0].getMediaType().getType());<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return super.getLocale();<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> @Override /* ServletRequest */<a name="line.447"></a>
-<span class="sourceLineNo">448</span> public Enumeration<Locale> getLocales() {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> String h = getOverriddenHeader("Accept-Language");<a name="line.449"></a>
-<span class="sourceLineNo">450</span> if (h != null) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> MediaTypeRange[] mr = MediaTypeRange.parse(h);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> if (mr.length > 0) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> List<Locale> l = new ArrayList<Locale>(mr.length);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> for (MediaTypeRange r : mr)<a name="line.454"></a>
-<span class="sourceLineNo">455</span> l.add(toLocale(r.getMediaType().getType()));<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return enumeration(l);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span> return super.getLocales();<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> //--------------------------------------------------------------------------------<a name="line.463"></a>
-<span class="sourceLineNo">464</span> // Query parameters<a name="line.464"></a>
-<span class="sourceLineNo">465</span> //--------------------------------------------------------------------------------<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> /**<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * Sets a request query parameter value.<a name="line.468"></a>
-<span class="sourceLineNo">469</span> *<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * @param name The parameter name.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * @param value The parameter value.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> */<a name="line.472"></a>
-<span class="sourceLineNo">473</span> public void setQueryParameter(String name, Object value) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> if (overriddenQueryParams == null)<a name="line.474"></a>
-<span class="sourceLineNo">475</span> overriddenQueryParams = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.475"></a>
-<span class="sourceLineNo">476</span> overriddenQueryParams.put(name, value == null ? null : value.toString());<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span> /**<a name="line.479"></a>
-<span class="sourceLineNo">480</span> * Returns a query parameter value.<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * <p><a name="line.481"></a>
-<span class="sourceLineNo">482</span> * Same as {@link #getParameter(String)} except only looks in the URL string, not parameters from URL-Encoded FORM posts.<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * <p><a name="line.483"></a>
-<span class="sourceLineNo">484</span> * This method can be used to retrieve a parameter without triggering the underlying servlet API to load and parse the request body.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> *<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * @param name The URL parameter name.<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @return The parameter value, or <jk>null</jk> if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.487"></a>
-<span class="sourceLineNo">488</span> */<a name="line.488"></a>
-<span class="sourceLineNo">489</span> public String getQueryParameter(String name) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> String s = null;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if (overriddenQueryParams != null)<a name="line.491"></a>
-<span class="sourceLineNo">492</span> s = overriddenQueryParams.get(name);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> if (s != null)<a name="line.493"></a>
-<span class="sourceLineNo">494</span> return s;<a name="line.494"></a>
-<span class="sourceLineNo">495</span> String[] v = queryParams.get(name);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> if (v == null || v.length == 0)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> return null;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (v.length == 1 && v[0] != null && v[0].isEmpty()) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> // Fix for behavior difference between Tomcat and WAS.<a name="line.499"></a>
-<span class="sourceLineNo">500</span> // getParameter("foo") on "&foo" in Tomcat returns "".<a name="line.500"></a>
-<span class="sourceLineNo">501</span> // getParameter("foo") on "&foo" in WAS returns null.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> if (queryParams.containsKey(name))<a name="line.502"></a>
-<span class="sourceLineNo">503</span> return null;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> return v[0];<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> * Same as {@link #getQueryParameter(String)} but returns the specified default value if the query parameter was not specified.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> *<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @param name The URL parameter name.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> * @param def The default value.<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * @return The parameter value, or the default value if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>.<a name="line.513"></a>
-<span class="sourceLineNo">514</span> */<a name="line.514"></a>
-<span class="sourceLineNo">515</span> public String getQueryParameter(String name, String def) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span> String s = getQueryParameter(name);<a name="line.516"></a>
-<span class="sourceLineNo">517</span> return s == null ? def : s;<a name="line.517"></a>
-<span class="sourceLineNo">518</span> }<a name="line.518"></a>
-<span class="sourceLineNo">519</span><a name="line.519"></a>
-<span class="sourceLineNo">520</span> /**<a name="line.520"></a>
-<span class="sourceLineNo">521</span> * Returns the specified query parameter value converted to a POJO.<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * <p><a name="line.522"></a>
-<span class="sourceLineNo">523</span> * This method can be used to retrieve a parameter without triggering the underlying servlet API to load and parse the request body.<a name="line.523"></a>
-<span class="sourceLineNo">524</span> * <p><a name="line.524"></a>
-<span class="sourceLineNo">525</span> * <h5 class='section'>Examples:</h5><a name="line.525"></a>
-<span class="sourceLineNo">526</span> * <p class='bcode'><a name="line.526"></a>
-<span class="sourceLineNo">527</span> * <jc>// Parse into an integer.</jc><a name="line.527"></a>
-<span class="sourceLineNo">528</span> * <jk>int</jk> myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> *<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * <jc>// Parse into an int array.</jc><a name="line.530"></a>
-<span class="sourceLineNo">531</span> * <jk>int</jk>[] myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>[].<jk>class</jk>);<a name="line.531"></a>
+<span class="sourceLineNo">389</span> public String getQuery(String name, String def) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> return getQuery().getFirst(name, def);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> //--------------------------------------------------------------------------------<a name="line.394"></a>
+<span class="sourceLineNo">395</span> // Form data parameters<a name="line.395"></a>
+<span class="sourceLineNo">396</span> //--------------------------------------------------------------------------------<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span> /**<a name="line.398"></a>
+<span class="sourceLineNo">399</span> * Retrieves the URL-encoded form data from the request if the body has already been cached locally.<a name="line.399"></a>
+<span class="sourceLineNo">400</span> *<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * @return The URL-encoded form data from the request.<a name="line.401"></a>
+<span class="sourceLineNo">402</span> */<a name="line.402"></a>
+<span class="sourceLineNo">403</span> public RequestFormData getFormData() {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> try {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> if (formData == null) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> formData = new RequestFormData();<a name="line.406"></a>
+<span class="sourceLineNo">407</span> formData.setParser(urlEncodingParser).setBeanSession(beanSession);<a name="line.407"></a>
+<span class="sourceLineNo">408</span> if (! body.isLoaded()) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span> formData.putAll(getParameterMap());<a name="line.409"></a>
+<span class="sourceLineNo">410</span> } else {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> Map<String,String> m = urlEncodingParser.parse(body.getReader(), Map.class, String.class, String.class);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> for (Map.Entry<String,String> e : m.entrySet()) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> formData.put(e.getKey(), e.getValue());<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> return formData;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } catch (Exception e) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> throw new RestException(SC_INTERNAL_SERVER_ERROR, e);<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><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * Convenience method for calling <code>getFormData().put(name, value);</code>.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> *<a name="line.425"></a>
+<span class="sourceLineNo">426</span> * @param name The parameter name.<a name="line.426"></a>
+<span class="sourceLineNo">427</span> * @param value The parameter value.<a name="line.427"></a>
+<span class="sourceLineNo">428</span
<TRUNCATED>