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/06/01 23:55:19 UTC
[01/32] incubator-juneau-website git commit: Update javadocs
Repository: incubator-juneau-website
Updated Branches:
refs/heads/asf-site 27fc70c99 -> 19e9b7df6
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
index 95ff724..409861a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
@@ -145,316 +145,335 @@
<span class="sourceLineNo">137</span> /** Reusable instance of {@link UrlEncodingSerializer}, all default settings. */<a name="line.137"></a>
<span class="sourceLineNo">138</span> public static final UrlEncodingSerializer DEFAULT = new UrlEncodingSerializer(PropertyStore.create());<a name="line.138"></a>
<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> /** Reusable instance of {@link UrlEncodingSerializer.Expanded}. */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public static final UrlEncodingSerializer DEFAULT_EXPANDED = new Expanded(PropertyStore.create());<a name="line.141"></a>
+<span class="sourceLineNo">140</span> /** Reusable instance of {@link UrlEncodingSerializer.PlainText}. */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public static final UrlEncodingSerializer DEFAULT_PLAINTEXT = new PlainText(PropertyStore.create());<a name="line.141"></a>
<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> /** Reusable instance of {@link UrlEncodingSerializer.Readable}. */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final UrlEncodingSerializer DEFAULT_READABLE = new Readable(PropertyStore.create());<a name="line.144"></a>
+<span class="sourceLineNo">143</span> /** Reusable instance of {@link UrlEncodingSerializer.Expanded}. */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> public static final UrlEncodingSerializer DEFAULT_EXPANDED = new Expanded(PropertyStore.create());<a name="line.144"></a>
<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> */<a name="line.148"></a>
-<span class="sourceLineNo">149</span> @Produces(value="application/x-www-form-urlencoded",contentType="application/x-www-form-urlencoded")<a name="line.149"></a>
-<span class="sourceLineNo">150</span> public static class Expanded extends UrlEncodingSerializer {<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * Constructor.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> */<a name="line.155"></a>
-<span class="sourceLineNo">156</span> public Expanded(PropertyStore propertyStore) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> super(propertyStore);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Override /* CoreObject */<a name="line.160"></a>
-<span class="sourceLineNo">161</span> protected ObjectMap getOverrideProperties() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return super.getOverrideProperties().append(UrlEncodingContext.URLENC_expandedParams, true);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> /**<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public static class Readable extends UrlEncodingSerializer {<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> * Constructor.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> */<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public Readable(PropertyStore propertyStore) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> super(propertyStore);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> @Override /* CoreObject */<a name="line.179"></a>
-<span class="sourceLineNo">180</span> protected ObjectMap getOverrideProperties() {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return super.getOverrideProperties().append(SERIALIZER_useWhitespace, true);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> private final UrlEncodingSerializerContext ctx;<a name="line.186"></a>
+<span class="sourceLineNo">146</span> /** Reusable instance of {@link UrlEncodingSerializer.Readable}. */<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final UrlEncodingSerializer DEFAULT_READABLE = new Readable(PropertyStore.create());<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> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span> @Produces(value="application/x-www-form-urlencoded",contentType="application/x-www-form-urlencoded")<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public static class Expanded extends UrlEncodingSerializer {<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * Constructor.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public Expanded(PropertyStore propertyStore) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> super(propertyStore);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> @Override /* CoreObject */<a name="line.163"></a>
+<span class="sourceLineNo">164</span> protected ObjectMap getOverrideProperties() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> return super.getOverrideProperties().append(UrlEncodingContext.URLENC_expandedParams, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> */<a name="line.171"></a>
+<span class="sourceLineNo">172</span> public static class Readable extends UrlEncodingSerializer {<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Constructor.<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public Readable(PropertyStore propertyStore) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> super(propertyStore);<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> @Override /* CoreObject */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> protected ObjectMap getOverrideProperties() {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return super.getOverrideProperties().append(SERIALIZER_useWhitespace, true);<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> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Constructor.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> */<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public UrlEncodingSerializer(PropertyStore propertyStore) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> super(propertyStore);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> this.ctx = createContext(UrlEncodingSerializerContext.class);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> @Override /* CoreObject */<a name="line.197"></a>
-<span class="sourceLineNo">198</span> public UrlEncodingSerializerBuilder builder() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> return new UrlEncodingSerializerBuilder(propertyStore);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> @Override /* CoreObject */<a name="line.202"></a>
-<span class="sourceLineNo">203</span> protected ObjectMap getOverrideProperties() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return super.getOverrideProperties().append(UON_encodeChars, true);<a name="line.204"></a>
+<span class="sourceLineNo">189</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().plainTextParts().build();</code>.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> */<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public static class PlainText extends UrlEncodingSerializer {<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> * Constructor.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> */<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public PlainText(PropertyStore propertyStore) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> super(propertyStore);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> @Override /* CoreObject */<a name="line.201"></a>
+<span class="sourceLineNo">202</span> protected ObjectMap getOverrideProperties() {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return super.getOverrideProperties().append(UonSerializerContext.UON_paramFormat, "PLAINTEXT");<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> * Workhorse method. Determines the type of object, and then calls the<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * appropriate type-specific serialization method.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> */<a name="line.210"></a>
-<span class="sourceLineNo">211</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private SerializerWriter serializeAnything(UrlEncodingSerializerSession session, UonWriter out, Object o) throws Exception {<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> ClassMeta<?> aType; // The actual type<a name="line.214"></a>
-<span class="sourceLineNo">215</span> ClassMeta<?> sType; // The serialized type<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> aType = session.push("root", o, object());<a name="line.217"></a>
-<span class="sourceLineNo">218</span> session.indent--;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (aType == null)<a name="line.219"></a>
-<span class="sourceLineNo">220</span> aType = object();<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> sType = aType.getSerializedClassMeta();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> String typeName = session.getBeanTypeName(session.object(), aType, null);<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> // Swap if necessary<a name="line.225"></a>
-<span class="sourceLineNo">226</span> PojoSwap swap = aType.getPojoSwap();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (swap != null) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> o = swap.swap(session, o);<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.230"></a>
-<span class="sourceLineNo">231</span> // the actual type now.<a name="line.231"></a>
-<span class="sourceLineNo">232</span> if (sType.isObject())<a name="line.232"></a>
-<span class="sourceLineNo">233</span> sType = session.getClassMetaForObject(o);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (sType.isMap()) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (o instanceof BeanMap)<a name="line.237"></a>
-<span class="sourceLineNo">238</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> else<a name="line.239"></a>
-<span class="sourceLineNo">240</span> serializeMap(session, out, (Map)o, sType);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> } else if (sType.isBean()) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.247"></a>
-<span class="sourceLineNo">248</span> // mock key/value pair with a "_value" key.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> out.append("_value=");<a name="line.249"></a>
-<span class="sourceLineNo">250</span> super.serializeAnything(session, out, o, null, null, null, session.plainTextParams());<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> session.pop();<a name="line.253"></a>
-<span class="sourceLineNo">254</span> return out;<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">207</span> private final UrlEncodingSerializerContext ctx;<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> /**<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * Constructor.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public UrlEncodingSerializer(PropertyStore propertyStore) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> super(propertyStore);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> this.ctx = createContext(UrlEncodingSerializerContext.class);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override /* CoreObject */<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public UrlEncodingSerializerBuilder builder() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> return new UrlEncodingSerializerBuilder(propertyStore);<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> @Override /* CoreObject */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> protected ObjectMap getOverrideProperties() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return super.getOverrideProperties().append(UON_encodeChars, true);<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> * Workhorse method. Determines the type of object, and then calls the<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * appropriate type-specific serialization method.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> */<a name="line.231"></a>
+<span class="sourceLineNo">232</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.232"></a>
+<span class="sourceLineNo">233</span> private SerializerWriter serializeAnything(UrlEncodingSerializerSession session, UonWriter out, Object o) throws Exception {<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> ClassMeta<?> aType; // The actual type<a name="line.235"></a>
+<span class="sourceLineNo">236</span> ClassMeta<?> sType; // The serialized type<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> aType = session.push("root", o, object());<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.indent--;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (aType == null)<a name="line.240"></a>
+<span class="sourceLineNo">241</span> aType = object();<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> sType = aType.getSerializedClassMeta();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> String typeName = session.getBeanTypeName(session.object(), aType, null);<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> // Swap if necessary<a name="line.246"></a>
+<span class="sourceLineNo">247</span> PojoSwap swap = aType.getPojoSwap();<a name="line.247"></a>
+<span class="sourceLineNo">248</span> if (swap != null) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> o = swap.swap(session, o);<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.251"></a>
+<span class="sourceLineNo">252</span> // the actual type now.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (sType.isObject())<a name="line.253"></a>
+<span class="sourceLineNo">254</span> sType = session.getClassMetaForObject(o);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * Converts a Collection into an integer-indexed map.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> */<a name="line.259"></a>
-<span class="sourceLineNo">260</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> int i = 0;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> for (Object o : c)<a name="line.263"></a>
-<span class="sourceLineNo">264</span> m.put(i++, o);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return m;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> /**<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * Converts an array into an integer-indexed map.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.273"></a>
-<span class="sourceLineNo">274</span> m.put(i, Array.get(array, i));<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return m;<a name="line.275"></a>
+<span class="sourceLineNo">257</span> if (sType.isMap()) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (o instanceof BeanMap)<a name="line.258"></a>
+<span class="sourceLineNo">259</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> else<a name="line.260"></a>
+<span class="sourceLineNo">261</span> serializeMap(session, out, (Map)o, sType);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } else if (sType.isBean()) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.266"></a>
+<span class="sourceLineNo">267</span> } else {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.268"></a>
+<span class="sourceLineNo">269</span> // mock key/value pair with a "_value" key.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> out.append("_value=");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> super.serializeAnything(session, out, o, null, null, null);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.pop();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return out;<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> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.278"></a>
-<span class="sourceLineNo">279</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> boolean plainTextParams = session.plainTextParams();<a name="line.281"></a>
-<span class="sourceLineNo">282</span> m = session.sort(m);<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> int depth = session.getIndent();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> boolean addAmp = false;<a name="line.287"></a>
+<span class="sourceLineNo">278</span> /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * Converts a Collection into an integer-indexed map.<a name="line.279"></a>
+<span class="sourceLineNo">280</span> */<a name="line.280"></a>
+<span class="sourceLineNo">281</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> int i = 0;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> for (Object o : c)<a name="line.284"></a>
+<span class="sourceLineNo">285</span> m.put(i++, o);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return m;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> Object value = e.getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> if (session.shouldUseExpandedParams(value)) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> while (i.hasNext()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> if (addAmp)<a name="line.296"></a>
-<span class="sourceLineNo">297</span> out.cr(depth).append('&');<a name="line.297"></a>
-<span class="sourceLineNo">298</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.298"></a>
-<span class="sourceLineNo">299</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null, plainTextParams);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> addAmp = true;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> if (addAmp)<a name="line.303"></a>
-<span class="sourceLineNo">304</span> out.cr(depth).append('&');<a name="line.304"></a>
-<span class="sourceLineNo">305</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.305"></a>
-<span class="sourceLineNo">306</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null, plainTextParams);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> addAmp = true;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> return out;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.314"></a>
-<span class="sourceLineNo">315</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> ClassMeta<?> valueType = type.getValueType();<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> int depth = session.getIndent();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> boolean addAmp = false;<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> if (addAmp)<a name="line.323"></a>
-<span class="sourceLineNo">324</span> out.cr(depth).append('&');<a name="line.324"></a>
-<span class="sourceLineNo">325</span> out.append(e.getKey()).append('=');<a name="line.325"></a>
-<span class="sourceLineNo">326</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null, session.plainTextParams());<a name="line.326"></a>
-<span class="sourceLineNo">327</span> addAmp = true;<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> return out;<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> @SuppressWarnings({ "rawtypes" })<a name="line.333"></a>
-<span class="sourceLineNo">334</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> int depth = session.getIndent();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> boolean plainTextParams = session.plainTextParams();<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> boolean addAmp = false;<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> String key = p.getName();<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Object value = p.getValue();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> Throwable t = p.getThrown();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (t != null)<a name="line.347"></a>
-<span class="sourceLineNo">348</span> session.addBeanGetterWarning(pMeta, t);<a name="line.348"></a>
+<span class="sourceLineNo">289</span> /**<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * Converts an array into an integer-indexed map.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.294"></a>
+<span class="sourceLineNo">295</span> m.put(i, Array.get(array, i));<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return m;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.299"></a>
+<span class="sourceLineNo">300</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> m = session.sort(m);<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> int depth = session.getIndent();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> boolean addAmp = false;<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> Object value = e.getValue();<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span> if (session.shouldUseExpandedParams(value)) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> while (i.hasNext()) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (addAmp)<a name="line.316"></a>
+<span class="sourceLineNo">317</span> out.cr(depth).append('&');<a name="line.317"></a>
+<span class="sourceLineNo">318</span> out.appendObject(key, true).append('=');<a name="line.318"></a>
+<span class="sourceLineNo">319</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> addAmp = true;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> } else {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (addAmp)<a name="line.323"></a>
+<span class="sourceLineNo">324</span> out.cr(depth).append('&');<a name="line.324"></a>
+<span class="sourceLineNo">325</span> out.appendObject(key, true).append('=');<a name="line.325"></a>
+<span class="sourceLineNo">326</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> addAmp = true;<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><a name="line.330"></a>
+<span class="sourceLineNo">331</span> return out;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.334"></a>
+<span class="sourceLineNo">335</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> ClassMeta<?> valueType = type.getValueType();<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> int depth = session.getIndent();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> boolean addAmp = false;<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (addAmp)<a name="line.343"></a>
+<span class="sourceLineNo">344</span> out.cr(depth).append('&');<a name="line.344"></a>
+<span class="sourceLineNo">345</span> out.append(e.getKey()).append('=');<a name="line.345"></a>
+<span class="sourceLineNo">346</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> addAmp = true;<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> if (session.canIgnoreValue(cMeta, key, value))<a name="line.350"></a>
-<span class="sourceLineNo">351</span> continue;<a name="line.351"></a>
+<span class="sourceLineNo">350</span> return out;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.354"></a>
-<span class="sourceLineNo">355</span> // so we need to check type if we think it's an array.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> while (i.hasNext()) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (addAmp)<a name="line.358"></a>
-<span class="sourceLineNo">359</span> out.cr(depth).append('&');<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.361"></a>
+<span class="sourceLineNo">353</span> @SuppressWarnings({ "rawtypes" })<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> int depth = session.getIndent();<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> boolean addAmp = false;<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.361"></a>
<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta, plainTextParams);<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> addAmp = true;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (addAmp)<a name="line.368"></a>
-<span class="sourceLineNo">369</span> out.cr(depth).append('&');<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> super.serializeAnything(session, out, value, cMeta, key, pMeta, plainTextParams);<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> addAmp = true;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> }<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return out;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">363</span> String key = p.getName();<a name="line.363"></a>
+<span class="sourceLineNo">364</span> Object value = p.getValue();<a name="line.364"></a>
+<span class="sourceLineNo">365</span> Throwable t = p.getThrown();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> if (t != null)<a name="line.366"></a>
+<span class="sourceLineNo">367</span> session.addBeanGetterWarning(pMeta, t);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.369"></a>
+<span class="sourceLineNo">370</span> continue;<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.373"></a>
+<span class="sourceLineNo">374</span> // so we need to check type if we think it's an array.<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> while (i.hasNext()) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (addAmp)<a name="line.377"></a>
+<span class="sourceLineNo">378</span> out.cr(depth).append('&');<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> out.appendObject(key, true).append('=');<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> //--------------------------------------------------------------------------------<a name="line.383"></a>
-<span class="sourceLineNo">384</span> // Methods for constructing individual parameter values.<a name="line.384"></a>
-<span class="sourceLineNo">385</span> //--------------------------------------------------------------------------------<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * Useful for constructing URL parts.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> *<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * @param o The object to serialize.<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * @param urlEncode URL-encode the string if necessary.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * If <jk>null</jk>, then uses the value of the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @param plainTextParams Whether we're using plain-text params.<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * If <jk>null</jk>, then uses the value from the {@link UrlEncodingSerializerContext#URLENC_paramFormat} setting.<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * @return The serialized object.<a name="line.397"></a>
-<span class="sourceLineNo">398</span> */<a name="line.398"></a>
-<span class="sourceLineNo">399</span> private String serializePart(Object o, Boolean urlEncode, Boolean plainTextParams) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> // Shortcut for simple types.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (cm != null) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (cm.isNumber() || cm.isBoolean())<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return o.toString();<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (cm.isCharSequence()) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> String s = o.toString();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> boolean ptt = (plainTextParams != null ? plainTextParams : ctx.plainTextParams);<a name="line.408"></a>
-<span class="sourceLineNo">409</span> if (ptt || ! UonUtils.needsQuotes(s))<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return (urlEncode ? StringUtils.urlEncode(s) : s);<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> StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super.doSerialize(s, o);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return w.toString();<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 RuntimeException(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> //--------------------------------------------------------------------------------<a name="line.424"></a>
-<span class="sourceLineNo">425</span> // Entry point methods<a name="line.425"></a>
-<span class="sourceLineNo">426</span> //--------------------------------------------------------------------------------<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
+<span class="sourceLineNo">382</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> addAmp = true;<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span> } else {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (addAmp)<a name="line.387"></a>
+<span class="sourceLineNo">388</span> out.cr(depth).append('&');<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> out.appendObject(key, true).append('=');<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> addAmp = true;<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> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return out;<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> //--------------------------------------------------------------------------------<a name="line.402"></a>
+<span class="sourceLineNo">403</span> // Methods for constructing individual parameter values.<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> /**<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Useful for constructing URL parts.<a name="line.409"></a>
+<span class="sourceLineNo">410</span> *<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * @param o The object to serialize.<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * @param urlEncode URL-encode the string if necessary.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * If <jk>null</jk>, then uses the value of the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * @param plainTextParams Whether we're using plain-text params.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * If <jk>null</jk>, then uses the value from the {@link UrlEncodingSerializerContext#URLENC_paramFormat} setting.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * @return The serialized object.<a name="line.416"></a>
+<span class="sourceLineNo">417</span> */<a name="line.417"></a>
+<span class="sourceLineNo">418</span> private String serializePart(Object o, Boolean urlEncode, Boolean plainTextParams) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> try {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> // Shortcut for simple types.<a name="line.420"></a>
+<span class="sourceLineNo">421</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (cm != null) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (cm.isNumber() || cm.isBoolean())<a name="line.423"></a>
+<span class="sourceLineNo">424</span> return o.toString();<a name="line.424"></a>
+<span class="sourceLineNo">425</span> if (cm.isCharSequence()) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> String s = o.toString();<a name="line.426"></a>
+<span class="sourceLineNo">427</span> boolean ptt = (plainTextParams != null ? plainTextParams : ctx.plainTextParams());<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (ptt || s.isEmpty() || ! UonUtils.needsQuotes(s))<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return (urlEncode ? StringUtils.urlEncode(s) : s);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span> }<a name="line.431"></a>
<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override /* Serializer */<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> serializeAnything(s, s.getWriter(), o);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> @Override /* PartSerializer */<a name="line.439"></a>
-<span class="sourceLineNo">440</span> public String serialize(PartType type, Object value) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> switch(type) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span> case HEADER: return serializePart(value, false, true);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> case FORM_DATA: return serializePart(value, false, null);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> case PATH: return serializePart(value, false, null);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> case QUERY: return serializePart(value, false, null);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> default: return StringUtils.toString(value);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>}<a name="line.449"></a>
+<span class="sourceLineNo">433</span> StringWriter w = new StringWriter();<a name="line.433"></a>
+<span class="sourceLineNo">434</span> UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> super.doSerialize(s, o);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> return w.toString();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> } catch (Exception e) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> throw new RuntimeException(e);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span> //--------------------------------------------------------------------------------<a name="line.443"></a>
+<span class="sourceLineNo">444</span> // Entry point methods<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 /* Serializer */<a name="line.447"></a>
+<span class="sourceLineNo">448</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> @Override /* Serializer */<a name="line.452"></a>
+<span class="sourceLineNo">453</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.454"></a>
+<span class="sourceLineNo">455</span> serializeAnything(s, s.getWriter(), o);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> @Override /* PartSerializer */<a name="line.458"></a>
+<span class="sourceLineNo">459</span> public String serialize(PartType type, Object value) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> switch(type) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> case HEADER: return serializePart(value, false, true);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> case FORM_DATA: return serializePart(value, false, null);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> case PATH: return serializePart(value, false, null);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> case QUERY: return serializePart(value, false, null);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> default: return StringUtils.toString(value);<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>}<a name="line.468"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
index 6c0b8f6..c1df310 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
@@ -132,17 +132,17 @@
<span class="sourceLineNo">124</span> *<a name="line.124"></a>
<span class="sourceLineNo">125</span> * @param paramFormat The new value for this property.<a name="line.125"></a>
<span class="sourceLineNo">126</span> * @return This object (for method chaining).<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @see UrlEncodingSerializerContext#URLENC_paramFormat<a name="line.127"></a>
+<span class="sourceLineNo">127</span> * @see UonSerializerContext#UON_paramFormat<a name="line.127"></a>
<span class="sourceLineNo">128</span> */<a name="line.128"></a>
<span class="sourceLineNo">129</span> public UrlEncodingSerializerBuilder paramFormat(String paramFormat) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return property(UrlEncodingSerializerContext.URLENC_paramFormat, paramFormat);<a name="line.130"></a>
+<span class="sourceLineNo">130</span> return property(UonSerializerContext.UON_paramFormat, paramFormat);<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> /**<a name="line.133"></a>
<span class="sourceLineNo">134</span> * Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.<a name="line.134"></a>
<span class="sourceLineNo">135</span> *<a name="line.135"></a>
<span class="sourceLineNo">136</span> * @return This object (for method chaining).<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * @see UrlEncodingSerializerContext#URLENC_paramFormat<a name="line.137"></a>
+<span class="sourceLineNo">137</span> * @see UonSerializerContext#UON_paramFormat<a name="line.137"></a>
<span class="sourceLineNo">138</span> */<a name="line.138"></a>
<span class="sourceLineNo">139</span> public UrlEncodingSerializerBuilder plainTextParams() {<a name="line.139"></a>
<span class="sourceLineNo">140</span> return paramFormat("PLAINTEXT");<a name="line.140"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
index fb2ed76..031b53b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
@@ -33,59 +33,30 @@
<span class="sourceLineNo">025</span> */<a name="line.25"></a>
<span class="sourceLineNo">026</span>public class UrlEncodingSerializerContext extends UonSerializerContext {<a name="line.26"></a>
<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span> /**<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <b>Configuration property:</b> Format to use for top-level query names and simple parameters.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <p><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <ul><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <li><b>Name:</b> <js>"UrlEncodingSerializer.paramFormat"</js><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <li><b>Data type:</b> <code>String</code><a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <li><b>Default:</b> <js>"UON"</js><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * </ul><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * Specifies the format to use for URL GET parameter keys and values.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <p><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * The possible values are:<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <ul><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <li><js>"UON"</js> (default) - Use UON notation for values.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <br>String values such as <js>"(foo='bar')"</js> will end up being quoted and escaped to <js>"'(foo=bar~'baz~')'"</js>.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <br>Similarly, boolean and numeric values will also end up quoted.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li><js>"PLAINTEXT"</js> (default) - Serialize as plain text.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <br>Strings will never be quoted or escaped.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <br>Note that this can cause errors during parsing if you're using the URL-encoding parser to parse<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * the results since UON constructs won't be differentiatable.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <br>However, this is not an issue if you're simply creating queries or form posts against 3rd-party interfaces.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * </ul><a name="line.50"></a>
-<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span> public static final String URLENC_paramFormat = "UrlEncodingSerializer.paramFormat";<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> final boolean<a name="line.55"></a>
-<span class="sourceLineNo">056</span> expandedParams,<a name="line.56"></a>
-<span class="sourceLineNo">057</span> plainTextParams;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> /**<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * Constructor.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <p><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Typically only called from {@link PropertyStore#getContext(Class)}.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @param ps The property store that created this context.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> */<a name="line.65"></a>
-<span class="sourceLineNo">066</span> public UrlEncodingSerializerContext(PropertyStore ps) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> super(ps);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> this.expandedParams = ps.getProperty(UrlEncodingContext.URLENC_expandedParams, boolean.class, false);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> this.plainTextParams = ps.getProperty(UrlEncodingSerializerContext.URLENC_paramFormat, String.class, "UON").equals("PLAINTEXT");<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> @Override /* Context */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public ObjectMap asMap() {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return super.asMap()<a name="line.74"></a>
-<span class="sourceLineNo">075</span> .append("UrlEncodingSerializerContext", new ObjectMap()<a name="line.75"></a>
-<span class="sourceLineNo">076</span> .append("expandedParams", expandedParams)<a name="line.76"></a>
-<span class="sourceLineNo">077</span> .append("plainTextParams", plainTextParams)<a name="line.77"></a>
-<span class="sourceLineNo">078</span> );<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span>}<a name="line.80"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span> final boolean<a name="line.29"></a>
+<span class="sourceLineNo">030</span> expandedParams;<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span> /**<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * Constructor.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Typically only called from {@link PropertyStore#getContext(Class)}.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * @param ps The property store that created this context.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> */<a name="line.38"></a>
+<span class="sourceLineNo">039</span> public UrlEncodingSerializerContext(PropertyStore ps) {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> super(ps);<a name="line.40"></a>
+<span class="sourceLineNo">041</span> this.expandedParams = ps.getProperty(UrlEncodingContext.URLENC_expandedParams, boolean.class, false);<a name="line.41"></a>
+<span class="sourceLineNo">042</span> }<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span> @Override /* Context */<a name="line.44"></a>
+<span class="sourceLineNo">045</span> public ObjectMap asMap() {<a name="line.45"></a>
+<span class="sourceLineNo">046</span> return super.asMap()<a name="line.46"></a>
+<span class="sourceLineNo">047</span> .append("UrlEncodingSerializerContext", new ObjectMap()<a name="line.47"></a>
+<span class="sourceLineNo">048</span> .append("expandedParams", expandedParams)<a name="line.48"></a>
+<span class="sourceLineNo">049</span> );<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span>}<a name="line.51"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
index d11761c..aa109c2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
@@ -35,7 +35,7 @@
<span class="sourceLineNo">027</span> */<a name="line.27"></a>
<span class="sourceLineNo">028</span>public class UrlEncodingSerializerSession extends UonSerializerSession {<a name="line.28"></a>
<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span> private final boolean expandedParams, plainTextParams;<a name="line.30"></a>
+<span class="sourceLineNo">030</span> private final boolean expandedParams;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
<span class="sourceLineNo">032</span> /**<a name="line.32"></a>
<span class="sourceLineNo">033</span> * Create a new session using properties specified in the context.<a name="line.33"></a>
@@ -59,55 +59,45 @@
<span class="sourceLineNo">051</span> super(ctx, encode, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.51"></a>
<span class="sourceLineNo">052</span> if (op == null || op.isEmpty()) {<a name="line.52"></a>
<span class="sourceLineNo">053</span> expandedParams = ctx.expandedParams;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> plainTextParams = ctx.plainTextParams;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> } else {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> expandedParams = op.getBoolean(UrlEncodingContext.URLENC_expandedParams, false);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> plainTextParams = op.getString(UrlEncodingSerializerContext.URLENC_paramFormat, "UON").equals("PLAINTEXT");<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Returns <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @param pMeta The metadata on the bean property.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * @return <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public final boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (cm.isCollectionOrArray()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> if (expandedParams)<a name="line.70"></a>
+<span class="sourceLineNo">054</span> } else {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> expandedParams = op.getBoolean(UrlEncodingContext.URLENC_expandedParams, false);<a name="line.55"></a>
+<span class="sourceLineNo">056</span> }<a name="line.56"></a>
+<span class="sourceLineNo">057</span> }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span> /**<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * Returns <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * @param pMeta The metadata on the bean property.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * @return <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> */<a name="line.64"></a>
+<span class="sourceLineNo">065</span> public final boolean shouldUseExpandedParams(BeanPropertyMeta pMeta) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> if (cm.isCollectionOrArray()) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> if (expandedParams)<a name="line.68"></a>
+<span class="sourceLineNo">069</span> return true;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (pMeta.getBeanMeta().getClassMeta().getExtendedMeta(UrlEncodingClassMeta.class).isExpandedParams())<a name="line.70"></a>
<span class="sourceLineNo">071</span> return true;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> if (pMeta.getBeanMeta().getClassMeta().getExtendedMeta(UrlEncodingClassMeta.class).isExpandedParams())<a name="line.72"></a>
-<span class="sourceLineNo">073</span> return true;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return false;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * Returns <jk>true</jk> if the specified value should be represented as an expanded parameter list.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> *<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * @param value The value to check.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @return <jk>true</jk> if the specified value should be represented as an expanded parameter list.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> */<a name="line.83"></a>
-<span class="sourceLineNo">084</span> public final boolean shouldUseExpandedParams(Object value) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> if (value == null || ! expandedParams)<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return false;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> ClassMeta<?> cm = getClassMetaForObject(value).getSerializedClassMeta();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> if (cm.isCollectionOrArray()) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> if (expandedParams)<a name="line.89"></a>
-<span class="sourceLineNo">090</span> return true;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return false;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * Returns <jk>true</jk> if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is <js>"PLAINTEXT"</js>.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * @return <jk>true</jk> if the {@link UrlEncodingSerializerContext#URLENC_paramFormat} is <js>"PLAINTEXT"</js>.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> */<a name="line.98"></a>
-<span class="sourceLineNo">099</span> protected boolean plainTextParams() {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> return plainTextParams;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span>}<a name="line.102"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span> return false;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Returns <jk>true</jk> if the specified value should be represented as an expanded parameter list.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> *<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * @param value The value to check.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @return <jk>true</jk> if the specified value should be represented as an expanded parameter list.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> */<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public final boolean shouldUseExpandedParams(Object value) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> if (value == null || ! expandedParams)<a name="line.83"></a>
+<span class="sourceLineNo">084</span> return false;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> ClassMeta<?> cm = getClassMetaForObject(value).getSerializedClassMeta();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (cm.isCollectionOrArray()) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> if (expandedParams)<a name="line.87"></a>
+<span class="sourceLineNo">088</span> return true;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return false;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span>}<a name="line.92"></a>
[09/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
index 9d04144..cf54be0 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestCall.html
@@ -36,1919 +36,1937 @@
<span class="sourceLineNo">028</span>import org.apache.http.client.entity.*;<a name="line.28"></a>
<span class="sourceLineNo">029</span>import org.apache.http.client.methods.*;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import org.apache.http.client.utils.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.http.impl.client.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.http.util.*;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.juneau.*;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.juneau.encoders.*;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.juneau.internal.*;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.juneau.parser.*;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.juneau.parser.ParseException;<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.utils.*;<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Represents a connection to a remote REST resource.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <p><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Instances of this class are created by the various {@code doX()} methods on the {@link RestClient} class.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <p><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * This class uses only Java standard APIs. Requests can be built up using a fluent interface with method chaining, like so...<a name="line.46"></a>
-<span class="sourceLineNo">047</span> *<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <p class='bcode'><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * RestClient client = <jk>new</jk> RestClient();<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * RestCall c = client.doPost(<jsf>URL</jsf>).setInput(o).setHeader(x,y);<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * MyBean b = c.getResponse(MyBean.<jk>class</jk>);<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * </p><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <p><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * The actual connection and request/response transaction occurs when calling one of the <code>getResponseXXX()</code> methods.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> *<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <h5 class='section'>Additional information:</h5><a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <ul><a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <li><a class="doclink" href="package-summary.html#RestClient">org.apache.juneau.rest.client &gt; REST client API</a> for more information and code examples.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * </ul><a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@SuppressWarnings({ "hiding", "unchecked" })<a name="line.61"></a>
-<span class="sourceLineNo">062</span>public final class RestCall {<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> private final RestClient client; // The client that created this call.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> private final HttpRequestBase request; // The request.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private HttpResponse response; // The response.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private List<RestCallInterceptor> interceptors = new ArrayList<RestCallInterceptor>(); // Used for intercepting and altering requests.<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> private boolean isConnected = false; // connect() has been called.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private boolean allowRedirectsOnPosts;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private int retries = 1;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private int redirectOnPostsTries = 5;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private long retryInterval = -1;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private RetryOn retryOn;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private boolean ignoreErrors;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> private boolean byLines = false;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private TeeWriter writers = new TeeWriter();<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private StringWriter capturedResponseWriter;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private String capturedResponse;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private TeeOutputStream outputStreams = new TeeOutputStream();<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private boolean isClosed = false;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private boolean isFailed = false;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private Object input;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private boolean hasInput; // input() was called, even if it's setting 'null'.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> private Serializer serializer;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> private Parser parser;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> private URIBuilder uriBuilder;<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private NameValuePairs formData;<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> /**<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * Constructs a REST call with the specified method name.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> *<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * @param client The client that created this request.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @param request The wrapped Apache HTTP client request object.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @param uri The URI for this call.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @throws RestCallException If an exception or non-200 response code occurred during the connection attempt.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> */<a name="line.97"></a>
-<span class="sourceLineNo">098</span> protected RestCall(RestClient client, HttpRequestBase request, URI uri) throws RestCallException {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> this.client = client;<a name="line.99"></a>
-<span class="sourceLineNo">100</span> this.request = request;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> for (RestCallInterceptor i : this.client.interceptors)<a name="line.101"></a>
-<span class="sourceLineNo">102</span> interceptor(i);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> this.retryOn = client.retryOn;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> this.retries = client.retries;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> this.retryInterval = client.retryInterval;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> this.serializer = client.serializer;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> this.parser = client.parser;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> uriBuilder = new URIBuilder(uri);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Sets the URI for this call.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <p><a name="line.113"></a>
-<span class="sourceLineNo">114</span> * Can be any of the following types:<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * <ul><a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <li>{@link URI}<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * <li>{@link URL}<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <li>{@link URIBuilder}<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * <li>Anything else converted to a string using {@link Object#toString()}.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * </ul><a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Relative URL strings will be interpreted as relative to the root URL defined on the client.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> *<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @param uri The URI to use for this call.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * This overrides the URI passed in from the client.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @return This object (for method chaining).<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @throws RestCallException<a name="line.126"></a>
-<span class="sourceLineNo">127</span> */<a name="line.127"></a>
-<span class="sourceLineNo">128</span> public RestCall uri(Object uri) throws RestCallException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> try {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (uri != null)<a name="line.130"></a>
-<span class="sourceLineNo">131</span> uriBuilder = new URIBuilder(client.toURI(uri));<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return this;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> } catch (URISyntaxException e) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> throw new RestCallException(e);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * Sets the URI scheme.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> *<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @param scheme The new URI host.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * @return This object (for method chaining).<a name="line.142"></a>
-<span class="sourceLineNo">143</span> */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public RestCall scheme(String scheme) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> uriBuilder.setScheme(scheme);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> return this;<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> * Sets the URI host.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> *<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @param host The new URI host.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @return This object (for method chaining).<a name="line.153"></a>
-<span class="sourceLineNo">154</span> */<a name="line.154"></a>
-<span class="sourceLineNo">155</span> public RestCall host(String host) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> uriBuilder.setHost(host);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> return this;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * Sets the URI port.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> *<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * @param port The new URI port.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * @return This object (for method chaining).<a name="line.164"></a>
-<span class="sourceLineNo">165</span> */<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public RestCall port(int port) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> uriBuilder.setPort(port);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return this;<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> * Adds a query parameter to the URI query.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> *<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * @param name The parameter name.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * Can be null/blank/* if the value is a {@link Map}, {@link String}, {@link NameValuePairs}, or bean.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * @param value The parameter value converted to a string using UON notation.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * Can also be {@link Map}, {@link String}, {@link NameValuePairs}, or bean if the name is null/blank/*.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * If a {@link String} and the name is null/blank/*, then calls {@link URIBuilder#setCustomQuery(String)}.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @param skipIfEmpty Don't add the pair if the value is empty.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @param partSerializer The part serializer to use to convert the value to a string.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * If <jk>null</jk>, then the URL-encoding serializer defined on the client is used.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * @return This object (for method chaining).<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @throws RestCallException<a name="line.183"></a>
-<span class="sourceLineNo">184</span> */<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public RestCall query(String name, Object value, boolean skipIfEmpty, PartSerializer partSerializer) throws RestCallException {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (partSerializer == null)<a name="line.186"></a>
-<span class="sourceLineNo">187</span> partSerializer = client.getPartSerializer();<a name="line.187"></a>
-<span class="sourceLineNo">188</span> if (! ("*".equals(name) || isEmpty(name))) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (value != null && ! (isEmpty(value) && skipIfEmpty))<a name="line.189"></a>
-<span class="sourceLineNo">190</span> uriBuilder.addParameter(name, partSerializer.serialize(PartType.QUERY, value));<a name="line.190"></a>
-<span class="sourceLineNo">191</span> } else if (value instanceof NameValuePairs) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> for (NameValuePair p : (NameValuePairs)value)<a name="line.192"></a>
-<span class="sourceLineNo">193</span> query(p.getName(), p.getValue(), skipIfEmpty, partSerializer);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> } else if (value instanceof String) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> String s = value.toString();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> if (! isEmpty(s))<a name="line.196"></a>
-<span class="sourceLineNo">197</span> uriBuilder.setCustomQuery(s);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } else if (value instanceof Map) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> for (Map.Entry<String,Object> p : ((Map<String,Object>) value).entrySet())<a name="line.199"></a>
-<span class="sourceLineNo">200</span> query(p.getKey(), p.getValue(), skipIfEmpty, partSerializer);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } else if (isBean(value)){<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return query(name, toBeanMap(value), skipIfEmpty, partSerializer);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> } else {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> throw new FormattedRuntimeException("Invalid name ''{0}'' passed to query(name,value,skipIfEmpty) for data type ''{1}''", name, ClassUtils.getReadableClassNameForObject(value));<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return this;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> /**<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * Adds a query parameter to the URI query.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> *<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * @param name The parameter name.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * @param value The parameter value converted to a string using UON notation.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @return This object (for method chaining).<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * @throws RestCallException<a name="line.215"></a>
-<span class="sourceLineNo">216</span> */<a name="line.216"></a>
-<span class="sourceLineNo">217</span> public RestCall query(String name, Object value) throws RestCallException {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return query(name, value, false, null);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> /**<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * Adds query parameters to the URI query.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> *<a name="line.223"></a>
-<span class="sourceLineNo">224</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * @return This object (for method chaining).<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * @throws RestCallException<a name="line.226"></a>
-<span class="sourceLineNo">227</span> */<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public RestCall query(Map<String,Object> params) throws RestCallException {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return query(null, params);<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> * Adds a query parameter to the URI query if the parameter value is not <jk>null</jk> or an empty string.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * <p><a name="line.234"></a>
-<span class="sourceLineNo">235</span> * NE = "not empty"<a name="line.235"></a>
-<span class="sourceLineNo">236</span> *<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * @param name The parameter name.<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * @param value The parameter value converted to a string using UON notation.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * @return This object (for method chaining).<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * @throws RestCallException<a name="line.240"></a>
-<span class="sourceLineNo">241</span> */<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public RestCall queryIfNE(String name, Object value) throws RestCallException {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> return query(name, value, true, null);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> /**<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * Adds query parameters to the URI for any parameters that aren't null/empty.<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * <p><a name="line.248"></a>
-<span class="sourceLineNo">249</span> * NE = "not empty"<a name="line.249"></a>
-<span class="sourceLineNo">250</span> *<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @return This object (for method chaining).<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * @throws RestCallException<a name="line.253"></a>
-<span class="sourceLineNo">254</span> */<a name="line.254"></a>
-<span class="sourceLineNo">255</span> public RestCall queryIfNE(Map<String,Object> params) throws RestCallException {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return query(null, params, true, null);<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> * Sets a custom URI query.<a name="line.260"></a>
-<span class="sourceLineNo">261</span> *<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * @param query The new URI query string.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * @return This object (for method chaining).<a name="line.263"></a>
-<span class="sourceLineNo">264</span> */<a name="line.264"></a>
-<span class="sourceLineNo">265</span> public RestCall query(String query) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> uriBuilder.setCustomQuery(query);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> return this;<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> /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.271"></a>
-<span class="sourceLineNo">272</span> *<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * @param name The parameter name.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * Can be null/blank/* if the value is a {@link Map}, {@link NameValuePairs}, or bean.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * @param value The parameter value converted to a string using UON notation.<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * Can also be {@link Map}, {@link NameValuePairs}, or bean if the name is null/blank/*.<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * @param skipIfEmpty Don't add the pair if the value is empty.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * @param partSerializer The part serializer to use to convert the value to a string.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * If <jk>null</jk>, then the URL-encoding serializer defined on the client is used.<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * @return This object (for method chaining).<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * @throws RestCallException<a name="line.281"></a>
-<span class="sourceLineNo">282</span> */<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public RestCall formData(String name, Object value, boolean skipIfEmpty, PartSerializer partSerializer) throws RestCallException {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (formData == null)<a name="line.284"></a>
-<span class="sourceLineNo">285</span> formData = new NameValuePairs();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> if (partSerializer == null)<a name="line.286"></a>
-<span class="sourceLineNo">287</span> partSerializer = client.getPartSerializer();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> if (! ("*".equals(name) || isEmpty(name))) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> if (value != null && ! (isEmpty(value) && skipIfEmpty))<a name="line.289"></a>
-<span class="sourceLineNo">290</span> formData.add(new SerializedNameValuePair(name, value, partSerializer));<a name="line.290"></a>
-<span class="sourceLineNo">291</span> } else if (value instanceof NameValuePairs) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> for (NameValuePair p : (NameValuePairs)value)<a name="line.292"></a>
-<span class="sourceLineNo">293</span> if (! (isEmpty(p.getValue()) && skipIfEmpty))<a name="line.293"></a>
-<span class="sourceLineNo">294</span> formData.add(p);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> } else if (value instanceof Map) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> for (Map.Entry<String,Object> p : ((Map<String,Object>) value).entrySet())<a name="line.296"></a>
-<span class="sourceLineNo">297</span> formData(p.getKey(), p.getValue(), skipIfEmpty, partSerializer);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> } else if (isBean(value)) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return formData(name, toBeanMap(value), skipIfEmpty, partSerializer);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> } else {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> throw new FormattedRuntimeException("Invalid name ''{0}'' passed to formData(name,value,skipIfEmpty) for data type ''{1}''", name, ClassUtils.getReadableClassNameForObject(value));<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return this;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> *<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * @param name The parameter name.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * Can be null/blank if the value is a {@link Map} or {@link NameValuePairs}.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * @param value The parameter value converted to a string using UON notation.<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * Can also be a {@link Map} or {@link NameValuePairs}.<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * @return This object (for method chaining).<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> */<a name="line.315"></a>
-<span class="sourceLineNo">316</span> public RestCall formData(String name, Object value) throws RestCallException {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return formData(name, value, false, null);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> /**<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> *<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * @param nameValuePairs The name-value pairs of the request.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @return This object (for method chaining).<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * @throws RestCallException<a name="line.325"></a>
-<span class="sourceLineNo">326</span> */<a name="line.326"></a>
-<span class="sourceLineNo">327</span> public RestCall formData(NameValuePairs nameValuePairs) throws RestCallException {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> return formData(null, nameValuePairs);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> /**<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.332"></a>
-<span class="sourceLineNo">333</span> *<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * @return This object (for method chaining).<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> */<a name="line.337"></a>
-<span class="sourceLineNo">338</span> public RestCall formData(Map<String,Object> params) throws RestCallException {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> return formData(null, params);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> /**<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * Adds a form data pair to the request if the parameter value is not <jk>null</jk> or an empty string.<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * <p><a name="line.344"></a>
-<span class="sourceLineNo">345</span> * NE = "not empty"<a name="line.345"></a>
-<span class="sourceLineNo">346</span> *<a name="line.346"></a>
-<span class="sourceLineNo">347</span> * @param name The parameter name.<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * @param value The parameter value converted to a string using UON notation.<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * @return This object (for method chaining).<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @throws RestCallException<a name="line.350"></a>
-<span class="sourceLineNo">351</span> */<a name="line.351"></a>
-<span class="sourceLineNo">352</span> public RestCall formDataIfNE(String name, Object value) throws RestCallException {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> return formData(name, value, true, null);<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> /**<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * Adds form data parameters to the request for any parameters that aren't null/empty.<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * <p><a name="line.358"></a>
-<span class="sourceLineNo">359</span> * NE = "not empty"<a name="line.359"></a>
-<span class="sourceLineNo">360</span> *<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * @return This object (for method chaining).<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @throws RestCallException<a name="line.363"></a>
-<span class="sourceLineNo">364</span> */<a name="line.364"></a>
-<span class="sourceLineNo">365</span> public RestCall formDataIfNE(Map<String,Object> params) throws RestCallException {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> return formData(null, params, true, null);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span> /**<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.<a name="line.370"></a>
-<span class="sourceLineNo">371</span> *<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @param name The path variable name.<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @param value The replacement value.<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @param partSerializer The part serializer to use to convert the value to a string.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * If <jk>null</jk>, then the URL-encoding serializer defined on the client is used.<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * @return This object (for method chaining).<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * @throws RestCallException If variable could not be found in path.<a name="line.377"></a>
-<span class="sourceLineNo">378</span> */<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public RestCall path(String name, Object value, PartSerializer partSerializer) throws RestCallException {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> String path = uriBuilder.getPath();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (partSerializer == null)<a name="line.381"></a>
-<span class="sourceLineNo">382</span> partSerializer = client.getPartSerializer();<a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (! ("*".equals(name) || isEmpty(name))) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> String var = "{" + name + "}";<a name="line.384"></a>
-<span class="sourceLineNo">385</span> if (path.indexOf(var) == -1)<a name="line.385"></a>
-<span class="sourceLineNo">386</span> throw new RestCallException("Path variable {"+name+"} was not found in path.");<a name="line.386"></a>
-<span class="sourceLineNo">387</span> String newPath = path.replace(var, partSerializer.serialize(PartType.PATH, value));<a name="line.387"></a>
-<span class="sourceLineNo">388</span> uriBuilder.setPath(newPath);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> } else if (value instanceof NameValuePairs) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> for (NameValuePair p : (NameValuePairs)value)<a name="line.390"></a>
-<span class="sourceLineNo">391</span> path(p.getName(), p.getValue());<a name="line.391"></a>
-<span class="sourceLineNo">392</span> } else if (value instanceof Map) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> for (Map.Entry<String,Object> p : ((Map<String,Object>) value).entrySet())<a name="line.393"></a>
-<span class="sourceLineNo">394</span> path(p.getKey(), p.getValue());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } else if (isBean(value)) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return path(name, toBeanMap(value));<a name="line.396"></a>
-<span class="sourceLineNo">397</span> } else {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> throw new FormattedRuntimeException("Invalid name ''{0}'' passed to path(name,value) for data type ''{1}''", name, ClassUtils.getReadableClassNameForObject(value));<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span> return this;<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span> /**<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @param name The path variable name.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> * @param value The replacement value.<a name="line.407"></a>
-<span class="sourceLineNo">408</span> * @return This object (for method chaining).<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * @throws RestCallException If variable could not be found in path.<a name="line.409"></a>
-<span class="sourceLineNo">410</span> */<a name="line.410"></a>
-<span class="sourceLineNo">411</span> public RestCall path(String name, Object value) throws RestCallException {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> return path(name, value, null);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<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> * Sets the URI user info.<a name="line.416"></a>
-<span class="sourceLineNo">417</span> *<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * @param userInfo The new URI user info.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * @return This object (for method chaining).<a name="line.419"></a>
-<span class="sourceLineNo">420</span> */<a name="line.420"></a>
-<span class="sourceLineNo">421</span> public RestCall userInfo(String userInfo) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> uriBuilder.setUserInfo(userInfo);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return this;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> /**<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * Sets the URI user info.<a name="line.427"></a>
-<span class="sourceLineNo">428</span> *<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * @param username The new URI username.<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * @param password The new URI password.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @return This object (for method chaining).<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public RestCall userInfo(String username, String password) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> uriBuilder.setUserInfo(username, password);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> return this;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span> /**<a name="line.438"></a>
-<span class="sourceLineNo">439</span> * Sets the input for this REST call.<a name="line.439"></a>
-<span class="sourceLineNo">440</span> *<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * @param input The input to be sent to the REST resource (only valid for PUT and POST) requests. <br><a name="line.441"></a>
-<span class="sourceLineNo">442</span> * Can be of the following types:<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * <ul class='spaced-list'><a name="line.443"></a>
-<span class="sourceLineNo">444</span> * <li>{@link Reader} - Raw contents of {@code Reader} will be serialized to remote resource.<a name="line.444"></a>
-<span class="sourceLineNo">445</span> * <li>{@link InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * <li>{@link Object} - POJO to be converted to text using the {@link Serializer} registered with the {@link RestClient}.<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * <li>{@link HttpEntity} - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * <li>{@link NameValuePairs} - Converted to a URL-encoded FORM post.<a name="line.448"></a>
-<span class="sourceLineNo">449</span> * </ul><a name="line.449"></a>
-<span class="sourceLineNo">450</span> * @return This object (for method chaining).<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * @throws RestCallException If a retry was attempted, but the entity was not repeatable.<a name="line.451"></a>
-<span class="sourceLineNo">452</span> */<a name="line.452"></a>
-<span class="sourceLineNo">453</span> public RestCall input(final Object input) throws RestCallException {<a name="line.453"></a>
-<span class="sourceLineNo">454</span> this.input = input;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> this.hasInput = true;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return this;<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> /**<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * Specifies the serializer to use on this call.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * <p><a name="line.461"></a>
-<span class="sourceLineNo">462</span> * Overrides the serializer specified on the {@link RestClient}.<a name="line.462"></a>
-<span class="sourceLineNo">463</span> *<a name="line.463"></a>
-<span class="sourceLineNo">464</span> * @param serializer The serializer used to serialize POJOs to the body of the HTTP request.<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * @return This object (for method chaining).<a name="line.465"></a>
-<span class="sourceLineNo">466</span> */<a name="line.466"></a>
-<span class="sourceLineNo">467</span> public RestCall serializer(Serializer serializer) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> this.serializer = serializer;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> return this;<a name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span> /**<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * Specifies the parser to use on this call.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> * <p><a name="line.474"></a>
-<span class="sourceLineNo">475</span> * Overrides the parser specified on the {@link RestClient}.<a name="line.475"></a>
-<span class="sourceLineNo">476</span> *<a name="line.476"></a>
-<span class="sourceLineNo">477</span> * @param parser The parser used to parse POJOs from the body of the HTTP response.<a name="line.477"></a>
-<span class="sourceLineNo">478</span> * @return This object (for method chaining).<a name="line.478"></a>
-<span class="sourceLineNo">479</span> */<a name="line.479"></a>
-<span class="sourceLineNo">480</span> public RestCall parser(Parser parser) {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> this.parser = parser;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> return this;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> }<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span> //--------------------------------------------------------------------------------<a name="line.486"></a>
-<span class="sourceLineNo">487</span> // HTTP headers<a name="line.487"></a>
-<span class="sourceLineNo">488</span> //--------------------------------------------------------------------------------<a name="line.488"></a>
+<span class="sourceLineNo">031</span>import org.apache.http.entity.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.http.impl.client.*;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.http.util.*;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.juneau.*;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.juneau.encoders.*;<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.internal.ObjectUtils;<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.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 a connection to a remote REST resource.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Instances of this class are created by the various {@code doX()} methods on the {@link RestClient} class.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * This class uses only Java standard APIs. Requests can be built up using a fluent interface with method chaining, like so...<a name="line.49"></a>
+<span class="sourceLineNo">050</span> *<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <p class='bcode'><a name="line.51"></a>
+<span class="sourceLineNo">052</span> * RestClient client = <jk>new</jk> RestClient();<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * RestCall c = client.doPost(<jsf>URL</jsf>).setInput(o).setHeader(x,y);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * MyBean b = c.getResponse(MyBean.<jk>class</jk>);<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * </p><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <p><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * The actual connection and request/response transaction occurs when calling one of the <code>getResponseXXX()</code> methods.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <h5 class='section'>Additional information:</h5><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <ul><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <li><a class="doclink" href="package-summary.html#RestClient">org.apache.juneau.rest.client &gt; REST client API</a> for more information and code examples.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * </ul><a name="line.62"></a>
+<span class="sourceLineNo">063</span> */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>@SuppressWarnings({ "hiding", "unchecked" })<a name="line.64"></a>
+<span class="sourceLineNo">065</span>public final class RestCall {<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> private final RestClient client; // The client that created this call.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> private final HttpRequestBase request; // The request.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private HttpResponse response; // The response.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private List<RestCallInterceptor> interceptors = new ArrayList<RestCallInterceptor>(); // Used for intercepting and altering requests.<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> private boolean isConnected = false; // connect() has been called.<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private boolean allowRedirectsOnPosts;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> private int retries = 1;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> private int redirectOnPostsTries = 5;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> private long retryInterval = -1;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> private RetryOn retryOn;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private boolean ignoreErrors;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private boolean byLines = false;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private TeeWriter writers = new TeeWriter();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private StringWriter capturedResponseWriter;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private String capturedResponse;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> private TeeOutputStream outputStreams = new TeeOutputStream();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private boolean isClosed = false;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private boolean isFailed = false;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> private Object input;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> private boolean hasInput; // input() was called, even if it's setting 'null'.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> private Serializer serializer;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> private Parser parser;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> private URIBuilder uriBuilder;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> private NameValuePairs formData;<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * Constructs a REST call with the specified method name.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> *<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @param client The client that created this request.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @param request The wrapped Apache HTTP client request object.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @param uri The URI for this call.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @throws RestCallException If an exception or non-200 response code occurred during the connection attempt.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span> protected RestCall(RestClient client, HttpRequestBase request, URI uri) throws RestCallException {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> this.client = client;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> this.request = request;<a name="line.103"></a>
+<span class="sourceLineNo">104</span> for (RestCallInterceptor i : this.client.interceptors)<a name="line.104"></a>
+<span class="sourceLineNo">105</span> interceptor(i);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> this.retryOn = client.retryOn;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> this.retries = client.retries;<a name="line.107"></a>
+<span class="sourceLineNo">108</span> this.retryInterval = client.retryInterval;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> this.serializer = client.serializer;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> this.parser = client.parser;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> uriBuilder = new URIBuilder(uri);<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Sets the URI for this call.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * Can be any of the following types:<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <ul><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <li>{@link URI}<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <li>{@link URL}<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * <li>{@link URIBuilder}<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <li>Anything else converted to a string using {@link Object#toString()}.<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * </ul><a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Relative URL strings will be interpreted as relative to the root URL defined on the client.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> *<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * @param uri The URI to use for this call.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * This overrides the URI passed in from the client.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @return This object (for method chaining).<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * @throws RestCallException<a name="line.129"></a>
+<span class="sourceLineNo">130</span> */<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public RestCall uri(Object uri) throws RestCallException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> try {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (uri != null)<a name="line.133"></a>
+<span class="sourceLineNo">134</span> uriBuilder = new URIBuilder(client.toURI(uri));<a name="line.134"></a>
+<span class="sourceLineNo">135</span> return this;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> } catch (URISyntaxException e) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> throw new RestCallException(e);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> /**<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * Sets the URI scheme.<a name="line.142"></a>
+<span class="sourceLineNo">143</span> *<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * @param scheme The new URI host.<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * @return This object (for method chaining).<a name="line.145"></a>
+<span class="sourceLineNo">146</span> */<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public RestCall scheme(String scheme) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> uriBuilder.setScheme(scheme);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> return this;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * Sets the URI host.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> *<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * @param host The new URI host.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @return This object (for method chaining).<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public RestCall host(String host) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> uriBuilder.setHost(host);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> return this;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> /**<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * Sets the URI port.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> *<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @param port The new URI port.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @return This object (for method chaining).<a name="line.167"></a>
+<span class="sourceLineNo">168</span> */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> public RestCall port(int port) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> uriBuilder.setPort(port);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> return this;<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Adds a query parameter to the URI query.<a name="line.175"></a>
+<span class="sourceLineNo">176</span> *<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * @param name The parameter name.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * Can be null/blank/* if the value is a {@link Map}, {@link String}, {@link NameValuePairs}, or bean.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * @param value The parameter value converted to a string using UON notation.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * Can also be {@link Map}, {@link String}, {@link NameValuePairs}, or bean if the name is null/blank/*.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * If a {@link String} and the name is null/blank/*, then calls {@link URIBuilder#setCustomQuery(String)}.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * @param skipIfEmpty Don't add the pair if the value is empty.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * @param partSerializer The part serializer to use to convert the value to a string.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * If <jk>null</jk>, then the URL-encoding serializer defined on the client is used.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * @return This object (for method chaining).<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * @throws RestCallException<a name="line.186"></a>
+<span class="sourceLineNo">187</span> */<a name="line.187"></a>
+<span class="sourceLineNo">188</span> public RestCall query(String name, Object value, boolean skipIfEmpty, PartSerializer partSerializer) throws RestCallException {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> if (partSerializer == null)<a name="line.189"></a>
+<span class="sourceLineNo">190</span> partSerializer = client.getPartSerializer();<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (! ("*".equals(name) || isEmpty(name))) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (value != null && ! (ObjectUtils.isEmpty(value) && skipIfEmpty))<a name="line.192"></a>
+<span class="sourceLineNo">193</span> uriBuilder.addParameter(name, partSerializer.serialize(PartType.QUERY, value));<a name="line.193"></a>
+<span class="sourceLineNo">194</span> } else if (value instanceof NameValuePairs) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> for (NameValuePair p : (NameValuePairs)value)<a name="line.195"></a>
+<span class="sourceLineNo">196</span> query(p.getName(), p.getValue(), skipIfEmpty, UrlEncodingSerializer.DEFAULT_PLAINTEXT);<a name="line.196"></a>
+<span class="sourceLineNo">197</span> } else if (value instanceof Map) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> for (Map.Entry<String,Object> p : ((Map<String,Object>) value).entrySet())<a name="line.198"></a>
+<span class="sourceLineNo">199</span> query(p.getKey(), p.getValue(), skipIfEmpty, partSerializer);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> } else if (isBean(value)) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return query(name, toBeanMap(value), skipIfEmpty, partSerializer);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> } else if (value instanceof Reader) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> try {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> uriBuilder.setCustomQuery(IOUtils.read(value));<a name="line.204"></a>
+<span class="sourceLineNo">205</span> } catch (IOException e) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> throw new RestCallException(e);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> } else if (value instanceof CharSequence) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> String s = value.toString();<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (! isEmpty(s))<a name="line.210"></a>
+<span class="sourceLineNo">211</span> uriBuilder.setCustomQuery(s);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> } else {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> throw new FormattedRuntimeException("Invalid name ''{0}'' passed to query(name,value,skipIfEmpty) for data type ''{1}''", name, ClassUtils.getReadableClassNameForObject(value));<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return this;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> /**<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * Adds a query parameter to the URI query.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> *<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * @param name The parameter name.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * @param value The parameter value converted to a string using UON notation.<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * @return This object (for method chaining).<a name="line.223"></a>
+<span class="sourceLineNo">224</span> * @throws RestCallException<a name="line.224"></a>
+<span class="sourceLineNo">225</span> */<a name="line.225"></a>
+<span class="sourceLineNo">226</span> public RestCall query(String name, Object value) throws RestCallException {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return query(name, value, false, null);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> /**<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * Adds query parameters to the URI query.<a name="line.231"></a>
+<span class="sourceLineNo">232</span> *<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * @return This object (for method chaining).<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @throws RestCallException<a name="line.235"></a>
+<span class="sourceLineNo">236</span> */<a name="line.236"></a>
+<span class="sourceLineNo">237</span> public RestCall query(Map<String,Object> params) throws RestCallException {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return query(null, params);<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> * Adds a query parameter to the URI query if the parameter value is not <jk>null</jk> or an empty string.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <p><a name="line.243"></a>
+<span class="sourceLineNo">244</span> * NE = "not empty"<a name="line.244"></a>
+<span class="sourceLineNo">245</span> *<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * @param name The parameter name.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * @param value The parameter value converted to a string using UON notation.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * @return This object (for method chaining).<a name="line.248"></a>
+<span class="sourceLineNo">249</span> * @throws RestCallException<a name="line.249"></a>
+<span class="sourceLineNo">250</span> */<a name="line.250"></a>
+<span class="sourceLineNo">251</span> public RestCall queryIfNE(String name, Object value) throws RestCallException {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> return query(name, value, true, null);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> /**<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * Adds query parameters to the URI for any parameters that aren't null/empty.<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * <p><a name="line.257"></a>
+<span class="sourceLineNo">258</span> * NE = "not empty"<a name="line.258"></a>
+<span class="sourceLineNo">259</span> *<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * @return This object (for method chaining).<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @throws RestCallException<a name="line.262"></a>
+<span class="sourceLineNo">263</span> */<a name="line.263"></a>
+<span class="sourceLineNo">264</span> public RestCall queryIfNE(Map<String,Object> params) throws RestCallException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return query(null, params, true, null);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> /**<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * Sets a custom URI query.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> *<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * @param query The new URI query string.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * @return This object (for method chaining).<a name="line.272"></a>
+<span class="sourceLineNo">273</span> */<a name="line.273"></a>
+<span class="sourceLineNo">274</span> public RestCall query(String query) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> uriBuilder.setCustomQuery(query);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return this;<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> /**<a name="line.279"></a>
+<span class="sourceLineNo">280</span> * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.280"></a>
+<span class="sourceLineNo">281</span> *<a name="line.281"></a>
+<span class="sourceLineNo">282</span> * @param name The parameter name.<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * Can be null/blank/* if the value is a {@link Map}, {@link NameValuePairs}, or bean.<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * @param value The parameter value converted to a string using UON notation.<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * Can also be {@link Map}, {@link NameValuePairs}, or bean if the name is null/blank/*.<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * @param skipIfEmpty Don't add the pair if the value is empty.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * @param partSerializer The part serializer to use to convert the value to a string.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * If <jk>null</jk>, then the URL-encoding serializer defined on the client is used.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * @return This object (for method chaining).<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * @throws RestCallException<a name="line.290"></a>
+<span class="sourceLineNo">291</span> */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> public RestCall formData(String name, Object value, boolean skipIfEmpty, PartSerializer partSerializer) throws RestCallException {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (formData == null)<a name="line.293"></a>
+<span class="sourceLineNo">294</span> formData = new NameValuePairs();<a name="line.294"></a>
+<span class="sourceLineNo">295</span> if (partSerializer == null)<a name="line.295"></a>
+<span class="sourceLineNo">296</span> partSerializer = client.getPartSerializer();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (! ("*".equals(name) || isEmpty(name))) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> if (value != null && ! (ObjectUtils.isEmpty(value) && skipIfEmpty))<a name="line.298"></a>
+<span class="sourceLineNo">299</span> formData.add(new SerializedNameValuePair(name, value, partSerializer));<a name="line.299"></a>
+<span class="sourceLineNo">300</span> } else if (value instanceof NameValuePairs) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> for (NameValuePair p : (NameValuePairs)value)<a name="line.301"></a>
+<span class="sourceLineNo">302</span> if (p.getValue() != null && ! (isEmpty(p.getValue()) && skipIfEmpty))<a name="line.302"></a>
+<span class="sourceLineNo">303</span> formData.add(p);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> } else if (value instanceof Map) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> for (Map.Entry<String,Object> p : ((Map<String,Object>) value).entrySet())<a name="line.305"></a>
+<span class="sourceLineNo">306</span> formData(p.getKey(), p.getValue(), skipIfEmpty, partSerializer);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } else if (isBean(value)) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return formData(name, toBeanMap(value), skipIfEmpty, partSerializer);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> } else if (value instanceof Reader) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> contentType("application/x-www-form-urlencoded");<a name="line.310"></a>
+<span class="sourceLineNo">311</span> input(value);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> } else if (value instanceof CharSequence) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> try {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> contentType("application/x-www-form-urlencoded");<a name="line.314"></a>
+<span class="sourceLineNo">315</span> input(new StringEntity(value.toString()));<a name="line.315"></a>
+<span class="sourceLineNo">316</span> } catch (UnsupportedEncodingException e) {}<a name="line.316"></a>
+<span class="sourceLineNo">317</span> } else {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> throw new FormattedRuntimeException("Invalid name ''{0}'' passed to formData(name,value,skipIfEmpty) for data type ''{1}''", name, ClassUtils.getReadableClassNameForObject(value));<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> return this;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> /**<a name="line.323"></a>
+<span class="sourceLineNo">324</span> * Adds a form data pair to this request to perform a URL-encoded form post.<a name="line.324"></a>
+<span class="sourceLineNo">325</span> *<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * @param name The parameter name.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> * Can be null/blank if the value is a {@link Map} or {@link NameValuePairs}.<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * @param value The parameter value converted to a string using UON notation.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * Can also be a {@link Map} or {@link NameValuePairs}.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @return This object (for method chaining).<a name="line.330"></a>
+<span class="sourceLineNo">331</span> * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.331"></a>
+<span class="sourceLineNo">332</span> */<a name="line.332"></a>
+<span class="sourceLineNo">333</span> public RestCall formData(String name, Object value) throws RestCallException {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> return formData(name, value, false, null);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> /**<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.338"></a>
+<span class="sourceLineNo">339</span> *<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * @param nameValuePairs The name-value pairs of the request.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * @return This object (for method chaining).<a name="line.341"></a>
+<span class="sourceLineNo">342</span> * @throws RestCallException<a name="line.342"></a>
+<span class="sourceLineNo">343</span> */<a name="line.343"></a>
+<span class="sourceLineNo">344</span> public RestCall formData(NameValuePairs nameValuePairs) throws RestCallException {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> return formData(null, nameValuePairs);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Adds form data pairs to this request to perform a URL-encoded form post.<a name="line.349"></a>
+<span class="sourceLineNo">350</span> *<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * @return This object (for method chaining).<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @throws RestCallException If name was null/blank and value wasn't a {@link Map} or {@link NameValuePairs}.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> */<a name="line.354"></a>
+<span class="sourceLineNo">355</span> public RestCall formData(Map<String,Object> params) throws RestCallException {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return formData(null, params);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> /**<a name="line.359"></a>
+<span class="sourceLineNo">360</span> * Adds a form data pair to the request if the parameter value is not <jk>null</jk> or an empty string.<a name="line.360"></a>
+<span class="sourceLineNo">361</span> * <p><a name="line.361"></a>
+<span class="sourceLineNo">362</span> * NE = "not empty"<a name="line.362"></a>
+<span class="sourceLineNo">363</span> *<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * @param name The parameter name.<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * @param value The parameter value converted to a string using UON notation.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * @return This object (for method chaining).<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * @throws RestCallException<a name="line.367"></a>
+<span class="sourceLineNo">368</span> */<a name="line.368"></a>
+<span class="sourceLineNo">369</span> public RestCall formDataIfNE(String name, Object value) throws RestCallException {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> return formData(name, value, true, null);<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> * Adds form data parameters to the request for any parameters that aren't null/empty.<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * <p><a name="line.375"></a>
+<span class="sourceLineNo">376</span> * NE = "not empty"<a name="line.376"></a>
+<span class="sourceLineNo">377</span> *<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @param params The parameters. Values are converted to a string using UON notation.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * @return This object (for method chaining).<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * @throws RestCallException<a name="line.380"></a>
+<span class="sourceLineNo">381</span> */<a name="line.381"></a>
+<span class="sourceLineNo">382</span> public RestCall formDataIfNE(Map<String,Object> params) throws RestCallException {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> return formData(null, params, true, null);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> /**<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.<a name="line.387"></a>
+<span class="sourceLineNo">388</span> *<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * @param name The path variable name.<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * @param value The replacement value.<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * @param partSerializer The part serializer to use to convert the value to a string.<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * If <jk>null</jk>, then the URL-encoding serializer defined on the client is used.<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * @return This object (for method chaining).<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * @throws RestCallException If variable could not be found in path.<a name="line.394"></a>
+<span class="sourceLineNo">395</span> */<a name="line.395"></a>
+<span class="sourceLineNo">396</span> public RestCall path(String name, Object value, PartSerializer partSerializer) throws RestCallException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> String path = uriBuilder.getPath();<a name="line.397"></a>
+<span class="sourceLineNo">398</span> if (partSerializer == null)<a name="line.398"></a>
+<span class="sourceLineNo">399</span> partSerializer = client.getPartSerializer();<a name="line.399"></a>
+<span class="sourceLineNo">400</span> if (! ("*".equals(name) || isEmpty(name))) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> String var = "{" + name + "}";<a name="line.401"></a>
+<span class="sourceLineNo">402</span> if (path.indexOf(var) == -1)<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throw new RestCallException("Path variable {"+name+"} was not found in path.");<a name="line.403"></a>
+<span class="sourceLineNo">404</span> String newPath = path.replace(var, partSerializer.serialize(PartType.PATH, value));<a name="line.404"></a>
+<span class="sourceLineNo">405</span> uriBuilder.setPath(newPath);<a name="line.405"></a>
+<span class="sourceLineNo">406</span> } else if (value instanceof NameValuePairs) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> for (NameValuePair p : (NameValuePairs)value)<a name="line.407"></a>
+<span class="sourceLineNo">408</span> path(p.getName(), p.getValue(), partSerializer);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> } else if (value instanceof Map) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> for (Map.Entry<String,Object> p : ((Map<String,Object>) value).entrySet())<a name="line.410"></a>
+<span class="sourceLineNo">411</span> path(p.getKey(), p.getValue(), partSerializer);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> } else if (isBean(value)) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> return path(name, toBeanMap(value), partSerializer);<a name="line.413"></a>
+<span class="sourceLineNo">414</span> } else if (value != null) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> throw new FormattedRuntimeException("Invalid name ''{0}'' passed to path(name,value) for data type ''{1}''", name, ClassUtils.getReadableClassNameForObject(value));<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> return this;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> /**<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> *<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * @param name The path variable name.<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * @param value The replacement value.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @return This object (for method chaining).<a name="line.425"></a>
+<span class="sourceLineNo">426</span> * @throws RestCallException If variable could not be found in path.<a name="line.426"></a>
+<span class="sourceLineNo">427</span> */<a name="line.427"></a>
+<span class="sourceLineNo">428</span> public RestCall path(String name, Object value) throws RestCallException {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return path(name, value, null);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> /**<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * Sets the URI user info.<a name="line.433"></a>
+<span class="sourceLineNo">434</span> *<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * @param userInfo The new URI user info.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> * @return This object (for method chaining).<a name="line.436"></a>
+<span class="sourceLineNo">437</span> */<a name="line.437"></a>
+<span class="sourceLineNo">438</span> public RestCall userInfo(String userInfo) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> uriBuilder.setUserInfo(userInfo);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>
<TRUNCATED>
[03/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
index 95ff724..409861a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
@@ -145,316 +145,335 @@
<span class="sourceLineNo">137</span> /** Reusable instance of {@link UrlEncodingSerializer}, all default settings. */<a name="line.137"></a>
<span class="sourceLineNo">138</span> public static final UrlEncodingSerializer DEFAULT = new UrlEncodingSerializer(PropertyStore.create());<a name="line.138"></a>
<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> /** Reusable instance of {@link UrlEncodingSerializer.Expanded}. */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public static final UrlEncodingSerializer DEFAULT_EXPANDED = new Expanded(PropertyStore.create());<a name="line.141"></a>
+<span class="sourceLineNo">140</span> /** Reusable instance of {@link UrlEncodingSerializer.PlainText}. */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public static final UrlEncodingSerializer DEFAULT_PLAINTEXT = new PlainText(PropertyStore.create());<a name="line.141"></a>
<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> /** Reusable instance of {@link UrlEncodingSerializer.Readable}. */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final UrlEncodingSerializer DEFAULT_READABLE = new Readable(PropertyStore.create());<a name="line.144"></a>
+<span class="sourceLineNo">143</span> /** Reusable instance of {@link UrlEncodingSerializer.Expanded}. */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> public static final UrlEncodingSerializer DEFAULT_EXPANDED = new Expanded(PropertyStore.create());<a name="line.144"></a>
<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> */<a name="line.148"></a>
-<span class="sourceLineNo">149</span> @Produces(value="application/x-www-form-urlencoded",contentType="application/x-www-form-urlencoded")<a name="line.149"></a>
-<span class="sourceLineNo">150</span> public static class Expanded extends UrlEncodingSerializer {<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * Constructor.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> */<a name="line.155"></a>
-<span class="sourceLineNo">156</span> public Expanded(PropertyStore propertyStore) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> super(propertyStore);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Override /* CoreObject */<a name="line.160"></a>
-<span class="sourceLineNo">161</span> protected ObjectMap getOverrideProperties() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return super.getOverrideProperties().append(UrlEncodingContext.URLENC_expandedParams, true);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> /**<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public static class Readable extends UrlEncodingSerializer {<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> * Constructor.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> */<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public Readable(PropertyStore propertyStore) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> super(propertyStore);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> @Override /* CoreObject */<a name="line.179"></a>
-<span class="sourceLineNo">180</span> protected ObjectMap getOverrideProperties() {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return super.getOverrideProperties().append(SERIALIZER_useWhitespace, true);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> private final UrlEncodingSerializerContext ctx;<a name="line.186"></a>
+<span class="sourceLineNo">146</span> /** Reusable instance of {@link UrlEncodingSerializer.Readable}. */<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final UrlEncodingSerializer DEFAULT_READABLE = new Readable(PropertyStore.create());<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> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span> @Produces(value="application/x-www-form-urlencoded",contentType="application/x-www-form-urlencoded")<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public static class Expanded extends UrlEncodingSerializer {<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * Constructor.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public Expanded(PropertyStore propertyStore) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> super(propertyStore);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> @Override /* CoreObject */<a name="line.163"></a>
+<span class="sourceLineNo">164</span> protected ObjectMap getOverrideProperties() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> return super.getOverrideProperties().append(UrlEncodingContext.URLENC_expandedParams, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> */<a name="line.171"></a>
+<span class="sourceLineNo">172</span> public static class Readable extends UrlEncodingSerializer {<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Constructor.<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public Readable(PropertyStore propertyStore) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> super(propertyStore);<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> @Override /* CoreObject */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> protected ObjectMap getOverrideProperties() {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return super.getOverrideProperties().append(SERIALIZER_useWhitespace, true);<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> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Constructor.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> */<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public UrlEncodingSerializer(PropertyStore propertyStore) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> super(propertyStore);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> this.ctx = createContext(UrlEncodingSerializerContext.class);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> @Override /* CoreObject */<a name="line.197"></a>
-<span class="sourceLineNo">198</span> public UrlEncodingSerializerBuilder builder() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> return new UrlEncodingSerializerBuilder(propertyStore);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> @Override /* CoreObject */<a name="line.202"></a>
-<span class="sourceLineNo">203</span> protected ObjectMap getOverrideProperties() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return super.getOverrideProperties().append(UON_encodeChars, true);<a name="line.204"></a>
+<span class="sourceLineNo">189</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().plainTextParts().build();</code>.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> */<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public static class PlainText extends UrlEncodingSerializer {<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> * Constructor.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> */<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public PlainText(PropertyStore propertyStore) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> super(propertyStore);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> @Override /* CoreObject */<a name="line.201"></a>
+<span class="sourceLineNo">202</span> protected ObjectMap getOverrideProperties() {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return super.getOverrideProperties().append(UonSerializerContext.UON_paramFormat, "PLAINTEXT");<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> * Workhorse method. Determines the type of object, and then calls the<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * appropriate type-specific serialization method.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> */<a name="line.210"></a>
-<span class="sourceLineNo">211</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private SerializerWriter serializeAnything(UrlEncodingSerializerSession session, UonWriter out, Object o) throws Exception {<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> ClassMeta<?> aType; // The actual type<a name="line.214"></a>
-<span class="sourceLineNo">215</span> ClassMeta<?> sType; // The serialized type<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> aType = session.push("root", o, object());<a name="line.217"></a>
-<span class="sourceLineNo">218</span> session.indent--;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (aType == null)<a name="line.219"></a>
-<span class="sourceLineNo">220</span> aType = object();<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> sType = aType.getSerializedClassMeta();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> String typeName = session.getBeanTypeName(session.object(), aType, null);<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> // Swap if necessary<a name="line.225"></a>
-<span class="sourceLineNo">226</span> PojoSwap swap = aType.getPojoSwap();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (swap != null) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> o = swap.swap(session, o);<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.230"></a>
-<span class="sourceLineNo">231</span> // the actual type now.<a name="line.231"></a>
-<span class="sourceLineNo">232</span> if (sType.isObject())<a name="line.232"></a>
-<span class="sourceLineNo">233</span> sType = session.getClassMetaForObject(o);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (sType.isMap()) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (o instanceof BeanMap)<a name="line.237"></a>
-<span class="sourceLineNo">238</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> else<a name="line.239"></a>
-<span class="sourceLineNo">240</span> serializeMap(session, out, (Map)o, sType);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> } else if (sType.isBean()) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.247"></a>
-<span class="sourceLineNo">248</span> // mock key/value pair with a "_value" key.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> out.append("_value=");<a name="line.249"></a>
-<span class="sourceLineNo">250</span> super.serializeAnything(session, out, o, null, null, null, session.plainTextParams());<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> session.pop();<a name="line.253"></a>
-<span class="sourceLineNo">254</span> return out;<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">207</span> private final UrlEncodingSerializerContext ctx;<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> /**<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * Constructor.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public UrlEncodingSerializer(PropertyStore propertyStore) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> super(propertyStore);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> this.ctx = createContext(UrlEncodingSerializerContext.class);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override /* CoreObject */<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public UrlEncodingSerializerBuilder builder() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> return new UrlEncodingSerializerBuilder(propertyStore);<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> @Override /* CoreObject */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> protected ObjectMap getOverrideProperties() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return super.getOverrideProperties().append(UON_encodeChars, true);<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> * Workhorse method. Determines the type of object, and then calls the<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * appropriate type-specific serialization method.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> */<a name="line.231"></a>
+<span class="sourceLineNo">232</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.232"></a>
+<span class="sourceLineNo">233</span> private SerializerWriter serializeAnything(UrlEncodingSerializerSession session, UonWriter out, Object o) throws Exception {<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> ClassMeta<?> aType; // The actual type<a name="line.235"></a>
+<span class="sourceLineNo">236</span> ClassMeta<?> sType; // The serialized type<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> aType = session.push("root", o, object());<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.indent--;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (aType == null)<a name="line.240"></a>
+<span class="sourceLineNo">241</span> aType = object();<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> sType = aType.getSerializedClassMeta();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> String typeName = session.getBeanTypeName(session.object(), aType, null);<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> // Swap if necessary<a name="line.246"></a>
+<span class="sourceLineNo">247</span> PojoSwap swap = aType.getPojoSwap();<a name="line.247"></a>
+<span class="sourceLineNo">248</span> if (swap != null) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> o = swap.swap(session, o);<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.251"></a>
+<span class="sourceLineNo">252</span> // the actual type now.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (sType.isObject())<a name="line.253"></a>
+<span class="sourceLineNo">254</span> sType = session.getClassMetaForObject(o);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * Converts a Collection into an integer-indexed map.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> */<a name="line.259"></a>
-<span class="sourceLineNo">260</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> int i = 0;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> for (Object o : c)<a name="line.263"></a>
-<span class="sourceLineNo">264</span> m.put(i++, o);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return m;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> /**<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * Converts an array into an integer-indexed map.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.273"></a>
-<span class="sourceLineNo">274</span> m.put(i, Array.get(array, i));<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return m;<a name="line.275"></a>
+<span class="sourceLineNo">257</span> if (sType.isMap()) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (o instanceof BeanMap)<a name="line.258"></a>
+<span class="sourceLineNo">259</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> else<a name="line.260"></a>
+<span class="sourceLineNo">261</span> serializeMap(session, out, (Map)o, sType);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } else if (sType.isBean()) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.266"></a>
+<span class="sourceLineNo">267</span> } else {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.268"></a>
+<span class="sourceLineNo">269</span> // mock key/value pair with a "_value" key.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> out.append("_value=");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> super.serializeAnything(session, out, o, null, null, null);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.pop();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return out;<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> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.278"></a>
-<span class="sourceLineNo">279</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> boolean plainTextParams = session.plainTextParams();<a name="line.281"></a>
-<span class="sourceLineNo">282</span> m = session.sort(m);<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> int depth = session.getIndent();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> boolean addAmp = false;<a name="line.287"></a>
+<span class="sourceLineNo">278</span> /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * Converts a Collection into an integer-indexed map.<a name="line.279"></a>
+<span class="sourceLineNo">280</span> */<a name="line.280"></a>
+<span class="sourceLineNo">281</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> int i = 0;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> for (Object o : c)<a name="line.284"></a>
+<span class="sourceLineNo">285</span> m.put(i++, o);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return m;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> Object value = e.getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> if (session.shouldUseExpandedParams(value)) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> while (i.hasNext()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> if (addAmp)<a name="line.296"></a>
-<span class="sourceLineNo">297</span> out.cr(depth).append('&');<a name="line.297"></a>
-<span class="sourceLineNo">298</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.298"></a>
-<span class="sourceLineNo">299</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null, plainTextParams);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> addAmp = true;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> if (addAmp)<a name="line.303"></a>
-<span class="sourceLineNo">304</span> out.cr(depth).append('&');<a name="line.304"></a>
-<span class="sourceLineNo">305</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.305"></a>
-<span class="sourceLineNo">306</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null, plainTextParams);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> addAmp = true;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> return out;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.314"></a>
-<span class="sourceLineNo">315</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> ClassMeta<?> valueType = type.getValueType();<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> int depth = session.getIndent();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> boolean addAmp = false;<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> if (addAmp)<a name="line.323"></a>
-<span class="sourceLineNo">324</span> out.cr(depth).append('&');<a name="line.324"></a>
-<span class="sourceLineNo">325</span> out.append(e.getKey()).append('=');<a name="line.325"></a>
-<span class="sourceLineNo">326</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null, session.plainTextParams());<a name="line.326"></a>
-<span class="sourceLineNo">327</span> addAmp = true;<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> return out;<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> @SuppressWarnings({ "rawtypes" })<a name="line.333"></a>
-<span class="sourceLineNo">334</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> int depth = session.getIndent();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> boolean plainTextParams = session.plainTextParams();<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> boolean addAmp = false;<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> String key = p.getName();<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Object value = p.getValue();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> Throwable t = p.getThrown();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (t != null)<a name="line.347"></a>
-<span class="sourceLineNo">348</span> session.addBeanGetterWarning(pMeta, t);<a name="line.348"></a>
+<span class="sourceLineNo">289</span> /**<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * Converts an array into an integer-indexed map.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.294"></a>
+<span class="sourceLineNo">295</span> m.put(i, Array.get(array, i));<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return m;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.299"></a>
+<span class="sourceLineNo">300</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> m = session.sort(m);<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> int depth = session.getIndent();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> boolean addAmp = false;<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> Object value = e.getValue();<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span> if (session.shouldUseExpandedParams(value)) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> while (i.hasNext()) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (addAmp)<a name="line.316"></a>
+<span class="sourceLineNo">317</span> out.cr(depth).append('&');<a name="line.317"></a>
+<span class="sourceLineNo">318</span> out.appendObject(key, true).append('=');<a name="line.318"></a>
+<span class="sourceLineNo">319</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> addAmp = true;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> } else {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (addAmp)<a name="line.323"></a>
+<span class="sourceLineNo">324</span> out.cr(depth).append('&');<a name="line.324"></a>
+<span class="sourceLineNo">325</span> out.appendObject(key, true).append('=');<a name="line.325"></a>
+<span class="sourceLineNo">326</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> addAmp = true;<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><a name="line.330"></a>
+<span class="sourceLineNo">331</span> return out;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.334"></a>
+<span class="sourceLineNo">335</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> ClassMeta<?> valueType = type.getValueType();<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> int depth = session.getIndent();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> boolean addAmp = false;<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (addAmp)<a name="line.343"></a>
+<span class="sourceLineNo">344</span> out.cr(depth).append('&');<a name="line.344"></a>
+<span class="sourceLineNo">345</span> out.append(e.getKey()).append('=');<a name="line.345"></a>
+<span class="sourceLineNo">346</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> addAmp = true;<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> if (session.canIgnoreValue(cMeta, key, value))<a name="line.350"></a>
-<span class="sourceLineNo">351</span> continue;<a name="line.351"></a>
+<span class="sourceLineNo">350</span> return out;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.354"></a>
-<span class="sourceLineNo">355</span> // so we need to check type if we think it's an array.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> while (i.hasNext()) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (addAmp)<a name="line.358"></a>
-<span class="sourceLineNo">359</span> out.cr(depth).append('&');<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.361"></a>
+<span class="sourceLineNo">353</span> @SuppressWarnings({ "rawtypes" })<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> int depth = session.getIndent();<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> boolean addAmp = false;<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.361"></a>
<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta, plainTextParams);<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> addAmp = true;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (addAmp)<a name="line.368"></a>
-<span class="sourceLineNo">369</span> out.cr(depth).append('&');<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> super.serializeAnything(session, out, value, cMeta, key, pMeta, plainTextParams);<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> addAmp = true;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> }<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return out;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">363</span> String key = p.getName();<a name="line.363"></a>
+<span class="sourceLineNo">364</span> Object value = p.getValue();<a name="line.364"></a>
+<span class="sourceLineNo">365</span> Throwable t = p.getThrown();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> if (t != null)<a name="line.366"></a>
+<span class="sourceLineNo">367</span> session.addBeanGetterWarning(pMeta, t);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.369"></a>
+<span class="sourceLineNo">370</span> continue;<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.373"></a>
+<span class="sourceLineNo">374</span> // so we need to check type if we think it's an array.<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> while (i.hasNext()) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (addAmp)<a name="line.377"></a>
+<span class="sourceLineNo">378</span> out.cr(depth).append('&');<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> out.appendObject(key, true).append('=');<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> //--------------------------------------------------------------------------------<a name="line.383"></a>
-<span class="sourceLineNo">384</span> // Methods for constructing individual parameter values.<a name="line.384"></a>
-<span class="sourceLineNo">385</span> //--------------------------------------------------------------------------------<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * Useful for constructing URL parts.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> *<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * @param o The object to serialize.<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * @param urlEncode URL-encode the string if necessary.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * If <jk>null</jk>, then uses the value of the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @param plainTextParams Whether we're using plain-text params.<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * If <jk>null</jk>, then uses the value from the {@link UrlEncodingSerializerContext#URLENC_paramFormat} setting.<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * @return The serialized object.<a name="line.397"></a>
-<span class="sourceLineNo">398</span> */<a name="line.398"></a>
-<span class="sourceLineNo">399</span> private String serializePart(Object o, Boolean urlEncode, Boolean plainTextParams) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> // Shortcut for simple types.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (cm != null) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (cm.isNumber() || cm.isBoolean())<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return o.toString();<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (cm.isCharSequence()) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> String s = o.toString();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> boolean ptt = (plainTextParams != null ? plainTextParams : ctx.plainTextParams);<a name="line.408"></a>
-<span class="sourceLineNo">409</span> if (ptt || ! UonUtils.needsQuotes(s))<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return (urlEncode ? StringUtils.urlEncode(s) : s);<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> StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super.doSerialize(s, o);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return w.toString();<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 RuntimeException(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> //--------------------------------------------------------------------------------<a name="line.424"></a>
-<span class="sourceLineNo">425</span> // Entry point methods<a name="line.425"></a>
-<span class="sourceLineNo">426</span> //--------------------------------------------------------------------------------<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
+<span class="sourceLineNo">382</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> addAmp = true;<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span> } else {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (addAmp)<a name="line.387"></a>
+<span class="sourceLineNo">388</span> out.cr(depth).append('&');<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> out.appendObject(key, true).append('=');<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> addAmp = true;<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> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return out;<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> //--------------------------------------------------------------------------------<a name="line.402"></a>
+<span class="sourceLineNo">403</span> // Methods for constructing individual parameter values.<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> /**<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Useful for constructing URL parts.<a name="line.409"></a>
+<span class="sourceLineNo">410</span> *<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * @param o The object to serialize.<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * @param urlEncode URL-encode the string if necessary.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * If <jk>null</jk>, then uses the value of the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * @param plainTextParams Whether we're using plain-text params.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * If <jk>null</jk>, then uses the value from the {@link UrlEncodingSerializerContext#URLENC_paramFormat} setting.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * @return The serialized object.<a name="line.416"></a>
+<span class="sourceLineNo">417</span> */<a name="line.417"></a>
+<span class="sourceLineNo">418</span> private String serializePart(Object o, Boolean urlEncode, Boolean plainTextParams) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> try {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> // Shortcut for simple types.<a name="line.420"></a>
+<span class="sourceLineNo">421</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (cm != null) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (cm.isNumber() || cm.isBoolean())<a name="line.423"></a>
+<span class="sourceLineNo">424</span> return o.toString();<a name="line.424"></a>
+<span class="sourceLineNo">425</span> if (cm.isCharSequence()) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> String s = o.toString();<a name="line.426"></a>
+<span class="sourceLineNo">427</span> boolean ptt = (plainTextParams != null ? plainTextParams : ctx.plainTextParams());<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (ptt || s.isEmpty() || ! UonUtils.needsQuotes(s))<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return (urlEncode ? StringUtils.urlEncode(s) : s);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span> }<a name="line.431"></a>
<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override /* Serializer */<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> serializeAnything(s, s.getWriter(), o);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> @Override /* PartSerializer */<a name="line.439"></a>
-<span class="sourceLineNo">440</span> public String serialize(PartType type, Object value) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> switch(type) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span> case HEADER: return serializePart(value, false, true);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> case FORM_DATA: return serializePart(value, false, null);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> case PATH: return serializePart(value, false, null);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> case QUERY: return serializePart(value, false, null);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> default: return StringUtils.toString(value);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>}<a name="line.449"></a>
+<span class="sourceLineNo">433</span> StringWriter w = new StringWriter();<a name="line.433"></a>
+<span class="sourceLineNo">434</span> UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> super.doSerialize(s, o);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> return w.toString();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> } catch (Exception e) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> throw new RuntimeException(e);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span> //--------------------------------------------------------------------------------<a name="line.443"></a>
+<span class="sourceLineNo">444</span> // Entry point methods<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 /* Serializer */<a name="line.447"></a>
+<span class="sourceLineNo">448</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> @Override /* Serializer */<a name="line.452"></a>
+<span class="sourceLineNo">453</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.454"></a>
+<span class="sourceLineNo">455</span> serializeAnything(s, s.getWriter(), o);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> @Override /* PartSerializer */<a name="line.458"></a>
+<span class="sourceLineNo">459</span> public String serialize(PartType type, Object value) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> switch(type) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> case HEADER: return serializePart(value, false, true);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> case FORM_DATA: return serializePart(value, false, null);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> case PATH: return serializePart(value, false, null);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> case QUERY: return serializePart(value, false, null);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> default: return StringUtils.toString(value);<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>}<a name="line.468"></a>
[17/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/PropertyNamer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/PropertyNamer.html b/content/site/apidocs/src-html/org/apache/juneau/PropertyNamer.html
index 3163450..36fea61 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/PropertyNamer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/PropertyNamer.html
@@ -25,7 +25,7 @@
<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
<span class="sourceLineNo">018</span> * Defines an API for converting conventional bean property names to some other form.<a name="line.18"></a>
<span class="sourceLineNo">019</span> * <p><a name="line.19"></a>
-<span class="sourceLineNo">020</span> * For example, given the bean property <js>"fooBarURL"</js>, the {@link PropertyNamerDashedLC}<a name="line.20"></a>
+<span class="sourceLineNo">020</span> * For example, given the bean property <js>"fooBarURL"</js>, the {@link PropertyNamerDLC}<a name="line.20"></a>
<span class="sourceLineNo">021</span> * property namer will convert this to <js>"foo-bar-url"</js>.<a name="line.21"></a>
<span class="sourceLineNo">022</span> * <p><a name="line.22"></a>
<span class="sourceLineNo">023</span> * Property namers are associated with beans through the {@link Bean#propertyNamer} annotation.<a name="line.23"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/PropertyNamerDashedLC.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/PropertyNamerDashedLC.html b/content/site/apidocs/src-html/org/apache/juneau/PropertyNamerDashedLC.html
deleted file mode 100644
index 643c375..0000000
--- a/content/site/apidocs/src-html/org/apache/juneau/PropertyNamerDashedLC.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a>
-<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a>
-<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a>
-<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a>
-<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a>
-<span class="sourceLineNo">006</span>// * *<a name="line.6"></a>
-<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a>
-<span class="sourceLineNo">008</span>// * *<a name="line.8"></a>
-<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a>
-<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a>
-<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a>
-<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
-<span class="sourceLineNo">013</span>package org.apache.juneau;<a name="line.13"></a>
-<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>/**<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * Converts property names to dashed-lower-case format.<a name="line.16"></a>
-<span class="sourceLineNo">017</span> *<a name="line.17"></a>
-<span class="sourceLineNo">018</span> * <h5 class='section'>Examples:</h5><a name="line.18"></a>
-<span class="sourceLineNo">019</span> * <ul><a name="line.19"></a>
-<span class="sourceLineNo">020</span> * <li><js>"fooBar"</js> -&gt; <js>"foo-bar"</js><a name="line.20"></a>
-<span class="sourceLineNo">021</span> * <li><js>"fooBarURL"</js> -&gt; <js>"foo-bar-url"</js><a name="line.21"></a>
-<span class="sourceLineNo">022</span> * <li><js>"FooBarURL"</js> -&gt; <js>"foo-bar-url"</js><a name="line.22"></a>
-<span class="sourceLineNo">023</span> * </ul><a name="line.23"></a>
-<span class="sourceLineNo">024</span> */<a name="line.24"></a>
-<span class="sourceLineNo">025</span>public final class PropertyNamerDashedLC implements PropertyNamer {<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span> @Override /* PropertyNamer */<a name="line.27"></a>
-<span class="sourceLineNo">028</span> public String getPropertyName(String name) {<a name="line.28"></a>
-<span class="sourceLineNo">029</span> if (name == null || name.isEmpty())<a name="line.29"></a>
-<span class="sourceLineNo">030</span> return name;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span> int numUCs = 0;<a name="line.32"></a>
-<span class="sourceLineNo">033</span> boolean isPrevUC = Character.isUpperCase(name.charAt(0));<a name="line.33"></a>
-<span class="sourceLineNo">034</span> for (int i = 1; i < name.length(); i++) {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> char c = name.charAt(i);<a name="line.35"></a>
-<span class="sourceLineNo">036</span> if (Character.isUpperCase(c)) {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> if (! isPrevUC)<a name="line.37"></a>
-<span class="sourceLineNo">038</span> numUCs++;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> isPrevUC = true;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> } else {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> isPrevUC = false;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> }<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> char[] name2 = new char[name.length() + numUCs];<a name="line.45"></a>
-<span class="sourceLineNo">046</span> isPrevUC = Character.isUpperCase(name.charAt(0));<a name="line.46"></a>
-<span class="sourceLineNo">047</span> name2[0] = Character.toLowerCase(name.charAt(0));<a name="line.47"></a>
-<span class="sourceLineNo">048</span> int ni = 0;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> for (int i = 0; i < name.length(); i++) {<a name="line.49"></a>
-<span class="sourceLineNo">050</span> char c = name.charAt(i);<a name="line.50"></a>
-<span class="sourceLineNo">051</span> if (Character.isUpperCase(c)) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> if (! isPrevUC)<a name="line.52"></a>
-<span class="sourceLineNo">053</span> name2[ni++] = '-';<a name="line.53"></a>
-<span class="sourceLineNo">054</span> isPrevUC = true;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> name2[ni++] = Character.toLowerCase(c);<a name="line.55"></a>
-<span class="sourceLineNo">056</span> } else {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> isPrevUC = false;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> name2[ni++] = c;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span> }<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span> return new String(name2);<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span>}<a name="line.64"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/annotation/Bean.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/Bean.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/Bean.html
index 6c9aeed..d21ec4a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/annotation/Bean.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/Bean.html
@@ -189,7 +189,7 @@
<span class="sourceLineNo">181</span> * Associates a {@link PropertyNamer} with this bean to tailor the names of the bean properties.<a name="line.181"></a>
<span class="sourceLineNo">182</span> * <p><a name="line.182"></a>
<span class="sourceLineNo">183</span> * Property namers are used to transform bean property names from standard form to some other form.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * For example, the {@link PropertyNamerDashedLC} will convert property names to dashed-lowercase, and<a name="line.184"></a>
+<span class="sourceLineNo">184</span> * For example, the {@link PropertyNamerDLC} will convert property names to dashed-lowercase, and<a name="line.184"></a>
<span class="sourceLineNo">185</span> * these will be used as attribute names in JSON, and element names in XML.<a name="line.185"></a>
<span class="sourceLineNo">186</span> * <p><a name="line.186"></a>
<span class="sourceLineNo">187</span> * This annotation is an alternative to using the {@link BeanFilter} class with an implemented {@link BeanFilter#getPropertyNamer()} method.<a name="line.187"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html
index 644aca7..866e325 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html
@@ -135,114 +135,127 @@
<span class="sourceLineNo">127</span> String name() default "";<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Identifies a specialized class type for the property.<a name="line.130"></a>
+<span class="sourceLineNo">130</span> * A synonym for {@link #name()}.<a name="line.130"></a>
<span class="sourceLineNo">131</span> * <p><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Normally this can be inferred through reflection of the field type or getter return type.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * However, you'll want to specify this value if you're parsing beans where the bean property class<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * is an interface or abstract class to identify the bean type to instantiate. Otherwise, you may<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * cause an {@link InstantiationException} when trying to set these fields.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * <p><a name="line.136"></a>
-<span class="sourceLineNo">137</span> * This property must denote a concrete bean class with a no-arg constructor.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> *<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * <h5 class='section'>Example:</h5><a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <p class='bcode'><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * <jk>public class</jk> MyBean {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> *<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <jc>// Identify concrete map type.</jc><a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>)<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * }<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * </p><a name="line.147"></a>
-<span class="sourceLineNo">148</span> */<a name="line.148"></a>
-<span class="sourceLineNo">149</span> Class<?> type() default Object.class;<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> /**<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * For bean properties of maps and collections, this annotation can be used to identify<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * the class types of the contents of the bean property object when the generic parameter<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * types are interfaces or abstract classes.<a name="line.154"></a>
+<span class="sourceLineNo">132</span> * The following annotations are equivalent:<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <p><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <p class='bcode'><a name="line.134"></a>
+<span class="sourceLineNo">135</span> * <ja>@BeanProperty</ja>(name=<js>"foo"</js>)<a name="line.135"></a>
+<span class="sourceLineNo">136</span> *<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <ja>@BeanProperty</ja>(<js>"foo"</js>)<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * </p><a name="line.138"></a>
+<span class="sourceLineNo">139</span> */<a name="line.139"></a>
+<span class="sourceLineNo">140</span> String value() default "";<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * Identifies a specialized class type for the property.<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <p><a name="line.144"></a>
+<span class="sourceLineNo">145</span> * Normally this can be inferred through reflection of the field type or getter return type.<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * However, you'll want to specify this value if you're parsing beans where the bean property class<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * is an interface or abstract class to identify the bean type to instantiate. Otherwise, you may<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * cause an {@link InstantiationException} when trying to set these fields.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <p><a name="line.149"></a>
+<span class="sourceLineNo">150</span> * This property must denote a concrete bean class with a no-arg constructor.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> *<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <h5 class='section'>Example:</h5><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <p class='bcode'><a name="line.153"></a>
+<span class="sourceLineNo">154</span> * <jk>public class</jk> MyBean {<a name="line.154"></a>
<span class="sourceLineNo">155</span> *<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * <h5 class='section'>Example:</h5><a name="line.156"></a>
-<span class="sourceLineNo">157</span> * <p class='bcode'><a name="line.157"></a>
-<span class="sourceLineNo">158</span> * <jk>public class</jk> MyBean {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> *<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * <jc>// Identify concrete map type with String keys and Integer values.</jc><a name="line.160"></a>
-<span class="sourceLineNo">161</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>, params={String.<jk>class</jk>,Integer.<jk>class</jk>})<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * </p><a name="line.164"></a>
-<span class="sourceLineNo">165</span> */<a name="line.165"></a>
-<span class="sourceLineNo">166</span> Class<?>[] params() default {};<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> /**<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * Associates a {@link PojoSwap} or {@link SurrogateSwap} with this bean property that will swap the value object<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * with another object during serialization and parsing.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * <p><a name="line.171"></a>
-<span class="sourceLineNo">172</span> * This annotation supersedes any swaps associated with the bean property type<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * class itself.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * <p><a name="line.174"></a>
-<span class="sourceLineNo">175</span> * Typically used for rendering {@link Date Dates} and {@link Calendar Calendars}<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * as a particular string format.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> *<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * <h5 class='section'>Example:</h5><a name="line.178"></a>
-<span class="sourceLineNo">179</span> * <p class='bcode'><a name="line.179"></a>
-<span class="sourceLineNo">180</span> * <jk>public class</jk> MyClass {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> *<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * <jc>// During serialization, convert to ISO8601 date-time string.</jc><a name="line.182"></a>
-<span class="sourceLineNo">183</span> * <ja>@BeanProperty</ja>(pojoSwap=CalendarSwap.ISO8601DT.<jk>class</jk>)<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * <jk>public</jk> Calendar getTime();<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * </p><a name="line.186"></a>
-<span class="sourceLineNo">187</span> */<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Class<?> swap() default Null.class;<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> /**<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * Used to limit which child properties are rendered by the serializers.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <p><a name="line.192"></a>
-<span class="sourceLineNo">193</span> * Can be used on any of the following bean property types:<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * <ul class='spaced-list'><a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <li>Beans - Only render the specified properties of the bean.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <li>Maps - Only render the specified entries in the map.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <li>Bean/Map arrays - Same, but applied to each element in the array.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * <li>Bean/Map collections - Same, but applied to each element in the collection.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * </ul><a name="line.199"></a>
-<span class="sourceLineNo">200</span> *<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * <h5 class='section'>Example:</h5><a name="line.201"></a>
-<span class="sourceLineNo">202</span> * <p class='bcode'><a name="line.202"></a>
-<span class="sourceLineNo">203</span> * <jk>public class</jk> MyClass {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> *<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * <jc>// Only render 'f1' when serializing this bean property.</jc><a name="line.205"></a>
-<span class="sourceLineNo">206</span> * <ja>@BeanProperty</ja>(properties=<js>"f1"</js>)<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * <jk>public</jk> MyChildClass x1 = <jk>new</jk> MyChildClass();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * }<a name="line.208"></a>
-<span class="sourceLineNo">209</span> *<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * <jk>public class</jk> MyChildClass {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * <jk>public int</jk> f1 = 1;<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * <jk>public int</jk> f2 = 2;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * }<a name="line.213"></a>
-<span class="sourceLineNo">214</span> *<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <jc>// Renders "{x1:{f1:1}}"</jc><a name="line.215"></a>
-<span class="sourceLineNo">216</span> * String json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> MyClass());<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * </p><a name="line.217"></a>
-<span class="sourceLineNo">218</span> */<a name="line.218"></a>
-<span class="sourceLineNo">219</span> String properties() default "";<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> /**<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * The list of classes that make up the bean dictionary for this bean property.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * <p><a name="line.223"></a>
-<span class="sourceLineNo">224</span> * The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * The names are defined through the {@link Bean#typeName()} annotation defined on the bean class.<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * <p><a name="line.226"></a>
-<span class="sourceLineNo">227</span> * This list can consist of the following class types:<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * <ul><a name="line.228"></a>
-<span class="sourceLineNo">229</span> * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.name()};<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * <li>Any subclass of {@link BeanDictionaryList} that defines an entire set of mappings.<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * <li>Any subclass of {@link BeanDictionaryMap} that defines an entire set of mappings.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * </ul><a name="line.234"></a>
-<span class="sourceLineNo">235</span> */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> Class<?>[] beanDictionary() default {};<a name="line.236"></a>
-<span class="sourceLineNo">237</span>}<a name="line.237"></a>
+<span class="sourceLineNo">156</span> * <jc>// Identify concrete map type.</jc><a name="line.156"></a>
+<span class="sourceLineNo">157</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>)<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * </p><a name="line.160"></a>
+<span class="sourceLineNo">161</span> */<a name="line.161"></a>
+<span class="sourceLineNo">162</span> Class<?> type() default Object.class;<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span> /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * For bean properties of maps and collections, this annotation can be used to identify<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * the class types of the contents of the bean property object when the generic parameter<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * types are interfaces or abstract classes.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> *<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * <h5 class='section'>Example:</h5><a name="line.169"></a>
+<span class="sourceLineNo">170</span> * <p class='bcode'><a name="line.170"></a>
+<span class="sourceLineNo">171</span> * <jk>public class</jk> MyBean {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> *<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * <jc>// Identify concrete map type with String keys and Integer values.</jc><a name="line.173"></a>
+<span class="sourceLineNo">174</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>, params={String.<jk>class</jk>,Integer.<jk>class</jk>})<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * }<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * </p><a name="line.177"></a>
+<span class="sourceLineNo">178</span> */<a name="line.178"></a>
+<span class="sourceLineNo">179</span> Class<?>[] params() default {};<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> * Associates a {@link PojoSwap} or {@link SurrogateSwap} with this bean property that will swap the value object<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * with another object during serialization and parsing.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * <p><a name="line.184"></a>
+<span class="sourceLineNo">185</span> * This annotation supersedes any swaps associated with the bean property type<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * class itself.<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * <p><a name="line.187"></a>
+<span class="sourceLineNo">188</span> * Typically used for rendering {@link Date Dates} and {@link Calendar Calendars}<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * as a particular string format.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> *<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * <h5 class='section'>Example:</h5><a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <p class='bcode'><a name="line.192"></a>
+<span class="sourceLineNo">193</span> * <jk>public class</jk> MyClass {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> *<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * <jc>// During serialization, convert to ISO8601 date-time string.</jc><a name="line.195"></a>
+<span class="sourceLineNo">196</span> * <ja>@BeanProperty</ja>(pojoSwap=CalendarSwap.ISO8601DT.<jk>class</jk>)<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * <jk>public</jk> Calendar getTime();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * }<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * </p><a name="line.199"></a>
+<span class="sourceLineNo">200</span> */<a name="line.200"></a>
+<span class="sourceLineNo">201</span> Class<?> swap() default Null.class;<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> * Used to limit which child properties are rendered by the serializers.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * <p><a name="line.205"></a>
+<span class="sourceLineNo">206</span> * Can be used on any of the following bean property types:<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * <ul class='spaced-list'><a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <li>Beans - Only render the specified properties of the bean.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * <li>Maps - Only render the specified entries in the map.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * <li>Bean/Map arrays - Same, but applied to each element in the array.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * <li>Bean/Map collections - Same, but applied to each element in the collection.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * </ul><a name="line.212"></a>
+<span class="sourceLineNo">213</span> *<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * <h5 class='section'>Example:</h5><a name="line.214"></a>
+<span class="sourceLineNo">215</span> * <p class='bcode'><a name="line.215"></a>
+<span class="sourceLineNo">216</span> * <jk>public class</jk> MyClass {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> *<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <jc>// Only render 'f1' when serializing this bean property.</jc><a name="line.218"></a>
+<span class="sourceLineNo">219</span> * <ja>@BeanProperty</ja>(properties=<js>"f1"</js>)<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <jk>public</jk> MyChildClass x1 = <jk>new</jk> MyChildClass();<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> * <jk>public class</jk> MyChildClass {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> * <jk>public int</jk> f1 = 1;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> * <jk>public int</jk> f2 = 2;<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> * <jc>// Renders "{x1:{f1:1}}"</jc><a name="line.228"></a>
+<span class="sourceLineNo">229</span> * String json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> MyClass());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * </p><a name="line.230"></a>
+<span class="sourceLineNo">231</span> */<a name="line.231"></a>
+<span class="sourceLineNo">232</span> String properties() default "";<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> * The list of classes that make up the bean dictionary for this bean property.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * <p><a name="line.236"></a>
+<span class="sourceLineNo">237</span> * The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * The names are defined through the {@link Bean#typeName()} annotation defined on the bean class.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * <p><a name="line.239"></a>
+<span class="sourceLineNo">240</span> * This list can consist of the following class types:<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <ul><a name="line.241"></a>
+<span class="sourceLineNo">242</span> * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.name()};<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <li>Any subclass of {@link BeanDictionaryList} that defines an entire set of mappings.<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <li>Any subclass of {@link BeanDictionaryMap} that defines an entire set of mappings.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * </ul><a name="line.247"></a>
+<span class="sourceLineNo">248</span> */<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Class<?>[] beanDictionary() default {};<a name="line.249"></a>
+<span class="sourceLineNo">250</span>}<a name="line.250"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Category.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Category.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Category.html
index b48a6e7..f8de6f8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Category.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Category.html
@@ -82,7 +82,7 @@
<span class="sourceLineNo">074</span> * @param term The category term.<a name="line.74"></a>
<span class="sourceLineNo">075</span> * @return This object (for method chaining).<a name="line.75"></a>
<span class="sourceLineNo">076</span> */<a name="line.76"></a>
-<span class="sourceLineNo">077</span> @BeanProperty(name="term")<a name="line.77"></a>
+<span class="sourceLineNo">077</span> @BeanProperty("term")<a name="line.77"></a>
<span class="sourceLineNo">078</span> public Category term(String term) {<a name="line.78"></a>
<span class="sourceLineNo">079</span> this.term = term;<a name="line.79"></a>
<span class="sourceLineNo">080</span> return this;<a name="line.80"></a>
@@ -104,7 +104,7 @@
<span class="sourceLineNo">096</span> * @param scheme The category scheme.<a name="line.96"></a>
<span class="sourceLineNo">097</span> * @return This object (for method chaining).<a name="line.97"></a>
<span class="sourceLineNo">098</span> */<a name="line.98"></a>
-<span class="sourceLineNo">099</span> @BeanProperty(name="scheme")<a name="line.99"></a>
+<span class="sourceLineNo">099</span> @BeanProperty("scheme")<a name="line.99"></a>
<span class="sourceLineNo">100</span> public Category scheme(URI scheme) {<a name="line.100"></a>
<span class="sourceLineNo">101</span> this.scheme = scheme;<a name="line.101"></a>
<span class="sourceLineNo">102</span> return this;<a name="line.102"></a>
@@ -126,7 +126,7 @@
<span class="sourceLineNo">118</span> * @param label The category label.<a name="line.118"></a>
<span class="sourceLineNo">119</span> * @return This object (for method chaining).<a name="line.119"></a>
<span class="sourceLineNo">120</span> */<a name="line.120"></a>
-<span class="sourceLineNo">121</span> @BeanProperty(name="label")<a name="line.121"></a>
+<span class="sourceLineNo">121</span> @BeanProperty("label")<a name="line.121"></a>
<span class="sourceLineNo">122</span> public Category label(String label) {<a name="line.122"></a>
<span class="sourceLineNo">123</span> this.label = label;<a name="line.123"></a>
<span class="sourceLineNo">124</span> return this;<a name="line.124"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Common.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Common.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Common.html
index 8a674ff..632ee5e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Common.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Common.html
@@ -68,7 +68,7 @@
<span class="sourceLineNo">060</span> * @param base The URI base of this object.<a name="line.60"></a>
<span class="sourceLineNo">061</span> * @return This object (for method chaining).<a name="line.61"></a>
<span class="sourceLineNo">062</span> */<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @BeanProperty(name="base")<a name="line.63"></a>
+<span class="sourceLineNo">063</span> @BeanProperty("base")<a name="line.63"></a>
<span class="sourceLineNo">064</span> public Common base(URI base) {<a name="line.64"></a>
<span class="sourceLineNo">065</span> this.base = base;<a name="line.65"></a>
<span class="sourceLineNo">066</span> return this;<a name="line.66"></a>
@@ -101,7 +101,7 @@
<span class="sourceLineNo">093</span> * @param lang The language of this object.<a name="line.93"></a>
<span class="sourceLineNo">094</span> * @return This object (for method chaining).<a name="line.94"></a>
<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> @BeanProperty(name="lang")<a name="line.96"></a>
+<span class="sourceLineNo">096</span> @BeanProperty("lang")<a name="line.96"></a>
<span class="sourceLineNo">097</span> public Common lang(String lang) {<a name="line.97"></a>
<span class="sourceLineNo">098</span> this.lang = lang;<a name="line.98"></a>
<span class="sourceLineNo">099</span> return this;<a name="line.99"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/CommonEntry.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/CommonEntry.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/CommonEntry.html
index 8caa68a..a20f717 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/CommonEntry.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/CommonEntry.html
@@ -91,7 +91,7 @@
<span class="sourceLineNo">083</span> * @param authors The list of authors for this object.<a name="line.83"></a>
<span class="sourceLineNo">084</span> * @return This object (for method chaining).<a name="line.84"></a>
<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> @BeanProperty(name="authors")<a name="line.86"></a>
+<span class="sourceLineNo">086</span> @BeanProperty("authors")<a name="line.86"></a>
<span class="sourceLineNo">087</span> public CommonEntry authors(Person...authors) {<a name="line.87"></a>
<span class="sourceLineNo">088</span> this.authors = authors;<a name="line.88"></a>
<span class="sourceLineNo">089</span> return this;<a name="line.89"></a>
@@ -113,7 +113,7 @@
<span class="sourceLineNo">105</span> * @param categories The list of categories of this object.<a name="line.105"></a>
<span class="sourceLineNo">106</span> * @return This object (for method chaining).<a name="line.106"></a>
<span class="sourceLineNo">107</span> */<a name="line.107"></a>
-<span class="sourceLineNo">108</span> @BeanProperty(name="categories")<a name="line.108"></a>
+<span class="sourceLineNo">108</span> @BeanProperty("categories")<a name="line.108"></a>
<span class="sourceLineNo">109</span> public CommonEntry categories(Category...categories) {<a name="line.109"></a>
<span class="sourceLineNo">110</span> this.categories = categories;<a name="line.110"></a>
<span class="sourceLineNo">111</span> return this;<a name="line.111"></a>
@@ -135,7 +135,7 @@
<span class="sourceLineNo">127</span> * @param contributors The list of contributors of this object.<a name="line.127"></a>
<span class="sourceLineNo">128</span> * @return This object (for method chaining).<a name="line.128"></a>
<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> @BeanProperty(name="contributors")<a name="line.130"></a>
+<span class="sourceLineNo">130</span> @BeanProperty("contributors")<a name="line.130"></a>
<span class="sourceLineNo">131</span> public CommonEntry contributors(Person...contributors) {<a name="line.131"></a>
<span class="sourceLineNo">132</span> this.contributors = contributors;<a name="line.132"></a>
<span class="sourceLineNo">133</span> return this;<a name="line.133"></a>
@@ -156,7 +156,7 @@
<span class="sourceLineNo">148</span> * @param id The ID of this object.<a name="line.148"></a>
<span class="sourceLineNo">149</span> * @return This object (for method chaining).<a name="line.149"></a>
<span class="sourceLineNo">150</span> */<a name="line.150"></a>
-<span class="sourceLineNo">151</span> @BeanProperty(name="id")<a name="line.151"></a>
+<span class="sourceLineNo">151</span> @BeanProperty("id")<a name="line.151"></a>
<span class="sourceLineNo">152</span> public CommonEntry id(Id id) {<a name="line.152"></a>
<span class="sourceLineNo">153</span> this.id = id;<a name="line.153"></a>
<span class="sourceLineNo">154</span> return this;<a name="line.154"></a>
@@ -189,7 +189,7 @@
<span class="sourceLineNo">181</span> * @param links The list of links of this object.<a name="line.181"></a>
<span class="sourceLineNo">182</span> * @return This object (for method chaining).<a name="line.182"></a>
<span class="sourceLineNo">183</span> */<a name="line.183"></a>
-<span class="sourceLineNo">184</span> @BeanProperty(name="links")<a name="line.184"></a>
+<span class="sourceLineNo">184</span> @BeanProperty("links")<a name="line.184"></a>
<span class="sourceLineNo">185</span> public CommonEntry links(Link...links) {<a name="line.185"></a>
<span class="sourceLineNo">186</span> this.links = links;<a name="line.186"></a>
<span class="sourceLineNo">187</span> return this;<a name="line.187"></a>
@@ -210,7 +210,7 @@
<span class="sourceLineNo">202</span> * @param rights The rights statement of this object.<a name="line.202"></a>
<span class="sourceLineNo">203</span> * @return This object (for method chaining).<a name="line.203"></a>
<span class="sourceLineNo">204</span> */<a name="line.204"></a>
-<span class="sourceLineNo">205</span> @BeanProperty(name="rights")<a name="line.205"></a>
+<span class="sourceLineNo">205</span> @BeanProperty("rights")<a name="line.205"></a>
<span class="sourceLineNo">206</span> public CommonEntry rights(Text rights) {<a name="line.206"></a>
<span class="sourceLineNo">207</span> this.rights = rights;<a name="line.207"></a>
<span class="sourceLineNo">208</span> return this;<a name="line.208"></a>
@@ -242,7 +242,7 @@
<span class="sourceLineNo">234</span> * @param title The title of this object.<a name="line.234"></a>
<span class="sourceLineNo">235</span> * @return This object (for method chaining).<a name="line.235"></a>
<span class="sourceLineNo">236</span> */<a name="line.236"></a>
-<span class="sourceLineNo">237</span> @BeanProperty(name="title")<a name="line.237"></a>
+<span class="sourceLineNo">237</span> @BeanProperty("title")<a name="line.237"></a>
<span class="sourceLineNo">238</span> public CommonEntry title(Text title) {<a name="line.238"></a>
<span class="sourceLineNo">239</span> this.title = title;<a name="line.239"></a>
<span class="sourceLineNo">240</span> return this;<a name="line.240"></a>
@@ -275,7 +275,7 @@
<span class="sourceLineNo">267</span> * @param updated The update timestamp of this object.<a name="line.267"></a>
<span class="sourceLineNo">268</span> * @return This object (for method chaining).<a name="line.268"></a>
<span class="sourceLineNo">269</span> */<a name="line.269"></a>
-<span class="sourceLineNo">270</span> @BeanProperty(name="updated")<a name="line.270"></a>
+<span class="sourceLineNo">270</span> @BeanProperty("updated")<a name="line.270"></a>
<span class="sourceLineNo">271</span> public CommonEntry updated(Calendar updated) {<a name="line.271"></a>
<span class="sourceLineNo">272</span> this.updated = updated;<a name="line.272"></a>
<span class="sourceLineNo">273</span> return this;<a name="line.273"></a>
@@ -287,7 +287,7 @@
<span class="sourceLineNo">279</span> * @param updated The update timestamp of this object in ISO8601 format.<a name="line.279"></a>
<span class="sourceLineNo">280</span> * @return This object (for method chaining).<a name="line.280"></a>
<span class="sourceLineNo">281</span> */<a name="line.281"></a>
-<span class="sourceLineNo">282</span> @BeanProperty(name="updated")<a name="line.282"></a>
+<span class="sourceLineNo">282</span> @BeanProperty("updated")<a name="line.282"></a>
<span class="sourceLineNo">283</span> public CommonEntry updated(String updated) {<a name="line.283"></a>
<span class="sourceLineNo">284</span> this.updated = parseDateTime(updated);<a name="line.284"></a>
<span class="sourceLineNo">285</span> return this;<a name="line.285"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Content.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Content.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Content.html
index f522434..6aa692b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Content.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Content.html
@@ -113,7 +113,7 @@
<span class="sourceLineNo">105</span> * @param src The source URI.<a name="line.105"></a>
<span class="sourceLineNo">106</span> * @return This object (for method chaining).<a name="line.106"></a>
<span class="sourceLineNo">107</span> */<a name="line.107"></a>
-<span class="sourceLineNo">108</span> @BeanProperty(name="src")<a name="line.108"></a>
+<span class="sourceLineNo">108</span> @BeanProperty("src")<a name="line.108"></a>
<span class="sourceLineNo">109</span> public Content src(URI src) {<a name="line.109"></a>
<span class="sourceLineNo">110</span> this.src = src;<a name="line.110"></a>
<span class="sourceLineNo">111</span> return this;<a name="line.111"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Entry.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Entry.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Entry.html
index 88db6c6..53bacc1 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Entry.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Entry.html
@@ -108,7 +108,7 @@
<span class="sourceLineNo">100</span> * @param content The content of this entry.<a name="line.100"></a>
<span class="sourceLineNo">101</span> * @return This object (for method chaining).<a name="line.101"></a>
<span class="sourceLineNo">102</span> */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> @BeanProperty(name="content")<a name="line.103"></a>
+<span class="sourceLineNo">103</span> @BeanProperty("content")<a name="line.103"></a>
<span class="sourceLineNo">104</span> public Entry content(Content content) {<a name="line.104"></a>
<span class="sourceLineNo">105</span> this.content = content;<a name="line.105"></a>
<span class="sourceLineNo">106</span> return this;<a name="line.106"></a>
@@ -130,7 +130,7 @@
<span class="sourceLineNo">122</span> * @param published The publish timestamp of this entry.<a name="line.122"></a>
<span class="sourceLineNo">123</span> * @return This object (for method chaining).<a name="line.123"></a>
<span class="sourceLineNo">124</span> */<a name="line.124"></a>
-<span class="sourceLineNo">125</span> @BeanProperty(name="published")<a name="line.125"></a>
+<span class="sourceLineNo">125</span> @BeanProperty("published")<a name="line.125"></a>
<span class="sourceLineNo">126</span> public Entry published(Calendar published) {<a name="line.126"></a>
<span class="sourceLineNo">127</span> this.published = published;<a name="line.127"></a>
<span class="sourceLineNo">128</span> return this;<a name="line.128"></a>
@@ -142,7 +142,7 @@
<span class="sourceLineNo">134</span> * @param published The publish timestamp of this entry in ISO8601 format.<a name="line.134"></a>
<span class="sourceLineNo">135</span> * @return This object (for method chaining).<a name="line.135"></a>
<span class="sourceLineNo">136</span> */<a name="line.136"></a>
-<span class="sourceLineNo">137</span> @BeanProperty(name="published")<a name="line.137"></a>
+<span class="sourceLineNo">137</span> @BeanProperty("published")<a name="line.137"></a>
<span class="sourceLineNo">138</span> public Entry published(String published) {<a name="line.138"></a>
<span class="sourceLineNo">139</span> this.published = parseDateTime(published);<a name="line.139"></a>
<span class="sourceLineNo">140</span> return this;<a name="line.140"></a>
@@ -163,7 +163,7 @@
<span class="sourceLineNo">155</span> * @param source The source of this entry.<a name="line.155"></a>
<span class="sourceLineNo">156</span> * @return This object (for method chaining).<a name="line.156"></a>
<span class="sourceLineNo">157</span> */<a name="line.157"></a>
-<span class="sourceLineNo">158</span> @BeanProperty(name="source")<a name="line.158"></a>
+<span class="sourceLineNo">158</span> @BeanProperty("source")<a name="line.158"></a>
<span class="sourceLineNo">159</span> public Entry source(Source source) {<a name="line.159"></a>
<span class="sourceLineNo">160</span> this.source = source;<a name="line.160"></a>
<span class="sourceLineNo">161</span> return this;<a name="line.161"></a>
@@ -184,7 +184,7 @@
<span class="sourceLineNo">176</span> * @param summary The summary of this entry.<a name="line.176"></a>
<span class="sourceLineNo">177</span> * @return This object (for method chaining).<a name="line.177"></a>
<span class="sourceLineNo">178</span> */<a name="line.178"></a>
-<span class="sourceLineNo">179</span> @BeanProperty(name="summary")<a name="line.179"></a>
+<span class="sourceLineNo">179</span> @BeanProperty("summary")<a name="line.179"></a>
<span class="sourceLineNo">180</span> public Entry summary(Text summary) {<a name="line.180"></a>
<span class="sourceLineNo">181</span> this.summary = summary;<a name="line.181"></a>
<span class="sourceLineNo">182</span> return this;<a name="line.182"></a>
@@ -196,7 +196,7 @@
<span class="sourceLineNo">188</span> * @param summary The summary of this entry.<a name="line.188"></a>
<span class="sourceLineNo">189</span> * @return This object (for method chaining).<a name="line.189"></a>
<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> @BeanProperty(name="summary")<a name="line.191"></a>
+<span class="sourceLineNo">191</span> @BeanProperty("summary")<a name="line.191"></a>
<span class="sourceLineNo">192</span> public Entry summary(String summary) {<a name="line.192"></a>
<span class="sourceLineNo">193</span> this.summary = new Text(summary);<a name="line.193"></a>
<span class="sourceLineNo">194</span> return this;<a name="line.194"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Feed.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Feed.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Feed.html
index d68dff7..2d646e9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Feed.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Feed.html
@@ -112,7 +112,7 @@
<span class="sourceLineNo">104</span> * @param generator The generator information on this feed.<a name="line.104"></a>
<span class="sourceLineNo">105</span> * @return This object (for method chaining).<a name="line.105"></a>
<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> @BeanProperty(name="generator")<a name="line.107"></a>
+<span class="sourceLineNo">107</span> @BeanProperty("generator")<a name="line.107"></a>
<span class="sourceLineNo">108</span> public Feed generator(Generator generator) {<a name="line.108"></a>
<span class="sourceLineNo">109</span> this.generator = generator;<a name="line.109"></a>
<span class="sourceLineNo">110</span> return this;<a name="line.110"></a>
@@ -133,7 +133,7 @@
<span class="sourceLineNo">125</span> * @param icon The feed icon.<a name="line.125"></a>
<span class="sourceLineNo">126</span> * @return This object (for method chaining).<a name="line.126"></a>
<span class="sourceLineNo">127</span> */<a name="line.127"></a>
-<span class="sourceLineNo">128</span> @BeanProperty(name="icon")<a name="line.128"></a>
+<span class="sourceLineNo">128</span> @BeanProperty("icon")<a name="line.128"></a>
<span class="sourceLineNo">129</span> public Feed icon(Icon icon) {<a name="line.129"></a>
<span class="sourceLineNo">130</span> this.icon = icon;<a name="line.130"></a>
<span class="sourceLineNo">131</span> return this;<a name="line.131"></a>
@@ -154,7 +154,7 @@
<span class="sourceLineNo">146</span> * @param logo The feed logo.<a name="line.146"></a>
<span class="sourceLineNo">147</span> * @return This object (for method chaining).<a name="line.147"></a>
<span class="sourceLineNo">148</span> */<a name="line.148"></a>
-<span class="sourceLineNo">149</span> @BeanProperty(name="logo")<a name="line.149"></a>
+<span class="sourceLineNo">149</span> @BeanProperty("logo")<a name="line.149"></a>
<span class="sourceLineNo">150</span> public Feed logo(Logo logo) {<a name="line.150"></a>
<span class="sourceLineNo">151</span> this.logo = logo;<a name="line.151"></a>
<span class="sourceLineNo">152</span> return this;<a name="line.152"></a>
@@ -165,7 +165,7 @@
<span class="sourceLineNo">157</span> *<a name="line.157"></a>
<span class="sourceLineNo">158</span> * @return The feed subtitle.<a name="line.158"></a>
<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> @BeanProperty(name="subtitle")<a name="line.160"></a>
+<span class="sourceLineNo">160</span> @BeanProperty("subtitle")<a name="line.160"></a>
<span class="sourceLineNo">161</span> public Text getSubTitle() {<a name="line.161"></a>
<span class="sourceLineNo">162</span> return subtitle;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<a name="line.163"></a>
@@ -176,7 +176,7 @@
<span class="sourceLineNo">168</span> * @param subtitle The feed subtitle.<a name="line.168"></a>
<span class="sourceLineNo">169</span> * @return This object (for method chaining).<a name="line.169"></a>
<span class="sourceLineNo">170</span> */<a name="line.170"></a>
-<span class="sourceLineNo">171</span> @BeanProperty(name="subtitle")<a name="line.171"></a>
+<span class="sourceLineNo">171</span> @BeanProperty("subtitle")<a name="line.171"></a>
<span class="sourceLineNo">172</span> public Feed subtitle(Text subtitle) {<a name="line.172"></a>
<span class="sourceLineNo">173</span> this.subtitle = subtitle;<a name="line.173"></a>
<span class="sourceLineNo">174</span> return this;<a name="line.174"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> * @param entries The entries in the feed.<a name="line.201"></a>
<span class="sourceLineNo">202</span> * @return This object (for method chaining).<a name="line.202"></a>
<span class="sourceLineNo">203</span> */<a name="line.203"></a>
-<span class="sourceLineNo">204</span> @BeanProperty(name="entries")<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @BeanProperty("entries")<a name="line.204"></a>
<span class="sourceLineNo">205</span> public Feed entries(Entry...entries) {<a name="line.205"></a>
<span class="sourceLineNo">206</span> this.entries = entries;<a name="line.206"></a>
<span class="sourceLineNo">207</span> return this;<a name="line.207"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Generator.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Generator.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Generator.html
index 0e52478..419bd28 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Generator.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Generator.html
@@ -85,7 +85,7 @@
<span class="sourceLineNo">077</span> * @param uri The URI of this generator statement.<a name="line.77"></a>
<span class="sourceLineNo">078</span> * @return This object (for method chaining).<a name="line.78"></a>
<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> @BeanProperty(name="uri")<a name="line.80"></a>
+<span class="sourceLineNo">080</span> @BeanProperty("uri")<a name="line.80"></a>
<span class="sourceLineNo">081</span> public Generator uri(URI uri) {<a name="line.81"></a>
<span class="sourceLineNo">082</span> this.uri = uri;<a name="line.82"></a>
<span class="sourceLineNo">083</span> return this;<a name="line.83"></a>
@@ -97,7 +97,7 @@
<span class="sourceLineNo">089</span> * @param uri The URI of this generator statement.<a name="line.89"></a>
<span class="sourceLineNo">090</span> * @return This object (for method chaining).<a name="line.90"></a>
<span class="sourceLineNo">091</span> */<a name="line.91"></a>
-<span class="sourceLineNo">092</span> @BeanProperty(name="uri")<a name="line.92"></a>
+<span class="sourceLineNo">092</span> @BeanProperty("uri")<a name="line.92"></a>
<span class="sourceLineNo">093</span> public Generator uri(String uri) {<a name="line.93"></a>
<span class="sourceLineNo">094</span> this.uri = toURI(uri);<a name="line.94"></a>
<span class="sourceLineNo">095</span> return this;<a name="line.95"></a>
@@ -119,7 +119,7 @@
<span class="sourceLineNo">111</span> * @param version The version of this generator statement.<a name="line.111"></a>
<span class="sourceLineNo">112</span> * @return This object (for method chaining).<a name="line.112"></a>
<span class="sourceLineNo">113</span> */<a name="line.113"></a>
-<span class="sourceLineNo">114</span> @BeanProperty(name="version")<a name="line.114"></a>
+<span class="sourceLineNo">114</span> @BeanProperty("version")<a name="line.114"></a>
<span class="sourceLineNo">115</span> public Generator version(String version) {<a name="line.115"></a>
<span class="sourceLineNo">116</span> this.version = version;<a name="line.116"></a>
<span class="sourceLineNo">117</span> return this;<a name="line.117"></a>
@@ -141,7 +141,7 @@
<span class="sourceLineNo">133</span> * @param text The content of this generator statement.<a name="line.133"></a>
<span class="sourceLineNo">134</span> * @return This object (for method chaining).<a name="line.134"></a>
<span class="sourceLineNo">135</span> */<a name="line.135"></a>
-<span class="sourceLineNo">136</span> @BeanProperty(name="text")<a name="line.136"></a>
+<span class="sourceLineNo">136</span> @BeanProperty("text")<a name="line.136"></a>
<span class="sourceLineNo">137</span> public Generator text(String text) {<a name="line.137"></a>
<span class="sourceLineNo">138</span> this.text = text;<a name="line.138"></a>
<span class="sourceLineNo">139</span> return this;<a name="line.139"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Icon.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Icon.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Icon.html
index 309d238..87e24d2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Icon.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Icon.html
@@ -90,7 +90,7 @@
<span class="sourceLineNo">082</span> * @param uri The URI of this icon.<a name="line.82"></a>
<span class="sourceLineNo">083</span> * @return This object (for method chaining).<a name="line.83"></a>
<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> @BeanProperty(name="uri")<a name="line.85"></a>
+<span class="sourceLineNo">085</span> @BeanProperty("uri")<a name="line.85"></a>
<span class="sourceLineNo">086</span> public Icon uri(URI uri) {<a name="line.86"></a>
<span class="sourceLineNo">087</span> this.uri = uri;<a name="line.87"></a>
<span class="sourceLineNo">088</span> return this;<a name="line.88"></a>
@@ -102,7 +102,7 @@
<span class="sourceLineNo">094</span> * @param uri The URI of this icon.<a name="line.94"></a>
<span class="sourceLineNo">095</span> * @return This object (for method chaining).<a name="line.95"></a>
<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> @BeanProperty(name="uri")<a name="line.97"></a>
+<span class="sourceLineNo">097</span> @BeanProperty("uri")<a name="line.97"></a>
<span class="sourceLineNo">098</span> public Icon uri(String uri) {<a name="line.98"></a>
<span class="sourceLineNo">099</span> this.uri = toURI(uri);<a name="line.99"></a>
<span class="sourceLineNo">100</span> return this;<a name="line.100"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Id.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Id.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Id.html
index d7f6192..a90e665 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Id.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Id.html
@@ -79,7 +79,7 @@
<span class="sourceLineNo">071</span> * @param text The content of this identifier.<a name="line.71"></a>
<span class="sourceLineNo">072</span> * @return This object (for method chaining).<a name="line.72"></a>
<span class="sourceLineNo">073</span> */<a name="line.73"></a>
-<span class="sourceLineNo">074</span> @BeanProperty(name="text")<a name="line.74"></a>
+<span class="sourceLineNo">074</span> @BeanProperty("text")<a name="line.74"></a>
<span class="sourceLineNo">075</span> public Id text(String text) {<a name="line.75"></a>
<span class="sourceLineNo">076</span> this.text = text;<a name="line.76"></a>
<span class="sourceLineNo">077</span> return this;<a name="line.77"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Link.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Link.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Link.html
index bf5aa5b..7d8a49e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Link.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Link.html
@@ -94,7 +94,7 @@
<span class="sourceLineNo">086</span> * @param href The href of the target of this link.<a name="line.86"></a>
<span class="sourceLineNo">087</span> * @return This object (for method chaining).<a name="line.87"></a>
<span class="sourceLineNo">088</span> */<a name="line.88"></a>
-<span class="sourceLineNo">089</span> @BeanProperty(name="href")<a name="line.89"></a>
+<span class="sourceLineNo">089</span> @BeanProperty("href")<a name="line.89"></a>
<span class="sourceLineNo">090</span> public Link href(String href) {<a name="line.90"></a>
<span class="sourceLineNo">091</span> this.href = href;<a name="line.91"></a>
<span class="sourceLineNo">092</span> return this;<a name="line.92"></a>
@@ -116,7 +116,7 @@
<span class="sourceLineNo">108</span> * @param rel The rell of this link.<a name="line.108"></a>
<span class="sourceLineNo">109</span> * @return This object (for method chaining).<a name="line.109"></a>
<span class="sourceLineNo">110</span> */<a name="line.110"></a>
-<span class="sourceLineNo">111</span> @BeanProperty(name="rel")<a name="line.111"></a>
+<span class="sourceLineNo">111</span> @BeanProperty("rel")<a name="line.111"></a>
<span class="sourceLineNo">112</span> public Link rel(String rel) {<a name="line.112"></a>
<span class="sourceLineNo">113</span> this.rel = rel;<a name="line.113"></a>
<span class="sourceLineNo">114</span> return this;<a name="line.114"></a>
@@ -146,7 +146,7 @@
<span class="sourceLineNo">138</span> * @param type The content type of the target of this link.<a name="line.138"></a>
<span class="sourceLineNo">139</span> * @return This object (for method chaining).<a name="line.139"></a>
<span class="sourceLineNo">140</span> */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> @BeanProperty(name="type")<a name="line.141"></a>
+<span class="sourceLineNo">141</span> @BeanProperty("type")<a name="line.141"></a>
<span class="sourceLineNo">142</span> public Link type(String type) {<a name="line.142"></a>
<span class="sourceLineNo">143</span> this.type = type;<a name="line.143"></a>
<span class="sourceLineNo">144</span> return this;<a name="line.144"></a>
@@ -168,7 +168,7 @@
<span class="sourceLineNo">160</span> * @param hreflang The language of the target of this link.<a name="line.160"></a>
<span class="sourceLineNo">161</span> * @return This object (for method chaining).<a name="line.161"></a>
<span class="sourceLineNo">162</span> */<a name="line.162"></a>
-<span class="sourceLineNo">163</span> @BeanProperty(name="hreflang")<a name="line.163"></a>
+<span class="sourceLineNo">163</span> @BeanProperty("hreflang")<a name="line.163"></a>
<span class="sourceLineNo">164</span> public Link hreflang(String hreflang) {<a name="line.164"></a>
<span class="sourceLineNo">165</span> this.hreflang = hreflang;<a name="line.165"></a>
<span class="sourceLineNo">166</span> return this;<a name="line.166"></a>
@@ -190,7 +190,7 @@
<span class="sourceLineNo">182</span> * @param title The title of the target of this link.<a name="line.182"></a>
<span class="sourceLineNo">183</span> * @return This object (for method chaining).<a name="line.183"></a>
<span class="sourceLineNo">184</span> */<a name="line.184"></a>
-<span class="sourceLineNo">185</span> @BeanProperty(name="title")<a name="line.185"></a>
+<span class="sourceLineNo">185</span> @BeanProperty("title")<a name="line.185"></a>
<span class="sourceLineNo">186</span> public Link title(String title) {<a name="line.186"></a>
<span class="sourceLineNo">187</span> this.title = title;<a name="line.187"></a>
<span class="sourceLineNo">188</span> return this;<a name="line.188"></a>
@@ -212,7 +212,7 @@
<span class="sourceLineNo">204</span> * @param length The length of the contents of the target of this link.<a name="line.204"></a>
<span class="sourceLineNo">205</span> * @return This object (for method chaining).<a name="line.205"></a>
<span class="sourceLineNo">206</span> */<a name="line.206"></a>
-<span class="sourceLineNo">207</span> @BeanProperty(name="length")<a name="line.207"></a>
+<span class="sourceLineNo">207</span> @BeanProperty("length")<a name="line.207"></a>
<span class="sourceLineNo">208</span> public Link length(Integer length) {<a name="line.208"></a>
<span class="sourceLineNo">209</span> this.length = length;<a name="line.209"></a>
<span class="sourceLineNo">210</span> return this;<a name="line.210"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Logo.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Logo.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Logo.html
index f6de67e..b2a617d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Logo.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Logo.html
@@ -90,7 +90,7 @@
<span class="sourceLineNo">082</span> * @param uri The URI of the logo.<a name="line.82"></a>
<span class="sourceLineNo">083</span> * @return This object (for method chaining).<a name="line.83"></a>
<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> @BeanProperty(name="uri")<a name="line.85"></a>
+<span class="sourceLineNo">085</span> @BeanProperty("uri")<a name="line.85"></a>
<span class="sourceLineNo">086</span> public Logo uri(URI uri) {<a name="line.86"></a>
<span class="sourceLineNo">087</span> this.uri = uri;<a name="line.87"></a>
<span class="sourceLineNo">088</span> return this;<a name="line.88"></a>
@@ -102,7 +102,7 @@
<span class="sourceLineNo">094</span> * @param uri The URI of the logo.<a name="line.94"></a>
<span class="sourceLineNo">095</span> * @return This object (for method chaining).<a name="line.95"></a>
<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> @BeanProperty(name="uri")<a name="line.97"></a>
+<span class="sourceLineNo">097</span> @BeanProperty("uri")<a name="line.97"></a>
<span class="sourceLineNo">098</span> public Logo uri(String uri) {<a name="line.98"></a>
<span class="sourceLineNo">099</span> this.uri = toURI(uri);<a name="line.99"></a>
<span class="sourceLineNo">100</span> return this;<a name="line.100"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Person.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Person.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Person.html
index a075408..5a8d272 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Person.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Person.html
@@ -81,7 +81,7 @@
<span class="sourceLineNo">073</span> * @param name The name of the person.<a name="line.73"></a>
<span class="sourceLineNo">074</span> * @return This object (for method chaining).<a name="line.74"></a>
<span class="sourceLineNo">075</span> */<a name="line.75"></a>
-<span class="sourceLineNo">076</span> @BeanProperty(name="name")<a name="line.76"></a>
+<span class="sourceLineNo">076</span> @BeanProperty("name")<a name="line.76"></a>
<span class="sourceLineNo">077</span> public Person name(String name) {<a name="line.77"></a>
<span class="sourceLineNo">078</span> this.name = name;<a name="line.78"></a>
<span class="sourceLineNo">079</span> return this;<a name="line.79"></a>
@@ -102,7 +102,7 @@
<span class="sourceLineNo">094</span> * @param uri The URI of the person.<a name="line.94"></a>
<span class="sourceLineNo">095</span> * @return This object (for method chaining).<a name="line.95"></a>
<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> @BeanProperty(name="uri")<a name="line.97"></a>
+<span class="sourceLineNo">097</span> @BeanProperty("uri")<a name="line.97"></a>
<span class="sourceLineNo">098</span> public Person uri(URI uri) {<a name="line.98"></a>
<span class="sourceLineNo">099</span> this.uri = uri;<a name="line.99"></a>
<span class="sourceLineNo">100</span> return this;<a name="line.100"></a>
@@ -114,7 +114,7 @@
<span class="sourceLineNo">106</span> * @param uri The URI of the person.<a name="line.106"></a>
<span class="sourceLineNo">107</span> * @return This object (for method chaining).<a name="line.107"></a>
<span class="sourceLineNo">108</span> */<a name="line.108"></a>
-<span class="sourceLineNo">109</span> @BeanProperty(name="uri")<a name="line.109"></a>
+<span class="sourceLineNo">109</span> @BeanProperty("uri")<a name="line.109"></a>
<span class="sourceLineNo">110</span> public Person uri(String uri) {<a name="line.110"></a>
<span class="sourceLineNo">111</span> this.uri = toURI(uri);<a name="line.111"></a>
<span class="sourceLineNo">112</span> return this;<a name="line.112"></a>
@@ -135,7 +135,7 @@
<span class="sourceLineNo">127</span> * @param email The email address of the person.<a name="line.127"></a>
<span class="sourceLineNo">128</span> * @return This object (for method chaining).<a name="line.128"></a>
<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> @BeanProperty(name="email")<a name="line.130"></a>
+<span class="sourceLineNo">130</span> @BeanProperty("email")<a name="line.130"></a>
<span class="sourceLineNo">131</span> public Person email(String email) {<a name="line.131"></a>
<span class="sourceLineNo">132</span> this.email = email;<a name="line.132"></a>
<span class="sourceLineNo">133</span> return this;<a name="line.133"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Source.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Source.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Source.html
index ea8b141..751740e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Source.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Source.html
@@ -79,7 +79,7 @@
<span class="sourceLineNo">071</span> * @param generator The generator info of this source.<a name="line.71"></a>
<span class="sourceLineNo">072</span> * @return This object (for method chaining).<a name="line.72"></a>
<span class="sourceLineNo">073</span> */<a name="line.73"></a>
-<span class="sourceLineNo">074</span> @BeanProperty(name="generator")<a name="line.74"></a>
+<span class="sourceLineNo">074</span> @BeanProperty("generator")<a name="line.74"></a>
<span class="sourceLineNo">075</span> public Source generator(Generator generator) {<a name="line.75"></a>
<span class="sourceLineNo">076</span> this.generator = generator;<a name="line.76"></a>
<span class="sourceLineNo">077</span> return this;<a name="line.77"></a>
@@ -100,7 +100,7 @@
<span class="sourceLineNo">092</span> * @param icon The icon of this source.<a name="line.92"></a>
<span class="sourceLineNo">093</span> * @return This object (for method chaining).<a name="line.93"></a>
<span class="sourceLineNo">094</span> */<a name="line.94"></a>
-<span class="sourceLineNo">095</span> @BeanProperty(name="icon")<a name="line.95"></a>
+<span class="sourceLineNo">095</span> @BeanProperty("icon")<a name="line.95"></a>
<span class="sourceLineNo">096</span> public Source icon(Icon icon) {<a name="line.96"></a>
<span class="sourceLineNo">097</span> this.icon = icon;<a name="line.97"></a>
<span class="sourceLineNo">098</span> return this;<a name="line.98"></a>
@@ -121,7 +121,7 @@
<span class="sourceLineNo">113</span> * @param logo The logo of this source.<a name="line.113"></a>
<span class="sourceLineNo">114</span> * @return This object (for method chaining).<a name="line.114"></a>
<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> @BeanProperty(name="logo")<a name="line.116"></a>
+<span class="sourceLineNo">116</span> @BeanProperty("logo")<a name="line.116"></a>
<span class="sourceLineNo">117</span> public Source logo(Logo logo) {<a name="line.117"></a>
<span class="sourceLineNo">118</span> this.logo = logo;<a name="line.118"></a>
<span class="sourceLineNo">119</span> return this;<a name="line.119"></a>
@@ -142,7 +142,7 @@
<span class="sourceLineNo">134</span> * @param subtitle The subtitle of this source.<a name="line.134"></a>
<span class="sourceLineNo">135</span> * @return This object (for method chaining).<a name="line.135"></a>
<span class="sourceLineNo">136</span> */<a name="line.136"></a>
-<span class="sourceLineNo">137</span> @BeanProperty(name="subtitle")<a name="line.137"></a>
+<span class="sourceLineNo">137</span> @BeanProperty("subtitle")<a name="line.137"></a>
<span class="sourceLineNo">138</span> public Source subtitle(Text subtitle) {<a name="line.138"></a>
<span class="sourceLineNo">139</span> this.subtitle = subtitle;<a name="line.139"></a>
<span class="sourceLineNo">140</span> return this;<a name="line.140"></a>
@@ -154,7 +154,7 @@
<span class="sourceLineNo">146</span> * @param subtitle The subtitle of this source.<a name="line.146"></a>
<span class="sourceLineNo">147</span> * @return This object (for method chaining).<a name="line.147"></a>
<span class="sourceLineNo">148</span> */<a name="line.148"></a>
-<span class="sourceLineNo">149</span> @BeanProperty(name="subtitle")<a name="line.149"></a>
+<span class="sourceLineNo">149</span> @BeanProperty("subtitle")<a name="line.149"></a>
<span class="sourceLineNo">150</span> public Source subtitle(String subtitle) {<a name="line.150"></a>
<span class="sourceLineNo">151</span> this.subtitle = new Text(subtitle);<a name="line.151"></a>
<span class="sourceLineNo">152</span> return this;<a name="line.152"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Text.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Text.html b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Text.html
index cb1e310..9506bda 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Text.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/atom/Text.html
@@ -100,7 +100,7 @@
<span class="sourceLineNo">092</span> * @param type The content type of this content.<a name="line.92"></a>
<span class="sourceLineNo">093</span> * @return This object (for method chaining).<a name="line.93"></a>
<span class="sourceLineNo">094</span> */<a name="line.94"></a>
-<span class="sourceLineNo">095</span> @BeanProperty(name="type")<a name="line.95"></a>
+<span class="sourceLineNo">095</span> @BeanProperty("type")<a name="line.95"></a>
<span class="sourceLineNo">096</span> public Text type(String type) {<a name="line.96"></a>
<span class="sourceLineNo">097</span> this.type = type;<a name="line.97"></a>
<span class="sourceLineNo">098</span> return this;<a name="line.98"></a>
@@ -122,7 +122,7 @@
<span class="sourceLineNo">114</span> * @param text The content of this content.<a name="line.114"></a>
<span class="sourceLineNo">115</span> * @return This object (for method chaining).<a name="line.115"></a>
<span class="sourceLineNo">116</span> */<a name="line.116"></a>
-<span class="sourceLineNo">117</span> @BeanProperty(name="text")<a name="line.117"></a>
+<span class="sourceLineNo">117</span> @BeanProperty("text")<a name="line.117"></a>
<span class="sourceLineNo">118</span> public Text text(String text) {<a name="line.118"></a>
<span class="sourceLineNo">119</span> this.text = text;<a name="line.119"></a>
<span class="sourceLineNo">120</span> return this;<a name="line.120"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.Row.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.Row.html b/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.Row.html
index a51c435..7e6218c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.Row.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.Row.html
@@ -169,7 +169,7 @@
<span class="sourceLineNo">161</span> *<a name="line.161"></a>
<span class="sourceLineNo">162</span> * @return The value of the <property>metadata</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.162"></a>
<span class="sourceLineNo">163</span> */<a name="line.163"></a>
-<span class="sourceLineNo">164</span> @BeanProperty(name="metadata")<a name="line.164"></a>
+<span class="sourceLineNo">164</span> @BeanProperty("metadata")<a name="line.164"></a>
<span class="sourceLineNo">165</span> public Column[] getMetaData() {<a name="line.165"></a>
<span class="sourceLineNo">166</span> return metaData;<a name="line.166"></a>
<span class="sourceLineNo">167</span> }<a name="line.167"></a>
@@ -180,7 +180,7 @@
<span class="sourceLineNo">172</span> * @param metaData The new value for the <property>metadata</property> property on this bean.<a name="line.172"></a>
<span class="sourceLineNo">173</span> * @return This object (for method chaining).<a name="line.173"></a>
<span class="sourceLineNo">174</span> */<a name="line.174"></a>
-<span class="sourceLineNo">175</span> @BeanProperty(name="metadata")<a name="line.175"></a>
+<span class="sourceLineNo">175</span> @BeanProperty("metadata")<a name="line.175"></a>
<span class="sourceLineNo">176</span> public DataSet setMetaData(Column[] metaData) {<a name="line.176"></a>
<span class="sourceLineNo">177</span> this.metaData = metaData;<a name="line.177"></a>
<span class="sourceLineNo">178</span> return this;<a name="line.178"></a>
@@ -191,7 +191,7 @@
<span class="sourceLineNo">183</span> *<a name="line.183"></a>
<span class="sourceLineNo">184</span> * @return The value of the <property>data</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.184"></a>
<span class="sourceLineNo">185</span> */<a name="line.185"></a>
-<span class="sourceLineNo">186</span> @BeanProperty(name="data")<a name="line.186"></a>
+<span class="sourceLineNo">186</span> @BeanProperty("data")<a name="line.186"></a>
<span class="sourceLineNo">187</span> public List<Row> getData() {<a name="line.187"></a>
<span class="sourceLineNo">188</span> return data;<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
@@ -202,7 +202,7 @@
<span class="sourceLineNo">194</span> * @param data The new value for the <property>data</property> property on this bean.<a name="line.194"></a>
<span class="sourceLineNo">195</span> * @return This object (for method chaining).<a name="line.195"></a>
<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> @BeanProperty(name="data")<a name="line.197"></a>
+<span class="sourceLineNo">197</span> @BeanProperty("data")<a name="line.197"></a>
<span class="sourceLineNo">198</span> public DataSet setData(List<Row> data) {<a name="line.198"></a>
<span class="sourceLineNo">199</span> this.data = data;<a name="line.199"></a>
<span class="sourceLineNo">200</span> return this;<a name="line.200"></a>
[24/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html b/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
index 5c9b145..ab4ad3a 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestClient.html
@@ -608,7 +608,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableProxy</h4>
-<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.482">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass)</pre>
+<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.488">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass)</pre>
<div class="block">Create a new proxy interface against a REST interface.
<p>
The URL to the REST interface is based on the following values:
@@ -655,7 +655,13 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
.rootUrl(<js>"http://hostname/resturl"</js>)
.build()
.getRemoteableProxy(MyInterface3.<jk>class</jk>);
- </p></div>
+ </p>
+ <h5 class='section'>Notes:</h5>
+ <ul>
+ <li>If you plan on using your proxy in a multi-threaded environment, you'll want to use an underlying
+ pooling client connection manager. The easiest way to do this is to use the <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#pooled--"><code>RestClientBuilder.pooled()</code></a>
+ method. If you don't do this, you may end up seeing "Connection still allocated" exceptions.
+ </ul></div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>interfaceClass</code> - The interface to create a proxy for.</dd>
@@ -672,7 +678,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableProxy</h4>
-<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.493">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.499">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> restUrl)</pre>
<div class="block">Same as <a href="../../../../../org/apache/juneau/rest/client/RestClient.html#getRemoteableProxy-java.lang.Class-"><code>getRemoteableProxy(Class)</code></a> except explicitly specifies the URL of the REST interface.</div>
<dl>
@@ -690,7 +696,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableProxy</h4>
-<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.507">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
+<pre>public <T> T <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.513">getRemoteableProxy</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> interfaceClass,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> restUrl,
<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer,
<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
@@ -712,7 +718,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObject.html" title="class
<ul class="blockListLast">
<li class="blockList">
<h4>finalize</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.687">finalize</a>()
+<pre>protected void <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClient.html#line.702">finalize</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
[04/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
index e7ef22f..0c5a5c2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonWriter.html
@@ -37,7 +37,7 @@
<span class="sourceLineNo">029</span>public final class UonWriter extends SerializerWriter {<a name="line.29"></a>
<span class="sourceLineNo">030</span><a name="line.30"></a>
<span class="sourceLineNo">031</span> private final UonSerializerSession session;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> private final boolean encodeChars;<a name="line.32"></a>
+<span class="sourceLineNo">032</span> private final boolean encodeChars, plainTextParams;<a name="line.32"></a>
<span class="sourceLineNo">033</span><a name="line.33"></a>
<span class="sourceLineNo">034</span> // Characters that do not need to be URL-encoded in strings.<a name="line.34"></a>
<span class="sourceLineNo">035</span> private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;/?:@-_.!*'$(),~=");<a name="line.35"></a>
@@ -61,203 +61,204 @@
<span class="sourceLineNo">053</span> * @param useWhitespace If <jk>true</jk>, tabs will be used in output.<a name="line.53"></a>
<span class="sourceLineNo">054</span> * @param encodeChars If <jk>true</jk>, special characters should be encoded.<a name="line.54"></a>
<span class="sourceLineNo">055</span> * @param trimStrings If <jk>true</jk>, strings should be trimmed before they're serialized.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * @param uriResolver The URI resolver for resolving URIs to absolute or root-relative form.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> */<a name="line.57"></a>
-<span class="sourceLineNo">058</span> protected UonWriter(UonSerializerSession session, Writer out, boolean useWhitespace, boolean encodeChars, boolean trimStrings, UriResolver uriResolver) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span> super(out, useWhitespace, trimStrings, '\'', uriResolver);<a name="line.59"></a>
-<span class="sourceLineNo">060</span> this.session = session;<a name="line.60"></a>
-<span class="sourceLineNo">061</span> this.encodeChars = encodeChars;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * Serializes the specified simple object as a UON string value.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> *<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @param o The object being serialized.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @param isTopAttrName If this is a top-level attribute name we're serializing.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @param plainTextParams This is a top-level name or parameter we're serializing and the parameter format is PLAINTEXT.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * @return This object (for method chaining).<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * @throws IOException Should never happen.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public final UonWriter appendObject(Object o, boolean isTopAttrName, boolean plainTextParams) throws IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> if (o instanceof Boolean)<a name="line.75"></a>
-<span class="sourceLineNo">076</span> return appendBoolean(o);<a name="line.76"></a>
-<span class="sourceLineNo">077</span> if (o instanceof Number)<a name="line.77"></a>
-<span class="sourceLineNo">078</span> return appendNumber(o);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> if (o == null)<a name="line.79"></a>
-<span class="sourceLineNo">080</span> return append("null");<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> String s = session.toString(o);<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> boolean needsQuotes = (! plainTextParams) && UonUtils.needsQuotes(s);<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span> AsciiSet unenc = (isTopAttrName ? unencodedCharsAttrName : unencodedChars);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> AsciiSet esc = plainTextParams ? noChars : escapedChars;<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> if (needsQuotes)<a name="line.89"></a>
-<span class="sourceLineNo">090</span> append('\'');<a name="line.90"></a>
-<span class="sourceLineNo">091</span> for (int i = 0; i < s.length(); i++) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> char c = s.charAt(i);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (esc.contains(c))<a name="line.93"></a>
-<span class="sourceLineNo">094</span> append('~');<a name="line.94"></a>
-<span class="sourceLineNo">095</span> if ((!encodeChars) || unenc.contains(c))<a name="line.95"></a>
-<span class="sourceLineNo">096</span> append(c);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> else {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> if (c == ' ')<a name="line.98"></a>
-<span class="sourceLineNo">099</span> append('+');<a name="line.99"></a>
-<span class="sourceLineNo">100</span> else {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> int p = s.codePointAt(i);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (p < 0x0080)<a name="line.102"></a>
-<span class="sourceLineNo">103</span> appendHex(p);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> else if (p < 0x0800) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> int p1=p>>>6;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> appendHex(p1+192).appendHex((p&63)+128);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> } else if (p < 0x10000) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> int p1=p>>>6, p2=p1>>>6;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> appendHex(p2+224).appendHex((p1&63)+128).appendHex((p&63)+128);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> i++; // Two-byte codepoint...skip past surrogate pair lower byte.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> int p1=p>>>6, p2=p1>>>6, p3=p2>>>6;<a name="line.112"></a>
-<span class="sourceLineNo">113</span> appendHex(p3+240).appendHex((p2&63)+128).appendHex((p1&63)+128).appendHex((p&63)+128);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> }<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> if (needsQuotes)<a name="line.118"></a>
-<span class="sourceLineNo">119</span> append('\'');<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> return this;<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * Appends a boolean value to the output.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> *<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @param o The boolean value to append to the output.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @return This object (for method chaining).<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @throws IOException<a name="line.129"></a>
-<span class="sourceLineNo">130</span> */<a name="line.130"></a>
-<span class="sourceLineNo">131</span> protected UonWriter appendBoolean(Object o) throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> append(o.toString());<a name="line.132"></a>
-<span class="sourceLineNo">133</span> return this;<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> /**<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * Appends a numeric value to the output.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> *<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * @param o The numeric value to append to the output.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * @return This object (for method chaining).<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @throws IOException<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> protected UonWriter appendNumber(Object o) throws IOException {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> append(o.toString());<a name="line.144"></a>
-<span class="sourceLineNo">145</span> return this;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * Prints out a two-byte %xx sequence for the given byte value.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> */<a name="line.150"></a>
-<span class="sourceLineNo">151</span> private UonWriter appendHex(int b) throws IOException {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> if (b > 255)<a name="line.152"></a>
-<span class="sourceLineNo">153</span> throw new IOException("Invalid value passed to appendHex. Must be in the range 0-255. Value=" + b);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> append('%').append(hexArray[b>>>4]).append(hexArray[b&0x0F]);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return this;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * Appends a URI to the output.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> *<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @param uri The URI to append to the output.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * @return This object (for method chaining).<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * @throws IOException<a name="line.163"></a>
-<span class="sourceLineNo">164</span> */<a name="line.164"></a>
-<span class="sourceLineNo">165</span> @Override<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return appendObject(uriResolver.resolve(uri), false, false);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">056</span> * @param plainTextParams If <jk>true</jk>, don't use UON notation for values.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * @param uriResolver The URI resolver for resolving URIs to absolute or root-relative form.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> */<a name="line.58"></a>
+<span class="sourceLineNo">059</span> protected UonWriter(UonSerializerSession session, Writer out, boolean useWhitespace, boolean encodeChars, boolean trimStrings, boolean plainTextParams, UriResolver uriResolver) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> super(out, useWhitespace, trimStrings, '\'', uriResolver);<a name="line.60"></a>
+<span class="sourceLineNo">061</span> this.session = session;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> this.encodeChars = encodeChars;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.plainTextParams = plainTextParams;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Serializes the specified simple object as a UON string value.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @param o The object being serialized.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * @param isTopAttrName If this is a top-level attribute name we're serializing.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * @return This object (for method chaining).<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * @throws IOException Should never happen.<a name="line.72"></a>
+<span class="sourceLineNo">073</span> */<a name="line.73"></a>
+<span class="sourceLineNo">074</span> public final UonWriter appendObject(Object o, boolean isTopAttrName) throws IOException {<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> if (o instanceof Boolean)<a name="line.76"></a>
+<span class="sourceLineNo">077</span> return appendBoolean(o);<a name="line.77"></a>
+<span class="sourceLineNo">078</span> if (o instanceof Number)<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return appendNumber(o);<a name="line.79"></a>
+<span class="sourceLineNo">080</span> if (o == null)<a name="line.80"></a>
+<span class="sourceLineNo">081</span> return append("null");<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> String s = session.toString(o);<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> boolean needsQuotes = (! plainTextParams) && UonUtils.needsQuotes(s);<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span> AsciiSet unenc = (isTopAttrName ? unencodedCharsAttrName : unencodedChars);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> AsciiSet esc = plainTextParams ? noChars : escapedChars;<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> if (needsQuotes)<a name="line.90"></a>
+<span class="sourceLineNo">091</span> append('\'');<a name="line.91"></a>
+<span class="sourceLineNo">092</span> for (int i = 0; i < s.length(); i++) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> char c = s.charAt(i);<a name="line.93"></a>
+<span class="sourceLineNo">094</span> if (esc.contains(c))<a name="line.94"></a>
+<span class="sourceLineNo">095</span> append('~');<a name="line.95"></a>
+<span class="sourceLineNo">096</span> if ((!encodeChars) || unenc.contains(c))<a name="line.96"></a>
+<span class="sourceLineNo">097</span> append(c);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> else {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> if (c == ' ')<a name="line.99"></a>
+<span class="sourceLineNo">100</span> append('+');<a name="line.100"></a>
+<span class="sourceLineNo">101</span> else {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> int p = s.codePointAt(i);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (p < 0x0080)<a name="line.103"></a>
+<span class="sourceLineNo">104</span> appendHex(p);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> else if (p < 0x0800) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> int p1=p>>>6;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> appendHex(p1+192).appendHex((p&63)+128);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> } else if (p < 0x10000) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> int p1=p>>>6, p2=p1>>>6;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> appendHex(p2+224).appendHex((p1&63)+128).appendHex((p&63)+128);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> } else {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> i++; // Two-byte codepoint...skip past surrogate pair lower byte.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> int p1=p>>>6, p2=p1>>>6, p3=p2>>>6;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> appendHex(p3+240).appendHex((p2&63)+128).appendHex((p1&63)+128).appendHex((p&63)+128);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span> if (needsQuotes)<a name="line.119"></a>
+<span class="sourceLineNo">120</span> append('\'');<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> return this;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<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> * Appends a boolean value to the output.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> *<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @param o The boolean value to append to the output.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * @return This object (for method chaining).<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @throws IOException<a name="line.130"></a>
+<span class="sourceLineNo">131</span> */<a name="line.131"></a>
+<span class="sourceLineNo">132</span> protected UonWriter appendBoolean(Object o) throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> append(o.toString());<a name="line.133"></a>
+<span class="sourceLineNo">134</span> return this;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> /**<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * Appends a numeric value to the output.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> *<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @param o The numeric value to append to the output.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * @return This object (for method chaining).<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * @throws IOException<a name="line.142"></a>
+<span class="sourceLineNo">143</span> */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> protected UonWriter appendNumber(Object o) throws IOException {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> append(o.toString());<a name="line.145"></a>
+<span class="sourceLineNo">146</span> return this;<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> * Prints out a two-byte %xx sequence for the given byte value.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span> private UonWriter appendHex(int b) throws IOException {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (b > 255)<a name="line.153"></a>
+<span class="sourceLineNo">154</span> throw new IOException("Invalid value passed to appendHex. Must be in the range 0-255. Value=" + b);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> append('%').append(hexArray[b>>>4]).append(hexArray[b&0x0F]);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> return this;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * Appends a URI to the output.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> *<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * @param uri The URI to append to the output.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @return This object (for method chaining).<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @throws IOException<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public SerializerWriter appendUri(Object uri) throws IOException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return appendObject(uriResolver.resolve(uri), false);<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> // Overridden methods<a name="line.172"></a>
-<span class="sourceLineNo">173</span> //--------------------------------------------------------------------------------<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> @Override /* SerializerWriter */<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public UonWriter cr(int depth) throws IOException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> super.cr(depth);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> return this;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span> @Override /* SerializerWriter */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> public UonWriter appendln(int indent, String text) throws IOException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> super.appendln(indent, text);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return this;<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> @Override /* SerializerWriter */<a name="line.187"></a>
-<span class="sourceLineNo">188</span> public UonWriter appendln(String text) throws IOException {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> super.appendln(text);<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return this;<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> @Override /* SerializerWriter */<a name="line.193"></a>
-<span class="sourceLineNo">194</span> public UonWriter append(int indent, String text) throws IOException {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> super.append(indent, text);<a name="line.195"></a>
-<span class="sourceLineNo">196</span> return this;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> @Override /* SerializerWriter */<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public UonWriter append(int indent, char c) throws IOException {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> super.append(indent, c);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return this;<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> @Override /* SerializerWriter */<a name="line.205"></a>
-<span class="sourceLineNo">206</span> public UonWriter q() throws IOException {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> super.q();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return this;<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> @Override /* SerializerWriter */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> public UonWriter i(int indent) throws IOException {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> super.i(indent);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return this;<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> @Override /* SerializerWriter */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> public UonWriter nl() throws IOException {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> super.nl();<a name="line.219"></a>
-<span class="sourceLineNo">220</span> return this;<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> @Override /* SerializerWriter */<a name="line.223"></a>
-<span class="sourceLineNo">224</span> public UonWriter append(Object text) throws IOException {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> super.append(text);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return this;<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> @Override /* SerializerWriter */<a name="line.229"></a>
-<span class="sourceLineNo">230</span> public UonWriter append(String text) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> super.append(text);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> return this;<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> @Override /* SerializerWriter */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> public UonWriter appendIf(boolean b, String text) throws IOException {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> super.appendIf(b, text);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return this;<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> @Override /* SerializerWriter */<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public UonWriter appendIf(boolean b, char c) throws IOException {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> super.appendIf(b, c);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return this;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span> @Override /* SerializerWriter */<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public UonWriter append(char c) throws IOException {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> super.append(c);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> return this;<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>}<a name="line.252"></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> // Overridden methods<a name="line.173"></a>
+<span class="sourceLineNo">174</span> //--------------------------------------------------------------------------------<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> @Override /* SerializerWriter */<a name="line.176"></a>
+<span class="sourceLineNo">177</span> public UonWriter cr(int depth) throws IOException {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> super.cr(depth);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> return this;<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> @Override /* SerializerWriter */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public UonWriter appendln(int indent, String text) throws IOException {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> super.appendln(indent, text);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return this;<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> @Override /* SerializerWriter */<a name="line.188"></a>
+<span class="sourceLineNo">189</span> public UonWriter appendln(String text) throws IOException {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> super.appendln(text);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return this;<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> @Override /* SerializerWriter */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> public UonWriter append(int indent, String text) throws IOException {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> super.append(indent, text);<a name="line.196"></a>
+<span class="sourceLineNo">197</span> return this;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> @Override /* SerializerWriter */<a name="line.200"></a>
+<span class="sourceLineNo">201</span> public UonWriter append(int indent, char c) throws IOException {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> super.append(indent, c);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return this;<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> @Override /* SerializerWriter */<a name="line.206"></a>
+<span class="sourceLineNo">207</span> public UonWriter q() throws IOException {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> super.q();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return this;<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> @Override /* SerializerWriter */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public UonWriter i(int indent) throws IOException {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> super.i(indent);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return this;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override /* SerializerWriter */<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public UonWriter nl() throws IOException {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> super.nl();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return this;<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> @Override /* SerializerWriter */<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public UonWriter append(Object text) throws IOException {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> super.append(text);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return this;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Override /* SerializerWriter */<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public UonWriter append(String text) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> super.append(text);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return this;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> @Override /* SerializerWriter */<a name="line.236"></a>
+<span class="sourceLineNo">237</span> public UonWriter appendIf(boolean b, String text) throws IOException {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> super.appendIf(b, text);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return this;<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> @Override /* SerializerWriter */<a name="line.242"></a>
+<span class="sourceLineNo">243</span> public UonWriter appendIf(boolean b, char c) throws IOException {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> super.appendIf(b, c);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> return this;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> @Override /* SerializerWriter */<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public UonWriter append(char c) throws IOException {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> super.append(c);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> return this;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>}<a name="line.253"></a>
[06/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/serializer/PartSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/PartSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/PartSerializer.html
index 619681a..c212cb9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/serializer/PartSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/PartSerializer.html
@@ -39,25 +39,26 @@
<span class="sourceLineNo">031</span> * <li>{@link Header#serializer()}<a name="line.31"></a>
<span class="sourceLineNo">032</span> * <li>{@link HeaderIfNE#serializer()}<a name="line.32"></a>
<span class="sourceLineNo">033</span> * <li>{@link Path#serializer()}<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <li><code>RestClientBuilder.partSerializer(Class)</code><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * </ul><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <p><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * Implementations must include a no-arg constructor.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> */<a name="line.38"></a>
-<span class="sourceLineNo">039</span>public interface PartSerializer {<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> /**<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Converts the specified value to a string that can be used as an HTTP header value, query parameter value,<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * form-data parameter, or URI path variable.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <p><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * Returned values should NOT be URL-encoded. This will happen automatically.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @param type The category of value being serialized.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * @param value The value being serialized.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * @return The serialized value.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span> public String serialize(PartType type, Object value);<a name="line.51"></a>
-<span class="sourceLineNo">052</span>}<a name="line.52"></a>
+<span class="sourceLineNo">034</span> * <li>{@link RequestBean#serializer()}<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <li><code>RestClientBuilder.partSerializer(Class)</code><a name="line.35"></a>
+<span class="sourceLineNo">036</span> * </ul><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <p><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * Implementations must include a no-arg constructor.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> */<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public interface PartSerializer {<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span> /**<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Converts the specified value to a string that can be used as an HTTP header value, query parameter value,<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * form-data parameter, or URI path variable.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <p><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Returned values should NOT be URL-encoded. This will happen automatically.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> *<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * @param type The category of value being serialized.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * @param value The value being serialized.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * @return The serialized value.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> */<a name="line.51"></a>
+<span class="sourceLineNo">052</span> public String serialize(PartType type, Object value);<a name="line.52"></a>
+<span class="sourceLineNo">053</span>}<a name="line.53"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
index 925d438..a90bf34 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Encoding.html
@@ -212,188 +212,195 @@
<span class="sourceLineNo">204</span> * @param eType The expected type of the object if this is a bean property.<a name="line.204"></a>
<span class="sourceLineNo">205</span> * @param attrName The bean property name if this is a bean property. <jk>null</jk> if this isn't a bean property being serialized.<a name="line.205"></a>
<span class="sourceLineNo">206</span> * @param pMeta The bean property metadata.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @param plainTextParams <jk>true</jk> if this is a top level parameter key or value and paramFormat is PLAINTEXT.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> *<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * @return The same writer passed in.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @throws Exception<a name="line.210"></a>
-<span class="sourceLineNo">211</span> */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.212"></a>
-<span class="sourceLineNo">213</span> protected SerializerWriter serializeAnything(UonSerializerSession session, UonWriter out, Object o, ClassMeta<?> eType,<a name="line.213"></a>
-<span class="sourceLineNo">214</span> String attrName, BeanPropertyMeta pMeta, boolean plainTextParams) throws Exception {<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (o == null) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> out.appendObject(null, false, plainTextParams);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return out;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (eType == null)<a name="line.221"></a>
-<span class="sourceLineNo">222</span> eType = object();<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> ClassMeta<?> aType; // The actual type<a name="line.224"></a>
-<span class="sourceLineNo">225</span> ClassMeta<?> sType; // The serialized type<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> aType = session.push(attrName, o, eType);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> boolean isRecursion = aType == null;<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // Handle recursion<a name="line.230"></a>
-<span class="sourceLineNo">231</span> if (aType == null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> o = null;<a name="line.232"></a>
-<span class="sourceLineNo">233</span> aType = object();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> sType = aType.getSerializedClassMeta();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> String typeName = session.getBeanTypeName(eType, aType, pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> // Swap if necessary<a name="line.239"></a>
-<span class="sourceLineNo">240</span> PojoSwap swap = aType.getPojoSwap();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (swap != null) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> o = swap.swap(session, o);<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.244"></a>
-<span class="sourceLineNo">245</span> // the actual type now.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (sType.isObject())<a name="line.246"></a>
-<span class="sourceLineNo">247</span> sType = session.getClassMetaForObject(o);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> // '\0' characters are considered null.<a name="line.250"></a>
-<span class="sourceLineNo">251</span> if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))<a name="line.251"></a>
-<span class="sourceLineNo">252</span> out.appendObject(null, false, plainTextParams);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> else if (sType.isBoolean())<a name="line.253"></a>
-<span class="sourceLineNo">254</span> out.appendBoolean(o);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> else if (sType.isNumber())<a name="line.255"></a>
-<span class="sourceLineNo">256</span> out.appendNumber(o);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> else if (sType.isBean())<a name="line.257"></a>
-<span class="sourceLineNo">258</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> else if (sType.isUri() || (pMeta != null && pMeta.isUri()))<a name="line.259"></a>
-<span class="sourceLineNo">260</span> out.appendUri(o);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> else if (sType.isMap()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (o instanceof BeanMap)<a name="line.262"></a>
-<span class="sourceLineNo">263</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> else<a name="line.264"></a>
-<span class="sourceLineNo">265</span> serializeMap(session, out, (Map)o, eType);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> else if (sType.isCollection()) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> serializeCollection(session, out, (Collection) o, eType);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> else if (sType.isArray()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> else {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> out.appendObject(o, false, plainTextParams);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (! isRecursion)<a name="line.277"></a>
-<span class="sourceLineNo">278</span> session.pop();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return out;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.282"></a>
-<span class="sourceLineNo">283</span> private SerializerWriter serializeMap(UonSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> m = session.sort(m);<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> int depth = session.getIndent();<a name="line.289"></a>
-<span class="sourceLineNo">290</span> out.append('(');<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> while (mapEntries.hasNext()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> Object value = e.getValue();<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> out.cr(depth).appendObject(key, false, false).append('=');<a name="line.298"></a>
-<span class="sourceLineNo">299</span> serializeAnything(session, out, value, valueType, (key == null ? null : session.toString(key)), null, false);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (mapEntries.hasNext())<a name="line.300"></a>
-<span class="sourceLineNo">301</span> out.append(',');<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (m.size() > 0)<a name="line.304"></a>
-<span class="sourceLineNo">305</span> out.cr(depth-1);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> out.append(')');<a name="line.306"></a>
+<span class="sourceLineNo">207</span> *<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * @return The same writer passed in.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @throws Exception<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.211"></a>
+<span class="sourceLineNo">212</span> protected SerializerWriter serializeAnything(UonSerializerSession session, UonWriter out, Object o, ClassMeta<?> eType,<a name="line.212"></a>
+<span class="sourceLineNo">213</span> String attrName, BeanPropertyMeta pMeta) throws Exception {<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (o == null) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> out.appendObject(null, false);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return out;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (eType == null)<a name="line.220"></a>
+<span class="sourceLineNo">221</span> eType = object();<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> ClassMeta<?> aType; // The actual type<a name="line.223"></a>
+<span class="sourceLineNo">224</span> ClassMeta<?> sType; // The serialized type<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> aType = session.push(attrName, o, eType);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> boolean isRecursion = aType == null;<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // Handle recursion<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (aType == null) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> o = null;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> aType = object();<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> sType = aType.getSerializedClassMeta();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> String typeName = session.getBeanTypeName(eType, aType, pMeta);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> // Swap if necessary<a name="line.238"></a>
+<span class="sourceLineNo">239</span> PojoSwap swap = aType.getPojoSwap();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (swap != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> o = swap.swap(session, o);<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.243"></a>
+<span class="sourceLineNo">244</span> // the actual type now.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (sType.isObject())<a name="line.245"></a>
+<span class="sourceLineNo">246</span> sType = session.getClassMetaForObject(o);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> // '\0' characters are considered null.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))<a name="line.250"></a>
+<span class="sourceLineNo">251</span> out.appendObject(null, false);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> else if (sType.isBoolean())<a name="line.252"></a>
+<span class="sourceLineNo">253</span> out.appendBoolean(o);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> else if (sType.isNumber())<a name="line.254"></a>
+<span class="sourceLineNo">255</span> out.appendNumber(o);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> else if (sType.isBean())<a name="line.256"></a>
+<span class="sourceLineNo">257</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> else if (sType.isUri() || (pMeta != null && pMeta.isUri()))<a name="line.258"></a>
+<span class="sourceLineNo">259</span> out.appendUri(o);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> else if (sType.isMap()) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (o instanceof BeanMap)<a name="line.261"></a>
+<span class="sourceLineNo">262</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> else<a name="line.263"></a>
+<span class="sourceLineNo">264</span> serializeMap(session, out, (Map)o, eType);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> else if (sType.isCollection()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> serializeCollection(session, out, (Collection) o, eType);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> else if (sType.isArray()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> else {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> out.appendObject(o, false);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! isRecursion)<a name="line.276"></a>
+<span class="sourceLineNo">277</span> session.pop();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return out;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private SerializerWriter serializeMap(UonSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> m = session.sort(m);<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> int depth = session.getIndent();<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> if (! session.isPlainTextParams())<a name="line.290"></a>
+<span class="sourceLineNo">291</span> out.append('(');<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> while (mapEntries.hasNext()) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Object value = e.getValue();<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> out.cr(depth).appendObject(key, false).append('=');<a name="line.299"></a>
+<span class="sourceLineNo">300</span> serializeAnything(session, out, value, valueType, (key == null ? null : session.toString(key)), null);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> if (mapEntries.hasNext())<a name="line.301"></a>
+<span class="sourceLineNo">302</span> out.append(',');<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> if (m.size() > 0)<a name="line.305"></a>
+<span class="sourceLineNo">306</span> out.cr(depth-1);<a name="line.306"></a>
<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> return out;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">308</span> if (! session.isPlainTextParams())<a name="line.308"></a>
+<span class="sourceLineNo">309</span> out.append(')');<a name="line.309"></a>
<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> private SerializerWriter serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> int depth = session.getIndent();<a name="line.312"></a>
+<span class="sourceLineNo">311</span> return out;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> out.append('(');<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> boolean addComma = false;<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.320"></a>
+<span class="sourceLineNo">314</span> private SerializerWriter serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> int depth = session.getIndent();<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (! session.isPlainTextParams())<a name="line.317"></a>
+<span class="sourceLineNo">318</span> out.append('(');<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> boolean addComma = false;<a name="line.320"></a>
<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> String key = p.getName();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> Object value = p.getValue();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Throwable t = p.getThrown();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> if (t != null)<a name="line.325"></a>
-<span class="sourceLineNo">326</span> session.addBeanGetterWarning(pMeta, t);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.328"></a>
-<span class="sourceLineNo">329</span> continue;<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> if (addComma)<a name="line.331"></a>
-<span class="sourceLineNo">332</span> out.append(',');<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> out.cr(depth).appendObject(key, false, false).append('=');<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> serializeAnything(session, out, value, cMeta, key, pMeta, false);<a name="line.336"></a>
+<span class="sourceLineNo">322</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> String key = p.getName();<a name="line.326"></a>
+<span class="sourceLineNo">327</span> Object value = p.getValue();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> Throwable t = p.getThrown();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> if (t != null)<a name="line.329"></a>
+<span class="sourceLineNo">330</span> session.addBeanGetterWarning(pMeta, t);<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.332"></a>
+<span class="sourceLineNo">333</span> continue;<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> if (addComma)<a name="line.335"></a>
+<span class="sourceLineNo">336</span> out.append(',');<a name="line.336"></a>
<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> addComma = true;<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> if (m.size() > 0)<a name="line.341"></a>
-<span class="sourceLineNo">342</span> out.cr(depth-1);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> out.append(')');<a name="line.343"></a>
+<span class="sourceLineNo">338</span> out.cr(depth).appendObject(key, false).append('=');<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> addComma = true;<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> return out;<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.348"></a>
-<span class="sourceLineNo">349</span> private SerializerWriter serializeCollection(UonSerializerSession session, UonWriter out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> ClassMeta<?> elementType = type.getElementType();<a name="line.351"></a>
+<span class="sourceLineNo">345</span> if (m.size() > 0)<a name="line.345"></a>
+<span class="sourceLineNo">346</span> out.cr(depth-1);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (! session.isPlainTextParams())<a name="line.347"></a>
+<span class="sourceLineNo">348</span> out.append(')');<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> return out;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> c = session.sort(c);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> out.append('@').append('(');<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> int depth = session.getIndent();<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> out.cr(depth);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> serializeAnything(session, out, i.next(), elementType, "<iterator>", null, false);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (i.hasNext())<a name="line.362"></a>
-<span class="sourceLineNo">363</span> out.append(',');<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (c.size() > 0)<a name="line.366"></a>
-<span class="sourceLineNo">367</span> out.cr(depth-1);<a name="line.367"></a>
-<span class="sourceLineNo">368</span> out.append(')');<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> return out;<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> //--------------------------------------------------------------------------------<a name="line.374"></a>
-<span class="sourceLineNo">375</span> // Entry point methods<a name="line.375"></a>
-<span class="sourceLineNo">376</span> //--------------------------------------------------------------------------------<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> @Override /* Serializer */<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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> @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> UonSerializerSession s = (UonSerializerSession)session;<a name="line.385"></a>
-<span class="sourceLineNo">386</span> serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), "root", null, false);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>}<a name="line.388"></a>
+<span class="sourceLineNo">353</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private SerializerWriter serializeCollection(UonSerializerSession session, UonWriter out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> ClassMeta<?> elementType = type.getElementType();<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> c = session.sort(c);<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (! session.isPlainTextParams())<a name="line.360"></a>
+<span class="sourceLineNo">361</span> out.append('@').append('(');<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> int depth = session.getIndent();<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> out.cr(depth);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> serializeAnything(session, out, i.next(), elementType, "<iterator>", null);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> if (i.hasNext())<a name="line.368"></a>
+<span class="sourceLineNo">369</span> out.append(',');<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> if (c.size() > 0)<a name="line.372"></a>
+<span class="sourceLineNo">373</span> out.cr(depth-1);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> if (! session.isPlainTextParams())<a name="line.374"></a>
+<span class="sourceLineNo">375</span> out.append(')');<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> return out;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> //--------------------------------------------------------------------------------<a name="line.381"></a>
+<span class="sourceLineNo">382</span> // Entry point methods<a name="line.382"></a>
+<span class="sourceLineNo">383</span> //--------------------------------------------------------------------------------<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> @Override /* Serializer */<a name="line.385"></a>
+<span class="sourceLineNo">386</span> public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> @Override /* Serializer */<a name="line.390"></a>
+<span class="sourceLineNo">391</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> UonSerializerSession s = (UonSerializerSession)session;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), "root", 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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
index 925d438..a90bf34 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.Readable.html
@@ -212,188 +212,195 @@
<span class="sourceLineNo">204</span> * @param eType The expected type of the object if this is a bean property.<a name="line.204"></a>
<span class="sourceLineNo">205</span> * @param attrName The bean property name if this is a bean property. <jk>null</jk> if this isn't a bean property being serialized.<a name="line.205"></a>
<span class="sourceLineNo">206</span> * @param pMeta The bean property metadata.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @param plainTextParams <jk>true</jk> if this is a top level parameter key or value and paramFormat is PLAINTEXT.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> *<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * @return The same writer passed in.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @throws Exception<a name="line.210"></a>
-<span class="sourceLineNo">211</span> */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.212"></a>
-<span class="sourceLineNo">213</span> protected SerializerWriter serializeAnything(UonSerializerSession session, UonWriter out, Object o, ClassMeta<?> eType,<a name="line.213"></a>
-<span class="sourceLineNo">214</span> String attrName, BeanPropertyMeta pMeta, boolean plainTextParams) throws Exception {<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (o == null) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> out.appendObject(null, false, plainTextParams);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return out;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (eType == null)<a name="line.221"></a>
-<span class="sourceLineNo">222</span> eType = object();<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> ClassMeta<?> aType; // The actual type<a name="line.224"></a>
-<span class="sourceLineNo">225</span> ClassMeta<?> sType; // The serialized type<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> aType = session.push(attrName, o, eType);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> boolean isRecursion = aType == null;<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // Handle recursion<a name="line.230"></a>
-<span class="sourceLineNo">231</span> if (aType == null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> o = null;<a name="line.232"></a>
-<span class="sourceLineNo">233</span> aType = object();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> sType = aType.getSerializedClassMeta();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> String typeName = session.getBeanTypeName(eType, aType, pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> // Swap if necessary<a name="line.239"></a>
-<span class="sourceLineNo">240</span> PojoSwap swap = aType.getPojoSwap();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (swap != null) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> o = swap.swap(session, o);<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.244"></a>
-<span class="sourceLineNo">245</span> // the actual type now.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (sType.isObject())<a name="line.246"></a>
-<span class="sourceLineNo">247</span> sType = session.getClassMetaForObject(o);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> // '\0' characters are considered null.<a name="line.250"></a>
-<span class="sourceLineNo">251</span> if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))<a name="line.251"></a>
-<span class="sourceLineNo">252</span> out.appendObject(null, false, plainTextParams);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> else if (sType.isBoolean())<a name="line.253"></a>
-<span class="sourceLineNo">254</span> out.appendBoolean(o);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> else if (sType.isNumber())<a name="line.255"></a>
-<span class="sourceLineNo">256</span> out.appendNumber(o);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> else if (sType.isBean())<a name="line.257"></a>
-<span class="sourceLineNo">258</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> else if (sType.isUri() || (pMeta != null && pMeta.isUri()))<a name="line.259"></a>
-<span class="sourceLineNo">260</span> out.appendUri(o);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> else if (sType.isMap()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (o instanceof BeanMap)<a name="line.262"></a>
-<span class="sourceLineNo">263</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> else<a name="line.264"></a>
-<span class="sourceLineNo">265</span> serializeMap(session, out, (Map)o, eType);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> else if (sType.isCollection()) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> serializeCollection(session, out, (Collection) o, eType);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> else if (sType.isArray()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> else {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> out.appendObject(o, false, plainTextParams);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (! isRecursion)<a name="line.277"></a>
-<span class="sourceLineNo">278</span> session.pop();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return out;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.282"></a>
-<span class="sourceLineNo">283</span> private SerializerWriter serializeMap(UonSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> m = session.sort(m);<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> int depth = session.getIndent();<a name="line.289"></a>
-<span class="sourceLineNo">290</span> out.append('(');<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> while (mapEntries.hasNext()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> Object value = e.getValue();<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> out.cr(depth).appendObject(key, false, false).append('=');<a name="line.298"></a>
-<span class="sourceLineNo">299</span> serializeAnything(session, out, value, valueType, (key == null ? null : session.toString(key)), null, false);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (mapEntries.hasNext())<a name="line.300"></a>
-<span class="sourceLineNo">301</span> out.append(',');<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (m.size() > 0)<a name="line.304"></a>
-<span class="sourceLineNo">305</span> out.cr(depth-1);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> out.append(')');<a name="line.306"></a>
+<span class="sourceLineNo">207</span> *<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * @return The same writer passed in.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @throws Exception<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.211"></a>
+<span class="sourceLineNo">212</span> protected SerializerWriter serializeAnything(UonSerializerSession session, UonWriter out, Object o, ClassMeta<?> eType,<a name="line.212"></a>
+<span class="sourceLineNo">213</span> String attrName, BeanPropertyMeta pMeta) throws Exception {<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (o == null) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> out.appendObject(null, false);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return out;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (eType == null)<a name="line.220"></a>
+<span class="sourceLineNo">221</span> eType = object();<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> ClassMeta<?> aType; // The actual type<a name="line.223"></a>
+<span class="sourceLineNo">224</span> ClassMeta<?> sType; // The serialized type<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> aType = session.push(attrName, o, eType);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> boolean isRecursion = aType == null;<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // Handle recursion<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (aType == null) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> o = null;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> aType = object();<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> sType = aType.getSerializedClassMeta();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> String typeName = session.getBeanTypeName(eType, aType, pMeta);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> // Swap if necessary<a name="line.238"></a>
+<span class="sourceLineNo">239</span> PojoSwap swap = aType.getPojoSwap();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (swap != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> o = swap.swap(session, o);<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.243"></a>
+<span class="sourceLineNo">244</span> // the actual type now.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (sType.isObject())<a name="line.245"></a>
+<span class="sourceLineNo">246</span> sType = session.getClassMetaForObject(o);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> // '\0' characters are considered null.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))<a name="line.250"></a>
+<span class="sourceLineNo">251</span> out.appendObject(null, false);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> else if (sType.isBoolean())<a name="line.252"></a>
+<span class="sourceLineNo">253</span> out.appendBoolean(o);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> else if (sType.isNumber())<a name="line.254"></a>
+<span class="sourceLineNo">255</span> out.appendNumber(o);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> else if (sType.isBean())<a name="line.256"></a>
+<span class="sourceLineNo">257</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> else if (sType.isUri() || (pMeta != null && pMeta.isUri()))<a name="line.258"></a>
+<span class="sourceLineNo">259</span> out.appendUri(o);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> else if (sType.isMap()) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (o instanceof BeanMap)<a name="line.261"></a>
+<span class="sourceLineNo">262</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> else<a name="line.263"></a>
+<span class="sourceLineNo">264</span> serializeMap(session, out, (Map)o, eType);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> else if (sType.isCollection()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> serializeCollection(session, out, (Collection) o, eType);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> else if (sType.isArray()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> else {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> out.appendObject(o, false);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! isRecursion)<a name="line.276"></a>
+<span class="sourceLineNo">277</span> session.pop();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return out;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private SerializerWriter serializeMap(UonSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> m = session.sort(m);<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> int depth = session.getIndent();<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> if (! session.isPlainTextParams())<a name="line.290"></a>
+<span class="sourceLineNo">291</span> out.append('(');<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> while (mapEntries.hasNext()) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Object value = e.getValue();<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> out.cr(depth).appendObject(key, false).append('=');<a name="line.299"></a>
+<span class="sourceLineNo">300</span> serializeAnything(session, out, value, valueType, (key == null ? null : session.toString(key)), null);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> if (mapEntries.hasNext())<a name="line.301"></a>
+<span class="sourceLineNo">302</span> out.append(',');<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> if (m.size() > 0)<a name="line.305"></a>
+<span class="sourceLineNo">306</span> out.cr(depth-1);<a name="line.306"></a>
<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> return out;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">308</span> if (! session.isPlainTextParams())<a name="line.308"></a>
+<span class="sourceLineNo">309</span> out.append(')');<a name="line.309"></a>
<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> private SerializerWriter serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> int depth = session.getIndent();<a name="line.312"></a>
+<span class="sourceLineNo">311</span> return out;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> out.append('(');<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> boolean addComma = false;<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.320"></a>
+<span class="sourceLineNo">314</span> private SerializerWriter serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> int depth = session.getIndent();<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (! session.isPlainTextParams())<a name="line.317"></a>
+<span class="sourceLineNo">318</span> out.append('(');<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> boolean addComma = false;<a name="line.320"></a>
<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> String key = p.getName();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> Object value = p.getValue();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Throwable t = p.getThrown();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> if (t != null)<a name="line.325"></a>
-<span class="sourceLineNo">326</span> session.addBeanGetterWarning(pMeta, t);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.328"></a>
-<span class="sourceLineNo">329</span> continue;<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> if (addComma)<a name="line.331"></a>
-<span class="sourceLineNo">332</span> out.append(',');<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> out.cr(depth).appendObject(key, false, false).append('=');<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> serializeAnything(session, out, value, cMeta, key, pMeta, false);<a name="line.336"></a>
+<span class="sourceLineNo">322</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> String key = p.getName();<a name="line.326"></a>
+<span class="sourceLineNo">327</span> Object value = p.getValue();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> Throwable t = p.getThrown();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> if (t != null)<a name="line.329"></a>
+<span class="sourceLineNo">330</span> session.addBeanGetterWarning(pMeta, t);<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.332"></a>
+<span class="sourceLineNo">333</span> continue;<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> if (addComma)<a name="line.335"></a>
+<span class="sourceLineNo">336</span> out.append(',');<a name="line.336"></a>
<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> addComma = true;<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> if (m.size() > 0)<a name="line.341"></a>
-<span class="sourceLineNo">342</span> out.cr(depth-1);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> out.append(')');<a name="line.343"></a>
+<span class="sourceLineNo">338</span> out.cr(depth).appendObject(key, false).append('=');<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> addComma = true;<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> return out;<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.348"></a>
-<span class="sourceLineNo">349</span> private SerializerWriter serializeCollection(UonSerializerSession session, UonWriter out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> ClassMeta<?> elementType = type.getElementType();<a name="line.351"></a>
+<span class="sourceLineNo">345</span> if (m.size() > 0)<a name="line.345"></a>
+<span class="sourceLineNo">346</span> out.cr(depth-1);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (! session.isPlainTextParams())<a name="line.347"></a>
+<span class="sourceLineNo">348</span> out.append(')');<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> return out;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> c = session.sort(c);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> out.append('@').append('(');<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> int depth = session.getIndent();<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> out.cr(depth);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> serializeAnything(session, out, i.next(), elementType, "<iterator>", null, false);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (i.hasNext())<a name="line.362"></a>
-<span class="sourceLineNo">363</span> out.append(',');<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (c.size() > 0)<a name="line.366"></a>
-<span class="sourceLineNo">367</span> out.cr(depth-1);<a name="line.367"></a>
-<span class="sourceLineNo">368</span> out.append(')');<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> return out;<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> //--------------------------------------------------------------------------------<a name="line.374"></a>
-<span class="sourceLineNo">375</span> // Entry point methods<a name="line.375"></a>
-<span class="sourceLineNo">376</span> //--------------------------------------------------------------------------------<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> @Override /* Serializer */<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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> @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> UonSerializerSession s = (UonSerializerSession)session;<a name="line.385"></a>
-<span class="sourceLineNo">386</span> serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), "root", null, false);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>}<a name="line.388"></a>
+<span class="sourceLineNo">353</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private SerializerWriter serializeCollection(UonSerializerSession session, UonWriter out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> ClassMeta<?> elementType = type.getElementType();<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> c = session.sort(c);<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (! session.isPlainTextParams())<a name="line.360"></a>
+<span class="sourceLineNo">361</span> out.append('@').append('(');<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> int depth = session.getIndent();<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> out.cr(depth);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> serializeAnything(session, out, i.next(), elementType, "<iterator>", null);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> if (i.hasNext())<a name="line.368"></a>
+<span class="sourceLineNo">369</span> out.append(',');<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> if (c.size() > 0)<a name="line.372"></a>
+<span class="sourceLineNo">373</span> out.cr(depth-1);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> if (! session.isPlainTextParams())<a name="line.374"></a>
+<span class="sourceLineNo">375</span> out.append(')');<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> return out;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> //--------------------------------------------------------------------------------<a name="line.381"></a>
+<span class="sourceLineNo">382</span> // Entry point methods<a name="line.382"></a>
+<span class="sourceLineNo">383</span> //--------------------------------------------------------------------------------<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> @Override /* Serializer */<a name="line.385"></a>
+<span class="sourceLineNo">386</span> public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> @Override /* Serializer */<a name="line.390"></a>
+<span class="sourceLineNo">391</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> UonSerializerSession s = (UonSerializerSession)session;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), "root", 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>
[11/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/rest/RequestHeaders.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestHeaders.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestHeaders.html
index 56449d3..fb33515 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestHeaders.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestHeaders.html
@@ -27,659 +27,702 @@
<span class="sourceLineNo">019</span>import org.apache.juneau.http.*;<a name="line.19"></a>
<span class="sourceLineNo">020</span>import org.apache.juneau.http.Date;<a name="line.20"></a>
<span class="sourceLineNo">021</span>import org.apache.juneau.internal.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.parser.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.urlencoding.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Represents the headers in an HTTP request.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <p><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * Entries are stored in a case-insensitive map.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> */<a name="line.29"></a>
-<span class="sourceLineNo">030</span>public class RequestHeaders extends TreeMap<String,String[]> {<a name="line.30"></a>
-<span class="sourceLineNo">031</span> private static final long serialVersionUID = 1L;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span> private UrlEncodingParser parser;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> private BeanSession beanSession;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> private RequestQuery queryParams;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span> RequestHeaders() {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> super(String.CASE_INSENSITIVE_ORDER);<a name="line.38"></a>
-<span class="sourceLineNo">039</span> }<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> RequestHeaders setParser(UrlEncodingParser parser) {<a name="line.41"></a>
-<span class="sourceLineNo">042</span> this.parser = parser;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> return this;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> }<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> RequestHeaders setBeanSession(BeanSession beanSession) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> this.beanSession = beanSession;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> return this;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> RequestHeaders setQueryParams(RequestQuery queryParams) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> this.queryParams = queryParams;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> return this;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> }<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * Adds default entries to these headers.<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <p><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * This includes the default headers defined on the servlet and method levels.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> *<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * @param defaultEntries The default entries. Can be <jk>null</jk>.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * @return This object (for method chaining).<a name="line.62"></a>
-<span class="sourceLineNo">063</span> */<a name="line.63"></a>
-<span class="sourceLineNo">064</span> public RequestHeaders addDefault(Map<String,String> defaultEntries) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> if (defaultEntries != null) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> for (Map.Entry<String,String> e : defaultEntries.entrySet()) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> String key = e.getKey(), value = e.getValue();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> String[] v = get(key);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (v == null || v.length == 0 || StringUtils.isEmpty(v[0]))<a name="line.69"></a>
-<span class="sourceLineNo">070</span> put(key, new String[]{value});<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span> return this;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * Adds a set of header values to this object.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> *<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * @param name The header name.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * @param values The header values.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * @return This object (for method chaining).<a name="line.81"></a>
-<span class="sourceLineNo">082</span> */<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public RequestHeaders put(String name, Enumeration<String> values) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // Optimized for enumerations of one entry, the most-common case.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> if (values.hasMoreElements()) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> String v = values.nextElement();<a name="line.86"></a>
-<span class="sourceLineNo">087</span> String[] s = new String[]{v};<a name="line.87"></a>
-<span class="sourceLineNo">088</span> while (values.hasMoreElements())<a name="line.88"></a>
-<span class="sourceLineNo">089</span> s = ArrayUtils.append(s, values.nextElement());<a name="line.89"></a>
-<span class="sourceLineNo">090</span> put(name, s);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return this;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * Returns the specified header value, or <jk>null</jk> if the header doesn't exist.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
-<span class="sourceLineNo">098</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.98"></a>
-<span class="sourceLineNo">099</span> * <p><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @param name The header name.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @return The header value, or <jk>null</jk> if it doesn't exist.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public String getFirst(String name) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> String[] v = null;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if (queryParams != null)<a name="line.105"></a>
-<span class="sourceLineNo">106</span> v = queryParams.get(name);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> if (v == null || v.length == 0)<a name="line.107"></a>
-<span class="sourceLineNo">108</span> v = get(name);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (v == null || v.length == 0)<a name="line.109"></a>
-<span class="sourceLineNo">110</span> return null;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return v[0];<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * Returns the specified header value, or a default value if the header doesn't exist.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
-<span class="sourceLineNo">117</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.117"></a>
-<span class="sourceLineNo">118</span> *<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param name The HTTP header name.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param def The default value to return if the header value isn't found.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @return The header value, or the default value if the header isn't present.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public String getFirst(String name, String def) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> String s = getFirst(name);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return StringUtils.isEmpty(s) ? def : s;<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> /**<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * Sets a request header value.<a name="line.129"></a>
-<span class="sourceLineNo">130</span> *<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * @param name The header name.<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * @param value The header value.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> */<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public void put(String name, Object value) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> super.put(name, new String[]{StringUtils.toString(value)});<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * Returns the specified header value converted to a POJO.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * <p><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.141"></a>
-<span class="sourceLineNo">142</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <p><a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <h5 class='section'>Examples:</h5><a name="line.144"></a>
-<span class="sourceLineNo">145</span> * <p class='bcode'><a name="line.145"></a>
-<span class="sourceLineNo">146</span> * <jc>// Parse into an integer.</jc><a name="line.146"></a>
-<span class="sourceLineNo">147</span> * <jk>int</jk> myheader = req.getHeader(<js>"My-Header"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> *<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * <jc>// Parse a UUID.</jc><a name="line.149"></a>
-<span class="sourceLineNo">150</span> * UUID myheader = req.getHeader(<js>"My-Header"</js>, UUID.<jk>class</jk>);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * </p><a name="line.151"></a>
-<span class="sourceLineNo">152</span> *<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @param name The HTTP header name.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param type The class type to convert the header value to.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @param <T> The class type to convert the header value to.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @return The parameter value converted to the specified class type.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> */<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public <T> T get(String name, Class<T> type) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> String h = getFirst(name);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return beanSession.convertToType(h, type);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> /**<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * Same as {@link #get(String, Class)} but returns a default value if not found.<a name="line.164"></a>
-<span class="sourceLineNo">165</span> *<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * @param name The HTTP header name.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * @param def The default value if the header was not specified or is <jk>null</jk>.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * @param type The class type to convert the header value to.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * @param <T> The class type to convert the header value to.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * @return The parameter value converted to the specified class type.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> */<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public <T> T get(String name, T def, Class<T> type) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> String h = getFirst(name);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (h == null)<a name="line.174"></a>
-<span class="sourceLineNo">175</span> return def;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return beanSession.convertToType(h, type);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * Returns the specified header value converted to a POJO.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * <p><a name="line.181"></a>
-<span class="sourceLineNo">182</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.182"></a>
-<span class="sourceLineNo">183</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * <p><a name="line.184"></a>
-<span class="sourceLineNo">185</span> * <h5 class='section'>Examples:</h5><a name="line.185"></a>
-<span class="sourceLineNo">186</span> * <p class='bcode'><a name="line.186"></a>
-<span class="sourceLineNo">187</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.187"></a>
-<span class="sourceLineNo">188</span> * List&lt;String&gt; myheader = req.getHeader(<js>"My-Header"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * </p><a name="line.189"></a>
-<span class="sourceLineNo">190</span> *<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * @param name The HTTP header name.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * @param type The type of object to create.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <br>Ignored if the main type is not a map or collection.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * @param <T> The class type to convert the header value to.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @return The parameter value converted to the specified class type.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * @throws ParseException If the header could not be converted to the specified type.<a name="line.199"></a>
-<span class="sourceLineNo">200</span> */<a name="line.200"></a>
-<span class="sourceLineNo">201</span> public <T> T get(String name, Type type, Type...args) throws ParseException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> String h = getFirst(name);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> return parser.parsePart(h, type, args);<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> * Returns the <code>Accept</code> header on the request.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * <p><a name="line.208"></a>
-<span class="sourceLineNo">209</span> * Content-Types that are acceptable for the response.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> *<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * <h6 class='figure'>Example:</h6><a name="line.211"></a>
-<span class="sourceLineNo">212</span> * <p class='bcode'><a name="line.212"></a>
-<span class="sourceLineNo">213</span> * Accept: text/plain<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * </p><a name="line.214"></a>
-<span class="sourceLineNo">215</span> *<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * @return The parsed <code>Accept</code> header on the request, or <jk>null</jk> if not found.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> *<a name="line.217"></a>
-<span class="sourceLineNo">218</span> */<a name="line.218"></a>
-<span class="sourceLineNo">219</span> public Accept getAccept() {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> return Accept.forString(getFirst("Accept"));<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> * Returns the <code>Accept-Charset</code> header on the request.<a name="line.224"></a>
-<span class="sourceLineNo">225</span> * <p><a name="line.225"></a>
-<span class="sourceLineNo">226</span> * Character sets that are acceptable.<a name="line.226"></a>
-<span class="sourceLineNo">227</span> *<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * <h6 class='figure'>Example:</h6><a name="line.228"></a>
-<span class="sourceLineNo">229</span> * <p class='bcode'><a name="line.229"></a>
-<span class="sourceLineNo">230</span> * Accept-Charset: utf-8<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * </p><a name="line.231"></a>
-<span class="sourceLineNo">232</span> *<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * @return The parsed <code>Accept-Charset</code> header on the request, or <jk>null</jk> if not found.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> */<a name="line.234"></a>
-<span class="sourceLineNo">235</span> public AcceptCharset getAcceptCharset() {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> return AcceptCharset.forString(getFirst("Accept-Charset"));<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> /**<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * Returns the <code>Accept-Encoding</code> header on the request.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * <p><a name="line.241"></a>
-<span class="sourceLineNo">242</span> * List of acceptable encodings.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> *<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * <h6 class='figure'>Example:</h6><a name="line.244"></a>
-<span class="sourceLineNo">245</span> * <p class='bcode'><a name="line.245"></a>
-<span class="sourceLineNo">246</span> * Accept-Encoding: gzip, deflate<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * </p><a name="line.247"></a>
-<span class="sourceLineNo">248</span> *<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * @return The parsed <code>Accept-Encoding</code> header on the request, or <jk>null</jk> if not found.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> */<a name="line.250"></a>
-<span class="sourceLineNo">251</span> public AcceptEncoding getAcceptEncoding() {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> return AcceptEncoding.forString(getFirst("Accept-Encoding"));<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> /**<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * Returns the <code>Accept-Language</code> header on the request.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * <p><a name="line.257"></a>
-<span class="sourceLineNo">258</span> * List of acceptable human languages for response.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> *<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * <h6 class='figure'>Example:</h6><a name="line.260"></a>
-<span class="sourceLineNo">261</span> * <p class='bcode'><a name="line.261"></a>
-<span class="sourceLineNo">262</span> * Accept-Language: en-US<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * </p><a name="line.263"></a>
-<span class="sourceLineNo">264</span> *<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * @return The parsed <code>Accept-Language</code> header on the request, or <jk>null</jk> if not found.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> */<a name="line.266"></a>
-<span class="sourceLineNo">267</span> public AcceptLanguage getAcceptLanguage() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return AcceptLanguage.forString(getFirst("Accept-Language"));<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> /**<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * Returns the <code>Authorization</code> header on the request.<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * <p><a name="line.273"></a>
-<span class="sourceLineNo">274</span> * Authentication credentials for HTTP authentication.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> *<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * <h6 class='figure'>Example:</h6><a name="line.276"></a>
-<span class="sourceLineNo">277</span> * <p class='bcode'><a name="line.277"></a>
-<span class="sourceLineNo">278</span> * Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * </p><a name="line.279"></a>
-<span class="sourceLineNo">280</span> *<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * @return The parsed <code>Authorization</code> header on the request, or <jk>null</jk> if not found.<a name="line.281"></a>
-<span class="sourceLineNo">282</span> */<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public Authorization getAuthorization() {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return Authorization.forString(getFirst("Authorization"));<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> * Returns the <code>Cache-Control</code> header on the request.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * <p><a name="line.289"></a>
-<span class="sourceLineNo">290</span> * Used to specify directives that must be obeyed by all caching mechanisms along the request-response chain.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> *<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * <h6 class='figure'>Example:</h6><a name="line.292"></a>
-<span class="sourceLineNo">293</span> * <p class='bcode'><a name="line.293"></a>
-<span class="sourceLineNo">294</span> * Cache-Control: no-cache<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * </p><a name="line.295"></a>
-<span class="sourceLineNo">296</span> *<a name="line.296"></a>
-<span class="sourceLineNo">297</span> * @return The parsed <code>Cache-Control</code> header on the request, or <jk>null</jk> if not found.<a name="line.297"></a>
-<span class="sourceLineNo">298</span> */<a name="line.298"></a>
-<span class="sourceLineNo">299</span> public CacheControl getCacheControl() {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> return CacheControl.forString(getFirst("Cache-Control"));<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> /**<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * Returns the <code>Connection</code> header on the request.<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * <p><a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Control options for the current connection and list of hop-by-hop request fields.<a name="line.306"></a>
-<span class="sourceLineNo">307</span> *<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * <h6 class='figure'>Example:</h6><a name="line.308"></a>
-<span class="sourceLineNo">309</span> * <p class='bcode'><a name="line.309"></a>
-<span class="sourceLineNo">310</span> * Connection: keep-alive<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * Connection: Upgrade<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> * @return The parsed <code></code> header on the request, or <jk>null</jk> if not found.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> */<a name="line.315"></a>
-<span class="sourceLineNo">316</span> public Connection getConnection() {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return Connection.forString(getFirst("Connection"));<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> /**<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * Returns the <code>Content-Length</code> header on the request.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * <p><a name="line.322"></a>
-<span class="sourceLineNo">323</span> * The length of the request body in octets (8-bit bytes).<a name="line.323"></a>
-<span class="sourceLineNo">324</span> *<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * <h6 class='figure'>Example:</h6><a name="line.325"></a>
-<span class="sourceLineNo">326</span> * <p class='bcode'><a name="line.326"></a>
-<span class="sourceLineNo">327</span> * Content-Length: 348<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * </p><a name="line.328"></a>
-<span class="sourceLineNo">329</span> *<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * @return The parsed <code>Content-Length</code> header on the request, or <jk>null</jk> if not found.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> */<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public ContentLength getContentLength() {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return ContentLength.forString(getFirst("Content-Length"));<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> /**<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * Returns the <code>Content-Type</code> header on the request.<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * <p><a name="line.338"></a>
-<span class="sourceLineNo">339</span> * The MIME type of the body of the request (used with POST and PUT requests).<a name="line.339"></a>
-<span class="sourceLineNo">340</span> *<a name="line.340"></a>
-<span class="sourceLineNo">341</span> * <h6 class='figure'>Example:</h6><a name="line.341"></a>
-<span class="sourceLineNo">342</span> * <p class='bcode'><a name="line.342"></a>
-<span class="sourceLineNo">343</span> * Content-Type: application/x-www-form-urlencoded<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * </p><a name="line.344"></a>
-<span class="sourceLineNo">345</span> *<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * @return The parsed <code>Content-Type</code> header on the request, or <jk>null</jk> if not found.<a name="line.346"></a>
-<span class="sourceLineNo">347</span> */<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public ContentType getContentType() {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return ContentType.forString(getFirst("Content-Type"));<a name="line.349"></a>
-<span class="sourceLineNo">350</span> }<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span> /**<a name="line.352"></a>
-<span class="sourceLineNo">353</span> * Returns the <code>Date</code> header on the request.<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * <p><a name="line.354"></a>
-<span class="sourceLineNo">355</span> * The date and time that the message was originated (in "HTTP-date" format as defined by RFC 7231 Date/Time Formats).<a name="line.355"></a>
-<span class="sourceLineNo">356</span> *<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * <h6 class='figure'>Example:</h6><a name="line.357"></a>
-<span class="sourceLineNo">358</span> * <p class='bcode'><a name="line.358"></a>
-<span class="sourceLineNo">359</span> * Date: Tue, 15 Nov 1994 08:12:31 GMT<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * </p><a name="line.360"></a>
-<span class="sourceLineNo">361</span> *<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * @return The parsed <code>Date</code> header on the request, or <jk>null</jk> if not found.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> */<a name="line.363"></a>
-<span class="sourceLineNo">364</span> public Date getDate() {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return Date.forString(getFirst("Date"));<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> /**<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * Returns the <code>Expect</code> header on the request.<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * <p><a name="line.370"></a>
-<span class="sourceLineNo">371</span> * Indicates that particular server behaviors are required by the client.<a name="line.371"></a>
-<span class="sourceLineNo">372</span> *<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * <h6 class='figure'>Example:</h6><a name="line.373"></a>
-<span class="sourceLineNo">374</span> * <p class='bcode'><a name="line.374"></a>
-<span class="sourceLineNo">375</span> * Expect: 100-continue<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * </p><a name="line.376"></a>
-<span class="sourceLineNo">377</span> *<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * @return The parsed <code>Expect</code> header on the request, or <jk>null</jk> if not found.<a name="line.378"></a>
-<span class="sourceLineNo">379</span> */<a name="line.379"></a>
-<span class="sourceLineNo">380</span> public Expect getExpect() {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> return Expect.forString(getFirst("Expect"));<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * Returns the <code>From</code> header on the request.<a name="line.385"></a>
-<span class="sourceLineNo">386</span> * <p><a name="line.386"></a>
-<span class="sourceLineNo">387</span> * The email address of the user making the request.<a name="line.387"></a>
-<span class="sourceLineNo">388</span> *<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * <h6 class='figure'>Example:</h6><a name="line.389"></a>
-<span class="sourceLineNo">390</span> * <p class='bcode'><a name="line.390"></a>
-<span class="sourceLineNo">391</span> * From: user@example.com<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * </p><a name="line.392"></a>
-<span class="sourceLineNo">393</span> *<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * @return The parsed <code>From</code> header on the request, or <jk>null</jk> if not found.<a name="line.394"></a>
-<span class="sourceLineNo">395</span> */<a name="line.395"></a>
-<span class="sourceLineNo">396</span> public From getFrom() {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> return From.forString(getFirst("From"));<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> /**<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * Returns the <code>Host</code> header on the request.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * <p><a name="line.402"></a>
-<span class="sourceLineNo">403</span> * The domain name of the server (for virtual hosting), and the TCP port number on which the server is listening.<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * The port number may be omitted if the port is the standard port for the service requested.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * <h6 class='figure'>Example:</h6><a name="line.406"></a>
-<span class="sourceLineNo">407</span> * <p class='bcode'><a name="line.407"></a>
-<span class="sourceLineNo">408</span> * Host: en.wikipedia.org:8080<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * Host: en.wikipedia.org<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * </p><a name="line.410"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.json.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.parser.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.urlencoding.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>/**<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * Represents the headers in an HTTP request.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <p><a name="line.28"></a>
+<span class="sourceLineNo">029</span> * Entries are stored in a case-insensitive map.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> */<a name="line.30"></a>
+<span class="sourceLineNo">031</span>public class RequestHeaders extends TreeMap<String,String[]> {<a name="line.31"></a>
+<span class="sourceLineNo">032</span> private static final long serialVersionUID = 1L;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span> private UrlEncodingParser parser;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> private BeanSession beanSession;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> private RequestQuery queryParams;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> RequestHeaders() {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> super(String.CASE_INSENSITIVE_ORDER);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> }<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span> RequestHeaders setParser(UrlEncodingParser parser) {<a name="line.42"></a>
+<span class="sourceLineNo">043</span> this.parser = parser;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> return this;<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> RequestHeaders setBeanSession(BeanSession beanSession) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> this.beanSession = beanSession;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return this;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> RequestHeaders setQueryParams(RequestQuery queryParams) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> this.queryParams = queryParams;<a name="line.53"></a>
+<span class="sourceLineNo">054</span> return this;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Adds default entries to these headers.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * This includes the default headers defined on the servlet and method levels.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * @param defaultEntries The default entries. Can be <jk>null</jk>.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * @return This object (for method chaining).<a name="line.63"></a>
+<span class="sourceLineNo">064</span> */<a name="line.64"></a>
+<span class="sourceLineNo">065</span> public RequestHeaders addDefault(Map<String,String> defaultEntries) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> if (defaultEntries != null) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> for (Map.Entry<String,String> e : defaultEntries.entrySet()) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> String key = e.getKey(), value = e.getValue();<a name="line.68"></a>
+<span class="sourceLineNo">069</span> String[] v = get(key);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (v == null || v.length == 0 || StringUtils.isEmpty(v[0]))<a name="line.70"></a>
+<span class="sourceLineNo">071</span> put(key, new String[]{value});<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return this;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> /**<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * Adds a set of header values to this object.<a name="line.78"></a>
+<span class="sourceLineNo">079</span> *<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @param name The header name.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @param values The header values.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @return This object (for method chaining).<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public RequestHeaders put(String name, Enumeration<String> values) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> // Optimized for enumerations of one entry, the most-common case.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (values.hasMoreElements()) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> String v = values.nextElement();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> String[] s = new String[]{v};<a name="line.88"></a>
+<span class="sourceLineNo">089</span> while (values.hasMoreElements())<a name="line.89"></a>
+<span class="sourceLineNo">090</span> s = ArrayUtils.append(s, values.nextElement());<a name="line.90"></a>
+<span class="sourceLineNo">091</span> put(name, s);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span> return this;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span> /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * Returns the specified header value, or <jk>null</jk> if the header doesn't exist.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
+<span class="sourceLineNo">099</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.99"></a>
+<span class="sourceLineNo">100</span> * <p><a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @param name The header name.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * @return The header value, or <jk>null</jk> if it doesn't exist.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> */<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public String getFirst(String name) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> String[] v = null;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> if (queryParams != null)<a name="line.106"></a>
+<span class="sourceLineNo">107</span> v = queryParams.get(name);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> if (v == null || v.length == 0)<a name="line.108"></a>
+<span class="sourceLineNo">109</span> v = get(name);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> if (v == null || v.length == 0)<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return null;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> return v[0];<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> /**<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * Returns the specified header value, or a default value if the header doesn't exist.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <p><a name="line.117"></a>
+<span class="sourceLineNo">118</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.118"></a>
+<span class="sourceLineNo">119</span> *<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @param name The HTTP header name.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param def The default value to return if the header value isn't found.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @return The header value, or the default value if the header isn't present.<a name="line.122"></a>
+<span class="sourceLineNo">123</span> */<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public String getFirst(String name, String def) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> String s = getFirst(name);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return StringUtils.isEmpty(s) ? def : s;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * Sets a request header value.<a name="line.130"></a>
+<span class="sourceLineNo">131</span> *<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * @param name The header name.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * @param value The header value.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> */<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public void put(String name, Object value) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> super.put(name, new String[]{StringUtils.toString(value)});<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> /**<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * Returns the specified header value converted to a POJO.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <p><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.142"></a>
+<span class="sourceLineNo">143</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <p><a name="line.144"></a>
+<span class="sourceLineNo">145</span> * <h5 class='section'>Examples:</h5><a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <p class='bcode'><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <jc>// Parse into an integer.</jc><a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <jk>int</jk> myheader = req.getHeader(<js>"My-Header"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> *<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * <jc>// Parse a UUID.</jc><a name="line.150"></a>
+<span class="sourceLineNo">151</span> * UUID myheader = req.getHeader(<js>"My-Header"</js>, UUID.<jk>class</jk>);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * </p><a name="line.152"></a>
+<span class="sourceLineNo">153</span> *<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * @param name The HTTP header name.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * @param type The class type to convert the header value to.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @param <T> The class type to convert the header value to.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @return The parameter value converted to the specified class type.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public <T> T get(String name, Class<T> type) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> String h = getFirst(name);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> return beanSession.convertToType(h, type);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span> /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * Same as {@link #get(String, Class)} but returns a default value if not found.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> *<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @param name The HTTP header name.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> * @param def The default value if the header was not specified or is <jk>null</jk>.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * @param type The class type to convert the header value to.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * @param <T> The class type to convert the header value to.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @return The parameter value converted to the specified class type.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> */<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public <T> T get(String name, T def, Class<T> type) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String h = getFirst(name);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (h == null)<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return def;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> return beanSession.convertToType(h, type);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> /**<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * Returns the specified header value converted to a POJO.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * <p><a name="line.182"></a>
+<span class="sourceLineNo">183</span> * The type can be any POJO type convertable from a <code>String</code><a name="line.183"></a>
+<span class="sourceLineNo">184</span> * (See <a class="doclink" href="package-summary.html#PojosConvertableFromString">POJOs Convertable From Strings</a>).<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * <p><a name="line.185"></a>
+<span class="sourceLineNo">186</span> * <h5 class='section'>Examples:</h5><a name="line.186"></a>
+<span class="sourceLineNo">187</span> * <p class='bcode'><a name="line.187"></a>
+<span class="sourceLineNo">188</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.188"></a>
+<span class="sourceLineNo">189</span> * List&lt;String&gt; myheader = req.getHeader(<js>"My-Header"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * </p><a name="line.190"></a>
+<span class="sourceLineNo">191</span> *<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @param name The HTTP header name.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * @param type The type of object to create.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * <br>Ignored if the main type is not a map or collection.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @param <T> The class type to convert the header value to.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @return The parameter value converted to the specified class type.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * @throws ParseException If the header could not be converted to the specified type.<a name="line.200"></a>
+<span class="sourceLineNo">201</span> */<a name="line.201"></a>
+<span class="sourceLineNo">202</span> public <T> T get(String name, Type type, Type...args) throws ParseException {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> String h = getFirst(name);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return parser.parsePart(h, type, args);<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> * Returns a copy of this object, but only with the specified header names copied.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @param headers The headers to include in the copy.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * @return A new headers object.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> */<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public RequestHeaders subset(String...headers) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> RequestHeaders rh2 = new RequestHeaders().setParser(parser).setBeanSession(beanSession).setQueryParams(queryParams);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (String h : headers)<a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (containsKey(h))<a name="line.215"></a>
+<span class="sourceLineNo">216</span> rh2.put(h, get(h));<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return rh2;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> /**<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * Same as {@link #subset(String...)}, but allows you to specify header names as a comma-delimited list.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * @param headers The headers to include in the copy.<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * @return A new headers object.<a name="line.223"></a>
+<span class="sourceLineNo">224</span> */<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public RequestHeaders subset(String headers) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return subset(StringUtils.split(headers, ','));<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> /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * Returns the <code>Accept</code> header on the request.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * <p><a name="line.231"></a>
+<span class="sourceLineNo">232</span> * Content-Types that are acceptable for the response.<a name="line.232"></a>
+<span class="sourceLineNo">233</span> *<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * <h6 class='figure'>Example:</h6><a name="line.234"></a>
+<span class="sourceLineNo">235</span> * <p class='bcode'><a name="line.235"></a>
+<span class="sourceLineNo">236</span> * Accept: text/plain<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * </p><a name="line.237"></a>
+<span class="sourceLineNo">238</span> *<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @return The parsed <code>Accept</code> header on the request, or <jk>null</jk> if not found.<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> public Accept getAccept() {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return Accept.forString(getFirst("Accept"));<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> /**<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * Returns the <code>Accept-Charset</code> header on the request.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * <p><a name="line.248"></a>
+<span class="sourceLineNo">249</span> * Character sets that are acceptable.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> *<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * <h6 class='figure'>Example:</h6><a name="line.251"></a>
+<span class="sourceLineNo">252</span> * <p class='bcode'><a name="line.252"></a>
+<span class="sourceLineNo">253</span> * Accept-Charset: utf-8<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * </p><a name="line.254"></a>
+<span class="sourceLineNo">255</span> *<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * @return The parsed <code>Accept-Charset</code> header on the request, or <jk>null</jk> if not found.<a name="line.256"></a>
+<span class="sourceLineNo">257</span> */<a name="line.257"></a>
+<span class="sourceLineNo">258</span> public AcceptCharset getAcceptCharset() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return AcceptCharset.forString(getFirst("Accept-Charset"));<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> /**<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * Returns the <code>Accept-Encoding</code> header on the request.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * <p><a name="line.264"></a>
+<span class="sourceLineNo">265</span> * List of acceptable encodings.<a name="line.265"></a>
+<span class="sourceLineNo">266</span> *<a name="line.266"></a>
+<span class="sourceLineNo">267</span> * <h6 class='figure'>Example:</h6><a name="line.267"></a>
+<span class="sourceLineNo">268</span> * <p class='bcode'><a name="line.268"></a>
+<span class="sourceLineNo">269</span> * Accept-Encoding: gzip, deflate<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * </p><a name="line.270"></a>
+<span class="sourceLineNo">271</span> *<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * @return The parsed <code>Accept-Encoding</code> header on the request, or <jk>null</jk> if not found.<a name="line.272"></a>
+<span class="sourceLineNo">273</span> */<a name="line.273"></a>
+<span class="sourceLineNo">274</span> public AcceptEncoding getAcceptEncoding() {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return AcceptEncoding.forString(getFirst("Accept-Encoding"));<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 <code>Accept-Language</code> header on the request.<a name="line.279"></a>
+<span class="sourceLineNo">280</span> * <p><a name="line.280"></a>
+<span class="sourceLineNo">281</span> * List of acceptable human languages for response.<a name="line.281"></a>
+<span class="sourceLineNo">282</span> *<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * <h6 class='figure'>Example:</h6><a name="line.283"></a>
+<span class="sourceLineNo">284</span> * <p class='bcode'><a name="line.284"></a>
+<span class="sourceLineNo">285</span> * Accept-Language: en-US<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * </p><a name="line.286"></a>
+<span class="sourceLineNo">287</span> *<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * @return The parsed <code>Accept-Language</code> header on the request, or <jk>null</jk> if not found.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> */<a name="line.289"></a>
+<span class="sourceLineNo">290</span> public AcceptLanguage getAcceptLanguage() {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return AcceptLanguage.forString(getFirst("Accept-Language"));<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> /**<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * Returns the <code>Authorization</code> header on the request.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * <p><a name="line.296"></a>
+<span class="sourceLineNo">297</span> * Authentication credentials for HTTP authentication.<a name="line.297"></a>
+<span class="sourceLineNo">298</span> *<a name="line.298"></a>
+<span class="sourceLineNo">299</span> * <h6 class='figure'>Example:</h6><a name="line.299"></a>
+<span class="sourceLineNo">300</span> * <p class='bcode'><a name="line.300"></a>
+<span class="sourceLineNo">301</span> * Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==<a name="line.301"></a>
+<span class="sourceLineNo">302</span> * </p><a name="line.302"></a>
+<span class="sourceLineNo">303</span> *<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * @return The parsed <code>Authorization</code> header on the request, or <jk>null</jk> if not found.<a name="line.304"></a>
+<span class="sourceLineNo">305</span> */<a name="line.305"></a>
+<span class="sourceLineNo">306</span> public Authorization getAuthorization() {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return Authorization.forString(getFirst("Authorization"));<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> /**<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * Returns the <code>Cache-Control</code> header on the request.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * <p><a name="line.312"></a>
+<span class="sourceLineNo">313</span> * Used to specify directives that must be obeyed by all caching mechanisms along the request-response chain.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> *<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * <h6 class='figure'>Example:</h6><a name="line.315"></a>
+<span class="sourceLineNo">316</span> * <p class='bcode'><a name="line.316"></a>
+<span class="sourceLineNo">317</span> * Cache-Control: no-cache<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * </p><a name="line.318"></a>
+<span class="sourceLineNo">319</span> *<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * @return The parsed <code>Cache-Control</code> header on the request, or <jk>null</jk> if not found.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> */<a name="line.321"></a>
+<span class="sourceLineNo">322</span> public CacheControl getCacheControl() {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> return CacheControl.forString(getFirst("Cache-Control"));<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> /**<a name="line.326"></a>
+<span class="sourceLineNo">327</span> * Returns the <code>Connection</code> header on the request.<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * <p><a name="line.328"></a>
+<span class="sourceLineNo">329</span> * Control options for the current connection and list of hop-by-hop request fields.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> *<a name="line.330"></a>
+<span class="sourceLineNo">331</span> * <h6 class='figure'>Example:</h6><a name="line.331"></a>
+<span class="sourceLineNo">332</span> * <p class='bcode'><a name="line.332"></a>
+<span class="sourceLineNo">333</span> * Connection: keep-alive<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * Connection: Upgrade<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * </p><a name="line.335"></a>
+<span class="sourceLineNo">336</span> *<a name="line.336"></a>
+<span class="sourceLineNo">337</span> * @return The parsed <code></code> header on the request, or <jk>null</jk> if not found.<a name="line.337"></a>
+<span class="sourceLineNo">338</span> */<a name="line.338"></a>
+<span class="sourceLineNo">339</span> public Connection getConnection() {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> return Connection.forString(getFirst("Connection"));<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<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> * Returns the <code>Content-Length</code> header on the request.<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * <p><a name="line.345"></a>
+<span class="sourceLineNo">346</span> * The length of the request body in octets (8-bit bytes).<a name="line.346"></a>
+<span class="sourceLineNo">347</span> *<a name="line.347"></a>
+<span class="sourceLineNo">348</span> * <h6 class='figure'>Example:</h6><a name="line.348"></a>
+<span class="sourceLineNo">349</span> * <p class='bcode'><a name="line.349"></a>
+<span class="sourceLineNo">350</span> * Content-Length: 348<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * </p><a name="line.351"></a>
+<span class="sourceLineNo">352</span> *<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @return The parsed <code>Content-Length</code> header on the request, or <jk>null</jk> if not found.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> */<a name="line.354"></a>
+<span class="sourceLineNo">355</span> public ContentLength getContentLength() {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return ContentLength.forString(getFirst("Content-Length"));<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> /**<a name="line.359"></a>
+<span class="sourceLineNo">360</span> * Returns the <code>Content-Type</code> header on the request.<a name="line.360"></a>
+<span class="sourceLineNo">361</span> * <p><a name="line.361"></a>
+<span class="sourceLineNo">362</span> * The MIME type of the body of the request (used with POST and PUT requests).<a name="line.362"></a>
+<span class="sourceLineNo">363</span> *<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * <h6 class='figure'>Example:</h6><a name="line.364"></a>
+<span class="sourceLineNo">365</span> * <p class='bcode'><a name="line.365"></a>
+<span class="sourceLineNo">366</span> * Content-Type: application/x-www-form-urlencoded<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * </p><a name="line.367"></a>
+<span class="sourceLineNo">368</span> *<a name="line.368"></a>
+<span class="sourceLineNo">369</span> * @return The parsed <code>Content-Type</code> header on the request, or <jk>null</jk> if not found.<a name="line.369"></a>
+<span class="sourceLineNo">370</span> */<a name="line.370"></a>
+<span class="sourceLineNo">371</span> public ContentType getContentType() {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> return ContentType.forString(getFirst("Content-Type"));<a name="line.372"></a>
+<span class="sourceLineNo">373</span> }<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span> /**<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * Returns the <code>Date</code> header on the request.<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * <p><a name="line.377"></a>
+<span class="sourceLineNo">378</span> * The date and time that the message was originated (in "HTTP-date" format as defined by RFC 7231 Date/Time Formats).<a name="line.378"></a>
+<span class="sourceLineNo">379</span> *<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * <h6 class='figure'>Example:</h6><a name="line.380"></a>
+<span class="sourceLineNo">381</span> * <p class='bcode'><a name="line.381"></a>
+<span class="sourceLineNo">382</span> * Date: Tue, 15 Nov 1994 08:12:31 GMT<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * </p><a name="line.383"></a>
+<span class="sourceLineNo">384</span> *<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * @return The parsed <code>Date</code> header on the request, or <jk>null</jk> if not found.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> */<a name="line.386"></a>
+<span class="sourceLineNo">387</span> public Date getDate() {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> return Date.forString(getFirst("Date"));<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> /**<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * Returns the <code>Expect</code> header on the request.<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * <p><a name="line.393"></a>
+<span class="sourceLineNo">394</span> * Indicates that particular server behaviors are required by the client.<a name="line.394"></a>
+<span class="sourceLineNo">395</span> *<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * <h6 class='figure'>Example:</h6><a name="line.396"></a>
+<span class="sourceLineNo">397</span> * <p class='bcode'><a name="line.397"></a>
+<span class="sourceLineNo">398</span> * Expect: 100-continue<a name="line.398"></a>
+<span class="sourceLineNo">399</span> * </p><a name="line.399"></a>
+<span class="sourceLineNo">400</span> *<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * @return The parsed <code>Expect</code> header on the request, or <jk>null</jk> if not found.<a name="line.401"></a>
+<span class="sourceLineNo">402</span> */<a name="line.402"></a>
+<span class="sourceLineNo">403</span> public Expect getExpect() {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> return Expect.forString(getFirst("Expect"));<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> /**<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * Returns the <code>From</code> header on the request.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * <p><a name="line.409"></a>
+<span class="sourceLineNo">410</span> * The email address of the user making the request.<a name="line.410"></a>
<span class="sourceLineNo">411</span> *<a name="line.411"></a>
-<span class="sourceLineNo">412</span> * @return The parsed <code>Host</code> header on the request, or <jk>null</jk> if not found.<a name="line.412"></a>
-<span class="sourceLineNo">413</span> */<a name="line.413"></a>
-<span class="sourceLineNo">414</span> public Host getHost() {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> return Host.forString(getFirst("Host"));<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> /**<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * Returns the <code>If-Match</code> header on the request.<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * <p><a name="line.420"></a>
-<span class="sourceLineNo">421</span> * Only perform the action if the client supplied entity matches the same entity on the server.<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * This is mainly for methods like PUT to only update a resource if it has not been modified since the user last updated it.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> *<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * <h6 class='figure'>Example:</h6><a name="line.424"></a>
-<span class="sourceLineNo">425</span> * <p class='bcode'><a name="line.425"></a>
-<span class="sourceLineNo">426</span> * If-Match: "737060cd8c284d8af7ad3082f209582d"<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * </p><a name="line.427"></a>
+<span class="sourceLineNo">412</span> * <h6 class='figure'>Example:</h6><a name="line.412"></a>
+<span class="sourceLineNo">413</span> * <p class='bcode'><a name="line.413"></a>
+<span class="sourceLineNo">414</span> * From: user@example.com<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * </p><a name="line.415"></a>
+<span class="sourceLineNo">416</span> *<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * @return The parsed <code>From</code> header on the request, or <jk>null</jk> if not found.<a name="line.417"></a>
+<span class="sourceLineNo">418</span> */<a name="line.418"></a>
+<span class="sourceLineNo">419</span> public From getFrom() {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return From.forString(getFirst("From"));<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> * Returns the <code>Host</code> header on the request.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * <p><a name="line.425"></a>
+<span class="sourceLineNo">426</span> * The domain name of the server (for virtual hosting), and the TCP port number on which the server is listening.<a name="line.426"></a>
+<span class="sourceLineNo">427</span> * The port number may be omitted if the port is the standard port for the service requested.<a name="line.427"></a>
<span class="sourceLineNo">428</span> *<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * @return The parsed <code>If-Match</code> header on the request, or <jk>null</jk> if not found.<a name="line.429"></a>
-<span class="sourceLineNo">430</span> */<a name="line.430"></a>
-<span class="sourceLineNo">431</span> public IfMatch getIfMatch() {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> return IfMatch.forString(getFirst("If-Match"));<a name="line.432"></a>
-<span class="sourceLineNo">433</span> }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span> /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span> * Returns the <code>If-Modified-Since</code> header on the request.<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * <p><a name="line.437"></a>
-<span class="sourceLineNo">438</span> * Allows a 304 Not Modified to be returned if content is unchanged.<a name="line.438"></a>
-<span class="sourceLineNo">439</span> *<a name="line.439"></a>
-<span class="sourceLineNo">440</span> * <h6 class='figure'>Example:</h6><a name="line.440"></a>
-<span class="sourceLineNo">441</span> * <p class='bcode'><a name="line.441"></a>
-<span class="sourceLineNo">442</span> * If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * </p><a name="line.443"></a>
-<span class="sourceLineNo">444</span> *<a name="line.444"></a>
-<span class="sourceLineNo">445</span> * @return The parsed <code>If-Modified-Since</code> header on the request, or <jk>null</jk> if not found.<a name="line.445"></a>
-<span class="sourceLineNo">446</span> */<a name="line.446"></a>
-<span class="sourceLineNo">447</span> public IfModifiedSince getIfModifiedSince() {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> return IfModifiedSince.forString(getFirst("If-Modified-Since"));<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> /**<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * Returns the <code>If-None-Match</code> header on the request.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * <p><a name="line.453"></a>
-<span class="sourceLineNo">454</span> * Allows a 304 Not Modified to be returned if content is unchanged, see HTTP ETag.<a name="line.454"></a>
-<span class="sourceLineNo">455</span> *<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * <h6 class='figure'>Example:</h6><a name="line.456"></a>
-<span class="sourceLineNo">457</span> * <p class='bcode'><a name="line.457"></a>
-<span class="sourceLineNo">458</span> * If-None-Match: "737060cd8c284d8af7ad3082f209582d"<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * </p><a name="line.459"></a>
-<span class="sourceLineNo">460</span> *<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * @return The parsed <code>If-None-Match</code> header on the request, or <jk>null</jk> if not found.<a name="line.461"></a>
-<span class="sourceLineNo">462</span> */<a name="line.462"></a>
-<span class="sourceLineNo">463</span> public IfNoneMatch getIfNoneMatch() {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> return IfNoneMatch.forString(getFirst("If-None-Match"));<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> * Returns the <code>If-Range</code> header on the request.<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * <p><a name="line.469"></a>
-<span class="sourceLineNo">470</span> * If the entity is unchanged, send me the part(s) that I am missing; otherwise, send me the entire new entity.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> *<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * <h6 class='figure'>Example:</h6><a name="line.472"></a>
-<span class="sourceLineNo">473</span> * <p class='bcode'><a name="line.473"></a>
-<span class="sourceLineNo">474</span> * If-Range: "737060cd8c284d8af7ad3082f209582d"<a name="line.474"></a>
-<span class="sourceLineNo">475</span> * </p><a name="line.475"></a>
-<span class="sourceLineNo">476</span> *<a name="line.476"></a>
-<span class="sourceLineNo">477</span> * @return The parsed <code>If-Range</code> header on the request, or <jk>null</jk> if not found.<a name="line.477"></a>
-<span class="sourceLineNo">478</span> */<a name="line.478"></a>
-<span class="sourceLineNo">479</span> public IfRange getIfRange() {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> return IfRange.forString(getFirst("If-Range"));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * Returns the <code>If-Unmodified-Since</code> header on the request.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * <p><a name="line.485"></a>
-<span class="sourceLineNo">486</span> * Only send the response if the entity has not been modified since a specific time.<a name="line.486"></a>
-<span class="sourceLineNo">487</span> *<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * <h6 class='figure'>Example:</h6><a name="line.488"></a>
-<span class="sourceLineNo">489</span> * <p class='bcode'><a name="line.489"></a>
-<span class="sourceLineNo">490</span> * If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT<a name="line.490"></a>
-<span class="sourceLineNo">491</span> * </p><a name="line.491"></a>
-<span class="sourceLineNo">492</span> *<a name="line.492"></a>
-<span class="sourceLineNo">493</span> * @return The parsed <code>If-Unmodified-Since</code> header on the request, or <jk>null</jk> if not found.<a name="line.493"></a>
-<span class="sourceLineNo">494</span> */<a name="line.494"></a>
-<span class="sourceLineNo">495</span> public IfUnmodifiedSince getIfUnmodifiedSince() {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> return IfUnmodifiedSince.forString(getFirst("If-Unmodified-Since"));<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> /**<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * Returns the <code>Max-Forwards</code> header on the request.<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * <p><a name="line.501"></a>
-<span class="sourceLineNo">502</span> * Limit the number of times the message can be forwarded through proxies or gateways.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> *<a name="line.503"></a>
-<span class="sourceLineNo">504</span> * <h6 class='figure'>Example:</h6><a name="line.504"></a>
-<span class="sourceLineNo">505</span> * <p class='bcode'><a name="line.505"></a>
-<span class="sourceLineNo">506</span> * Max-Forwards: 10<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * </p><a name="line.507"></a>
-<span class="sourceLineNo">508</span> *<a name="line.508"></a>
-<span class="sourceLineNo">509</span> * @return The parsed <code>Max-Forwards</code> header on the request, or <jk>null</jk> if not found.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> */<a name="line.510"></a>
-<span class="sourceLineNo">511</span> public MaxForwards getMaxForwards() {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> return MaxForwards.forString(getFirst("Max-Forwards"));<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span> /**<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * Returns the <code>Pragma</code> header on the request.<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * <p><a name="line.517"></a>
-<span class="sourceLineNo">518</span> * Implementation-specific fields that may have various effects anywhere along the request-response chain.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> *<a name="line.519"></a>
-<span class="sourceLine
<TRUNCATED>
[14/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
index ec0a060..0edb104 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormData.html
@@ -25,93 +25,187 @@
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.annotation.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.serializer.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.urlencoding.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * Annotation applied to Java method arguments of interface proxies to denote that they are FORM post parameters on the request.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <h5 class='section'>Example:</h5><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <p class='bcode'><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <jk>public interface</jk> MyProxy {<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * String myProxyMethod1(<ja>@FormData</ja>(<js>"foo"</js>)</ja> String foo, <ja>@FormData</ja>(<js>"bar"</js>)</ja> MyPojo pojo);<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * String myProxyMethod2(<ja>@FormData</ja> NameValuePairs form);<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * String myProxyMethod2(<ja>@FormData</ja> Map&lt;String,Object&gt; form);<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * }<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * </p><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * The argument can be any of the following types:<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <ul class='spaced-list'><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li>Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <li><code>NameValuePairs</code> - Individual name-value pairs.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <li>A bean - Individual name-value pairs.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * </ul><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <p><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * {@link RequestBean @RequestBean}:<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <p><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <h5 class='section'>Example:</h5><a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <p class='bcode'><a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <jk>public interface</jk> MyProxy {<a name="line.59"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.serializer.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.urlencoding.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Annotation applied to Java method arguments of interface proxies to denote that they are FORM post parameters on the request.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <h5 class='section'>Example:</h5><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <p class='bcode'><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <jk>public interface</jk> MyProxy {<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <jc>// Explicit names specified for form data parameters.</jc><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * String myProxyMethod1(<ja>@FormData</ja>(<js>"foo"</js>)</ja> String foo, <ja>@FormData</ja>(<js>"bar"</js>)</ja> MyPojo pojo);<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <jc>// Multiple values pulled from a NameValuePairs object.</jc><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <jc>// Same as @FormData("*").</jc><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * String myProxyMethod2(<ja>@FormData</ja> NameValuePairs nameValuePairs);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <jc>// Multiple values pulled from a Map.</jc><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <jc>// Same as @FormData("*").</jc><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * String myProxyMethod3(<ja>@FormData</ja> Map&lt;String,Object&gt; map);<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <jc>// Multiple values pulled from a bean.</jc><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <jc>// Same as @FormData("*").</jc><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod4"</js>)<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * String myProxyMethod4(<ja>@FormData</ja> MyBean myBean);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> *<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <jc>// An entire form-data HTTP body as a String.</jc><a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <jc>// Same as @FormData("*").</jc><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod5"</js>)<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * String myProxyMethod5(<ja>@FormData</ja> String string);<a name="line.54"></a>
+<span class="sourceLineNo">055</span> *<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <jc>// An entire form-data HTTP body as a Reader.</jc><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <jc>// Sames as @FormData("*").</jc><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod6"</js>)<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * String myProxyMethod6(<ja>@FormData</ja> Reader reader);<a name="line.59"></a>
<span class="sourceLineNo">060</span> *<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * }<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <jk>public interface</jk> MyRequestBean {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <ja>@FormData</ja><a name="line.66"></a>
-<span class="sourceLineNo">067</span> * String getFoo();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> *<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * <ja>@FormData</ja><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * MyPojo getBar();<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * </p><a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <p><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * When used in a request bean, the {@link #value()} can be used to override the form data parameter name.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * It can also be overridden via the {@link BeanProperty#name @BeanProperty.name()} annotation.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * map or bean to be expanded to form data parameters.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>@Documented<a name="line.79"></a>
-<span class="sourceLineNo">080</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.80"></a>
-<span class="sourceLineNo">081</span>@Retention(RUNTIME)<a name="line.81"></a>
-<span class="sourceLineNo">082</span>@Inherited<a name="line.82"></a>
-<span class="sourceLineNo">083</span>public @interface FormData {<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * The form post parameter name.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <p><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * for the following data types:<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <ul><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <li><code>NameValuePairs</code><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <li><code>Map&lt;String,Object&gt;</code><a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <li>A bean<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * </ul><a name="line.94"></a>
-<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> String value() default "*";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span> /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <p><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * The default serializer converters values to UON notation.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <p><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * This annotation is provided to allow values to be custom serialized.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> */<a name="line.104"></a>
-<span class="sourceLineNo">105</span> Class<? extends PartSerializer> serializer() default UrlEncodingSerializer.class;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>}<a name="line.106"></a>
+<span class="sourceLineNo">061</span> * }<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * </p><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
+<span class="sourceLineNo">064</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * {@link RequestBean @RequestBean}:<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * <p><a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <h5 class='section'>Example:</h5><a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <p class='bcode'><a name="line.68"></a>
+<span class="sourceLineNo">069</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <jk>public interface</jk> MyProxy {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> *<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * }<a name="line.74"></a>
+<span class="sourceLineNo">075</span> *<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <jk>public interface</jk> MyRequestBean {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <jc>// Name explicitly specified.</jc><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <ja>@FormData</ja>(<js>"foo"</js>)<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * String getX();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <jc>// Name inherited from bean property.</jc><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <jc>// Same as @FormData("bar")</jc><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <ja>@FormData</ja><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * String getBar();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <jc>// Name inherited from bean property.</jc><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <jc>// Same as @FormData("baz")</jc><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <ja>@FormData</ja><a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <ja>@BeanProperty</ja>(<js>"baz"</js>)<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * String getY();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> *<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <jc>// Multiple values pulled from NameValuePairs object.</jc><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <jc>// Same as @FormData("*")</jc><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * <ja>@FormData</ja><a name="line.95"></a>
+<span class="sourceLineNo">096</span> * NameValuePairs getNameValuePairs();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> *<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <jc>// Multiple values pulled from Map.</jc><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * <jc>// Same as @FormData("*")</jc><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <ja>@FormData</ja><a name="line.100"></a>
+<span class="sourceLineNo">101</span> * Map&lt;String,Object&gt; getMap();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> *<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <jc>// Multiple values pulled from bean.</jc><a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <jc>// Same as @FormData("*")</jc><a name="line.104"></a>
+<span class="sourceLineNo">105</span> * <ja>@FormData</ja><a name="line.105"></a>
+<span class="sourceLineNo">106</span> * MyBean getMyBean();<a name="line.106"></a>
+<span class="sourceLineNo">107</span> *<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <jc>// An entire form-data HTTP body as a Reader.</jc><a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <jc>// Same as @FormData("*")</jc><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <ja>@FormData</ja><a name="line.110"></a>
+<span class="sourceLineNo">111</span> * Reader getReader();<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * </p><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <p><a name="line.114"></a>
+<span class="sourceLineNo">115</span> * The {@link #name()} and {@link #value()} elements are synonyms for specifying the parameter name. Only one should be used.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <br>The following annotations are fully equivalent:<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <p><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <p class='bcode'><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <ja>@FormData</ja>(name=<js>"foo"</js>)<a name="line.119"></a>
+<span class="sourceLineNo">120</span> *<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * <ja>@FormData</ja>(<js>"foo"</js>)<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * </p><a name="line.122"></a>
+<span class="sourceLineNo">123</span> */<a name="line.123"></a>
+<span class="sourceLineNo">124</span>@Documented<a name="line.124"></a>
+<span class="sourceLineNo">125</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.125"></a>
+<span class="sourceLineNo">126</span>@Retention(RUNTIME)<a name="line.126"></a>
+<span class="sourceLineNo">127</span>@Inherited<a name="line.127"></a>
+<span class="sourceLineNo">128</span>public @interface FormData {<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span> /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * The form post parameter name.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * <p><a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Note that {@link #name()} and {@link #value()} are synonyms.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <p><a name="line.134"></a>
+<span class="sourceLineNo">135</span> * The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * form data parameter name.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <p><a name="line.137"></a>
+<span class="sourceLineNo">138</span> * A blank value (the default) has the following behavior:<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <ul class='spaced-list'><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <h6 class='figure'>Example:</h6><a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <p class='bcode'><a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <jc>// When used on a remote method parameter</jc><a name="line.144"></a>
+<span class="sourceLineNo">145</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <jk>public interface</jk> MyProxy {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> *<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <jc>// Equivalent to @FormData("*")</jc><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * String myProxyMethod1(<ja>@FormData</ja> Map&lt;String,Object&gt; formData);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * }<a name="line.151"></a>
+<span class="sourceLineNo">152</span> *<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <jc>// When used on a request bean method</jc><a name="line.153"></a>
+<span class="sourceLineNo">154</span> * <jk>public interface</jk> MyRequestBean {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> *<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * <jc>// Equivalent to @FormData("*")</jc><a name="line.156"></a>
+<span class="sourceLineNo">157</span> * <ja>@FormData</ja><a name="line.157"></a>
+<span class="sourceLineNo">158</span> * Map&lt;String,Object&gt; getFoo();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * </p><a name="line.160"></a>
+<span class="sourceLineNo">161</span> * <br><a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <li>If used on a request bean method, uses the bean property name.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <h6 class='figure'>Example:</h6><a name="line.163"></a>
+<span class="sourceLineNo">164</span> * <p class='bcode'><a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <jk>public interface</jk> MyRequestBean {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> *<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * <jc>// Equivalent to @FormData("foo")</jc><a name="line.167"></a>
+<span class="sourceLineNo">168</span> * <ja>@FormData</ja><a name="line.168"></a>
+<span class="sourceLineNo">169</span> * String getFoo();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * </p><a name="line.171"></a>
+<span class="sourceLineNo">172</span> * </ul><a name="line.172"></a>
+<span class="sourceLineNo">173</span> * </ul><a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> String name() default "";<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> /**<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * A synonym for {@link #name()}.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * <p><a name="line.179"></a>
+<span class="sourceLineNo">180</span> * Allows you to use shortened notation if you're only specifying the name.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> */<a name="line.181"></a>
+<span class="sourceLineNo">182</span> String value() default "";<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Skips this value if it's an empty string or empty collection/array.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * <p><a name="line.186"></a>
+<span class="sourceLineNo">187</span> * Note that <jk>null</jk> values are already ignored.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> */<a name="line.188"></a>
+<span class="sourceLineNo">189</span> boolean skipIfEmpty() default false;<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> /**<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * <p><a name="line.193"></a>
+<span class="sourceLineNo">194</span> * The default value defaults to the using the part serializer defined on the {@link RequestBean} annotation,<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * then on the client which by default is {@link UrlEncodingSerializer}.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * <p><a name="line.196"></a>
+<span class="sourceLineNo">197</span> * This annotation is provided to allow values to be custom serialized.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>}<a name="line.200"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
index 68d07a5..b8c080b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/FormDataIfNE.html
@@ -39,25 +39,25 @@
<span class="sourceLineNo">031</span><a name="line.31"></a>
<span class="sourceLineNo">032</span> /**<a name="line.32"></a>
<span class="sourceLineNo">033</span> * The form post parameter name.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * for the following data types:<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <ul><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <li><code>NameValuePairs</code><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <li><code>Map&lt;String,Object&gt;</code><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <li>A bean<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * </ul><a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span> String value() default "*";<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span> /**<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <p><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * The default serializer converters values to UON notation.<a name="line.48"></a>
+<span class="sourceLineNo">034</span> * @see FormData#name()<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span> String name() default "";<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> /**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * A synonym for {@link #name()}.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * @see FormData#value()<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span> String value() default "";<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> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * The default value defaults to the using the part serializer defined on the {@link RequestBean} annotation,<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * then on the client which by default is {@link UrlEncodingSerializer}.<a name="line.48"></a>
<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
<span class="sourceLineNo">050</span> * This annotation is provided to allow values to be custom serialized.<a name="line.50"></a>
<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span> Class<? extends PartSerializer> serializer() default UrlEncodingSerializer.class;<a name="line.52"></a>
+<span class="sourceLineNo">052</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.52"></a>
<span class="sourceLineNo">053</span>}<a name="line.53"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
index 0791608..ddc8f08 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Header.html
@@ -25,90 +25,173 @@
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.annotation.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.serializer.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.urlencoding.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * Annotation applied to Java method arguments of interface proxies to denote that they are serialized as an HTTP header value.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <h5 class='section'>Example:</h5><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <p class='bcode'><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <jk>public interface</jk> MyProxy {<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * String myProxyMethod1(<ja>@Header</ja>(<js>"Foo"</js>)</ja> String foo, <ja>@Header</ja>(<js>"Bar"</js>)</ja> MyPojo pojo);<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * String myProxyMethod2(<ja>@Header</ja> Map&lt;String,Object&gt; headers);<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * }<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * </p><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <p><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * The argument can be any of the following types:<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <ul class='spaced-list'><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <li><code>NameValuePairs</code> - Individual name-value pairs.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <li>Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <li>A bean - Individual name-value pairs.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * </ul><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * {@link RequestBean @RequestBean}:<a name="line.51"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.serializer.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.urlencoding.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Annotation applied to Java method arguments of interface proxies to denote that they are serialized as an HTTP header value.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <h5 class='section'>Example:</h5><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <p class='bcode'><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <jk>public interface</jk> MyProxy {<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <jc>// Explicit names specified for form data parameters.</jc><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * String myProxyMethod1(<ja>@Header</ja>(<js>"Foo"</js>)</ja> String foo, <ja>@Header</ja>(<js>"Bar"</js>)</ja> MyPojo pojo);<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <jc>// Multiple values pulled from a NameValuePairs object.</jc><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <jc>// Same as @Header("*").</jc><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * String myProxyMethod2(<ja>@Header</ja> NameValuePairs nameValuePairs);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <jc>// Multiple values pulled from a Map.</jc><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <jc>// Same as @Header("*").</jc><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * String myProxyMethod3(<ja>@Header</ja> Map&lt;String,Object&gt; map);<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <jc>// Multiple values pulled from a bean.</jc><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <jc>// Same as @Header("*").</jc><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod4"</js>)<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * String myProxyMethod4(<ja>@Header</ja> MyBean myBean);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * }<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * </p><a name="line.51"></a>
<span class="sourceLineNo">052</span> * <p><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <h5 class='section'>Example:</h5><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * <p class='bcode'><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <jk>public interface</jk> MyProxy {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * }<a name="line.60"></a>
-<span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <jk>public interface</jk> MyRequestBean {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <ja>@Header</ja>(<js>"Foo"</js>)<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * String getFoo();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> *<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <ja>@Header</ja>(<js>"Bar"</js>)<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * MyPojo getBar();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * }<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * </p><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <p><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * When used in a request bean, the {@link #value()} can be used to override the header name.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * It can also be overridden via the {@link BeanProperty#name @BeanProperty.name()} annotation.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * map or bean to be expanded to headers.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>@Documented<a name="line.76"></a>
-<span class="sourceLineNo">077</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.77"></a>
-<span class="sourceLineNo">078</span>@Retention(RUNTIME)<a name="line.78"></a>
-<span class="sourceLineNo">079</span>@Inherited<a name="line.79"></a>
-<span class="sourceLineNo">080</span>public @interface Header {<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * The HTTP header name.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <p><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * for the following data types:<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <ul><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <li><code>NameValuePairs</code><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * <li><code>Map&lt;String,Object&gt;</code><a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <li>A bean<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * </ul><a name="line.91"></a>
-<span class="sourceLineNo">092</span> */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> String value() default "*";<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * <p><a name="line.97"></a>
-<span class="sourceLineNo">098</span> * The default serializer converters values to UON notation.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * <p><a name="line.99"></a>
-<span class="sourceLineNo">100</span> * This annotation is provided to allow values to be custom serialized.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> */<a name="line.101"></a>
-<span class="sourceLineNo">102</span> Class<? extends PartSerializer> serializer() default UrlEncodingSerializer.class;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>}<a name="line.103"></a>
+<span class="sourceLineNo">053</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * {@link RequestBean @RequestBean}:<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <p><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <h5 class='section'>Example:</h5><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <p class='bcode'><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <jk>public interface</jk> MyProxy {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * }<a name="line.63"></a>
+<span class="sourceLineNo">064</span> *<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <jk>public interface</jk> MyRequestBean {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> *<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <jc>// Name explicitly specified.</jc><a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <ja>@Header</ja>(<js>"Foo"</js>)<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * String getX();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> *<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <jc>// Name inherited from bean property.</jc><a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <jc>// Same as @Header("bar")</jc><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <ja>@Header</ja><a name="line.73"></a>
+<span class="sourceLineNo">074</span> * String getBar();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> *<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <jc>// Name inherited from bean property.</jc><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <jc>// Same as @Header("Baz")</jc><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <ja>@Header</ja><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <ja>@BeanProperty</ja>(<js>"Baz"</js>)<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * String getY();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <jc>// Multiple values pulled from NameValuePairs object.</jc><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <jc>// Same as @Header("*")</jc><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <ja>@Header</ja><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * NameValuePairs getNameValuePairs();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <jc>// Multiple values pulled from Map.</jc><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <jc>// Same as @Header("*")</jc><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <ja>@Header</ja><a name="line.89"></a>
+<span class="sourceLineNo">090</span> * Map&lt;String,Object&gt; getMap();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <jc>// Multiple values pulled from bean.</jc><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <jc>// Same as @Header("*")</jc><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <ja>@Header</ja><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * MyBean getBean();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * }<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * </p><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * The {@link #name()} and {@link #value()} elements are synonyms for specifying the header name. Only one should be used.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <br>The following annotations are fully equivalent:<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * <p><a name="line.101"></a>
+<span class="sourceLineNo">102</span> * <p class='bcode'><a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <ja>@Header</ja>(name=<js>"Foo"</js>)<a name="line.103"></a>
+<span class="sourceLineNo">104</span> *<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * <ja>@Header</ja>(<js>"Foo"</js>)<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * </p><a name="line.106"></a>
+<span class="sourceLineNo">107</span> */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>@Documented<a name="line.108"></a>
+<span class="sourceLineNo">109</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.109"></a>
+<span class="sourceLineNo">110</span>@Retention(RUNTIME)<a name="line.110"></a>
+<span class="sourceLineNo">111</span>@Inherited<a name="line.111"></a>
+<span class="sourceLineNo">112</span>public @interface Header {<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> * The HTTP header name.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * A blank value (the default) indicates to reuse the bean property name when used on a request bean property.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <p><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <p><a name="line.119"></a>
+<span class="sourceLineNo">120</span> * The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * header name.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <p><a name="line.122"></a>
+<span class="sourceLineNo">123</span> * A blank value (the default) has the following behavior:<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * <ul class='spaced-list'><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <h6 class='figure'>Example:</h6><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <p class='bcode'><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * <jc>// When used on a remote method parameter</jc><a name="line.129"></a>
+<span class="sourceLineNo">130</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <jk>public interface</jk> MyProxy {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> *<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <jc>// Equivalent to @Header("*")</jc><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * String myProxyMethod1(<ja>@Header</ja> Map&lt;String,Object&gt; headers);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * }<a name="line.136"></a>
+<span class="sourceLineNo">137</span> *<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <jc>// When used on a request bean method</jc><a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <jk>public interface</jk> MyRequestBean {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> *<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <jc>// Equivalent to @Header("*")</jc><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <ja>@Header</ja><a name="line.142"></a>
+<span class="sourceLineNo">143</span> * Map&lt;String,Object&gt; getFoo();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * }<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * </p><a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <br><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <li>If used on a request bean method, uses the bean property name.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <h6 class='figure'>Example:</h6><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <p class='bcode'><a name="line.149"></a>
+<span class="sourceLineNo">150</span> * <jk>public interface</jk> MyRequestBean {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> *<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <jc>// Equivalent to @Header("Foo")</jc><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <ja>@Header</ja><a name="line.153"></a>
+<span class="sourceLineNo">154</span> * <ja>@BeanProperty</ja>(<js>"Foo"</js>)<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * String getFoo();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * </p><a name="line.157"></a>
+<span class="sourceLineNo">158</span> * </ul><a name="line.158"></a>
+<span class="sourceLineNo">159</span> * </ul><a name="line.159"></a>
+<span class="sourceLineNo">160</span> */<a name="line.160"></a>
+<span class="sourceLineNo">161</span> String name() default "";<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> /**<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * A synonym for {@link #name()}.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <p><a name="line.165"></a>
+<span class="sourceLineNo">166</span> * Allows you to use shortened notation if you're only specifying the name.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> */<a name="line.167"></a>
+<span class="sourceLineNo">168</span> String value() default "";<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> /**<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * Skips this value if it's an empty string or empty collection/array.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * <p><a name="line.172"></a>
+<span class="sourceLineNo">173</span> * Note that <jk>null</jk> values are already ignored.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> boolean skipIfEmpty() default false;<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> /**<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * <p><a name="line.179"></a>
+<span class="sourceLineNo">180</span> * The default value defaults to the using the part serializer defined on the {@link RequestBean} annotation,<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * then on the client which by default is {@link UrlEncodingSerializer}.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * <p><a name="line.182"></a>
+<span class="sourceLineNo">183</span> * This annotation is provided to allow values to be custom serialized.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> */<a name="line.184"></a>
+<span class="sourceLineNo">185</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>}<a name="line.186"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
index bc59ea5..af87931 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/HeaderIfNE.html
@@ -39,25 +39,25 @@
<span class="sourceLineNo">031</span><a name="line.31"></a>
<span class="sourceLineNo">032</span> /**<a name="line.32"></a>
<span class="sourceLineNo">033</span> * The HTTP header name.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * for the following data types:<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <ul><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <li><code>NameValuePairs</code><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <li><code>Map&lt;String,Object&gt;</code><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <li>A bean<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * </ul><a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span> String value() default "*";<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span> /**<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <p><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * The default serializer converters values to UON notation.<a name="line.48"></a>
+<span class="sourceLineNo">034</span> * @see Header#name()<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span> String name() default "";<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> /**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * A synonym for {@link #name()}.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * @see Header#value()<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span> String value() default "";<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> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * The default value defaults to the using the part serializer defined on the {@link RequestBean} annotation,<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * then on the client which by default is {@link UrlEncodingSerializer}.<a name="line.48"></a>
<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
<span class="sourceLineNo">050</span> * This annotation is provided to allow values to be custom serialized.<a name="line.50"></a>
<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span> Class<? extends PartSerializer> serializer() default UrlEncodingSerializer.class;<a name="line.52"></a>
+<span class="sourceLineNo">052</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.52"></a>
<span class="sourceLineNo">053</span>}<a name="line.53"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html
index d23e75e..3435aaa 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Path.html
@@ -25,84 +25,162 @@
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.annotation.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.serializer.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.urlencoding.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <h5 class='section'>Example:</h5><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <p class='bcode'><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <jk>public interface</jk> MyProxy {<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1/{foo}"</js>)<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * String myProxyMethod1(<ja>@Path</ja>(<js>"foo"</js>)</ja> String foo);<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * }<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * </p><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <p><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * The argument can be any of the following types:<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <ul class='spaced-list'><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <li><code>NameValuePairs</code> - Individual name-value pairs.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <li>Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <li>A bean - Individual name-value pairs.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * </ul><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * {@link RequestBean @RequestBean}:<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <h5 class='section'>Example:</h5><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <p class='bcode'><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <jk>public interface</jk> MyProxy {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1/{foo}"</js>)<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * }<a name="line.57"></a>
-<span class="sourceLineNo">058</span> *<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <jk>public interface</jk> MyRequestBean {<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <ja>@Path</ja><a name="line.60"></a>
-<span class="sourceLineNo">061</span> * String getFoo();<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * }<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * </p><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * <p><a name="line.64"></a>
-<span class="sourceLineNo">065</span> * When used in a request bean, the {@link #value()} can be used to override the path variable name.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * It can also be overridden via the {@link BeanProperty#name @BeanProperty.name()} annotation.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * map or bean to be expanded to path variables.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>@Documented<a name="line.70"></a>
-<span class="sourceLineNo">071</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.71"></a>
-<span class="sourceLineNo">072</span>@Retention(RUNTIME)<a name="line.72"></a>
-<span class="sourceLineNo">073</span>@Inherited<a name="line.73"></a>
-<span class="sourceLineNo">074</span>public @interface Path {<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * The path parameter name.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <p><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * for the following data types:<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <ul><a name="line.81"></a>
-<span class="sourceLineNo">082</span> * <li><code>NameValuePairs</code><a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <li><code>Map&lt;String,Object&gt;</code><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <li>A bean<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * </ul><a name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span> String value() default "*";<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> /**<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <p><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * The default serializer converters values to UON notation.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <p><a name="line.93"></a>
-<span class="sourceLineNo">094</span> * This annotation is provided to allow values to be custom serialized.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> Class<? extends PartSerializer> serializer() default UrlEncodingSerializer.class;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>}<a name="line.97"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.serializer.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.urlencoding.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <h5 class='section'>Example:</h5><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <p class='bcode'><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <jk>public interface</jk> MyProxy {<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <jc>// Explicit names specified for path parameters.</jc><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1/{foo}/{bar}"</js>)<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * String myProxyMethod1(<ja>@Path</ja>(<js>"foo"</js>)</ja> String foo, <ja>@Path</ja>(<js>"bar"</js>)</ja> MyPojo pojo);<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <jc>// Multiple values pulled from a NameValuePairs object.</jc><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <jc>// Same as @Path("*").</jc><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod2/{foo}/{bar}/{baz}"</js>)<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * String myProxyMethod2(<ja>@Path</ja> NameValuePairs nameValuePairs);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <jc>// Multiple values pulled from a Map.</jc><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <jc>// Same as @Path("*").</jc><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod3/{foo}/{bar}/{baz}"</js>)<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * String myProxyMethod3(<ja>@Path</ja> Map&lt;String,Object&gt; map);<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <jc>// Multiple values pulled from a bean.</jc><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <jc>// Same as @Path("*").</jc><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod4/{foo}/{bar}/{baz}"</js>)<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * String myProxyMethod4(<ja>@Path</ja> MyBean myBean);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * }<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * </p><a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <p><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * {@link RequestBean @RequestBean}:<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <p><a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <h5 class='section'>Example:</h5><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <p class='bcode'><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <jk>public interface</jk> MyProxy {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> *<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod/{foo}/{bar}/{baz}"</js>)<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * }<a name="line.63"></a>
+<span class="sourceLineNo">064</span> *<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <jk>public interface</jk> MyRequestBean {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> *<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <jc>// Name explicitly specified.</jc><a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <ja>@Path</ja>(<js>"foo"</js>)<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * String getX();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> *<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <jc>// Name inherited from bean property.</jc><a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <jc>// Same as @Path("bar")</jc><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <ja>@Path</ja><a name="line.73"></a>
+<span class="sourceLineNo">074</span> * String getBar();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> *<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <jc>// Name inherited from bean property.</jc><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <jc>// Same as @Path("baz")</jc><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <ja>@Path</ja><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <ja>@BeanProperty</ja>(<js>"baz"</js>)<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * String getY();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <jc>// Multiple values pulled from NameValuePairs object.</jc><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <jc>// Same as @Path("*")</jc><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <ja>@Path</ja><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * NameValuePairs getNameValuePairs();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <jc>// Multiple values pulled from Map.</jc><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <jc>// Same as @Path("*")</jc><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <ja>@Path</ja><a name="line.89"></a>
+<span class="sourceLineNo">090</span> * Map&lt;String,Object&gt; getMap();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <jc>// Multiple values pulled from bean.</jc><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <jc>// Same as @Path("*")</jc><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <ja>@Path</ja><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * MyBean getMyBean();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * }<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * </p><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <p><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * The {@link #name()} and {@link #value()} elements are synonyms for specifying the path variable name. Only one should be used.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * <br>The following annotations are fully equivalent:<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * <p><a name="line.101"></a>
+<span class="sourceLineNo">102</span> * <p class='bcode'><a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <ja>@Path</ja>(name=<js>"foo"</js>)<a name="line.103"></a>
+<span class="sourceLineNo">104</span> *<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * <ja>@Path</ja>(<js>"foo"</js>)<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * </p><a name="line.106"></a>
+<span class="sourceLineNo">107</span> */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>@Documented<a name="line.108"></a>
+<span class="sourceLineNo">109</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.109"></a>
+<span class="sourceLineNo">110</span>@Retention(RUNTIME)<a name="line.110"></a>
+<span class="sourceLineNo">111</span>@Inherited<a name="line.111"></a>
+<span class="sourceLineNo">112</span>public @interface Path {<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> * The path parameter name.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * Note that {@link #name()} and {@link #value()} are synonyms.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <p><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * path variable name.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * <p><a name="line.121"></a>
+<span class="sourceLineNo">122</span> * A blank value (the default) has the following behavior:<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <ul class='spaced-list'><a name="line.123"></a>
+<span class="sourceLineNo">124</span> * <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * then it's the equivalent to <js>"*"</js> which will cause the value to be treated as name/value pairs.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * <h6 class='figure'>Example:</h6><a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <p class='bcode'><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <jc>// When used on a remote method parameter</jc><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * <jk>public interface</jk> MyProxy {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> *<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * <jc>// Equivalent to @Path("*")</jc><a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod/{foo}/{bar}"</js>)<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * String myProxyMethod1(<ja>@FormData</ja> Map&lt;String,Object&gt; pathVars);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * }<a name="line.135"></a>
+<span class="sourceLineNo">136</span> *<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * <jc>// When used on a request bean method</jc><a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <jk>public interface</jk> MyRequestBean {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> *<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * <jc>// Equivalent to @Path("*")</jc><a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <ja>@Path</ja><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * Map&lt;String,Object&gt; getPathVars();<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * }<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * </p><a name="line.144"></a>
+<span class="sourceLineNo">145</span> * <br><a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <li>If used on a request bean method, uses the bean property name.<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <h6 class='figure'>Example:</h6><a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <p class='bcode'><a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <jk>public interface</jk> MyRequestBean {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * <jc>// Equivalent to @Path("foo")</jc><a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <ja>@Path</ja><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * String getFoo();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * </ul><a name="line.155"></a>
+<span class="sourceLineNo">156</span> */<a name="line.156"></a>
+<span class="sourceLineNo">157</span> String name() default "";<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * A synonym for {@link #name()}.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * <p><a name="line.161"></a>
+<span class="sourceLineNo">162</span> * Allows you to use shortened notation if you're only specifying the name.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> */<a name="line.163"></a>
+<span class="sourceLineNo">164</span> String value() default "";<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> /**<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> * <p><a name="line.168"></a>
+<span class="sourceLineNo">169</span> * The default value defaults to the using the part serializer defined on the {@link RequestBean} annotation,<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * then on the client which by default is {@link UrlEncodingSerializer}.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * <p><a name="line.171"></a>
+<span class="sourceLineNo">172</span> * This annotation is provided to allow values to be custom serialized.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> */<a name="line.173"></a>
+<span class="sourceLineNo">174</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.174"></a>
+<span class="sourceLineNo">175</span>}<a name="line.175"></a>
[12/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/rest/RequestFormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestFormData.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestFormData.html
index 3825a48..f05af81 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestFormData.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestFormData.html
@@ -25,276 +25,297 @@
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>import org.apache.juneau.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span>import org.apache.juneau.internal.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.parser.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.urlencoding.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * Represents the parsed form data parameters in an HTTP request.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> */<a name="line.25"></a>
-<span class="sourceLineNo">026</span>@SuppressWarnings("unchecked")<a name="line.26"></a>
-<span class="sourceLineNo">027</span>public class RequestFormData extends LinkedHashMap<String,String[]> {<a name="line.27"></a>
-<span class="sourceLineNo">028</span> private static final long serialVersionUID = 1L;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span> private UrlEncodingParser parser;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> private BeanSession beanSession;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span> RequestFormData setParser(UrlEncodingParser parser) {<a name="line.33"></a>
-<span class="sourceLineNo">034</span> this.parser = parser;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> return this;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> }<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span> RequestFormData setBeanSession(BeanSession beanSession) {<a name="line.38"></a>
-<span class="sourceLineNo">039</span> this.beanSession = beanSession;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> return this;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> }<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> /**<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Adds default entries to these form-data parameters.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <p><a name="line.45"></a>
-<span class="sourceLineNo">046</span> * This includes the default form-data parameters defined on the servlet and method levels.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> *<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * @param defaultEntries The default entries. Can be <jk>null</jk>.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * @return This object (for method chaining).<a name="line.49"></a>
-<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span> public RequestFormData addDefault(Map<String,String> defaultEntries) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> if (defaultEntries != null) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> for (Map.Entry<String,String> e : defaultEntries.entrySet()) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> String key = e.getKey(), value = e.getValue();<a name="line.54"></a>
-<span class="sourceLineNo">055</span> String[] v = get(key);<a name="line.55"></a>
-<span class="sourceLineNo">056</span> if (v == null || v.length == 0 || StringUtils.isEmpty(v[0]))<a name="line.56"></a>
-<span class="sourceLineNo">057</span> put(key, new String[]{value});<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span> return this;<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span> /**<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * Sets a request form data parameter value.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> *<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * @param name The parameter name.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @param value The parameter value.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> */<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public void put(String name, Object value) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> super.put(name, new String[]{StringUtils.toString(value)});<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> /**<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * Returns a form data parameter value.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * <p><a name="line.75"></a>
-<span class="sourceLineNo">076</span> * Parameter lookup is case-insensitive (consistent with WAS, but differs from Tomcat).<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <p><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <h5 class='section'>Notes:</h5><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * <ul><a name="line.79"></a>
-<span class="sourceLineNo">080</span> * <li>Calling this method on URL-Encoded FORM posts causes the body content to be loaded and parsed by the underlying servlet API.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <li>This method returns the raw unparsed value, and differs from calling <code>getFormDataParameter(name, String.<jk>class</js>)</code><a name="line.81"></a>
-<span class="sourceLineNo">082</span> * which will convert the value from UON notation:<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <ul><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * <li><js>"null"</js> =&gt; <jk>null</jk><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <li><js>"'null'"</js> =&gt; <js>"null"</js><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * <li><js>"'foo bar'"</js> =&gt; <js>"foo bar"</js><a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <li><js>"foo~~bar"</js> =&gt; <js>"foo~bar"</js><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * </ul><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * </ul><a name="line.89"></a>
-<span class="sourceLineNo">090</span> *<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @param name The form data parameter name.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * @return The parameter value, or <jk>null</jk> if parameter does not exist.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> */<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public String getFirst(String name) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> String[] v = get(name);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (v == null || v.length == 0)<a name="line.96"></a>
-<span class="sourceLineNo">097</span> return null;<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> // Fix for behavior difference between Tomcat and WAS.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> // getParameter("foo") on "&foo" in Tomcat returns "".<a name="line.100"></a>
-<span class="sourceLineNo">101</span> // getParameter("foo") on "&foo" in WAS returns null.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (v.length == 1 && v[0] == null) <a name="line.102"></a>
-<span class="sourceLineNo">103</span> return "";<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> return v[0];<a name="line.105"></a>
-<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * Same as {@link #getFirst(String)} except returns a default value if <jk>null</jk> or empty.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> *<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @param name The form data parameter name.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * @param def The default value.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @return The parameter value, or the default value if <jk>null</jk> or empty.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> */<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public String getFirst(String name, String def) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> String s = getFirst(name);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> return StringUtils.isEmpty(s) ? def : s;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Returns the specified form data parameter value converted to a POJO using the<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * {@link UrlEncodingParser} registered with this servlet.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * <p><a name="line.123"></a>
-<span class="sourceLineNo">124</span> * <h5 class='section'>Examples:</h5><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * <p class='bcode'><a name="line.125"></a>
-<span class="sourceLineNo">126</span> * <jc>// Parse into an integer.</jc><a name="line.126"></a>
-<span class="sourceLineNo">127</span> * <jk>int</jk> myparam = req.getFormDataParameter(<js>"myparam"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> *<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * <jc>// Parse into an int array.</jc><a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <jk>int</jk>[] myparam = req.getFormDataParameter(<js>"myparam"</js>, <jk>int</jk>[].<jk>class</jk>);<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> * <jc>// Parse into a bean.</jc><a name="line.132"></a>
-<span class="sourceLineNo">133</span> * MyBean myparam = req.getFormDataParameter(<js>"myparam"</js>, MyBean.<jk>class</jk>);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> *<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * <jc>// Parse into a linked-list of objects.</jc><a name="line.135"></a>
-<span class="sourceLineNo">136</span> * List myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> *<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * <jc>// Parse into a map of object keys/values.</jc><a name="line.138"></a>
-<span class="sourceLineNo">139</span> * Map myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * </p><a name="line.140"></a>
-<span class="sourceLineNo">141</span> * <p><a name="line.141"></a>
-<span class="sourceLineNo">142</span> * <h5 class='section'>Notes:</h5><a name="line.142"></a>
-<span class="sourceLineNo">143</span> * <ul><a name="line.143"></a>
-<span class="sourceLineNo">144</span> * <li>Calling this method on URL-Encoded FORM posts causes the body content to be loaded and parsed by the underlying servlet API.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * </ul><a name="line.145"></a>
-<span class="sourceLineNo">146</span> *<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * @param name The parameter name.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * @param type The class type to convert the parameter value to.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * @param <T> The class type to convert the parameter value to.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @return The parameter value converted to the specified class type.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @throws ParseException<a name="line.151"></a>
-<span class="sourceLineNo">152</span> */<a name="line.152"></a>
-<span class="sourceLineNo">153</span> public <T> T get(String name, Class<T> type) throws ParseException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> return parse(name, beanSession.getClassMeta(type));<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> /**<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * Same as {@link #get(String, Class)} except returns a default value if not specified.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> *<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @param name The parameter name.<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @param def The default value if the parameter was not specified or is <jk>null</jk>.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * @param type The class type to convert the parameter value to.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * @param <T> The class type to convert the parameter value to.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * @return The parameter value converted to the specified class type.<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * @throws ParseException<a name="line.165"></a>
-<span class="sourceLineNo">166</span> */<a name="line.166"></a>
-<span class="sourceLineNo">167</span> public <T> T get(String name, T def, Class<T> type) throws ParseException {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return parse(name, def, beanSession.getClassMeta(type));<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> * Same as {@link #get(String, Class)} except for use on multi-part parameters<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * (e.g. <js>"key=1&amp;key=2&amp;key=3"</js> instead of <js>"key=(1,2,3)"</js>)<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * <p><a name="line.174"></a>
-<span class="sourceLineNo">175</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> *<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * @param name The parameter name.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * @param type The class type to convert the parameter value to.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @return The parameter value converted to the specified class type.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @throws ParseException<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> public <T> T getAll(String name, Class<T> type) throws ParseException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return parseAll(name, beanSession.getClassMeta(type));<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> /**<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * Returns the specified form data parameter value converted to a POJO using the<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * {@link UrlEncodingParser} registered with this servlet.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * <p><a name="line.189"></a>
-<span class="sourceLineNo">190</span> * <h5 class='section'>Notes:</h5><a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <ul><a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <li>Calling this method on URL-Encoded FORM posts causes the body content to be loaded and parsed by the underlying servlet API.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <li>Use this method if you want to parse into a parameterized <code>Map</code>/<code>Collection</code> object.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * </ul><a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <p><a name="line.195"></a>
-<span class="sourceLineNo">196</span> * <h5 class='section'>Examples:</h5><a name="line.196"></a>
-<span class="sourceLineNo">197</span> * <p class='bcode'><a name="line.197"></a>
-<span class="sourceLineNo">198</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.198"></a>
-<span class="sourceLineNo">199</span> * List&lt;String&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> *<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * <jc>// Parse into a linked-list of linked-lists of strings.</jc><a name="line.201"></a>
-<span class="sourceLineNo">202</span> * List&lt;List&lt;String&gt;&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> *<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * <jc>// Parse into a map of string keys/values.</jc><a name="line.204"></a>
-<span class="sourceLineNo">205</span> * Map&lt;String,String&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> *<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * <jc>// Parse into a map containing string keys and values of lists containing beans.</jc><a name="line.207"></a>
-<span class="sourceLineNo">208</span> * Map&lt;String,List&lt;MyBean&gt;&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * </p><a name="line.209"></a>
-<span class="sourceLineNo">210</span> *<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @param name The parameter name.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * @param type The type of object to create.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * <br>Ignored if the main type is not a map or collection.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * @return The parameter value converted to the specified class type.<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * @throws ParseException<a name="line.218"></a>
-<span class="sourceLineNo">219</span> */<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public <T> T get(String name, Type type, Type...args) throws ParseException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return (T)parse(name, beanSession.getClassMeta(type, args));<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> * Same as {@link #get(String, Type, Type...)} except for use on multi-part parameters<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * (e.g. <js>"key=1&amp;key=2&amp;key=3"</js> instead of <js>"key=(1,2,3)"</js>)<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * <p><a name="line.227"></a>
-<span class="sourceLineNo">228</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.228"></a>
-<span class="sourceLineNo">229</span> *<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * @param name The parameter name.<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * @param type The type of object to create.<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * <br>Ignored if the main type is not a map or collection.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @return The parameter value converted to the specified class type.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * @throws ParseException<a name="line.237"></a>
-<span class="sourceLineNo">238</span> */<a name="line.238"></a>
-<span class="sourceLineNo">239</span> public <T> T getAll(String name, Type type, Type...args) throws ParseException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> return (T)parseAll(name, beanSession.getClassMeta(type, args));<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span> /* Workhorse method */<a name="line.243"></a>
-<span class="sourceLineNo">244</span> <T> T parse(String name, T def, ClassMeta<T> cm) throws ParseException {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> String val = getFirst(name);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (val == null)<a name="line.246"></a>
-<span class="sourceLineNo">247</span> return def;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> return parseValue(val, cm);<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> /* Workhorse method */<a name="line.251"></a>
-<span class="sourceLineNo">252</span> <T> T parse(String name, ClassMeta<T> cm) throws ParseException {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> String val = getFirst(name);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> if (cm.isPrimitive() && (val == null || val.isEmpty()))<a name="line.254"></a>
-<span class="sourceLineNo">255</span> return cm.getPrimitiveDefault();<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return parseValue(val, cm);<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> /* Workhorse method */<a name="line.259"></a>
-<span class="sourceLineNo">260</span> @SuppressWarnings("rawtypes")<a name="line.260"></a>
-<span class="sourceLineNo">261</span> <T> T parseAll(String name, ClassMeta<T> cm) throws ParseException {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> String[] p = get(name);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (p == null)<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return null;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> if (cm.isArray()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> List c = new ArrayList();<a name="line.266"></a>
-<span class="sourceLineNo">267</span> for (int i = 0; i < p.length; i++)<a name="line.267"></a>
-<span class="sourceLineNo">268</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return (T)ArrayUtils.toArray(c, cm.getElementType().getInnerClass());<a name="line.269"></a>
-<span class="sourceLineNo">270</span> } else if (cm.isCollection()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> try {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> Collection c = (Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new ObjectList());<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for (int i = 0; i < p.length; i++)<a name="line.273"></a>
-<span class="sourceLineNo">274</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return (T)c;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> } catch (ParseException e) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> throw e;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> } catch (Exception e) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> // Typically an instantiation exception.<a name="line.279"></a>
-<span class="sourceLineNo">280</span> throw new ParseException(e);<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> throw new ParseException("Invalid call to getParameters(String, ClassMeta). Class type must be a Collection or array.");<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> private <T> T parseValue(String val, ClassMeta<T> c) throws ParseException {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return parser.parsePart(val, c);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>}<a name="line.289"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.json.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.parser.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.urlencoding.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Represents the parsed form data parameters in an HTTP request.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> */<a name="line.26"></a>
+<span class="sourceLineNo">027</span>@SuppressWarnings("unchecked")<a name="line.27"></a>
+<span class="sourceLineNo">028</span>public class RequestFormData extends LinkedHashMap<String,String[]> {<a name="line.28"></a>
+<span class="sourceLineNo">029</span> private static final long serialVersionUID = 1L;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span> private UrlEncodingParser parser;<a name="line.31"></a>
+<span class="sourceLineNo">032</span> private BeanSession beanSession;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span> RequestFormData setParser(UrlEncodingParser parser) {<a name="line.34"></a>
+<span class="sourceLineNo">035</span> this.parser = parser;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> return this;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> }<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span> RequestFormData setBeanSession(BeanSession beanSession) {<a name="line.39"></a>
+<span class="sourceLineNo">040</span> this.beanSession = beanSession;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> return this;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> }<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> * Adds default entries to these form-data parameters.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * This includes the default form-data parameters defined on the servlet and method levels.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> *<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * @param defaultEntries The default entries. Can be <jk>null</jk>.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * @return This object (for method chaining).<a name="line.50"></a>
+<span class="sourceLineNo">051</span> */<a name="line.51"></a>
+<span class="sourceLineNo">052</span> public RequestFormData addDefault(Map<String,String> defaultEntries) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> if (defaultEntries != null) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> for (Map.Entry<String,String> e : defaultEntries.entrySet()) {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> String key = e.getKey(), value = e.getValue();<a name="line.55"></a>
+<span class="sourceLineNo">056</span> String[] v = get(key);<a name="line.56"></a>
+<span class="sourceLineNo">057</span> if (v == null || v.length == 0 || StringUtils.isEmpty(v[0]))<a name="line.57"></a>
+<span class="sourceLineNo">058</span> put(key, new String[]{value});<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span> }<a name="line.60"></a>
+<span class="sourceLineNo">061</span> return this;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span> /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * Sets a request form data parameter value.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> *<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * @param name The parameter name.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * @param value The parameter value.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> */<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public void put(String name, Object value) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> super.put(name, new String[]{StringUtils.toString(value)});<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> /**<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * Returns a form data parameter value.<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <p><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Parameter lookup is case-insensitive (consistent with WAS, but differs from Tomcat).<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <p><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <h5 class='section'>Notes:</h5><a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <ul><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <li>Calling this method on URL-Encoded FORM posts causes the body content to be loaded and parsed by the underlying servlet API.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <li>This method returns the raw unparsed value, and differs from calling <code>getFormDataParameter(name, String.<jk>class</js>)</code><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * which will convert the value from UON notation:<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * <ul><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * <li><js>"null"</js> =&gt; <jk>null</jk><a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <li><js>"'null'"</js> =&gt; <js>"null"</js><a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <li><js>"'foo bar'"</js> =&gt; <js>"foo bar"</js><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <li><js>"foo~~bar"</js> =&gt; <js>"foo~bar"</js><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * </ul><a name="line.89"></a>
+<span class="sourceLineNo">090</span> * </ul><a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @param name The form data parameter name.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * @return The parameter value, or <jk>null</jk> if parameter does not exist.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> */<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public String getFirst(String name) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> String[] v = get(name);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> if (v == null || v.length == 0)<a name="line.97"></a>
+<span class="sourceLineNo">098</span> return null;<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> // Fix for behavior difference between Tomcat and WAS.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> // getParameter("foo") on "&foo" in Tomcat returns "".<a name="line.101"></a>
+<span class="sourceLineNo">102</span> // getParameter("foo") on "&foo" in WAS returns null.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (v.length == 1 && v[0] == null)<a name="line.103"></a>
+<span class="sourceLineNo">104</span> return "";<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> return v[0];<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<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> * Same as {@link #getFirst(String)} except returns a default value if <jk>null</jk> or empty.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> *<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @param name The form data parameter name.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @param def The default value.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @return The parameter value, or the default value if <jk>null</jk> or empty.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> */<a name="line.115"></a>
+<span class="sourceLineNo">116</span> public String getFirst(String name, String def) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> String s = getFirst(name);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> return StringUtils.isEmpty(s) ? def : s;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * Returns the specified form data parameter value converted to a POJO using the<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * {@link UrlEncodingParser} registered with this servlet.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * <p><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * <h5 class='section'>Examples:</h5><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * <p class='bcode'><a name="line.126"></a>
+<span class="sourceLineNo">127</span> * <jc>// Parse into an integer.</jc><a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <jk>int</jk> myparam = req.getFormDataParameter(<js>"myparam"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> *<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * <jc>// Parse into an int array.</jc><a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <jk>int</jk>[] myparam = req.getFormDataParameter(<js>"myparam"</js>, <jk>int</jk>[].<jk>class</jk>);<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <jc>// Parse into a bean.</jc><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * MyBean myparam = req.getFormDataParameter(<js>"myparam"</js>, MyBean.<jk>class</jk>);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> *<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <jc>// Parse into a linked-list of objects.</jc><a name="line.136"></a>
+<span class="sourceLineNo">137</span> * List myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> *<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <jc>// Parse into a map of object keys/values.</jc><a name="line.139"></a>
+<span class="sourceLineNo">140</span> * Map myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * </p><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <p><a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <h5 class='section'>Notes:</h5><a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <ul><a name="line.144"></a>
+<span class="sourceLineNo">145</span> * <li>Calling this method on URL-Encoded FORM posts causes the body content to be loaded and parsed by the underlying servlet API.<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * </ul><a name="line.146"></a>
+<span class="sourceLineNo">147</span> *<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @param name The parameter name.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @param type The class type to convert the parameter value to.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @param <T> The class type to convert the parameter value to.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return The parameter value converted to the specified class type.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * @throws ParseException<a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public <T> T get(String name, Class<T> type) throws ParseException {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return parse(name, beanSession.getClassMeta(type));<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * Same as {@link #get(String, Class)} except returns a default value if not specified.<a name="line.159"></a>
+<span class="sourceLineNo">160</span> *<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * @param name The parameter name.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * @param def The default value if the parameter was not specified or is <jk>null</jk>.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @param type The class type to convert the parameter value to.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @param <T> The class type to convert the parameter value to.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * @return The parameter value converted to the specified class type.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @throws ParseException<a name="line.166"></a>
+<span class="sourceLineNo">167</span> */<a name="line.167"></a>
+<span class="sourceLineNo">168</span> public <T> T get(String name, T def, Class<T> type) throws ParseException {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return parse(name, def, beanSession.getClassMeta(type));<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> * Same as {@link #get(String, Class)} except for use on multi-part parameters<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * (e.g. <js>"key=1&amp;key=2&amp;key=3"</js> instead of <js>"key=(1,2,3)"</js>)<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * <p><a name="line.175"></a>
+<span class="sourceLineNo">176</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> *<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * @param name The parameter name.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * @param type The class type to convert the parameter value to.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * @return The parameter value converted to the specified class type.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @throws ParseException<a name="line.181"></a>
+<span class="sourceLineNo">182</span> */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public <T> T getAll(String name, Class<T> type) throws ParseException {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return parseAll(name, beanSession.getClassMeta(type));<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> * Returns the specified form data parameter value converted to a POJO using the<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * {@link UrlEncodingParser} registered with this servlet.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * <p><a name="line.190"></a>
+<span class="sourceLineNo">191</span> * <h5 class='section'>Notes:</h5><a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <ul><a name="line.192"></a>
+<span class="sourceLineNo">193</span> * <li>Calling this method on URL-Encoded FORM posts causes the body content to be loaded and parsed by the underlying servlet API.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <li>Use this method if you want to parse into a parameterized <code>Map</code>/<code>Collection</code> object.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * </ul><a name="line.195"></a>
+<span class="sourceLineNo">196</span> * <p><a name="line.196"></a>
+<span class="sourceLineNo">197</span> * <h5 class='section'>Examples:</h5><a name="line.197"></a>
+<span class="sourceLineNo">198</span> * <p class='bcode'><a name="line.198"></a>
+<span class="sourceLineNo">199</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.199"></a>
+<span class="sourceLineNo">200</span> * List&lt;String&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> *<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * <jc>// Parse into a linked-list of linked-lists of strings.</jc><a name="line.202"></a>
+<span class="sourceLineNo">203</span> * List&lt;List&lt;String&gt;&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> *<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * <jc>// Parse into a map of string keys/values.</jc><a name="line.205"></a>
+<span class="sourceLineNo">206</span> * Map&lt;String,String&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> *<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <jc>// Parse into a map containing string keys and values of lists containing beans.</jc><a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Map&lt;String,List&lt;MyBean&gt;&gt; myparam = req.getFormDataParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * </p><a name="line.210"></a>
+<span class="sourceLineNo">211</span> *<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * @param name The parameter name.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * @param type The type of object to create.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * <br>Ignored if the main type is not a map or collection.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * @return The parameter value converted to the specified class type.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * @throws ParseException<a name="line.219"></a>
+<span class="sourceLineNo">220</span> */<a name="line.220"></a>
+<span class="sourceLineNo">221</span> public <T> T get(String name, Type type, Type...args) throws ParseException {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> return (T)parse(name, beanSession.getClassMeta(type, args));<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> /**<a name="line.225"></a>
+<span class="sourceLineNo">226</span> * Same as {@link #get(String, Type, Type...)} except for use on multi-part parameters<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * (e.g. <js>"key=1&amp;key=2&amp;key=3"</js> instead of <js>"key=(1,2,3)"</js>)<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * <p><a name="line.228"></a>
+<span class="sourceLineNo">229</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> *<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * @param name The parameter name.<a name="line.231"></a>
+<span class="sourceLineNo">232</span> * @param type The type of object to create.<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * <br>Ignored if the main type is not a map or collection.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @return The parameter value converted to the specified class type.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @throws ParseException<a name="line.238"></a>
+<span class="sourceLineNo">239</span> */<a name="line.239"></a>
+<span class="sourceLineNo">240</span> public <T> T getAll(String name, Type type, Type...args) throws ParseException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> return (T)parseAll(name, beanSession.getClassMeta(type, args));<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span> /* Workhorse method */<a name="line.244"></a>
+<span class="sourceLineNo">245</span> <T> T parse(String name, T def, ClassMeta<T> cm) throws ParseException {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> String val = getFirst(name);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> if (val == null)<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return def;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> return parseValue(val, cm);<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> /* Workhorse method */<a name="line.252"></a>
+<span class="sourceLineNo">253</span> <T> T parse(String name, ClassMeta<T> cm) throws ParseException {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> String val = getFirst(name);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> if (cm.isPrimitive() && (val == null || val.isEmpty()))<a name="line.255"></a>
+<span class="sourceLineNo">256</span> return cm.getPrimitiveDefault();<a name="line.256"></a>
+<span class="sourceLineNo">257</span> return parseValue(val, cm);<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> /* Workhorse method */<a name="line.260"></a>
+<span class="sourceLineNo">261</span> @SuppressWarnings("rawtypes")<a name="line.261"></a>
+<span class="sourceLineNo">262</span> <T> T parseAll(String name, ClassMeta<T> cm) throws ParseException {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> String[] p = get(name);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (p == null)<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return null;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> if (cm.isArray()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> List c = new ArrayList();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> for (int i = 0; i < p.length; i++)<a name="line.268"></a>
+<span class="sourceLineNo">269</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.269"></a>
+<span class="sourceLineNo">270</span> return (T)ArrayUtils.toArray(c, cm.getElementType().getInnerClass());<a name="line.270"></a>
+<span class="sourceLineNo">271</span> } else if (cm.isCollection()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> try {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Collection c = (Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new ObjectList());<a name="line.273"></a>
+<span class="sourceLineNo">274</span> for (int i = 0; i < p.length; i++)<a name="line.274"></a>
+<span class="sourceLineNo">275</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return (T)c;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> } catch (ParseException e) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> throw e;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> } catch (Exception e) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> // Typically an instantiation exception.<a name="line.280"></a>
+<span class="sourceLineNo">281</span> throw new ParseException(e);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> throw new ParseException("Invalid call to getParameters(String, ClassMeta). Class type must be a Collection or array.");<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> private <T> T parseValue(String val, ClassMeta<T> c) throws ParseException {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return parser.parsePart(val, c);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * Converts the form data parameters to a readable string.<a name="line.292"></a>
+<span class="sourceLineNo">293</span> *<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * @param sorted Sort the form data parameters by name.<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * @return A JSON string containing the contents of the form data parameters.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> */<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public String toString(boolean sorted) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Map<String,Object> m = (sorted ? new TreeMap<String,Object>() : new LinkedHashMap<String,Object>());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> for (Map.Entry<String,String[]> e : this.entrySet()) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> String[] v = e.getValue();<a name="line.300"></a>
+<span class="sourceLineNo">301</span> m.put(e.getKey(), v.length == 1 ? v[0] : v);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> return JsonSerializer.DEFAULT_LAX.toString(m);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> @Override /* Object */<a name="line.306"></a>
+<span class="sourceLineNo">307</span> public String toString() {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return toString(false);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>}<a name="line.310"></a>
[08/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
index e8a0896..8605428 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClient.html
@@ -482,229 +482,244 @@
<span class="sourceLineNo">474</span> * .build()<a name="line.474"></a>
<span class="sourceLineNo">475</span> * .getRemoteableProxy(MyInterface3.<jk>class</jk>);<a name="line.475"></a>
<span class="sourceLineNo">476</span> * </p><a name="line.476"></a>
-<span class="sourceLineNo">477</span> *<a name="line.477"></a>
-<span class="sourceLineNo">478</span> * @param interfaceClass The interface to create a proxy for.<a name="line.478"></a>
-<span class="sourceLineNo">479</span> * @return The new proxy interface.<a name="line.479"></a>
-<span class="sourceLineNo">480</span> * @throws RemoteableMetadataException If the REST URI cannot be determined based on the information given.<a name="line.480"></a>
-<span class="sourceLineNo">481</span> */<a name="line.481"></a>
-<span class="sourceLineNo">482</span> public <T> T getRemoteableProxy(final Class<T> interfaceClass) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> return getRemoteableProxy(interfaceClass, null);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span> /**<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * Same as {@link #getRemoteableProxy(Class)} except explicitly specifies the URL of the REST interface.<a name="line.487"></a>
-<span class="sourceLineNo">488</span> *<a name="line.488"></a>
-<span class="sourceLineNo">489</span> * @param interfaceClass The interface to create a proxy for.<a name="line.489"></a>
-<span class="sourceLineNo">490</span> * @param restUrl The URL of the REST interface.<a name="line.490"></a>
-<span class="sourceLineNo">491</span> * @return The new proxy interface.<a name="line.491"></a>
-<span class="sourceLineNo">492</span> */<a name="line.492"></a>
-<span class="sourceLineNo">493</span> public <T> T getRemoteableProxy(final Class<T> interfaceClass, final Object restUrl) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> return getRemoteableProxy(interfaceClass, restUrl, serializer, parser);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> /**<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * Same as {@link #getRemoteableProxy(Class, Object)} but allows you to override the serializer and parser used.<a name="line.498"></a>
-<span class="sourceLineNo">499</span> *<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * @param interfaceClass The interface to create a proxy for.<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * @param restUrl The URL of the REST interface.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * @param serializer The serializer used to serialize POJOs to the body of the HTTP request.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * @param parser The parser used to parse POJOs from the body of the HTTP response.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> * @return The new proxy interface.<a name="line.504"></a>
-<span class="sourceLineNo">505</span> */<a name="line.505"></a>
-<span class="sourceLineNo">506</span> @SuppressWarnings({ "unchecked", "hiding" })<a name="line.506"></a>
-<span class="sourceLineNo">507</span> public <T> T getRemoteableProxy(final Class<T> interfaceClass, Object restUrl, final Serializer serializer, final Parser parser) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> if (restUrl == null) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> Remoteable r = ReflectionUtils.getAnnotation(Remoteable.class, interfaceClass);<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> String path = r == null ? "" : trimSlashes(r.path());<a name="line.512"></a>
-<span class="sourceLineNo">513</span> if (path.indexOf("://") == -1) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> if (path.isEmpty())<a name="line.514"></a>
-<span class="sourceLineNo">515</span> path = interfaceClass.getName();<a name="line.515"></a>
-<span class="sourceLineNo">516</span> if (rootUrl == null)<a name="line.516"></a>
-<span class="sourceLineNo">517</span> throw new RemoteableMetadataException(interfaceClass, "Root URI has not been specified. Cannot construct absolute path to remoteable proxy.");<a name="line.517"></a>
-<span class="sourceLineNo">518</span> path = trimSlashes(rootUrl) + '/' + path;<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> restUrl = path;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span> final String restUrl2 = restUrl.toString();<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> try {<a name="line.525"></a>
-<span class="sourceLineNo">526</span> return (T)Proxy.newProxyInstance(<a name="line.526"></a>
-<span class="sourceLineNo">527</span> interfaceClass.getClassLoader(),<a name="line.527"></a>
-<span class="sourceLineNo">528</span> new Class[] { interfaceClass },<a name="line.528"></a>
-<span class="sourceLineNo">529</span> new InvocationHandler() {<a name="line.529"></a>
+<span class="sourceLineNo">477</span> * <h5 class='section'>Notes:</h5><a name="line.477"></a>
+<span class="sourceLineNo">478</span> * <ul><a name="line.478"></a>
+<span class="sourceLineNo">479</span> * <li>If you plan on using your proxy in a multi-threaded environment, you'll want to use an underlying<a name="line.479"></a>
+<span class="sourceLineNo">480</span> * pooling client connection manager. The easiest way to do this is to use the {@link RestClientBuilder#pooled()}<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * method. If you don't do this, you may end up seeing "Connection still allocated" exceptions.<a name="line.481"></a>
+<span class="sourceLineNo">482</span> * </ul><a name="line.482"></a>
+<span class="sourceLineNo">483</span> *<a name="line.483"></a>
+<span class="sourceLineNo">484</span> * @param interfaceClass The interface to create a proxy for.<a name="line.484"></a>
+<span class="sourceLineNo">485</span> * @return The new proxy interface.<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @throws RemoteableMetadataException If the REST URI cannot be determined based on the information given.<a name="line.486"></a>
+<span class="sourceLineNo">487</span> */<a name="line.487"></a>
+<span class="sourceLineNo">488</span> public <T> T getRemoteableProxy(final Class<T> interfaceClass) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> return getRemoteableProxy(interfaceClass, null);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span> /**<a name="line.492"></a>
+<span class="sourceLineNo">493</span> * Same as {@link #getRemoteableProxy(Class)} except explicitly specifies the URL of the REST interface.<a name="line.493"></a>
+<span class="sourceLineNo">494</span> *<a name="line.494"></a>
+<span class="sourceLineNo">495</span> * @param interfaceClass The interface to create a proxy for.<a name="line.495"></a>
+<span class="sourceLineNo">496</span> * @param restUrl The URL of the REST interface.<a name="line.496"></a>
+<span class="sourceLineNo">497</span> * @return The new proxy interface.<a name="line.497"></a>
+<span class="sourceLineNo">498</span> */<a name="line.498"></a>
+<span class="sourceLineNo">499</span> public <T> T getRemoteableProxy(final Class<T> interfaceClass, final Object restUrl) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return getRemoteableProxy(interfaceClass, restUrl, serializer, parser);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> /**<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * Same as {@link #getRemoteableProxy(Class, Object)} but allows you to override the serializer and parser used.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> *<a name="line.505"></a>
+<span class="sourceLineNo">506</span> * @param interfaceClass The interface to create a proxy for.<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * @param restUrl The URL of the REST interface.<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * @param serializer The serializer used to serialize POJOs to the body of the HTTP request.<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * @param parser The parser used to parse POJOs from the body of the HTTP response.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * @return The new proxy interface.<a name="line.510"></a>
+<span class="sourceLineNo">511</span> */<a name="line.511"></a>
+<span class="sourceLineNo">512</span> @SuppressWarnings({ "unchecked", "hiding" })<a name="line.512"></a>
+<span class="sourceLineNo">513</span> public <T> T getRemoteableProxy(final Class<T> interfaceClass, Object restUrl, final Serializer serializer, final Parser parser) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span> if (restUrl == null) {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> Remoteable r = ReflectionUtils.getAnnotation(Remoteable.class, interfaceClass);<a name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span> String path = r == null ? "" : trimSlashes(r.path());<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (path.indexOf("://") == -1) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> if (path.isEmpty())<a name="line.520"></a>
+<span class="sourceLineNo">521</span> path = interfaceClass.getName();<a name="line.521"></a>
+<span class="sourceLineNo">522</span> if (rootUrl == null)<a name="line.522"></a>
+<span class="sourceLineNo">523</span> throw new RemoteableMetadataException(interfaceClass, "Root URI has not been specified. Cannot construct absolute path to remoteable proxy.");<a name="line.523"></a>
+<span class="sourceLineNo">524</span> path = trimSlashes(rootUrl) + '/' + path;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span> restUrl = path;<a name="line.526"></a>
+<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span> final String restUrl2 = restUrl.toString();<a name="line.529"></a>
<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> final RemoteableMeta rm = new RemoteableMeta(interfaceClass, restUrl2);<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span> @Override /* InvocationHandler */<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> RemoteableMethodMeta rmm = rm.getMethodMeta(method);<a name="line.535"></a>
+<span class="sourceLineNo">531</span> try {<a name="line.531"></a>
+<span class="sourceLineNo">532</span> return (T)Proxy.newProxyInstance(<a name="line.532"></a>
+<span class="sourceLineNo">533</span> interfaceClass.getClassLoader(),<a name="line.533"></a>
+<span class="sourceLineNo">534</span> new Class[] { interfaceClass },<a name="line.534"></a>
+<span class="sourceLineNo">535</span> new InvocationHandler() {<a name="line.535"></a>
<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (rmm == null)<a name="line.537"></a>
-<span class="sourceLineNo">538</span> throw new RuntimeException("Method is not exposed as a remoteable method.");<a name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span> try {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> String url = rmm.getUrl();<a name="line.541"></a>
-<span class="sourceLineNo">542</span> String httpMethod = rmm.getHttpMethod();<a name="line.542"></a>
-<span class="sourceLineNo">543</span> RestCall rc = (httpMethod.equals("POST") ? doPost(url) : doGet(url));<a name="line.543"></a>
-<span class="sourceLineNo">544</span> rc.serializer(serializer).parser(parser);<a name="line.544"></a>
+<span class="sourceLineNo">537</span> final RemoteableMeta rm = new RemoteableMeta(interfaceClass, restUrl2);<a name="line.537"></a>
+<span class="sourceLineNo">538</span><a name="line.538"></a>
+<span class="sourceLineNo">539</span> @Override /* InvocationHandler */<a name="line.539"></a>
+<span class="sourceLineNo">540</span> public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {<a name="line.540"></a>
+<span class="sourceLineNo">541</span> RemoteableMethodMeta rmm = rm.getMethodMeta(method);<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span> if (rmm == null)<a name="line.543"></a>
+<span class="sourceLineNo">544</span> throw new RuntimeException("Method is not exposed as a remoteable method.");<a name="line.544"></a>
<span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span> for (RemoteMethodArg a : rmm.getPathArgs())<a name="line.546"></a>
-<span class="sourceLineNo">547</span> rc.path(a.name, args[a.index], a.serializer);<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> for (RemoteMethodArg a : rmm.getQueryArgs())<a name="line.549"></a>
-<span class="sourceLineNo">550</span> rc.query(a.name, args[a.index], a.skipIfNE, a.serializer);<a name="line.550"></a>
+<span class="sourceLineNo">546</span> try {<a name="line.546"></a>
+<span class="sourceLineNo">547</span> String url = rmm.getUrl();<a name="line.547"></a>
+<span class="sourceLineNo">548</span> String httpMethod = rmm.getHttpMethod();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> RestCall rc = (httpMethod.equals("POST") ? doPost(url) : doGet(url));<a name="line.549"></a>
+<span class="sourceLineNo">550</span> rc.serializer(serializer).parser(parser);<a name="line.550"></a>
<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span> for (RemoteMethodArg a : rmm.getFormDataArgs())<a name="line.552"></a>
-<span class="sourceLineNo">553</span> rc.formData(a.name, args[a.index], a.skipIfNE, a.serializer);<a name="line.553"></a>
+<span class="sourceLineNo">552</span> for (RemoteMethodArg a : rmm.getPathArgs())<a name="line.552"></a>
+<span class="sourceLineNo">553</span> rc.path(a.name, args[a.index], a.serializer);<a name="line.553"></a>
<span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span> for (RemoteMethodArg a : rmm.getHeaderArgs())<a name="line.555"></a>
-<span class="sourceLineNo">556</span> rc.header(a.name, args[a.index], a.skipIfNE, a.serializer);<a name="line.556"></a>
+<span class="sourceLineNo">555</span> for (RemoteMethodArg a : rmm.getQueryArgs())<a name="line.555"></a>
+<span class="sourceLineNo">556</span> rc.query(a.name, args[a.index], a.skipIfNE, a.serializer);<a name="line.556"></a>
<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> if (rmm.getBodyArg() != null)<a name="line.558"></a>
-<span class="sourceLineNo">559</span> rc.input(args[rmm.getBodyArg()]);<a name="line.559"></a>
+<span class="sourceLineNo">558</span> for (RemoteMethodArg a : rmm.getFormDataArgs())<a name="line.558"></a>
+<span class="sourceLineNo">559</span> rc.formData(a.name, args[a.index], a.skipIfNE, a.serializer);<a name="line.559"></a>
<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> if (rmm.getRequestBeanArgs().length > 0) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> BeanSession bs = getBeanContext().createSession();<a name="line.562"></a>
+<span class="sourceLineNo">561</span> for (RemoteMethodArg a : rmm.getHeaderArgs())<a name="line.561"></a>
+<span class="sourceLineNo">562</span> rc.header(a.name, args[a.index], a.skipIfNE, a.serializer);<a name="line.562"></a>
<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span> for (Integer i : rmm.getRequestBeanArgs()) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span> BeanMap<?> bm = bs.toBeanMap(args[i]);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> for (BeanPropertyValue bpv : bm.getValues(true)) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> BeanPropertyMeta pMeta = bpv.getMeta();<a name="line.567"></a>
-<span class="sourceLineNo">568</span> Object val = bpv.getValue();<a name="line.568"></a>
+<span class="sourceLineNo">564</span> if (rmm.getBodyArg() != null)<a name="line.564"></a>
+<span class="sourceLineNo">565</span> rc.input(args[rmm.getBodyArg()]);<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> if (rmm.getRequestBeanArgs().length > 0) {<a name="line.567"></a>
+<span class="sourceLineNo">568</span> BeanSession bs = getBeanContext().createSession();<a name="line.568"></a>
<span class="sourceLineNo">569</span><a name="line.569"></a>
-<span class="sourceLineNo">570</span> Path p = pMeta.getAnnotation(Path.class);<a name="line.570"></a>
-<span class="sourceLineNo">571</span> if (p != null)<a name="line.571"></a>
-<span class="sourceLineNo">572</span> rc.path(getName(p.value(), pMeta), val, getPartSerializer(p.serializer()));<a name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span> Query q1 = pMeta.getAnnotation(Query.class);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> if (q1 != null)<a name="line.575"></a>
-<span class="sourceLineNo">576</span> rc.query(getName(q1.value(), pMeta), val, false, getPartSerializer(q1.serializer()));<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> QueryIfNE q2 = pMeta.getAnnotation(QueryIfNE.class);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> if (q2 != null)<a name="line.579"></a>
-<span class="sourceLineNo">580</span> rc.query(getName(q2.value(), pMeta), val, true, getPartSerializer(q2.serializer()));<a name="line.580"></a>
-<span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span> FormData f1 = pMeta.getAnnotation(FormData.class);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> if (f1 != null)<a name="line.583"></a>
-<span class="sourceLineNo">584</span> rc.formData(getName(f1.value(), pMeta), val, false, getPartSerializer(f1.serializer()));<a name="line.584"></a>
+<span class="sourceLineNo">570</span> for (RemoteMethodArg rma : rmm.getRequestBeanArgs()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> BeanMap<?> bm = bs.toBeanMap(args[rma.index]);<a name="line.571"></a>
+<span class="sourceLineNo">572</span><a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (BeanPropertyValue bpv : bm.getValues(false)) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> BeanPropertyMeta pMeta = bpv.getMeta();<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Object val = bpv.getValue();<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span> Path p = pMeta.getAnnotation(Path.class);<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if (p != null)<a name="line.578"></a>
+<span class="sourceLineNo">579</span> rc.path(getName(p.name(), p.value(), pMeta), val, getPartSerializer(p.serializer(), rma.serializer));<a name="line.579"></a>
+<span class="sourceLineNo">580</span><a name="line.580"></a>
+<span class="sourceLineNo">581</span> if (val != null) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> Query q1 = pMeta.getAnnotation(Query.class);<a name="line.582"></a>
+<span class="sourceLineNo">583</span> if (q1 != null)<a name="line.583"></a>
+<span class="sourceLineNo">584</span> rc.query(getName(q1.name(), q1.value(), pMeta), val, q1.skipIfEmpty(), getPartSerializer(q1.serializer(), rma.serializer));<a name="line.584"></a>
<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span> FormDataIfNE f2 = pMeta.getAnnotation(FormDataIfNE.class);<a name="line.586"></a>
-<span class="sourceLineNo">587</span> if (f2 != null)<a name="line.587"></a>
-<span class="sourceLineNo">588</span> rc.formData(getName(f2.value(), pMeta), val, true, getPartSerializer(f2.serializer()));<a name="line.588"></a>
+<span class="sourceLineNo">586</span> QueryIfNE q2 = pMeta.getAnnotation(QueryIfNE.class);<a name="line.586"></a>
+<span class="sourceLineNo">587</span> if (q2 != null)<a name="line.587"></a>
+<span class="sourceLineNo">588</span> rc.query(getName(q2.name(), q2.value(), pMeta), val, true, getPartSerializer(q2.serializer(), rma.serializer));<a name="line.588"></a>
<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span> org.apache.juneau.remoteable.Header h1 = pMeta.getAnnotation(org.apache.juneau.remoteable.Header.class);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> if (h1 != null)<a name="line.591"></a>
-<span class="sourceLineNo">592</span> rc.header(getName(h1.value(), pMeta), val, false, getPartSerializer(h1.serializer()));<a name="line.592"></a>
+<span class="sourceLineNo">590</span> FormData f1 = pMeta.getAnnotation(FormData.class);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (f1 != null)<a name="line.591"></a>
+<span class="sourceLineNo">592</span> rc.formData(getName(f1.name(), f1.value(), pMeta), val, f1.skipIfEmpty(), getPartSerializer(f1.serializer(), rma.serializer));<a name="line.592"></a>
<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span> HeaderIfNE h2 = pMeta.getAnnotation(HeaderIfNE.class);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> if (h2 != null)<a name="line.595"></a>
-<span class="sourceLineNo">596</span> rc.header(getName(h2.value(), pMeta), val, true, getPartSerializer(h2.serializer()));<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
-<span class="sourceLineNo">598</span> }<a name="line.598"></a>
-<span class="sourceLineNo">599</span> }<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span> if (rmm.getOtherArgs().length > 0) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> Object[] otherArgs = new Object[rmm.getOtherArgs().length];<a name="line.602"></a>
-<span class="sourceLineNo">603</span> int i = 0;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> for (Integer otherArg : rmm.getOtherArgs())<a name="line.604"></a>
-<span class="sourceLineNo">605</span> otherArgs[i++] = args[otherArg];<a name="line.605"></a>
-<span class="sourceLineNo">606</span> rc.input(otherArgs);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> return rc.getResponse(method.getGenericReturnType());<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span> } catch (RestCallException e) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> // Try to throw original exception if possible.<a name="line.612"></a>
-<span class="sourceLineNo">613</span> e.throwServerException(interfaceClass.getClassLoader());<a name="line.613"></a>
-<span class="sourceLineNo">614</span> throw new RuntimeException(e);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch (Exception e) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> throw new RuntimeException(e);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span> });<a name="line.619"></a>
-<span class="sourceLineNo">620</span> } catch (Exception e) {<a name="line.620"></a>
-<span class="sourceLineNo">621</span> throw new RuntimeException(e);<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span> private static String getName(String name, BeanPropertyMeta pMeta) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> if ("*".equals(name) && ! pMeta.getClassMeta().isMapOrBean())<a name="line.626"></a>
-<span class="sourceLineNo">627</span> name = pMeta.getName();<a name="line.627"></a>
-<span class="sourceLineNo">628</span> return name;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> private static PartSerializer getPartSerializer(Class c) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> if (c == UrlEncodingSerializer.class)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> return null;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> PartSerializer pf = partSerializerCache.get(c);<a name="line.634"></a>
-<span class="sourceLineNo">635</span> if (pf == null) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> try {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> partSerializerCache.putIfAbsent(c, (PartSerializer)c.newInstance());<a name="line.637"></a>
-<span class="sourceLineNo">638</span> } catch (Exception e) {<a name="line.638"></a>
-<span class="sourceLineNo">639</span> throw new RuntimeException(e);<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span> pf = partSerializerCache.get(c);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span> return pf;<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span> private Pattern absUrlPattern = Pattern.compile("^\\w+\\:\\/\\/.*");<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> PartSerializer getPartSerializer() {<a name="line.648"></a>
-<span class="sourceLineNo">649</span> return partSerializer;<a name="line.649"></a>
-<span class="sourceLineNo">650</span> }<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> URI toURI(Object url) throws URISyntaxException {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> if (url instanceof URI)<a name="line.653"></a>
-<span class="sourceLineNo">654</span> return (URI)url;<a name="line.654"></a>
-<span class="sourceLineNo">655</span> if (url instanceof URL)<a name="line.655"></a>
-<span class="sourceLineNo">656</span> ((URL)url).toURI();<a name="line.656"></a>
-<span class="sourceLineNo">657</span> if (url instanceof URIBuilder)<a name="line.657"></a>
-<span class="sourceLineNo">658</span> return ((URIBuilder)url).build();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> String s = url == null ? "" : url.toString();<a name="line.659"></a>
-<span class="sourceLineNo">660</span> if (rootUrl != null && ! absUrlPattern.matcher(s).matches()) {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> if (s.isEmpty())<a name="line.661"></a>
-<span class="sourceLineNo">662</span> s = rootUrl;<a name="line.662"></a>
-<span class="sourceLineNo">663</span> else {<a name="line.663"></a>
-<span class="sourceLineNo">664</span> StringBuilder sb = new StringBuilder(rootUrl);<a name="line.664"></a>
-<span class="sourceLineNo">665</span> if (! s.startsWith("/"))<a name="line.665"></a>
-<span class="sourceLineNo">666</span> sb.append('/');<a name="line.666"></a>
-<span class="sourceLineNo">667</span> sb.append(s);<a name="line.667"></a>
-<span class="sourceLineNo">668</span> s = sb.toString();<a name="line.668"></a>
-<span class="sourceLineNo">669</span> }<a name="line.669"></a>
-<span class="sourceLineNo">670</span> }<a name="line.670"></a>
-<span class="sourceLineNo">671</span> if (s.indexOf('{') != -1)<a name="line.671"></a>
-<span class="sourceLineNo">672</span> s = s.replace("{", "%7B").replace("}", "%7D");<a name="line.672"></a>
-<span class="sourceLineNo">673</span> return new URI(s);<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span> ExecutorService getExecutorService(boolean create) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span> if (executorService != null || ! create)<a name="line.677"></a>
-<span class="sourceLineNo">678</span> return executorService;<a name="line.678"></a>
-<span class="sourceLineNo">679</span> synchronized(this) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span> if (executorService == null)<a name="line.680"></a>
-<span class="sourceLineNo">681</span> executorService = new ThreadPoolExecutor(1, 1, 30, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));<a name="line.681"></a>
-<span class="sourceLineNo">682</span> return executorService;<a name="line.682"></a>
-<span class="sourceLineNo">683</span> }<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span> @Override<a name="line.686"></a>
-<span class="sourceLineNo">687</span> protected void finalize() throws Throwable {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> if (! isClosed && ! keepHttpClientOpen) {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> System.err.println("WARNING: RestClient garbage collected before it was finalized.");<a name="line.689"></a>
-<span class="sourceLineNo">690</span> if (creationStack != null) {<a name="line.690"></a>
-<span class="sourceLineNo">691</span> System.err.println("Creation Stack:");<a name="line.691"></a>
-<span class="sourceLineNo">692</span> for (StackTraceElement e : creationStack)<a name="line.692"></a>
-<span class="sourceLineNo">693</span> System.err.println(e);<a name="line.693"></a>
-<span class="sourceLineNo">694</span> } else {<a name="line.694"></a>
-<span class="sourceLineNo">695</span> System.err.println("Creation stack traces can be displayed by setting the system property 'org.apache.juneau.rest.client.RestClient.trackLifecycle' to true.");<a name="line.695"></a>
-<span class="sourceLineNo">696</span> }<a name="line.696"></a>
-<span class="sourceLineNo">697</span> }<a name="line.697"></a>
-<span class="sourceLineNo">698</span> }<a name="line.698"></a>
-<span class="sourceLineNo">699</span>}<a name="line.699"></a>
+<span class="sourceLineNo">594</span> FormDataIfNE f2 = pMeta.getAnnotation(FormDataIfNE.class);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> if (f2 != null)<a name="line.595"></a>
+<span class="sourceLineNo">596</span> rc.formData(getName(f2.name(), f2.value(), pMeta), val, true, getPartSerializer(f2.serializer(), rma.serializer));<a name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span> org.apache.juneau.remoteable.Header h1 = pMeta.getAnnotation(org.apache.juneau.remoteable.Header.class);<a name="line.598"></a>
+<span class="sourceLineNo">599</span> if (h1 != null)<a name="line.599"></a>
+<span class="sourceLineNo">600</span> rc.header(getName(h1.name(), h1.value(), pMeta), val, h1.skipIfEmpty(), getPartSerializer(h1.serializer(), rma.serializer));<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span> HeaderIfNE h2 = pMeta.getAnnotation(HeaderIfNE.class);<a name="line.602"></a>
+<span class="sourceLineNo">603</span> if (h2 != null)<a name="line.603"></a>
+<span class="sourceLineNo">604</span> rc.header(getName(h2.name(), h2.value(), pMeta), val, true, getPartSerializer(h2.serializer(), rma.serializer));<a name="line.604"></a>
+<span class="sourceLineNo">605</span> }<a name="line.605"></a>
+<span class="sourceLineNo">606</span> }<a name="line.606"></a>
+<span class="sourceLineNo">607</span> }<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span><a name="line.609"></a>
+<span class="sourceLineNo">610</span> if (rmm.getOtherArgs().length > 0) {<a name="line.610"></a>
+<span class="sourceLineNo">611</span> Object[] otherArgs = new Object[rmm.getOtherArgs().length];<a name="line.611"></a>
+<span class="sourceLineNo">612</span> int i = 0;<a name="line.612"></a>
+<span class="sourceLineNo">613</span> for (Integer otherArg : rmm.getOtherArgs())<a name="line.613"></a>
+<span class="sourceLineNo">614</span> otherArgs[i++] = args[otherArg];<a name="line.614"></a>
+<span class="sourceLineNo">615</span> rc.input(otherArgs);<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a name="line.616"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span> return rc.getResponse(method.getGenericReturnType());<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> } catch (RestCallException e) {<a name="line.620"></a>
+<span class="sourceLineNo">621</span> // Try to throw original exception if possible.<a name="line.621"></a>
+<span class="sourceLineNo">622</span> e.throwServerException(interfaceClass.getClassLoader());<a name="line.622"></a>
+<span class="sourceLineNo">623</span> throw new RuntimeException(e);<a name="line.623"></a>
+<span class="sourceLineNo">624</span> } catch (Exception e) {<a name="line.624"></a>
+<span class="sourceLineNo">625</span> throw new RuntimeException(e);<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
+<span class="sourceLineNo">627</span> }<a name="line.627"></a>
+<span class="sourceLineNo">628</span> });<a name="line.628"></a>
+<span class="sourceLineNo">629</span> } catch (Exception e) {<a name="line.629"></a>
+<span class="sourceLineNo">630</span> throw new RuntimeException(e);<a name="line.630"></a>
+<span class="sourceLineNo">631</span> }<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> private static String getName(String name1, String name2, BeanPropertyMeta pMeta) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> String n = name1.isEmpty() ? name2 : name1;<a name="line.635"></a>
+<span class="sourceLineNo">636</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.636"></a>
+<span class="sourceLineNo">637</span> if (n.isEmpty() && (cm.isMapOrBean() || cm.isReader() || cm.isInstanceOf(NameValuePairs.class)))<a name="line.637"></a>
+<span class="sourceLineNo">638</span> n = "*";<a name="line.638"></a>
+<span class="sourceLineNo">639</span> if (n.isEmpty())<a name="line.639"></a>
+<span class="sourceLineNo">640</span> n = pMeta.getName();<a name="line.640"></a>
+<span class="sourceLineNo">641</span> return n;<a name="line.641"></a>
+<span class="sourceLineNo">642</span> }<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span> private static PartSerializer getPartSerializer(Class c, PartSerializer c2) {<a name="line.644"></a>
+<span class="sourceLineNo">645</span> if (c2 != null)<a name="line.645"></a>
+<span class="sourceLineNo">646</span> return c2;<a name="line.646"></a>
+<span class="sourceLineNo">647</span> if (c == PartSerializer.class)<a name="line.647"></a>
+<span class="sourceLineNo">648</span> return null;<a name="line.648"></a>
+<span class="sourceLineNo">649</span> PartSerializer pf = partSerializerCache.get(c);<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (pf == null) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> try {<a name="line.651"></a>
+<span class="sourceLineNo">652</span> partSerializerCache.putIfAbsent(c, (PartSerializer)c.newInstance());<a name="line.652"></a>
+<span class="sourceLineNo">653</span> } catch (Exception e) {<a name="line.653"></a>
+<span class="sourceLineNo">654</span> throw new RuntimeException(e);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> }<a name="line.655"></a>
+<span class="sourceLineNo">656</span> pf = partSerializerCache.get(c);<a name="line.656"></a>
+<span class="sourceLineNo">657</span> }<a name="line.657"></a>
+<span class="sourceLineNo">658</span> return pf;<a name="line.658"></a>
+<span class="sourceLineNo">659</span> }<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span> private Pattern absUrlPattern = Pattern.compile("^\\w+\\:\\/\\/.*");<a name="line.661"></a>
+<span class="sourceLineNo">662</span><a name="line.662"></a>
+<span class="sourceLineNo">663</span> PartSerializer getPartSerializer() {<a name="line.663"></a>
+<span class="sourceLineNo">664</span> return partSerializer;<a name="line.664"></a>
+<span class="sourceLineNo">665</span> }<a name="line.665"></a>
+<span class="sourceLineNo">666</span><a name="line.666"></a>
+<span class="sourceLineNo">667</span> URI toURI(Object url) throws URISyntaxException {<a name="line.667"></a>
+<span class="sourceLineNo">668</span> if (url instanceof URI)<a name="line.668"></a>
+<span class="sourceLineNo">669</span> return (URI)url;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> if (url instanceof URL)<a name="line.670"></a>
+<span class="sourceLineNo">671</span> ((URL)url).toURI();<a name="line.671"></a>
+<span class="sourceLineNo">672</span> if (url instanceof URIBuilder)<a name="line.672"></a>
+<span class="sourceLineNo">673</span> return ((URIBuilder)url).build();<a name="line.673"></a>
+<span class="sourceLineNo">674</span> String s = url == null ? "" : url.toString();<a name="line.674"></a>
+<span class="sourceLineNo">675</span> if (rootUrl != null && ! absUrlPattern.matcher(s).matches()) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> if (s.isEmpty())<a name="line.676"></a>
+<span class="sourceLineNo">677</span> s = rootUrl;<a name="line.677"></a>
+<span class="sourceLineNo">678</span> else {<a name="line.678"></a>
+<span class="sourceLineNo">679</span> StringBuilder sb = new StringBuilder(rootUrl);<a name="line.679"></a>
+<span class="sourceLineNo">680</span> if (! s.startsWith("/"))<a name="line.680"></a>
+<span class="sourceLineNo">681</span> sb.append('/');<a name="line.681"></a>
+<span class="sourceLineNo">682</span> sb.append(s);<a name="line.682"></a>
+<span class="sourceLineNo">683</span> s = sb.toString();<a name="line.683"></a>
+<span class="sourceLineNo">684</span> }<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span> if (s.indexOf('{') != -1)<a name="line.686"></a>
+<span class="sourceLineNo">687</span> s = s.replace("{", "%7B").replace("}", "%7D");<a name="line.687"></a>
+<span class="sourceLineNo">688</span> return new URI(s);<a name="line.688"></a>
+<span class="sourceLineNo">689</span> }<a name="line.689"></a>
+<span class="sourceLineNo">690</span><a name="line.690"></a>
+<span class="sourceLineNo">691</span> ExecutorService getExecutorService(boolean create) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span> if (executorService != null || ! create)<a name="line.692"></a>
+<span class="sourceLineNo">693</span> return executorService;<a name="line.693"></a>
+<span class="sourceLineNo">694</span> synchronized(this) {<a name="line.694"></a>
+<span class="sourceLineNo">695</span> if (executorService == null)<a name="line.695"></a>
+<span class="sourceLineNo">696</span> executorService = new ThreadPoolExecutor(1, 1, 30, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));<a name="line.696"></a>
+<span class="sourceLineNo">697</span> return executorService;<a name="line.697"></a>
+<span class="sourceLineNo">698</span> }<a name="line.698"></a>
+<span class="sourceLineNo">699</span> }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span> @Override<a name="line.701"></a>
+<span class="sourceLineNo">702</span> protected void finalize() throws Throwable {<a name="line.702"></a>
+<span class="sourceLineNo">703</span> if (! isClosed && ! keepHttpClientOpen) {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> System.err.println("WARNING: RestClient garbage collected before it was finalized.");<a name="line.704"></a>
+<span class="sourceLineNo">705</span> if (creationStack != null) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> System.err.println("Creation Stack:");<a name="line.706"></a>
+<span class="sourceLineNo">707</span> for (StackTraceElement e : creationStack)<a name="line.707"></a>
+<span class="sourceLineNo">708</span> System.err.println(e);<a name="line.708"></a>
+<span class="sourceLineNo">709</span> } else {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> System.err.println("Creation stack traces can be displayed by setting the system property 'org.apache.juneau.rest.client.RestClient.trackLifecycle' to true.");<a name="line.710"></a>
+<span class="sourceLineNo">711</span> }<a name="line.711"></a>
+<span class="sourceLineNo">712</span> }<a name="line.712"></a>
+<span class="sourceLineNo">713</span> }<a name="line.713"></a>
+<span class="sourceLineNo">714</span>}<a name="line.714"></a>
[22/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/serializer/PartSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/serializer/PartSerializer.html b/content/site/apidocs/org/apache/juneau/serializer/PartSerializer.html
index ba34831..10a5f7f 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/PartSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/PartSerializer.html
@@ -100,11 +100,11 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></dd>
+<dd><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></dd>
</dl>
<hr>
<br>
-<pre>public interface <a href="../../../../src-html/org/apache/juneau/serializer/PartSerializer.html#line.39">PartSerializer</a></pre>
+<pre>public interface <a href="../../../../src-html/org/apache/juneau/serializer/PartSerializer.html#line.40">PartSerializer</a></pre>
<div class="block">Interface used to convert POJOs to simple strings in HTTP headers, query parameters, form-data parameters, and URI
path variables.
<p>
@@ -120,6 +120,7 @@ var activeTableTab = "activeTableTab";
<li><a href="../../../../org/apache/juneau/remoteable/Header.html#serializer--"><code>Header.serializer()</code></a>
<li><a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html#serializer--"><code>HeaderIfNE.serializer()</code></a>
<li><a href="../../../../org/apache/juneau/remoteable/Path.html#serializer--"><code>Path.serializer()</code></a>
+ <li><a href="../../../../org/apache/juneau/remoteable/RequestBean.html#serializer--"><code>RequestBean.serializer()</code></a>
<li><code>RestClientBuilder.partSerializer(Class)</code>
</ul>
<p>
@@ -171,7 +172,7 @@ var activeTableTab = "activeTableTab";
<ul class="blockListLast">
<li class="blockList">
<h4>serialize</h4>
-<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/serializer/PartSerializer.html#line.51">serialize</a>(<a href="../../../../org/apache/juneau/serializer/PartType.html" title="enum in org.apache.juneau.serializer">PartType</a> type,
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/serializer/PartSerializer.html#line.52">serialize</a>(<a href="../../../../org/apache/juneau/serializer/PartType.html" title="enum in org.apache.juneau.serializer">PartType</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Converts the specified value to a string that can be used as an HTTP header value, query parameter value,
form-data parameter, or URI path variable.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
index 42963b6..5adca36 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Encoding.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
index cc4a353..bfccd59 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.Readable.html
@@ -222,7 +222,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="cl
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#builder--">builder</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.http.MediaType-org.apache.juneau.UriContext-">createSession</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">doSerialize</a>, <a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
index 38d233b..c34d40f 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializer.html
@@ -364,13 +364,12 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
</tr>
<tr id="i3" class="rowColor">
<td class="colFirst"><code>protected <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> out,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> eType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> attrName,
- <a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a> pMeta,
- boolean plainTextParams)</code>
+ <a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a> pMeta)</code>
<div class="block">Workhorse method.</div>
</td>
</tr>
@@ -495,19 +494,18 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
</dl>
</li>
</ul>
-<a name="serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">
+<a name="serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>serializeAnything</h4>
-<pre>protected <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializer.html#line.213">serializeAnything</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
+<pre>protected <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializer.html#line.212">serializeAnything</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
<a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> out,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
<a href="../../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> eType,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> attrName,
- <a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a> pMeta,
- boolean plainTextParams)
+ <a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a> pMeta)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Workhorse method. Determines the type of object, and then calls the
appropriate type-specific serialization method.</div>
@@ -519,7 +517,6 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
<dd><code>eType</code> - The expected type of the object if this is a bean property.</dd>
<dd><code>attrName</code> - The bean property name if this is a bean property. <jk>null</jk> if this isn't a bean property being serialized.</dd>
<dd><code>pMeta</code> - The bean property metadata.</dd>
-<dd><code>plainTextParams</code> - <jk>true</jk> if this is a top level parameter key or value and paramFormat is PLAINTEXT.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>The same writer passed in.</dd>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -533,7 +530,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializer.html#line.379">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output,
+<pre>public <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializer.html#line.386">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale,
@@ -583,7 +580,7 @@ extends <a href="../../../../org/apache/juneau/serializer/WriterSerializer.html"
<ul class="blockListLast">
<li class="blockList">
<h4>doSerialize</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/uon/UonSerializer.html#line.384">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a> session,
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/uon/UonSerializer.html#line.391">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">Serializer</a></code></span></div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
index 3d7617d..646325d 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializerContext.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10};
+var methods = {"i0":10,"i1":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -173,6 +173,12 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
<div class="block"><b>Configuration property:</b> Encode non-valid URI characters.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat">UON_paramFormat</a></span></code>
+<div class="block"><b>Configuration property:</b> Format to use for top-level query names and simple parameters.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="fields.inherited.from.class.org.apache.juneau.serializer.SerializerContext">
@@ -227,6 +233,12 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
<div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
</td>
</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#plainTextParams--">plainTextParams</a></span>()</code>
+<div class="block">Returns <jk>true</jk> if the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanContext">
@@ -293,7 +305,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
<a name="UON_addBeanTypeProperties">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>UON_addBeanTypeProperties</h4>
<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerContext.html#line.72">UON_addBeanTypeProperties</a></pre>
@@ -318,6 +330,42 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
</dl>
</li>
</ul>
+<a name="UON_paramFormat">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UON_paramFormat</h4>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerContext.html#line.99">UON_paramFormat</a></pre>
+<div class="block"><b>Configuration property:</b> Format to use for top-level query names and simple parameters.
+ <p>
+ <ul>
+ <li><b>Name:</b> <js>"UrlEncodingSerializer.paramFormat"</js>
+ <li><b>Data type:</b> <code>String</code>
+ <li><b>Default:</b> <js>"UON"</js>
+ <li><b>Session-overridable:</b> <jk>true</jk>
+ </ul>
+ <p>
+ Specifies the format to use for URL GET parameter keys and values.
+ <p>
+ The possible values are:
+ <ul>
+ <li><js>"UON"</js> (default) - Use UON notation for values.
+ <br>String values such as <js>"(foo='bar')"</js> will end up being quoted and escaped to <js>"'(foo=bar~'baz~')'"</js>.
+ <br>Boolean strings (<js>"true"</js>/<js>"false"</js>) and numeric values (<js>"123"</js>) will also end up
+ quoted (<js>"'true'"</js>, <js>"'false'"</js>, <js>"'123'"</js>.
+ <li><js>"PLAINTEXT"</js> (default) - Serialize as plain text.
+ <br>Strings will never be quoted or escaped.
+ <br>Note that this can cause errors during parsing if you're using the URL-encoding parser to parse
+ the results since UON constructs won't be differentiatable.
+ <br>However, this is not an issue if you're simply creating queries or form posts against 3rd-party interfaces.
+ </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.apache.juneau.uon.UonSerializerContext.UON_paramFormat">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -332,7 +380,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
<ul class="blockListLast">
<li class="blockList">
<h4>UonSerializerContext</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerContext.html#line.86">UonSerializerContext</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> ps)</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerContext.html#line.114">UonSerializerContext</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> ps)</pre>
<div class="block">Constructor.
<p>
Typically only called from <a href="../../../../org/apache/juneau/PropertyStore.html#getContext-java.lang.Class-"><code>PropertyStore.getContext(Class)</code></a>.</div>
@@ -353,10 +401,10 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
<a name="asMap--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>asMap</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerContext.html#line.93">asMap</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerContext.html#line.122">asMap</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/Context.html#asMap--">Context</a></code></span></div>
<div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
<dl>
@@ -367,6 +415,20 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerContext.html
</dl>
</li>
</ul>
+<a name="plainTextParams--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>plainTextParams</h4>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerContext.html#line.135">plainTextParams</a>()</pre>
+<div class="block">Returns <jk>true</jk> if the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html b/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
index 09cf796..a62a42a 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonSerializerSession.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -212,6 +212,12 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<div class="block">Returns the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars"><code>UonSerializerContext.UON_encodeChars</code></a> setting value for this session.</div>
</td>
</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#isPlainTextParams--">isPlainTextParams</a></span>()</code>
+<div class="block">Returns <jk>true</jk> if the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.SerializerSession">
@@ -261,7 +267,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<ul class="blockListLast">
<li class="blockList">
<h4>UonSerializerSession</h4>
-<pre>protected <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.55">UonSerializerSession</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a> ctx,
+<pre>protected <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.56">UonSerializerSession</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a> ctx,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> encode,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output,
@@ -304,7 +310,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<ul class="blockList">
<li class="blockList">
<h4>isEncodeChars</h4>
-<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.71">isEncodeChars</a>()</pre>
+<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.74">isEncodeChars</a>()</pre>
<div class="block">Returns the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars"><code>UonSerializerContext.UON_encodeChars</code></a> setting value for this session.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -318,7 +324,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
<ul class="blockList">
<li class="blockList">
<h4>isAddBeanTypeProperties</h4>
-<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.81">isAddBeanTypeProperties</a>()</pre>
+<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.84">isAddBeanTypeProperties</a>()</pre>
<div class="block">Returns the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_addBeanTypeProperties"><code>UonSerializerContext.UON_addBeanTypeProperties</code></a> setting value for this session.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -328,13 +334,27 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerSession.html
</dl>
</li>
</ul>
+<a name="isPlainTextParams--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isPlainTextParams</h4>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.92">isPlainTextParams</a>()</pre>
+<div class="block">Returns <jk>true</jk> if the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if the <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</dd>
+</dl>
+</li>
+</ul>
<a name="getWriter--">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>getWriter</h4>
-<pre>public final <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.86">getWriter</a>()
+<pre>public final <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonSerializerSession.html#line.97">getWriter</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerSession.html#getWriter--">SerializerSession</a></code></span></div>
<div class="block">Wraps the specified output object inside a writer.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/UonWriter.html b/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
index 6e6940a..c04b6b1 100644
--- a/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
+++ b/content/site/apidocs/org/apache/juneau/uon/UonWriter.html
@@ -172,11 +172,12 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
</tr>
<tr class="altColor">
<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-org.apache.juneau.UriResolver-">UonWriter</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-boolean-org.apache.juneau.UriResolver-">UonWriter</a></span>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> out,
boolean useWhitespace,
boolean encodeChars,
boolean trimStrings,
+ boolean plainTextParams,
<a href="../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a> uriResolver)</code>
<div class="block">Constructor.</div>
</td>
@@ -268,9 +269,8 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
</tr>
<tr id="i11" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonWriter.html#appendObject-java.lang.Object-boolean-boolean-">appendObject</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
- boolean isTopAttrName,
- boolean plainTextParams)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/uon/UonWriter.html#appendObject-java.lang.Object-boolean-">appendObject</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
+ boolean isTopAttrName)</code>
<div class="block">Serializes the specified simple object as a UON string value.</div>
</td>
</tr>
@@ -340,17 +340,18 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<!-- -->
</a>
<h3>Constructor Detail</h3>
-<a name="UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-org.apache.juneau.UriResolver-">
+<a name="UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-boolean-org.apache.juneau.UriResolver-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>UonWriter</h4>
-<pre>protected <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.58">UonWriter</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
+<pre>protected <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.59">UonWriter</a>(<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> out,
boolean useWhitespace,
boolean encodeChars,
boolean trimStrings,
+ boolean plainTextParams,
<a href="../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a> uriResolver)</pre>
<div class="block">Constructor.</div>
<dl>
@@ -360,6 +361,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<dd><code>useWhitespace</code> - If <jk>true</jk>, tabs will be used in output.</dd>
<dd><code>encodeChars</code> - If <jk>true</jk>, special characters should be encoded.</dd>
<dd><code>trimStrings</code> - If <jk>true</jk>, strings should be trimmed before they're serialized.</dd>
+<dd><code>plainTextParams</code> - If <jk>true</jk>, don't use UON notation for values.</dd>
<dd><code>uriResolver</code> - The URI resolver for resolving URIs to absolute or root-relative form.</dd>
</dl>
</li>
@@ -372,22 +374,20 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<!-- -->
</a>
<h3>Method Detail</h3>
-<a name="appendObject-java.lang.Object-boolean-boolean-">
+<a name="appendObject-java.lang.Object-boolean-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>appendObject</h4>
-<pre>public final <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.73">appendObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
- boolean isTopAttrName,
- boolean plainTextParams)
+<pre>public final <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.74">appendObject</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o,
+ boolean isTopAttrName)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Serializes the specified simple object as a UON string value.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>o</code> - The object being serialized.</dd>
<dd><code>isTopAttrName</code> - If this is a top-level attribute name we're serializing.</dd>
-<dd><code>plainTextParams</code> - This is a top-level name or parameter we're serializing and the parameter format is PLAINTEXT.</dd>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>This object (for method chaining).</dd>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -401,7 +401,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>appendBoolean</h4>
-<pre>protected <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.131">appendBoolean</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
+<pre>protected <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.132">appendBoolean</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Appends a boolean value to the output.</div>
<dl>
@@ -420,7 +420,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>appendNumber</h4>
-<pre>protected <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.143">appendNumber</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
+<pre>protected <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.144">appendNumber</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Appends a numeric value to the output.</div>
<dl>
@@ -439,7 +439,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>appendUri</h4>
-<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.166">appendUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)
+<pre>public <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer">SerializerWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.167">appendUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Appends a URI to the output.</div>
<dl>
@@ -460,7 +460,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>cr</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.176">cr</a>(int depth)
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.177">cr</a>(int depth)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#cr-int-">SerializerWriter</a></code></span></div>
<div class="block">Performs a carriage return.
@@ -484,7 +484,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>appendln</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.182">appendln</a>(int indent,
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.183">appendln</a>(int indent,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -509,7 +509,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>appendln</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.188">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.189">appendln</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendln-java.lang.String-">SerializerWriter</a></code></span></div>
<div class="block">Writes the specified text followed by a newline (if the <code>useWhitespace</code> setting is enabled).</div>
@@ -531,7 +531,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>append</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.194">append</a>(int indent,
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.195">append</a>(int indent,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -555,7 +555,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>append</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.200">append</a>(int indent,
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.201">append</a>(int indent,
char c)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-int-char-">SerializerWriter</a></code></span></div>
@@ -579,7 +579,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>q</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.206">q</a>()
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.207">q</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#q--">SerializerWriter</a></code></span></div>
<div class="block">Adds the quote character specified by the <code>quoteChar</code> setting to the output.</div>
@@ -599,7 +599,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>i</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.212">i</a>(int indent)
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.213">i</a>(int indent)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#i-int-">SerializerWriter</a></code></span></div>
<div class="block">Writes an indent to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -621,7 +621,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>nl</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.218">nl</a>()
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.219">nl</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#nl--">SerializerWriter</a></code></span></div>
<div class="block">Writes a newline to the writer if the <code>useWhitespace</code> setting is enabled.</div>
@@ -641,7 +641,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>append</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.224">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> text)
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.225">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.Object-">SerializerWriter</a></code></span></div>
<div class="block">Writes the specified text to the writer.</div>
@@ -663,7 +663,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>append</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.230">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.231">append</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#append-java.lang.String-">SerializerWriter</a></code></span></div>
<div class="block">Writes the specified text to the writer.</div>
@@ -685,7 +685,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>appendIf</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.236">appendIf</a>(boolean b,
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.237">appendIf</a>(boolean b,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendIf-boolean-java.lang.String-">SerializerWriter</a></code></span></div>
@@ -709,7 +709,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockList">
<li class="blockList">
<h4>appendIf</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.242">appendIf</a>(boolean b,
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.243">appendIf</a>(boolean b,
char c)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/SerializerWriter.html#appendIf-boolean-char-">SerializerWriter</a></code></span></div>
@@ -733,7 +733,7 @@ extends <a href="../../../../org/apache/juneau/serializer/SerializerWriter.html"
<ul class="blockListLast">
<li class="blockList">
<h4>append</h4>
-<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.248">append</a>(char c)
+<pre>public <a href="../../../../org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a> <a href="../../../../src-html/org/apache/juneau/uon/UonWriter.html#line.249">append</a>(char c)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/uon/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/uon/package-summary.html b/content/site/apidocs/org/apache/juneau/uon/package-summary.html
index c828341..2dac616 100644
--- a/content/site/apidocs/org/apache/juneau/uon/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/uon/package-summary.html
@@ -608,12 +608,12 @@
<p>
Another useful feature is the <a href="../../../../org/apache/juneau/annotation/Bean.html#propertyNamer--"><code>Bean.propertyNamer()</code></a> annotation that allows you to plug in your own
logic for determining bean property names.<br>
- The <a href="../../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><code>PropertyNamerDashedLC</code></a> is an example of an alternate property namer.
+ The <a href="../../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><code>PropertyNamerDLC</code></a> is an example of an alternate property namer.
It converts bean property names to lowercase-dashed format.
</p>
<h6 class='figure'>Example:</h6>
<p class='bcode'>
- <ja>@Bean</ja>(propertyNamer=PropertyNamerDashedLC.<jk>class</jk>)
+ <ja>@Bean</ja>(propertyNamer=PropertyNamerDLC.<jk>class</jk>)
<jk>public class</jk> Person {
...
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
index 4031f0a..a25b017 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" target="_top">Frames</a></li>
@@ -143,7 +143,7 @@ var activeTableTab = "activeTableTab";
<br>
<pre><a href="../../../../org/apache/juneau/annotation/Produces.html" title="annotation in org.apache.juneau.annotation">@Produces</a>(<a href="../../../../org/apache/juneau/annotation/Produces.html#value--">value</a>="application/x-www-form-urlencoded",
<a href="../../../../org/apache/juneau/annotation/Produces.html#contentType--">contentType</a>="application/x-www-form-urlencoded")
-public static class <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.150">UrlEncodingSerializer.Expanded</a>
+public static class <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.153">UrlEncodingSerializer.Expanded</a>
extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></pre>
<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.</div>
</li>
@@ -163,7 +163,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<!-- -->
</a>
<h3>Nested classes/interfaces inherited from class org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></code></li>
+<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.juneau.uon.UonSerializer">
@@ -185,7 +185,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<!-- -->
</a>
<h3>Fields inherited from class org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT">DEFAULT</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_EXPANDED">DEFAULT_EXPANDED</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_READABLE">DEFAULT_READABLE</a></code></li>
+<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT">DEFAULT</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_EXPANDED">DEFAULT_EXPANDED</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_PLAINTEXT">DEFAULT_PLAINTEXT</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_READABLE">DEFAULT_READABLE</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="fields.inherited.from.class.org.apache.juneau.uon.UonSerializer">
@@ -254,7 +254,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
@@ -304,7 +304,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<ul class="blockListLast">
<li class="blockList">
<h4>Expanded</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html#line.156">Expanded</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html#line.159">Expanded</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
<div class="block">Constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -326,7 +326,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<ul class="blockListLast">
<li class="blockList">
<h4>getOverrideProperties</h4>
-<pre>protected <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html#line.161">getOverrideProperties</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html#line.164">getOverrideProperties</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/CoreObject.html#getOverrideProperties--">CoreObject</a></code></span></div>
<div class="block">Method used by subclasses to override context factory properties for just this
instance without modifying the context factory itself.
@@ -369,7 +369,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
index 23c770b..4855bae 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -141,7 +141,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.169">UrlEncodingSerializer.Readable</a>
+<pre>public static class <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.172">UrlEncodingSerializer.Readable</a>
extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></pre>
<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.</div>
</li>
@@ -161,7 +161,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<!-- -->
</a>
<h3>Nested classes/interfaces inherited from class org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></code></li>
+<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.juneau.uon.UonSerializer">
@@ -183,7 +183,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<!-- -->
</a>
<h3>Fields inherited from class org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT">DEFAULT</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_EXPANDED">DEFAULT_EXPANDED</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_READABLE">DEFAULT_READABLE</a></code></li>
+<code><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT">DEFAULT</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_EXPANDED">DEFAULT_EXPANDED</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_PLAINTEXT">DEFAULT_PLAINTEXT</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_READABLE">DEFAULT_READABLE</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="fields.inherited.from.class.org.apache.juneau.uon.UonSerializer">
@@ -252,7 +252,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
@@ -302,7 +302,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<ul class="blockListLast">
<li class="blockList">
<h4>Readable</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html#line.175">Readable</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html#line.178">Readable</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
<div class="block">Constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -324,7 +324,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
<ul class="blockListLast">
<li class="blockList">
<h4>getOverrideProperties</h4>
-<pre>protected <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html#line.180">getOverrideProperties</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html#line.183">getOverrideProperties</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/CoreObject.html#getOverrideProperties--">CoreObject</a></code></span></div>
<div class="block">Method used by subclasses to override context factory properties for just this
instance without modifying the context factory itself.
@@ -366,7 +366,7 @@ extends <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
[25/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html b/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
index 237b40a..640c642 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestCall.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public final class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.62">RestCall</a>
+<pre>public final class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.65">RestCall</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Represents a connection to a remote REST resource.
<p>
@@ -850,7 +850,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>RestCall</h4>
-<pre>protected <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.98">RestCall</a>(<a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> client,
+<pre>protected <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.101">RestCall</a>(<a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> client,
org.apache.http.client.methods.HttpRequestBase request,
<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
@@ -879,7 +879,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.128">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.131">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> uri)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the URI for this call.
<p>
@@ -908,7 +908,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>scheme</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.144">scheme</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> scheme)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.147">scheme</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> scheme)</pre>
<div class="block">Sets the URI scheme.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -924,7 +924,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>host</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.155">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.158">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</pre>
<div class="block">Sets the URI host.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -940,7 +940,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>port</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.166">port</a>(int port)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.169">port</a>(int port)</pre>
<div class="block">Sets the URI port.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -956,7 +956,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>query</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.185">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.188">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value,
boolean skipIfEmpty,
<a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a> partSerializer)
@@ -985,7 +985,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>query</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.217">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.226">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds a query parameter to the URI query.</div>
@@ -1006,7 +1006,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>query</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.228">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.237">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds query parameters to the URI query.</div>
<dl>
@@ -1025,7 +1025,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>queryIfNE</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.242">queryIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.251">queryIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds a query parameter to the URI query if the parameter value is not <jk>null</jk> or an empty string.
@@ -1048,7 +1048,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>queryIfNE</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.255">queryIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.264">queryIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds query parameters to the URI for any parameters that aren't null/empty.
<p>
@@ -1069,7 +1069,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>query</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.265">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> query)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.274">query</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> query)</pre>
<div class="block">Sets a custom URI query.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1085,7 +1085,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>formData</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.283">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.292">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value,
boolean skipIfEmpty,
<a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a> partSerializer)
@@ -1113,7 +1113,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>formData</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.316">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.333">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds a form data pair to this request to perform a URL-encoded form post.</div>
@@ -1136,7 +1136,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>formData</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.327">formData</a>(<a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client">NameValuePairs</a> nameValuePairs)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.344">formData</a>(<a href="../../../../../org/apache/juneau/rest/client/NameValuePairs.html" title="class in org.apache.juneau.rest.client">NameValuePairs</a> nameValuePairs)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds form data pairs to this request to perform a URL-encoded form post.</div>
<dl>
@@ -1155,7 +1155,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>formData</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.338">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.355">formData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds form data pairs to this request to perform a URL-encoded form post.</div>
<dl>
@@ -1174,7 +1174,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>formDataIfNE</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.352">formDataIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.369">formDataIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds a form data pair to the request if the parameter value is not <jk>null</jk> or an empty string.
@@ -1197,7 +1197,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>formDataIfNE</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.365">formDataIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.382">formDataIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> params)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Adds form data parameters to the request for any parameters that aren't null/empty.
<p>
@@ -1218,7 +1218,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>path</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.379">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.396">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value,
<a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a> partSerializer)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
@@ -1242,7 +1242,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>path</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.411">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.428">path</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Replaces a variable of the form <js>"{name}"</js> in the URL path with the specified value.</div>
@@ -1263,7 +1263,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>userInfo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.421">userInfo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> userInfo)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.438">userInfo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> userInfo)</pre>
<div class="block">Sets the URI user info.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1279,7 +1279,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>userInfo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.433">userInfo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> username,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.450">userInfo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> username,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> password)</pre>
<div class="block">Sets the URI user info.</div>
<dl>
@@ -1297,7 +1297,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>input</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.453">input</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.470">input</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> input)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the input for this REST call.</div>
<dl>
@@ -1324,7 +1324,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>serializer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.467">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.485">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer)</pre>
<div class="block">Specifies the serializer to use on this call.
<p>
Overrides the serializer specified on the <a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client"><code>RestClient</code></a>.</div>
@@ -1342,7 +1342,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>parser</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.480">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.498">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
<div class="block">Specifies the parser to use on this call.
<p>
Overrides the parser specified on the <a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client"><code>RestClient</code></a>.</div>
@@ -1360,7 +1360,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>header</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.502">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.520">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value,
boolean skipIfEmpty,
<a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a> partSerializer)
@@ -1387,7 +1387,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>header</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.532">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.550">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets a header on the request.</div>
@@ -1409,7 +1409,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>headers</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.543">headers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> values)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.561">headers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> values)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets headers on the request.</div>
<dl>
@@ -1428,7 +1428,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>headerIfNE</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.558">headerIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.576">headerIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets a header on the request if the value is not null/empty.
@@ -1452,7 +1452,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>headersIfNE</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.571">headersIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> values)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.589">headersIfNE</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> values)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets headers on the request if the values are not null/empty.
<p>
@@ -1473,7 +1473,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>accept</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.584">accept</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.602">accept</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Accept</code> request header.
<p>
@@ -1494,7 +1494,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>acceptCharset</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.597">acceptCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.615">acceptCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Accept-Charset</code> request header.
<p>
@@ -1515,7 +1515,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>acceptEncoding</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.610">acceptEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.628">acceptEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Accept-Encoding</code> request header.
<p>
@@ -1536,7 +1536,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>acceptLanguage</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.623">acceptLanguage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.641">acceptLanguage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Accept-Language</code> request header.
<p>
@@ -1557,7 +1557,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>authorization</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.636">authorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.654">authorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Authorization</code> request header.
<p>
@@ -1578,7 +1578,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>cacheControl</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.649">cacheControl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.667">cacheControl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Cache-Control</code> request header.
<p>
@@ -1599,7 +1599,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>connection</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.662">connection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.680">connection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Connection</code> request header.
<p>
@@ -1620,7 +1620,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>contentLength</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.675">contentLength</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.693">contentLength</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Content-Length</code> request header.
<p>
@@ -1641,7 +1641,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>contentType</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.688">contentType</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.706">contentType</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Content-Type</code> request header.
<p>
@@ -1662,7 +1662,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>date</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.701">date</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.719">date</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Date</code> request header.
<p>
@@ -1683,7 +1683,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>expect</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.714">expect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.732">expect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Expect</code> request header.
<p>
@@ -1704,7 +1704,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>forwarded</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.727">forwarded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.745">forwarded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Forwarded</code> request header.
<p>
@@ -1725,7 +1725,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>from</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.740">from</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.758">from</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>From</code> request header.
<p>
@@ -1746,7 +1746,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>host</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.753">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.771">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Host</code> request header.
<p>
@@ -1767,7 +1767,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifMatch</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.766">ifMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.784">ifMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>If-Match</code> request header.
<p>
@@ -1788,7 +1788,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifModifiedSince</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.779">ifModifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.797">ifModifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>If-Modified-Since</code> request header.
<p>
@@ -1809,7 +1809,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifNoneMatch</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.792">ifNoneMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.810">ifNoneMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>If-None-Match</code> request header.
<p>
@@ -1830,7 +1830,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifRange</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.805">ifRange</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.823">ifRange</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>If-Range</code> request header.
<p>
@@ -1851,7 +1851,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ifUnmodifiedSince</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.818">ifUnmodifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.836">ifUnmodifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>If-Unmodified-Since</code> request header.
<p>
@@ -1872,7 +1872,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>maxForwards</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.831">maxForwards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.849">maxForwards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Max-Forwards</code> request header.
<p>
@@ -1893,7 +1893,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>origin</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.844">origin</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.862">origin</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Origin</code> request header.
<p>
@@ -1914,7 +1914,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>pragma</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.857">pragma</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.875">pragma</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Pragma</code> request header.
<p>
@@ -1935,7 +1935,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>proxyAuthorization</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.870">proxyAuthorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.888">proxyAuthorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Proxy-Authorization</code> request header.
<p>
@@ -1956,7 +1956,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>range</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.883">range</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.901">range</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Range</code> request header.
<p>
@@ -1977,7 +1977,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>referer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.896">referer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.914">referer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Referer</code> request header.
<p>
@@ -1998,7 +1998,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>te</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.909">te</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.927">te</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>TE</code> request header.
<p>
@@ -2019,7 +2019,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>userAgent</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.922">userAgent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.940">userAgent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>User-Agent</code> request header.
<p>
@@ -2040,7 +2040,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>upgrade</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.935">upgrade</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.953">upgrade</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Upgrade</code> request header.
<p>
@@ -2061,7 +2061,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>via</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.948">via</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.966">via</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Via</code> request header.
<p>
@@ -2082,7 +2082,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>warning</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.961">warning</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.979">warning</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the value for the <code>Warning</code> request header.
<p>
@@ -2103,7 +2103,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>clientVersion</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.972">clientVersion</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.990">clientVersion</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
<div class="block">Sets the client version by setting the value for the <js>"X-Client-Version"</js> header.</div>
<dl>
@@ -2122,7 +2122,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>retryable</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.986">retryable</a>(int retries,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1004">retryable</a>(int retries,
long interval,
<a href="../../../../../org/apache/juneau/rest/client/RetryOn.html" title="class in org.apache.juneau.rest.client">RetryOn</a> retryOn)
throws <a href="../../../../../org/apache/juneau/rest/client/RestCallException.html" title="class in org.apache.juneau.rest.client">RestCallException</a></pre>
@@ -2146,7 +2146,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>allowRedirectsOnPosts</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1014">allowRedirectsOnPosts</a>(boolean b)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1032">allowRedirectsOnPosts</a>(boolean b)</pre>
<div class="block">For this call, allow automatic redirects when a 302 or 307 occurs when
performing a POST.
<p>
@@ -2169,7 +2169,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>redirectMaxAttempts</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1025">redirectMaxAttempts</a>(int maxAttempts)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1043">redirectMaxAttempts</a>(int maxAttempts)</pre>
<div class="block">Specify the number of redirects to follow before throwing an exception.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2185,7 +2185,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>interceptor</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1036">interceptor</a>(<a href="../../../../../org/apache/juneau/rest/client/RestCallInterceptor.html" title="class in org.apache.juneau.rest.client">RestCallInterceptor</a> interceptor)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1054">interceptor</a>(<a href="../../../../../org/apache/juneau/rest/client/RestCallInterceptor.html" title="class in org.apache.juneau.rest.client">RestCallInterceptor</a> interceptor)</pre>
<div class="block">Add an interceptor for this call only.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2201,7 +2201,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>pipeTo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1052">pipeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1070">pipeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)</pre>
<div class="block">Pipes the request output to the specified writer when <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> is called.
<p>
The writer is not closed.
@@ -2221,7 +2221,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>pipeTo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1065">pipeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1083">pipeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w,
boolean close)</pre>
<div class="block">Pipe output from response to the specified writer when <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> is called.
<p>
@@ -2241,7 +2241,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>pipeTo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1080">pipeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client">RestCall</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1098">pipeTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w,
boolean close)</pre>
<div class="block">Pipe output from response to the specified writer when <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#run--"><code>run()</code></a> is called and associate
@@ -2264,7 +2264,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getWriter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1091">getWriter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestCall.html#line.1109">getWriter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> id)</pre>
<div class="block">Retrieves a writer associated with an ID via <a href="../../../../../org/apache/juneau/rest/client/RestCall.html#pipeTo-java.lang.String-java.io.Writer-boolean-"><code>pipeTo(String, Writer, boolean)</code></a></div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2280,7 +2280,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class
<TRUNCATED>
[10/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/rest/RequestQuery.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestQuery.html b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestQuery.html
index 37ba0f1..2a75c77 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RequestQuery.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RequestQuery.html
@@ -27,292 +27,313 @@
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import org.apache.juneau.*;<a name="line.20"></a>
<span class="sourceLineNo">021</span>import org.apache.juneau.internal.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.parser.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.urlencoding.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Represents the query parameters in an HTTP request.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>@SuppressWarnings("unchecked")<a name="line.28"></a>
-<span class="sourceLineNo">029</span>public final class RequestQuery extends LinkedHashMap<String,String[]> {<a name="line.29"></a>
-<span class="sourceLineNo">030</span> private static final long serialVersionUID = 1L;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span> private UrlEncodingParser parser;<a name="line.32"></a>
-<span class="sourceLineNo">033</span> private BeanSession beanSession;<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span> RequestQuery setParser(UrlEncodingParser parser) {<a name="line.35"></a>
-<span class="sourceLineNo">036</span> this.parser = parser;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> return this;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> }<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> RequestQuery setBeanSession(BeanSession beanSession) {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> this.beanSession = beanSession;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> return this;<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> /**<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * Adds default entries to these query parameters.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <p><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * This includes the default queries defined on the servlet and method levels.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> *<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * @param defaultEntries The default entries. Can be <jk>null</jk>.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * @return This object (for method chaining).<a name="line.51"></a>
-<span class="sourceLineNo">052</span> */<a name="line.52"></a>
-<span class="sourceLineNo">053</span> public RequestQuery addDefault(Map<String,String> defaultEntries) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> if (defaultEntries != null) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> for (Map.Entry<String,String> e : defaultEntries.entrySet()) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> String key = e.getKey(), value = e.getValue();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> String[] v = get(key);<a name="line.57"></a>
-<span class="sourceLineNo">058</span> if (v == null || v.length == 0 || StringUtils.isEmpty(v[0]))<a name="line.58"></a>
-<span class="sourceLineNo">059</span> put(key, new String[]{value});<a name="line.59"></a>
-<span class="sourceLineNo">060</span> }<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
-<span class="sourceLineNo">062</span> return this;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> /**<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Sets a request query parameter value.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> *<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @param name The parameter name.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @param value The parameter value.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> */<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public void put(String name, Object value) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> put(name, new String[]{StringUtils.toString(value)});<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * Returns a query parameter value.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <p><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * Same as {@link HttpServletRequest#getParameter(String)} except only looks in the URL string, not parameters from URL-Encoded FORM posts.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * <p><a name="line.79"></a>
-<span class="sourceLineNo">080</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.80"></a>
-<span class="sourceLineNo">081</span> *<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @param name The URL parameter name.<a name="line.82"></a>
-<span class="sourceLineNo">083</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.83"></a>
-<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> public String getFirst(String name) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> String[] v = get(name);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> if (v == null || v.length == 0)<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return null;<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> // Fix for behavior difference between Tomcat and WAS.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> // getParameter("foo") on "&foo" in Tomcat returns "".<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // getParameter("foo") on "&foo" in WAS returns null.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (v.length == 1 && v[0] == null) <a name="line.93"></a>
-<span class="sourceLineNo">094</span> return "";<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> return v[0];<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> /**<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * Same as {@link #getFirst(String)} but returns the specified default value if the query parameter was not specified.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> *<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * @param name The URL parameter name.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * @param def The default value.<a name="line.103"></a>
-<span class="sourceLineNo">104</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.104"></a>
-<span class="sourceLineNo">105</span> */<a name="line.105"></a>
-<span class="sourceLineNo">106</span> public String getFirst(String name, String def) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> String s = getFirst(name);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> return StringUtils.isEmpty(s) ? def : s;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Returns the specified query parameter value converted to a POJO.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <p><a name="line.113"></a>
-<span class="sourceLineNo">114</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.114"></a>
-<span class="sourceLineNo">115</span> * <p><a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <h5 class='section'>Examples:</h5><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * <p class='bcode'><a name="line.117"></a>
-<span class="sourceLineNo">118</span> * <jc>// Parse into an integer.</jc><a name="line.118"></a>
-<span class="sourceLineNo">119</span> * <jk>int</jk> myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> *<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * <jc>// Parse into an int array.</jc><a name="line.121"></a>
-<span class="sourceLineNo">122</span> * <jk>int</jk>[] myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>[].<jk>class</jk>);<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> * <jc>// Parse into a bean.</jc><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * MyBean myparam = req.getQueryParameter(<js>"myparam"</js>, MyBean.<jk>class</jk>);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> *<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * <jc>// Parse into a linked-list of objects.</jc><a name="line.127"></a>
-<span class="sourceLineNo">128</span> * List myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> *<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * <jc>// Parse into a map of object keys/values.</jc><a name="line.130"></a>
-<span class="sourceLineNo">131</span> * Map myparam = req.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * </p><a name="line.132"></a>
-<span class="sourceLineNo">133</span> *<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @param name The parameter name.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * @param type The class type to convert the parameter value to.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @param <T> The class type to convert the parameter value to.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * @return The parameter value converted to the specified class type.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * @throws ParseException<a name="line.138"></a>
-<span class="sourceLineNo">139</span> */<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public <T> T get(String name, Class<T> type) throws ParseException {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> return get(name, beanSession.getClassMeta(type));<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> * Same as {@link #get(String, Class)} except returns a default value if not found.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> *<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * @param name The parameter name.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * @param def The default value if the parameter was not specified or is <jk>null</jk>.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * @param type The class type to convert the parameter value to.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @param <T> The class type to convert the parameter value to.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @return The parameter value converted to the specified class type.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @throws ParseException<a name="line.152"></a>
-<span class="sourceLineNo">153</span> */<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public <T> T get(String name, T def, Class<T> type) throws ParseException {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return get(name, def, beanSession.getClassMeta(type));<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * Returns the specified query parameter value converted to a POJO.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * <p><a name="line.160"></a>
-<span class="sourceLineNo">161</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.161"></a>
-<span class="sourceLineNo">162</span> * <p><a name="line.162"></a>
-<span class="sourceLineNo">163</span> * Use this method if you want to parse into a parameterized <code>Map</code>/<code>Collection</code> object.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> * <p><a name="line.164"></a>
-<span class="sourceLineNo">165</span> * <h5 class='section'>Examples:</h5><a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <p class='bcode'><a name="line.166"></a>
-<span class="sourceLineNo">167</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.167"></a>
-<span class="sourceLineNo">168</span> * Listt&lt;String&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> *<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * <jc>// Parse into a linked-list of linked-lists of strings.</jc><a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Listt&lt;List&lt;String&gt;&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> *<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * <jc>// Parse into a map of string keys/values.</jc><a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Map&lt;String,String&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> *<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * <jc>// Parse into a map containing string keys and values of lists containing beans.</jc><a name="line.176"></a>
-<span class="sourceLineNo">177</span> * Map&lt;String,List&lt;MyBean&gt;&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * </p><a name="line.178"></a>
-<span class="sourceLineNo">179</span> *<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @param name The parameter name.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * @param type The type of object to create.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * <br>Ignored if the main type is not a map or collection.<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @param <T> The class type to convert the parameter value to.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * @return The parameter value converted to the specified class type.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * @throws ParseException<a name="line.188"></a>
-<span class="sourceLineNo">189</span> */<a name="line.189"></a>
-<span class="sourceLineNo">190</span> public <T> T get(String name, Type type, Type...args) throws ParseException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> return (T)parse(name, beanSession.getClassMeta(type, args));<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> /**<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * Same as {@link #get(String, Class)} except returns a default value if not found.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> *<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * @param name The parameter name.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @param type The type of object to create.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * <br>Ignored if the main type is not a map or collection.<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * @param def The default value if the parameter was not specified or is <jk>null</jk>.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * @param <T> The class type to convert the parameter value to.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * @return The parameter value converted to the specified class type.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * @throws ParseException<a name="line.206"></a>
-<span class="sourceLineNo">207</span> */<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public <T> T get(String name, Object def, Type type, Type...args) throws ParseException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> return (T)parse(name, def, beanSession.getClassMeta(type, args));<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> /**<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * Same as {@link #get(String, Class)} except for use on multi-part parameters<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * (e.g. <js>"&amp;key=1&amp;key=2&amp;key=3"</js> instead of <js>"&amp;key=(1,2,3)"</js>).<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <p><a name="line.215"></a>
-<span class="sourceLineNo">216</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> *<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * @param name The query parameter name.<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * @param c The class type to convert the parameter value to.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * @param <T> The class type to convert the parameter value to.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> * @return The query parameter value converted to the specified class type.<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * @throws ParseException<a name="line.222"></a>
-<span class="sourceLineNo">223</span> */<a name="line.223"></a>
-<span class="sourceLineNo">224</span> public <T> T getAll(String name, Class<T> c) throws ParseException {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> return getAll(name, beanSession.getClassMeta(c));<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> * Same as {@link #get(String, Type, Type...)} except for use on multi-part parameters<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * (e.g. <js>"&amp;key=1&amp;key=2&amp;key=3"</js> instead of <js>"&amp;key=(1,2,3)"</js>).<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * <p><a name="line.231"></a>
-<span class="sourceLineNo">232</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> *<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * @param name The query parameter name.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * @param type The type of object to create.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * <br>Ignored if the main type is not a map or collection.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * @param <T> The class type to convert the parameter value to.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * @return The query parameter value converted to the specified class type.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * @throws ParseException<a name="line.242"></a>
-<span class="sourceLineNo">243</span> */<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public <T> T getAll(String name, Type type, Type...args) throws ParseException {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return (T)parseAll(name, beanSession.getClassMeta(type, args));<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> /**<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * Returns <jk>true</jk> if the request contains any of the specified query parameters.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> *<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * @param params The list of parameters to check for.<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @return <jk>true</jk> if the request contains any of the specified query parameters.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> */<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public boolean containsAnyKeys(String...params) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> for (String p : params)<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (containsKey(p))<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return true;<a name="line.257"></a>
-<span class="sourceLineNo">258</span> return false;<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> /* Workhorse method */<a name="line.261"></a>
-<span class="sourceLineNo">262</span> private <T> T parse(String name, T def, ClassMeta<T> cm) throws ParseException {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> String val = getFirst(name);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> if (val == null)<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return def;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> return parseValue(val, cm);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> /* Workhorse method */<a name="line.269"></a>
-<span class="sourceLineNo">270</span> private <T> T parse(String name, ClassMeta<T> cm) throws ParseException {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> String val = getFirst(name);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (cm.isPrimitive() && (val == null || val.isEmpty()))<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return cm.getPrimitiveDefault();<a name="line.273"></a>
-<span class="sourceLineNo">274</span> return parseValue(val, cm);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> /* Workhorse method */<a name="line.277"></a>
-<span class="sourceLineNo">278</span> @SuppressWarnings("rawtypes")<a name="line.278"></a>
-<span class="sourceLineNo">279</span> private <T> T parseAll(String name, ClassMeta<T> cm) throws ParseException {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> String[] p = get(name);<a name="line.280"></a>
-<span class="sourceLineNo">281</span> if (p == null)<a name="line.281"></a>
-<span class="sourceLineNo">282</span> return null;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (cm.isArray()) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> List c = new ArrayList();<a name="line.284"></a>
-<span class="sourceLineNo">285</span> for (int i = 0; i < p.length; i++)<a name="line.285"></a>
-<span class="sourceLineNo">286</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return (T)ArrayUtils.toArray(c, cm.getElementType().getInnerClass());<a name="line.287"></a>
-<span class="sourceLineNo">288</span> } else if (cm.isCollection()) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> try {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Collection c = (Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new ObjectList());<a name="line.290"></a>
-<span class="sourceLineNo">291</span> for (int i = 0; i < p.length; i++)<a name="line.291"></a>
-<span class="sourceLineNo">292</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return (T)c;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> } catch (ParseException e) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> throw e;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> } catch (Exception e) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // Typically an instantiation exception.<a name="line.297"></a>
-<span class="sourceLineNo">298</span> throw new ParseException(e);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> }<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> throw new ParseException("Invalid call to getQueryParameters(String, ClassMeta). Class type must be a Collection or array.");<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> private <T> T parseValue(String val, ClassMeta<T> c) throws ParseException {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> return parser.parsePart(val, c);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>}<a name="line.307"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.json.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.parser.*;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.urlencoding.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>/**<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * Represents the query parameters in an HTTP request.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> */<a name="line.28"></a>
+<span class="sourceLineNo">029</span>@SuppressWarnings("unchecked")<a name="line.29"></a>
+<span class="sourceLineNo">030</span>public final class RequestQuery extends LinkedHashMap<String,String[]> {<a name="line.30"></a>
+<span class="sourceLineNo">031</span> private static final long serialVersionUID = 1L;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span> private UrlEncodingParser parser;<a name="line.33"></a>
+<span class="sourceLineNo">034</span> private BeanSession beanSession;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span> RequestQuery setParser(UrlEncodingParser parser) {<a name="line.36"></a>
+<span class="sourceLineNo">037</span> this.parser = parser;<a name="line.37"></a>
+<span class="sourceLineNo">038</span> return this;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> }<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> RequestQuery setBeanSession(BeanSession beanSession) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> this.beanSession = beanSession;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> return this;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> }<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span> /**<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Adds default entries to these query parameters.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * This includes the default queries defined on the servlet and method levels.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> *<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * @param defaultEntries The default entries. Can be <jk>null</jk>.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @return This object (for method chaining).<a name="line.52"></a>
+<span class="sourceLineNo">053</span> */<a name="line.53"></a>
+<span class="sourceLineNo">054</span> public RequestQuery addDefault(Map<String,String> defaultEntries) {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> if (defaultEntries != null) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> for (Map.Entry<String,String> e : defaultEntries.entrySet()) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> String key = e.getKey(), value = e.getValue();<a name="line.57"></a>
+<span class="sourceLineNo">058</span> String[] v = get(key);<a name="line.58"></a>
+<span class="sourceLineNo">059</span> if (v == null || v.length == 0 || StringUtils.isEmpty(v[0]))<a name="line.59"></a>
+<span class="sourceLineNo">060</span> put(key, new String[]{value});<a name="line.60"></a>
+<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span> return this;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Sets a request query parameter value.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> *<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @param name The parameter name.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * @param value The parameter value.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> */<a name="line.71"></a>
+<span class="sourceLineNo">072</span> public void put(String name, Object value) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> put(name, new String[]{StringUtils.toString(value)});<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Returns a query parameter value.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <p><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * Same as {@link HttpServletRequest#getParameter(String)} except only looks in the URL string, not parameters from URL-Encoded FORM posts.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <p><a name="line.80"></a>
+<span class="sourceLineNo">081</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.81"></a>
+<span class="sourceLineNo">082</span> *<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * @param name The URL parameter name.<a name="line.83"></a>
+<span class="sourceLineNo">084</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.84"></a>
+<span class="sourceLineNo">085</span> */<a name="line.85"></a>
+<span class="sourceLineNo">086</span> public String getFirst(String name) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> String[] v = get(name);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> if (v == null || v.length == 0)<a name="line.88"></a>
+<span class="sourceLineNo">089</span> return null;<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> // Fix for behavior difference between Tomcat and WAS.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // getParameter("foo") on "&foo" in Tomcat returns "".<a name="line.92"></a>
+<span class="sourceLineNo">093</span> // getParameter("foo") on "&foo" in WAS returns null.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> if (v.length == 1 && v[0] == null)<a name="line.94"></a>
+<span class="sourceLineNo">095</span> return "";<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span> return v[0];<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * Same as {@link #getFirst(String)} but returns the specified default value if the query parameter was not specified.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> *<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * @param name The URL parameter name.<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @param def The default value.<a name="line.104"></a>
+<span class="sourceLineNo">105</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.105"></a>
+<span class="sourceLineNo">106</span> */<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public String getFirst(String name, String def) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> String s = getFirst(name);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> return StringUtils.isEmpty(s) ? def : s;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> /**<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * Returns the specified query parameter value converted to a POJO.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * <p><a name="line.114"></a>
+<span class="sourceLineNo">115</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.115"></a>
+<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <h5 class='section'>Examples:</h5><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <p class='bcode'><a name="line.118"></a>
+<span class="sourceLineNo">119</span> * <jc>// Parse into an integer.</jc><a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <jk>int</jk> myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>.<jk>class</jk>);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> *<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * <jc>// Parse into an int array.</jc><a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <jk>int</jk>[] myparam = req.getQueryParameter(<js>"myparam"</js>, <jk>int</jk>[].<jk>class</jk>);<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span> * <jc>// Parse into a bean.</jc><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * MyBean myparam = req.getQueryParameter(<js>"myparam"</js>, MyBean.<jk>class</jk>);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> *<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * <jc>// Parse into a linked-list of objects.</jc><a name="line.128"></a>
+<span class="sourceLineNo">129</span> * List myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> *<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <jc>// Parse into a map of object keys/values.</jc><a name="line.131"></a>
+<span class="sourceLineNo">132</span> * Map myparam = req.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * </p><a name="line.133"></a>
+<span class="sourceLineNo">134</span> *<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * @param name The parameter name.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * @param type The class type to convert the parameter value to.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * @param <T> The class type to convert the parameter value to.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * @return The parameter value converted to the specified class type.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @throws ParseException<a name="line.139"></a>
+<span class="sourceLineNo">140</span> */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public <T> T get(String name, Class<T> type) throws ParseException {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> return get(name, beanSession.getClassMeta(type));<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> /**<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * Same as {@link #get(String, Class)} except returns a default value if not found.<a name="line.146"></a>
+<span class="sourceLineNo">147</span> *<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @param name The parameter name.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @param def The default value if the parameter was not specified or is <jk>null</jk>.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @param type The class type to convert the parameter value to.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @param <T> The class type to convert the parameter value to.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * @return The parameter value converted to the specified class type.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * @throws ParseException<a name="line.153"></a>
+<span class="sourceLineNo">154</span> */<a name="line.154"></a>
+<span class="sourceLineNo">155</span> public <T> T get(String name, T def, Class<T> type) throws ParseException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> return get(name, def, beanSession.getClassMeta(type));<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * Returns the specified query parameter value converted to a POJO.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * <p><a name="line.161"></a>
+<span class="sourceLineNo">162</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.162"></a>
+<span class="sourceLineNo">163</span> * <p><a name="line.163"></a>
+<span class="sourceLineNo">164</span> * Use this method if you want to parse into a parameterized <code>Map</code>/<code>Collection</code> object.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * <p><a name="line.165"></a>
+<span class="sourceLineNo">166</span> * <h5 class='section'>Examples:</h5><a name="line.166"></a>
+<span class="sourceLineNo">167</span> * <p class='bcode'><a name="line.167"></a>
+<span class="sourceLineNo">168</span> * <jc>// Parse into a linked-list of strings.</jc><a name="line.168"></a>
+<span class="sourceLineNo">169</span> * Listt&lt;String&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> *<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * <jc>// Parse into a linked-list of linked-lists of strings.</jc><a name="line.171"></a>
+<span class="sourceLineNo">172</span> * Listt&lt;List&lt;String&gt;&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> *<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * <jc>// Parse into a map of string keys/values.</jc><a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Map&lt;String,String&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> *<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * <jc>// Parse into a map containing string keys and values of lists containing beans.</jc><a name="line.177"></a>
+<span class="sourceLineNo">178</span> * Map&lt;String,List&lt;MyBean&gt;&gt; myparam = req.getQueryParameter(<js>"myparam"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * </p><a name="line.179"></a>
+<span class="sourceLineNo">180</span> *<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @param name The parameter name.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * @param type The type of object to create.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * <br>Ignored if the main type is not a map or collection.<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * @param <T> The class type to convert the parameter value to.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * @return The parameter value converted to the specified class type.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * @throws ParseException<a name="line.189"></a>
+<span class="sourceLineNo">190</span> */<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public <T> T get(String name, Type type, Type...args) throws ParseException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return (T)parse(name, beanSession.getClassMeta(type, args));<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> * Same as {@link #get(String, Class)} except returns a default value if not found.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> *<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @param name The parameter name.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @param type The type of object to create.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * <br>Ignored if the main type is not a map or collection.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * @param def The default value if the parameter was not specified or is <jk>null</jk>.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * @param <T> The class type to convert the parameter value to.<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * @return The parameter value converted to the specified class type.<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * @throws ParseException<a name="line.207"></a>
+<span class="sourceLineNo">208</span> */<a name="line.208"></a>
+<span class="sourceLineNo">209</span> public <T> T get(String name, Object def, Type type, Type...args) throws ParseException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> return (T)parse(name, def, beanSession.getClassMeta(type, args));<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> /**<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * Same as {@link #get(String, Class)} except for use on multi-part parameters<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * (e.g. <js>"&amp;key=1&amp;key=2&amp;key=3"</js> instead of <js>"&amp;key=(1,2,3)"</js>).<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * <p><a name="line.216"></a>
+<span class="sourceLineNo">217</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> *<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * @param name The query parameter name.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * @param c The class type to convert the parameter value to.<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * @param <T> The class type to convert the parameter value to.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * @return The query parameter value converted to the specified class type.<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * @throws ParseException<a name="line.223"></a>
+<span class="sourceLineNo">224</span> */<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public <T> T getAll(String name, Class<T> c) throws ParseException {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return getAll(name, beanSession.getClassMeta(c));<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> /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * Same as {@link #get(String, Type, Type...)} except for use on multi-part parameters<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * (e.g. <js>"&amp;key=1&amp;key=2&amp;key=3"</js> instead of <js>"&amp;key=(1,2,3)"</js>).<a name="line.231"></a>
+<span class="sourceLineNo">232</span> * <p><a name="line.232"></a>
+<span class="sourceLineNo">233</span> * This method must only be called when parsing into classes of type Collection or array.<a name="line.233"></a>
+<span class="sourceLineNo">234</span> *<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @param name The query parameter name.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * @param type The type of object to create.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * <br>Ignored if the main type is not a map or collection.<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * @param <T> The class type to convert the parameter value to.<a name="line.241"></a>
+<span class="sourceLineNo">242</span> * @return The query parameter value converted to the specified class type.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * @throws ParseException<a name="line.243"></a>
+<span class="sourceLineNo">244</span> */<a name="line.244"></a>
+<span class="sourceLineNo">245</span> public <T> T getAll(String name, Type type, Type...args) throws ParseException {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return (T)parseAll(name, beanSession.getClassMeta(type, args));<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> /**<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * Returns <jk>true</jk> if the request contains any of the specified query parameters.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> *<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * @param params The list of parameters to check for.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * @return <jk>true</jk> if the request contains any of the specified query parameters.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> */<a name="line.254"></a>
+<span class="sourceLineNo">255</span> public boolean containsAnyKeys(String...params) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> for (String p : params)<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (containsKey(p))<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return true;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return false;<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> /* Workhorse method */<a name="line.262"></a>
+<span class="sourceLineNo">263</span> private <T> T parse(String name, T def, ClassMeta<T> cm) throws ParseException {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> String val = getFirst(name);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (val == null)<a name="line.265"></a>
+<span class="sourceLineNo">266</span> return def;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return parseValue(val, cm);<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> /* Workhorse method */<a name="line.270"></a>
+<span class="sourceLineNo">271</span> private <T> T parse(String name, ClassMeta<T> cm) throws ParseException {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> String val = getFirst(name);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> if (cm.isPrimitive() && (val == null || val.isEmpty()))<a name="line.273"></a>
+<span class="sourceLineNo">274</span> return cm.getPrimitiveDefault();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return parseValue(val, cm);<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> /* Workhorse method */<a name="line.278"></a>
+<span class="sourceLineNo">279</span> @SuppressWarnings("rawtypes")<a name="line.279"></a>
+<span class="sourceLineNo">280</span> private <T> T parseAll(String name, ClassMeta<T> cm) throws ParseException {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> String[] p = get(name);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (p == null)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return null;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> if (cm.isArray()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> List c = new ArrayList();<a name="line.285"></a>
+<span class="sourceLineNo">286</span> for (int i = 0; i < p.length; i++)<a name="line.286"></a>
+<span class="sourceLineNo">287</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return (T)ArrayUtils.toArray(c, cm.getElementType().getInnerClass());<a name="line.288"></a>
+<span class="sourceLineNo">289</span> } else if (cm.isCollection()) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> try {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> Collection c = (Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new ObjectList());<a name="line.291"></a>
+<span class="sourceLineNo">292</span> for (int i = 0; i < p.length; i++)<a name="line.292"></a>
+<span class="sourceLineNo">293</span> c.add(parseValue(p[i], cm.getElementType()));<a name="line.293"></a>
+<span class="sourceLineNo">294</span> return (T)c;<a name="line.294"></a>
+<span class="sourceLineNo">295</span> } catch (ParseException e) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> throw e;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> } catch (Exception e) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> // Typically an instantiation exception.<a name="line.298"></a>
+<span class="sourceLineNo">299</span> throw new ParseException(e);<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> throw new ParseException("Invalid call to getQueryParameters(String, ClassMeta). Class type must be a Collection or array.");<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> private <T> T parseValue(String val, ClassMeta<T> c) throws ParseException {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> return parser.parsePart(val, c);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> /**<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * Converts the query parameters to a readable string.<a name="line.310"></a>
+<span class="sourceLineNo">311</span> *<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * @param sorted Sort the query parameters by name.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @return A JSON string containing the contents of the query parameters.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public String toString(boolean sorted) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> Map<String,Object> m = (sorted ? new TreeMap<String,Object>() : new LinkedHashMap<String,Object>());<a name="line.316"></a>
+<span class="sourceLineNo">317</span> for (Map.Entry<String,String[]> e : this.entrySet()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> String[] v = e.getValue();<a name="line.318"></a>
+<span class="sourceLineNo">319</span> m.put(e.getKey(), v.length == 1 ? v[0] : v);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> return JsonSerializer.DEFAULT_LAX.toString(m);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> @Override /* Object */<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public String toString() {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> return toString(false);<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>
[19/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html b/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
index 18e60d9..9f6adb7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
@@ -435,13 +435,13 @@
<span class="sourceLineNo">427</span> */<a name="line.427"></a>
<span class="sourceLineNo">428</span> private String findPropertyName(Field f, Set<String> fixedBeanProps) {<a name="line.428"></a>
<span class="sourceLineNo">429</span> BeanProperty bp = f.getAnnotation(BeanProperty.class);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (bp != null && ! bp.name().equals("")) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> String name = bp.name();<a name="line.431"></a>
+<span class="sourceLineNo">430</span> String name = bpName(bp);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> if (! name.isEmpty()) {<a name="line.431"></a>
<span class="sourceLineNo">432</span> if (fixedBeanProps.isEmpty() || fixedBeanProps.contains(name))<a name="line.432"></a>
<span class="sourceLineNo">433</span> return name;<a name="line.433"></a>
<span class="sourceLineNo">434</span> throw new BeanRuntimeException(classMeta.getInnerClass(), "Method property ''{0}'' identified in @BeanProperty, but missing from @Bean", name);<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span> String name = propertyNamer.getPropertyName(f.getName());<a name="line.436"></a>
+<span class="sourceLineNo">436</span> name = propertyNamer.getPropertyName(f.getName());<a name="line.436"></a>
<span class="sourceLineNo">437</span> if (fixedBeanProps.isEmpty() || fixedBeanProps.contains(name))<a name="line.437"></a>
<span class="sourceLineNo">438</span> return name;<a name="line.438"></a>
<span class="sourceLineNo">439</span> return null;<a name="line.439"></a>
@@ -566,7 +566,7 @@
<span class="sourceLineNo">558</span> Class<?> rt = m.getReturnType();<a name="line.558"></a>
<span class="sourceLineNo">559</span> boolean isGetter = false, isSetter = false;<a name="line.559"></a>
<span class="sourceLineNo">560</span> BeanProperty bp = getMethodAnnotation(BeanProperty.class, m);<a name="line.560"></a>
-<span class="sourceLineNo">561</span> String bpName = bp == null ? "" : bp.name();<a name="line.561"></a>
+<span class="sourceLineNo">561</span> String bpName = bpName(bp);<a name="line.561"></a>
<span class="sourceLineNo">562</span> if (pt.length == 0) {<a name="line.562"></a>
<span class="sourceLineNo">563</span> if (n.startsWith("get") && (! rt.equals(Void.TYPE))) {<a name="line.563"></a>
<span class="sourceLineNo">564</span> isGetter = true;<a name="line.564"></a>
@@ -772,16 +772,24 @@
<span class="sourceLineNo">764</span> }<a name="line.764"></a>
<span class="sourceLineNo">765</span> }<a name="line.765"></a>
<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span> @Override /* Object */<a name="line.767"></a>
-<span class="sourceLineNo">768</span> public String toString() {<a name="line.768"></a>
-<span class="sourceLineNo">769</span> StringBuilder sb = new StringBuilder(c.getName());<a name="line.769"></a>
-<span class="sourceLineNo">770</span> sb.append(" {\n");<a name="line.770"></a>
-<span class="sourceLineNo">771</span> for (BeanPropertyMeta pm : this.properties.values())<a name="line.771"></a>
-<span class="sourceLineNo">772</span> sb.append('\t').append(pm.toString()).append(",\n");<a name="line.772"></a>
-<span class="sourceLineNo">773</span> sb.append('}');<a name="line.773"></a>
-<span class="sourceLineNo">774</span> return sb.toString();<a name="line.774"></a>
-<span class="sourceLineNo">775</span> }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>}<a name="line.776"></a>
+<span class="sourceLineNo">767</span> private static String bpName(BeanProperty bp) {<a name="line.767"></a>
+<span class="sourceLineNo">768</span> if (bp == null)<a name="line.768"></a>
+<span class="sourceLineNo">769</span> return "";<a name="line.769"></a>
+<span class="sourceLineNo">770</span> if (! bp.name().isEmpty())<a name="line.770"></a>
+<span class="sourceLineNo">771</span> return bp.name();<a name="line.771"></a>
+<span class="sourceLineNo">772</span> return bp.value();<a name="line.772"></a>
+<span class="sourceLineNo">773</span> }<a name="line.773"></a>
+<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">775</span> @Override /* Object */<a name="line.775"></a>
+<span class="sourceLineNo">776</span> public String toString() {<a name="line.776"></a>
+<span class="sourceLineNo">777</span> StringBuilder sb = new StringBuilder(c.getName());<a name="line.777"></a>
+<span class="sourceLineNo">778</span> sb.append(" {\n");<a name="line.778"></a>
+<span class="sourceLineNo">779</span> for (BeanPropertyMeta pm : this.properties.values())<a name="line.779"></a>
+<span class="sourceLineNo">780</span> sb.append('\t').append(pm.toString()).append(",\n");<a name="line.780"></a>
+<span class="sourceLineNo">781</span> sb.append('}');<a name="line.781"></a>
+<span class="sourceLineNo">782</span> return sb.toString();<a name="line.782"></a>
+<span class="sourceLineNo">783</span> }<a name="line.783"></a>
+<span class="sourceLineNo">784</span>}<a name="line.784"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html
index f94cc33..ffd5080 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html
@@ -90,7 +90,16 @@
<span class="sourceLineNo">082</span> public int compareTo(BeanPropertyValue o) {<a name="line.82"></a>
<span class="sourceLineNo">083</span> return name.compareTo(o.name);<a name="line.83"></a>
<span class="sourceLineNo">084</span> }<a name="line.84"></a>
-<span class="sourceLineNo">085</span>}<a name="line.85"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> @Override /* Object */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public String toString() {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> return new ObjectMap()<a name="line.88"></a>
+<span class="sourceLineNo">089</span> .append("name", name)<a name="line.89"></a>
+<span class="sourceLineNo">090</span> .append("value", value)<a name="line.90"></a>
+<span class="sourceLineNo">091</span> .append("type", pMeta.getClassMeta().getInnerClass().getSimpleName())<a name="line.91"></a>
+<span class="sourceLineNo">092</span> .toString();<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>}<a name="line.94"></a>
[32/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
Update javadocs
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/19e9b7df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/19e9b7df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/19e9b7df
Branch: refs/heads/asf-site
Commit: 19e9b7df61531172fbeafe626c48494a80ec6839
Parents: 27fc70c
Author: JamesBognar <ja...@apache.org>
Authored: Thu Jun 1 19:55:06 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Thu Jun 1 19:55:06 2017 -0400
----------------------------------------------------------------------
content/site/apidocs/allclasses-frame.html | 4 +-
content/site/apidocs/allclasses-noframe.html | 4 +-
content/site/apidocs/constant-values.html | 26 +-
content/site/apidocs/index-all.html | 118 +-
.../apidocs/org/apache/juneau/BeanContext.html | 24 +-
.../apidocs/org/apache/juneau/BeanMeta.html | 2 +-
.../org/apache/juneau/BeanPropertyValue.html | 23 +-
.../apidocs/org/apache/juneau/ClassMeta.html | 156 +-
.../org/apache/juneau/PropertyNamer.html | 8 +-
.../apache/juneau/PropertyNamerDashedLC.html | 295 --
.../org/apache/juneau/PropertyNamerDefault.html | 8 +-
.../org/apache/juneau/PropertyStore.html | 4 +-
.../org/apache/juneau/annotation/Bean.html | 2 +-
.../apache/juneau/annotation/BeanProperty.html | 41 +-
.../org/apache/juneau/dto/atom/Category.html | 6 +-
.../org/apache/juneau/dto/atom/Common.html | 4 +-
.../org/apache/juneau/dto/atom/CommonEntry.html | 18 +-
.../org/apache/juneau/dto/atom/Content.html | 2 +-
.../org/apache/juneau/dto/atom/Entry.html | 12 +-
.../org/apache/juneau/dto/atom/Feed.html | 12 +-
.../org/apache/juneau/dto/atom/Generator.html | 8 +-
.../org/apache/juneau/dto/atom/Icon.html | 4 +-
.../apidocs/org/apache/juneau/dto/atom/Id.html | 2 +-
.../org/apache/juneau/dto/atom/Link.html | 12 +-
.../org/apache/juneau/dto/atom/Logo.html | 4 +-
.../org/apache/juneau/dto/atom/Person.html | 8 +-
.../org/apache/juneau/dto/atom/Source.html | 10 +-
.../org/apache/juneau/dto/atom/Text.html | 4 +-
.../org/apache/juneau/dto/cognos/DataSet.html | 8 +-
.../apache/juneau/dto/html5/HtmlElement.html | 4 +-
.../juneau/dto/html5/HtmlElementContainer.html | 2 +-
.../juneau/dto/html5/HtmlElementMixed.html | 2 +-
.../juneau/dto/html5/HtmlElementRawText.html | 4 +-
.../juneau/dto/html5/HtmlElementText.html | 4 +-
.../apache/juneau/dto/jsonschema/Schema.html | 8 +-
.../org/apache/juneau/http/package-summary.html | 9 +
.../org/apache/juneau/internal/ArrayUtils.html | 76 +-
.../org/apache/juneau/internal/IOUtils.html | 88 +-
.../org/apache/juneau/internal/ObjectUtils.html | 41 +-
.../org/apache/juneau/json/package-summary.html | 4 +-
.../org/apache/juneau/package-frame.html | 3 +-
.../org/apache/juneau/package-summary.html | 20 +-
.../apidocs/org/apache/juneau/package-tree.html | 3 +-
.../org/apache/juneau/remoteable/FormData.html | 197 +-
.../apache/juneau/remoteable/FormDataIfNE.html | 56 +-
.../org/apache/juneau/remoteable/Header.html | 186 +-
.../apache/juneau/remoteable/HeaderIfNE.html | 56 +-
.../org/apache/juneau/remoteable/Path.html | 165 +-
.../org/apache/juneau/remoteable/Query.html | 198 +-
.../org/apache/juneau/remoteable/QueryIfNE.html | 59 +-
.../juneau/remoteable/RemoteMethodArg.html | 11 +-
.../juneau/remoteable/RemoteableMethodMeta.html | 4 +-
.../apache/juneau/remoteable/RequestBean.html | 70 +-
.../org/apache/juneau/rest/RequestFormData.html | 67 +-
.../org/apache/juneau/rest/RequestHeaders.html | 165 +-
.../org/apache/juneau/rest/RequestQuery.html | 71 +-
.../org/apache/juneau/rest/client/RestCall.html | 210 +-
.../apache/juneau/rest/client/RestClient.html | 16 +-
.../juneau/rest/client/RestClientBuilder.html | 410 +-
.../juneau/serializer/PartSerializer.html | 7 +-
.../juneau/uon/UonSerializer.Encoding.html | 2 +-
.../juneau/uon/UonSerializer.Readable.html | 2 +-
.../org/apache/juneau/uon/UonSerializer.html | 17 +-
.../apache/juneau/uon/UonSerializerContext.html | 72 +-
.../apache/juneau/uon/UonSerializerSession.html | 30 +-
.../org/apache/juneau/uon/UonWriter.html | 54 +-
.../org/apache/juneau/uon/package-summary.html | 4 +-
.../UrlEncodingSerializer.Expanded.html | 16 +-
.../UrlEncodingSerializer.Readable.html | 16 +-
.../urlencoding/UrlEncodingSerializer.html | 42 +-
.../UrlEncodingSerializerBuilder.html | 4 +-
.../UrlEncodingSerializerContext.html | 77 +-
.../UrlEncodingSerializerSession.html | 32 +-
.../juneau/urlencoding/package-frame.html | 1 +
.../juneau/urlencoding/package-summary.html | 16 +-
.../apache/juneau/urlencoding/package-tree.html | 1 +
.../org/apache/juneau/xml/package-summary.html | 4 +-
content/site/apidocs/overview-summary.html | 21 +-
content/site/apidocs/overview-tree.html | 4 +-
.../src-html/org/apache/juneau/BeanContext.html | 1001 ++---
.../src-html/org/apache/juneau/BeanMeta.html | 36 +-
.../org/apache/juneau/BeanPropertyValue.html | 11 +-
.../src-html/org/apache/juneau/ClassMeta.html | 3191 ++++++++-------
.../org/apache/juneau/PropertyNamer.html | 2 +-
.../apache/juneau/PropertyNamerDashedLC.html | 136 -
.../org/apache/juneau/annotation/Bean.html | 2 +-
.../apache/juneau/annotation/BeanProperty.html | 225 +-
.../org/apache/juneau/dto/atom/Category.html | 6 +-
.../org/apache/juneau/dto/atom/Common.html | 4 +-
.../org/apache/juneau/dto/atom/CommonEntry.html | 18 +-
.../org/apache/juneau/dto/atom/Content.html | 2 +-
.../org/apache/juneau/dto/atom/Entry.html | 12 +-
.../org/apache/juneau/dto/atom/Feed.html | 12 +-
.../org/apache/juneau/dto/atom/Generator.html | 8 +-
.../org/apache/juneau/dto/atom/Icon.html | 4 +-
.../src-html/org/apache/juneau/dto/atom/Id.html | 2 +-
.../org/apache/juneau/dto/atom/Link.html | 12 +-
.../org/apache/juneau/dto/atom/Logo.html | 4 +-
.../org/apache/juneau/dto/atom/Person.html | 8 +-
.../org/apache/juneau/dto/atom/Source.html | 10 +-
.../org/apache/juneau/dto/atom/Text.html | 4 +-
.../apache/juneau/dto/cognos/DataSet.Row.html | 8 +-
.../org/apache/juneau/dto/cognos/DataSet.html | 8 +-
.../apache/juneau/dto/html5/HtmlElement.html | 4 +-
.../juneau/dto/html5/HtmlElementContainer.html | 2 +-
.../juneau/dto/html5/HtmlElementMixed.html | 2 +-
.../juneau/dto/html5/HtmlElementRawText.html | 4 +-
.../juneau/dto/html5/HtmlElementText.html | 4 +-
.../Schema.BooleanOrSchemaArraySwap.html | 8 +-
.../jsonschema/Schema.BooleanOrSchemaSwap.html | 8 +-
.../Schema.JsonTypeOrJsonTypeArraySwap.html | 8 +-
.../Schema.SchemaOrSchemaArraySwap.html | 8 +-
.../apache/juneau/dto/jsonschema/Schema.html | 8 +-
.../org/apache/juneau/internal/ArrayUtils.html | 265 +-
.../org/apache/juneau/internal/IOUtils.html | 698 ++--
.../org/apache/juneau/internal/ObjectUtils.html | 73 +-
.../org/apache/juneau/remoteable/FormData.html | 266 +-
.../apache/juneau/remoteable/FormDataIfNE.html | 32 +-
.../org/apache/juneau/remoteable/Header.html | 249 +-
.../apache/juneau/remoteable/HeaderIfNE.html | 32 +-
.../org/apache/juneau/remoteable/Path.html | 234 +-
.../org/apache/juneau/remoteable/Query.html | 269 +-
.../org/apache/juneau/remoteable/QueryIfNE.html | 41 +-
.../juneau/remoteable/RemoteMethodArg.html | 37 +-
.../juneau/remoteable/RemoteableMethodMeta.html | 32 +-
.../apache/juneau/remoteable/RequestBean.html | 120 +-
.../org/apache/juneau/rest/RequestFormData.html | 561 +--
.../org/apache/juneau/rest/RequestHeaders.html | 1343 +++---
.../org/apache/juneau/rest/RequestQuery.html | 593 +--
.../org/apache/juneau/rest/client/RestCall.html | 3802 ++++++++---------
.../apache/juneau/rest/client/RestClient.html | 437 +-
.../juneau/rest/client/RestClientBuilder.html | 3865 +++++++++---------
.../juneau/serializer/PartSerializer.html | 39 +-
.../juneau/uon/UonSerializer.Encoding.html | 357 +-
.../juneau/uon/UonSerializer.Readable.html | 357 +-
.../org/apache/juneau/uon/UonSerializer.html | 357 +-
.../apache/juneau/uon/UonSerializerContext.html | 92 +-
.../apache/juneau/uon/UonSerializerSession.html | 127 +-
.../org/apache/juneau/uon/UonWriter.html | 395 +-
.../UrlEncodingSerializer.Expanded.html | 609 +--
.../UrlEncodingSerializer.Readable.html | 609 +--
.../urlencoding/UrlEncodingSerializer.html | 609 +--
.../UrlEncodingSerializerBuilder.html | 6 +-
.../UrlEncodingSerializerContext.html | 77 +-
.../UrlEncodingSerializerSession.html | 88 +-
145 files changed, 13152 insertions(+), 11761 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-frame.html b/content/site/apidocs/allclasses-frame.html
index 3386fdb..6fb9b8d 100644
--- a/content/site/apidocs/allclasses-frame.html
+++ b/content/site/apidocs/allclasses-frame.html
@@ -460,8 +460,9 @@
<li><a href="org/apache/juneau/rest/annotation/Properties.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Properties</a></li>
<li><a href="org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation" target="classFrame">Property</a></li>
<li><a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau" target="classFrame"><span class="interfaceName">PropertyNamer</span></a></li>
-<li><a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDashedLC</a></li>
<li><a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDefault</a></li>
+<li><a href="org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDLC</a></li>
+<li><a href="org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerULC</a></li>
<li><a href="org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau" target="classFrame">PropertyStore</a></li>
<li><a href="org/apache/juneau/http/ProxyAuthenticate.html" title="class in org.apache.juneau.http" target="classFrame">ProxyAuthenticate</a></li>
<li><a href="org/apache/juneau/http/ProxyAuthorization.html" title="class in org.apache.juneau.http" target="classFrame">ProxyAuthorization</a></li>
@@ -702,6 +703,7 @@
<li><a href="org/apache/juneau/urlencoding/UrlEncodingParserSession.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingParserSession</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer.Expanded</a></li>
+<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer.PlainText</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer.Readable</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializerBuilder</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializerContext</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/allclasses-noframe.html b/content/site/apidocs/allclasses-noframe.html
index b335673..055881a 100644
--- a/content/site/apidocs/allclasses-noframe.html
+++ b/content/site/apidocs/allclasses-noframe.html
@@ -460,8 +460,9 @@
<li><a href="org/apache/juneau/rest/annotation/Properties.html" title="annotation in org.apache.juneau.rest.annotation">Properties</a></li>
<li><a href="org/apache/juneau/rest/annotation/Property.html" title="annotation in org.apache.juneau.rest.annotation">Property</a></li>
<li><a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><span class="interfaceName">PropertyNamer</span></a></li>
-<li><a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau">PropertyNamerDashedLC</a></li>
<li><a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a></li>
+<li><a href="org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau">PropertyNamerDLC</a></li>
+<li><a href="org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau">PropertyNamerULC</a></li>
<li><a href="org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a></li>
<li><a href="org/apache/juneau/http/ProxyAuthenticate.html" title="class in org.apache.juneau.http">ProxyAuthenticate</a></li>
<li><a href="org/apache/juneau/http/ProxyAuthorization.html" title="class in org.apache.juneau.http">ProxyAuthorization</a></li>
@@ -702,6 +703,7 @@
<li><a href="org/apache/juneau/urlencoding/UrlEncodingParserSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingParserSession</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a></li>
+<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a></li>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/constant-values.html b/content/site/apidocs/constant-values.html
index 454f4ff..a145c95 100644
--- a/content/site/apidocs/constant-values.html
+++ b/content/site/apidocs/constant-values.html
@@ -1669,6 +1669,13 @@
<td><code><a href="org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars">UON_encodeChars</a></code></td>
<td class="colLast"><code>"UonSerializer.encodeChars"</code></td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.juneau.uon.UonSerializerContext.UON_paramFormat">
+<!-- -->
+</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat">UON_paramFormat</a></code></td>
+<td class="colLast"><code>"UonSerializer.paramFormat"</code></td>
+</tr>
</tbody>
</table>
</li>
@@ -1693,25 +1700,6 @@
</tbody>
</table>
</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a></span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="org.apache.juneau.urlencoding.UrlEncodingSerializerContext.URLENC_paramFormat">
-<!-- -->
-</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td><code><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat">URLENC_paramFormat</a></code></td>
-<td class="colLast"><code>"UrlEncodingSerializer.paramFormat"</code></td>
-</tr>
-</tbody>
-</table>
-</li>
</ul>
<ul class="blockList">
<li class="blockList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html
index d9d4e35..bdec443 100644
--- a/content/site/apidocs/index-all.html
+++ b/content/site/apidocs/index-all.html
@@ -1178,7 +1178,7 @@
<dd>
<div class="block">Appends a numeric value to the output.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonWriter.html#appendObject-java.lang.Object-boolean-boolean-">appendObject(Object, boolean, boolean)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonWriter.html#appendObject-java.lang.Object-boolean-">appendObject(Object, boolean)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></dt>
<dd>
<div class="block">Serializes the specified simple object as a UON string value.</div>
</dd>
@@ -5614,6 +5614,10 @@
<dd>
<div class="block">Default N-Triple serializer, all default settings.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_PLAINTEXT">DEFAULT_PLAINTEXT</a></span> - Static variable in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></dt>
+<dd>
+<div class="block">Reusable instance of <a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer.PlainText</code></a>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/json/JsonSerializer.html#DEFAULT_READABLE">DEFAULT_READABLE</a></span> - Static variable in class org.apache.juneau.json.<a href="org/apache/juneau/json/JsonSerializer.html" title="class in org.apache.juneau.json">JsonSerializer</a></dt>
<dd>
<div class="block">Default serializer, all default settings.</div>
@@ -10053,6 +10057,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html#getOverrideProperties--">getOverrideProperties()</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html#getOverrideProperties--">getOverrideProperties()</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html#getOverrideProperties--">getOverrideProperties()</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlDocSerializer.Ns.html#getOverrideProperties--">getOverrideProperties()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlDocSerializer.Ns.html" title="class in org.apache.juneau.xml">XmlDocSerializer.Ns</a></dt>
@@ -10375,10 +10381,12 @@
<dd>
<div class="block">Convert the specified default property name to some other value.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerDashedLC.html#getPropertyName-java.lang.String-">getPropertyName(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau">PropertyNamerDashedLC</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerDefault.html#getPropertyName-java.lang.String-">getPropertyName(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerDLC.html#getPropertyName-java.lang.String-">getPropertyName(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau">PropertyNamerDLC</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerULC.html#getPropertyName-java.lang.String-">getPropertyName(String)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau">PropertyNamerULC</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/transform/BeanFilter.html#getPropertyNamer--">getPropertyNamer()</a></span> - Method in class org.apache.juneau.transform.<a href="org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform">BeanFilter</a></dt>
<dd>
<div class="block">Returns the <a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><code>PropertyNamer</code></a> associated with the bean to tailor the names of bean properties.</div>
@@ -13721,6 +13729,10 @@
<dd>
<div class="block">Returns <jk>true</jk> if this class is an array.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/ArrayUtils.html#isArray-java.lang.Object-">isArray(Object)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal">ArrayUtils</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if the specified object is an array.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html#isAsPlainText--">isAsPlainText()</a></span> - Method in class org.apache.juneau.html.<a href="org/apache/juneau/html/HtmlBeanPropertyMeta.html" title="class in org.apache.juneau.html">HtmlBeanPropertyMeta</a></dt>
<dd>
<div class="block">Returns whether this bean property should be serialized as plain text instead of HTML.</div>
@@ -13856,6 +13868,10 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ini/Section.html#isEmpty--">isEmpty()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/Section.html" title="class in org.apache.juneau.ini">Section</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/ObjectUtils.html#isEmpty-java.lang.Object-">isEmpty(Object)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/ObjectUtils.html" title="class in org.apache.juneau.internal">ObjectUtils</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if the specified object is empty.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#isEmpty-java.lang.String-">isEmpty(String)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
<dd>
<div class="block">Returns <jk>true</jk> if specified string is <jk>null</jk> or empty.</div>
@@ -14087,6 +14103,10 @@
<dd>
<div class="block">Returns <jk>true</jk> if <code>&plainText=true</code> was specified as a URL parameter.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializerSession.html#isPlainTextParams--">isPlainTextParams()</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a></dt>
+<dd>
+<div class="block">Returns <jk>true</jk> if the <a href="org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/xml/XmlParserSession.html#isPreserveRootElement--">isPreserveRootElement()</a></span> - Method in class org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlParserSession.html" title="class in org.apache.juneau.xml">XmlParserSession</a></dt>
<dd>
<div class="block">Returns the <a href="org/apache/juneau/xml/XmlParserContext.html#XML_preserveRootElement"><code>XmlParserContext.XML_preserveRootElement</code></a> setting value for this session.</div>
@@ -17190,7 +17210,9 @@
<div class="block">HTML annotations</div>
</dd>
<dt><a href="org/apache/juneau/http/package-summary.html">org.apache.juneau.http</a> - package org.apache.juneau.http</dt>
-<dd> </dd>
+<dd>
+<div class="block">RFC2616 HTTP Headers</div>
+</dd>
<dt><a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a> - package org.apache.juneau.ini</dt>
<dd>
<div class="block">INI file support</div>
@@ -17494,7 +17516,7 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#paramFormat-java.lang.String-">paramFormat(String)</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
<dd>
-<div class="block">Sets the <a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a> property on the URL-encoding serializers in this group.</div>
+<div class="block">Sets the <a href="org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a> property on the URL-encoding serializers in this group.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html#paramFormat-java.lang.String-">paramFormat(String)</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a></dt>
<dd>
@@ -17948,17 +17970,17 @@
<dd>
<div class="block">Constructor</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#plainTextParams--">plainTextParams()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html#PlainText-org.apache.juneau.PropertyStore-">PlainText(PropertyStore)</a></span> - Constructor for class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a></dt>
<dd>
-<div class="block">Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.</div>
+<div class="block">Constructor.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html#plainTextParams--">plainTextParams()</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializerContext.html#plainTextParams--">plainTextParams()</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a></dt>
<dd>
-<div class="block">Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.</div>
+<div class="block">Returns <jk>true</jk> if the <a href="org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#plainTextParams--">plainTextParams()</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html#plainTextParams--">plainTextParams()</a></span> - Method in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a></dt>
<dd>
-<div class="block">Returns <jk>true</jk> if the <a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
+<div class="block">Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.</div>
</dd>
<dt><a href="org/apache/juneau/plaintext/PlainTextParser.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">PlainTextParser</span></a> - Class in <a href="org/apache/juneau/plaintext/package-summary.html">org.apache.juneau.plaintext</a></dt>
<dd>
@@ -17980,6 +18002,10 @@
<dd>
<div class="block">Constructor.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/client/RestClientBuilder.html#plainTextParts--">plainTextParts()</a></span> - Method in class org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></dt>
+<dd>
+<div class="block">Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.</div>
+</dd>
<dt><a href="org/apache/juneau/plaintext/PlainTextSerializer.html" title="class in org.apache.juneau.plaintext"><span class="typeNameLink">PlainTextSerializer</span></a> - Class in <a href="org/apache/juneau/plaintext/package-summary.html">org.apache.juneau.plaintext</a></dt>
<dd>
<div class="block">Serializes POJOs to plain text using just the <code>toString()</code> method on the serialized object.</div>
@@ -18483,17 +18509,23 @@
<dd>
<div class="block">The property namer to use to name bean properties.</div>
</dd>
-<dt><a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDashedLC</span></a> - Class in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
+<dt><a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDefault</span></a> - Class in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
+<dd>
+<div class="block">Default property namer.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerDefault.html#PropertyNamerDefault--">PropertyNamerDefault()</a></span> - Constructor for class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a></dt>
+<dd> </dd>
+<dt><a href="org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDLC</span></a> - Class in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
<dd>
<div class="block">Converts property names to dashed-lower-case format.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerDashedLC.html#PropertyNamerDashedLC--">PropertyNamerDashedLC()</a></span> - Constructor for class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau">PropertyNamerDashedLC</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerDLC.html#PropertyNamerDLC--">PropertyNamerDLC()</a></span> - Constructor for class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau">PropertyNamerDLC</a></dt>
<dd> </dd>
-<dt><a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDefault</span></a> - Class in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
+<dt><a href="org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerULC</span></a> - Class in <a href="org/apache/juneau/package-summary.html">org.apache.juneau</a></dt>
<dd>
-<div class="block">Default property namer.</div>
+<div class="block">Converts property names to underscore-lower-case format.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerDefault.html#PropertyNamerDefault--">PropertyNamerDefault()</a></span> - Constructor for class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/PropertyNamerULC.html#PropertyNamerULC--">PropertyNamerULC()</a></span> - Constructor for class org.apache.juneau.<a href="org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau">PropertyNamerULC</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/CoreObject.html#propertyStore">propertyStore</a></span> - Variable in class org.apache.juneau.<a href="org/apache/juneau/CoreObject.html" title="class in org.apache.juneau">CoreObject</a></dt>
<dd>
@@ -19282,6 +19314,10 @@
<dd>
<div class="block">Reads the contents of a file into a string.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/IOUtils.html#read-java.lang.Object-">read(Object)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/IOUtils.html" title="class in org.apache.juneau.internal">IOUtils</a></dt>
+<dd>
+<div class="block">Reads the specified object to a <code>String</code>.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/IOUtils.html#read-java.io.Reader-">read(Reader)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/IOUtils.html" title="class in org.apache.juneau.internal">IOUtils</a></dt>
<dd>
<div class="block">Reads the contents of a reader into a string.</div>
@@ -19570,7 +19606,7 @@
<dd>
<div class="block">Represents the metadata about an annotated argument of a method on a remote proxy interface.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/remoteable/RemoteMethodArg.html#RemoteMethodArg-java.lang.String-int-boolean-java.lang.Class-">RemoteMethodArg(String, int, boolean, Class<? extends PartSerializer>)</a></span> - Constructor for class org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/remoteable/RemoteMethodArg.html#RemoteMethodArg-java.lang.String-java.lang.String-int-boolean-java.lang.Class-">RemoteMethodArg(String, String, int, boolean, Class<? extends PartSerializer>)</a></span> - Constructor for class org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a></dt>
<dd>
<div class="block">Constructor.</div>
</dd>
@@ -21445,7 +21481,7 @@
<dd>
<div class="block">Serialize the specified object to the specified writer.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything(UonSerializerSession, UonWriter, Object, ClassMeta<?>, String, BeanPropertyMeta, boolean)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">serializeAnything(UonSerializerSession, UonWriter, Object, ClassMeta<?>, String, BeanPropertyMeta)</a></span> - Method in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></dt>
<dd>
<div class="block">Workhorse method.</div>
</dd>
@@ -24603,6 +24639,14 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/utils/StringObject.html#subSequence-int-int-">subSequence(int, int)</a></span> - Method in class org.apache.juneau.utils.<a href="org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#subset-java.lang.String...-">subset(String...)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
+<dd>
+<div class="block">Returns a copy of this object, but only with the specified header names copied.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#subset-java.lang.String-">subset(String)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
+<dd>
+<div class="block">Same as <a href="org/apache/juneau/rest/RequestHeaders.html#subset-java.lang.String...-"><code>RequestHeaders.subset(String...)</code></a>, but allows you to specify header names as a comma-delimited list.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/dto/atom/Feed.html#subtitle-org.apache.juneau.dto.atom.Text-">subtitle(Text)</a></span> - Method in class org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a></dt>
<dd>
<div class="block">Sets the feed subtitle.</div>
@@ -25327,6 +25371,10 @@
<dd>
<div class="block">Synonym for <a href="org/apache/juneau/dto/swagger/SecurityScheme.html#setTokenUrl-java.lang.String-"><code>SecurityScheme.setTokenUrl(String)</code></a>.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/ArrayUtils.html#toList-java.lang.Object-java.lang.Class-">toList(Object, Class<T>)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/ArrayUtils.html" title="class in org.apache.juneau.internal">ArrayUtils</a></dt>
+<dd>
+<div class="block">Converts the specified array to an <code>ArrayList</code></div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList(Class<?>, Object)</a></span> - Static method in class org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a></dt>
<dd>
<div class="block">Converts the contents of the specified object array to a list.</div>
@@ -25357,6 +25405,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/BeanPropertyMeta.html#toString--">toString()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/BeanPropertyValue.html#toString--">toString()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanPropertyValue.html" title="class in org.apache.juneau">BeanPropertyValue</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/BeanRegistry.html#toString--">toString()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/ClassMeta.html#toString--">toString()</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a></dt>
@@ -25455,6 +25505,24 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/ReaderResource.html#toString--">toString()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/ReaderResource.html" title="class in org.apache.juneau.rest">ReaderResource</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestFormData.html#toString-boolean-">toString(boolean)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a></dt>
+<dd>
+<div class="block">Converts the form data parameters to a readable string.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestFormData.html#toString--">toString()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#toString-boolean-">toString(boolean)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
+<dd>
+<div class="block">Converts the headers to a readable string.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestHeaders.html#toString--">toString()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestQuery.html#toString-boolean-">toString(boolean)</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a></dt>
+<dd>
+<div class="block">Converts the query parameters to a readable string.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RequestQuery.html#toString--">toString()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestParamType.html#toString--">toString()</a></span> - Method in enum org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestParamType.html" title="enum in org.apache.juneau.rest">RestParamType</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/RestRequest.html#toString--">toString()</a></span> - Method in class org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest">RestRequest</a></dt>
@@ -26058,6 +26126,10 @@
<dd>
<div class="block"><b>Configuration property:</b> Encode non-valid URI characters.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat">UON_paramFormat</a></span> - Static variable in class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a></dt>
+<dd>
+<div class="block"><b>Configuration property:</b> Format to use for top-level query names and simple parameters.</div>
+</dd>
<dt><a href="org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon"><span class="typeNameLink">UonParser</span></a> - Class in <a href="org/apache/juneau/uon/package-summary.html">org.apache.juneau.uon</a></dt>
<dd>
<div class="block">Parses UON (a notation for URL-encoded query parameter values) text into POJO models.</div>
@@ -26168,7 +26240,7 @@
<dd>
<div class="block">Specialized writer for serializing UON-encoded text.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-org.apache.juneau.UriResolver-">UonWriter(UonSerializerSession, Writer, boolean, boolean, boolean, UriResolver)</a></span> - Constructor for class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/juneau/uon/UonWriter.html#UonWriter-org.apache.juneau.uon.UonSerializerSession-java.io.Writer-boolean-boolean-boolean-boolean-org.apache.juneau.UriResolver-">UonWriter(UonSerializerSession, Writer, boolean, boolean, boolean, boolean, UriResolver)</a></span> - Constructor for class org.apache.juneau.uon.<a href="org/apache/juneau/uon/UonWriter.html" title="class in org.apache.juneau.uon">UonWriter</a></dt>
<dd>
<div class="block">Constructor.</div>
</dd>
@@ -26435,10 +26507,6 @@
<dd>
<div class="block">Serialize bean property collections/arrays as separate key/value pairs (<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang"><code>Boolean</code></a>, default=<jk>false</jk>).</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat">URLENC_paramFormat</a></span> - Static variable in class org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a></dt>
-<dd>
-<div class="block"><b>Configuration property:</b> Format to use for top-level query names and simple parameters.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/apache/juneau/internal/StringUtils.html#urlEncode-java.lang.String-">urlEncode(String)</a></span> - Static method in class org.apache.juneau.internal.<a href="org/apache/juneau/internal/StringUtils.html" title="class in org.apache.juneau.internal">StringUtils</a></dt>
<dd>
<div class="block">Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.</div>
@@ -26532,6 +26600,10 @@
<dd>
<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.</div>
</dd>
+<dt><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.PlainText</span></a> - Class in <a href="org/apache/juneau/urlencoding/package-summary.html">org.apache.juneau.urlencoding</a></dt>
+<dd>
+<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().plainTextParts().build();</code>.</div>
+</dd>
<dt><a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.Readable</span></a> - Class in <a href="org/apache/juneau/urlencoding/package-summary.html">org.apache.juneau.urlencoding</a></dt>
<dd>
<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/BeanContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/BeanContext.html b/content/site/apidocs/org/apache/juneau/BeanContext.html
index deeb608..b05a510 100644
--- a/content/site/apidocs/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/org/apache/juneau/BeanContext.html
@@ -1838,7 +1838,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getClassMeta</h4>
-<pre>public final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1104">getClassMeta</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
+<pre>public final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1119">getClassMeta</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)</pre>
<div class="block">Used to resolve <code>ClassMetas</code> of type <code>Collection</code> and <code>Map</code> that have
<code>ClassMeta</code> values that themselves could be collections or maps.
@@ -1880,7 +1880,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getClassMetaForObject</h4>
-<pre>public final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1288">getClassMetaForObject</a>(T o)</pre>
+<pre>public final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1303">getClassMetaForObject</a>(T o)</pre>
<div class="block">Shortcut for calling <code>getClassMeta(o.getClass())</code>.</div>
<dl>
<dt><span class="paramLabel">Type Parameters:</span></dt>
@@ -1898,7 +1898,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>resolveClassMeta</h4>
-<pre>protected final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1307">resolveClassMeta</a>(<a href="../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a> p,
+<pre>protected final <T> <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1322">resolveClassMeta</a>(<a href="../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a> p,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> t,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[]> typeVarImpls)</pre>
<div class="block">Used for determining the class type on a method or field where a <code>@BeanProperty</code> annotation
@@ -1923,7 +1923,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getBeanTypePropertyName</h4>
-<pre>protected final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1410">getBeanTypePropertyName</a>()</pre>
+<pre>protected final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1425">getBeanTypePropertyName</a>()</pre>
<div class="block">Returns the type property name as defined by <a href="../../../org/apache/juneau/BeanContext.html#BEAN_beanTypePropertyName"><code>BEAN_beanTypePropertyName</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1937,7 +1937,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getBeanRegistry</h4>
-<pre>protected final <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1419">getBeanRegistry</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1434">getBeanRegistry</a>()</pre>
<div class="block">Returns the bean registry defined in this bean context defined by <a href="../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BEAN_beanDictionary</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1951,7 +1951,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>getImplClassConstructor</h4>
-<pre>protected final <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1431">getImplClassConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c,
+<pre>protected final <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1446">getImplClassConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c,
<a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a> v)</pre>
<div class="block">Gets the no-arg constructor for the specified class.</div>
<dl>
@@ -1971,7 +1971,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>object</h4>
-<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1478">object</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1493">object</a>()</pre>
<div class="block">Returns a reusable <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representation for the class <code>Object</code>.
<p>
This <code>ClassMeta</code> is often used to represent "any object type" when an object type
@@ -1991,7 +1991,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>string</h4>
-<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1492">string</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1507">string</a>()</pre>
<div class="block">Returns a reusable <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representation for the class <code>String</code>.
<p>
This <code>ClassMeta</code> is often used to represent key types in maps.
@@ -2010,7 +2010,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>_class</h4>
-<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1506">_class</a>()</pre>
+<pre>protected final <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1521">_class</a>()</pre>
<div class="block">Returns a reusable <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> representation for the class <code>Class</code>.
<p>
This <code>ClassMeta</code> is often used to represent key types in maps.
@@ -2029,7 +2029,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1511">hashCode</a>()</pre>
+<pre>public int <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1526">hashCode</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -2042,7 +2042,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1516">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1531">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -2055,7 +2055,7 @@ extends <a href="../../../org/apache/juneau/Context.html" title="class in org.ap
<ul class="blockListLast">
<li class="blockList">
<h4>asMap</h4>
-<pre>public <a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1525">asMap</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../src-html/org/apache/juneau/BeanContext.html#line.1540">asMap</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../org/apache/juneau/Context.html#asMap--">Context</a></code></span></div>
<div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/BeanMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/BeanMeta.html b/content/site/apidocs/org/apache/juneau/BeanMeta.html
index 7a38d2f..02d18ca 100644
--- a/content/site/apidocs/org/apache/juneau/BeanMeta.html
+++ b/content/site/apidocs/org/apache/juneau/BeanMeta.html
@@ -607,7 +607,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockListLast">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/BeanMeta.html#line.768">toString</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/BeanMeta.html#line.776">toString</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/BeanPropertyValue.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/BeanPropertyValue.html b/content/site/apidocs/org/apache/juneau/BeanPropertyValue.html
index 8c93e0f..b0c1324 100644
--- a/content/site/apidocs/org/apache/juneau/BeanPropertyValue.html
+++ b/content/site/apidocs/org/apache/juneau/BeanPropertyValue.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -191,13 +191,17 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
<div class="block">Returns the bean property value.</div>
</td>
</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/BeanPropertyValue.html#toString--">toString</a></span>()</code> </td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
<!-- -->
</a>
<h3>Methods inherited from class java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
</ul>
</li>
</ul>
@@ -314,7 +318,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
<a name="compareTo-org.apache.juneau.BeanPropertyValue-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>compareTo</h4>
<pre>public int <a href="../../../src-html/org/apache/juneau/BeanPropertyValue.html#line.82">compareTo</a>(<a href="../../../org/apache/juneau/BeanPropertyValue.html" title="class in org.apache.juneau">BeanPropertyValue</a> o)</pre>
@@ -324,6 +328,19 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
</dl>
</li>
</ul>
+<a name="toString--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/BeanPropertyValue.html#line.87">toString</a>()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
[30/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/PropertyNamerDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/PropertyNamerDefault.html b/content/site/apidocs/org/apache/juneau/PropertyNamerDefault.html
index 438e6e7..c6e1366 100644
--- a/content/site/apidocs/org/apache/juneau/PropertyNamerDefault.html
+++ b/content/site/apidocs/org/apache/juneau/PropertyNamerDefault.html
@@ -48,8 +48,8 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../index.html?org/apache/juneau/PropertyNamerDefault.html" target="_top">Frames</a></li>
@@ -252,8 +252,8 @@ implements <a href="../../../org/apache/juneau/PropertyNamer.html" title="interf
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../index.html?org/apache/juneau/PropertyNamerDefault.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/PropertyStore.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/PropertyStore.html b/content/site/apidocs/org/apache/juneau/PropertyStore.html
index 7c8621d..3fec34d 100644
--- a/content/site/apidocs/org/apache/juneau/PropertyStore.html
+++ b/content/site/apidocs/org/apache/juneau/PropertyStore.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../org/apache/juneau/PropertyStore.PropertyMap.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -1161,7 +1161,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../org/apache/juneau/PropertyStore.PropertyMap.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/annotation/Bean.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Bean.html b/content/site/apidocs/org/apache/juneau/annotation/Bean.html
index 857726d..fd2ea2d 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/Bean.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/Bean.html
@@ -402,7 +402,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<div class="block">Associates a <a href="../../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><code>PropertyNamer</code></a> with this bean to tailor the names of the bean properties.
<p>
Property namers are used to transform bean property names from standard form to some other form.
- For example, the <a href="../../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><code>PropertyNamerDashedLC</code></a> will convert property names to dashed-lowercase, and
+ For example, the <a href="../../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><code>PropertyNamerDLC</code></a> will convert property names to dashed-lowercase, and
these will be used as attribute names in JSON, and element names in XML.
<p>
This annotation is an alternative to using the <a href="../../../../org/apache/juneau/transform/BeanFilter.html" title="class in org.apache.juneau.transform"><code>BeanFilter</code></a> class with an implemented <a href="../../../../org/apache/juneau/transform/BeanFilter.html#getPropertyNamer--"><code>BeanFilter.getPropertyNamer()</code></a> method.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html b/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
index 701c1b9..c7b7829 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
@@ -170,6 +170,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<div class="block">Identifies a specialized class type for the property.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a></span></code>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>name()</code></a>.</div>
+</td>
+</tr>
</table>
</li>
</ul>
@@ -278,13 +284,38 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
</li>
</ul>
<ul class="blockList">
+<li class="blockList"><a name="value--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>value</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.140">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>name()</code></a>.
+ <p>
+ The following annotations are equivalent:
+ <p>
+ <p class='bcode'>
+ <ja>@BeanProperty</ja>(name=<js>"foo"</js>)
+
+ <ja>@BeanProperty</ja>(<js>"foo"</js>)
+ </p></div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
<li class="blockList"><a name="type--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>type</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.149">type</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.162">type</a></pre>
<div class="block">Identifies a specialized class type for the property.
<p>
Normally this can be inferred through reflection of the field type or getter return type.
@@ -318,7 +349,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>params</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.166">params</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.179">params</a></pre>
<div class="block">For bean properties of maps and collections, this annotation can be used to identify
the class types of the contents of the bean property object when the generic parameter
types are interfaces or abstract classes.
@@ -347,7 +378,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>swap</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.188">swap</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.201">swap</a></pre>
<div class="block">Associates a <a href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> or <a href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class in org.apache.juneau.transform"><code>SurrogateSwap</code></a> with this bean property that will swap the value object
with another object during serialization and parsing.
<p>
@@ -381,7 +412,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>properties</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.219">properties</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.232">properties</a></pre>
<div class="block">Used to limit which child properties are rendered by the serializers.
<p>
Can be used on any of the following bean property types:
@@ -424,7 +455,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockListLast">
<li class="blockList">
<h4>beanDictionary</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.236">beanDictionary</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.249">beanDictionary</a></pre>
<div class="block">The list of classes that make up the bean dictionary for this bean property.
<p>
The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Category.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Category.html b/content/site/apidocs/org/apache/juneau/dto/atom/Category.html
index 1cd1938..d3dff5a 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Category.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Category.html
@@ -300,7 +300,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>term</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="term")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="term")
public <a href="../../../../../org/apache/juneau/dto/atom/Category.html" title="class in org.apache.juneau.dto.atom">Category</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Category.html#line.78">term</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> term)</pre>
<div class="block">Sets the category term.</div>
<dl>
@@ -332,7 +332,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>scheme</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="scheme")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="scheme")
public <a href="../../../../../org/apache/juneau/dto/atom/Category.html" title="class in org.apache.juneau.dto.atom">Category</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Category.html#line.100">scheme</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> scheme)</pre>
<div class="block">Sets the category scheme.</div>
<dl>
@@ -364,7 +364,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>label</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="label")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="label")
public <a href="../../../../../org/apache/juneau/dto/atom/Category.html" title="class in org.apache.juneau.dto.atom">Category</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Category.html#line.122">label</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> label)</pre>
<div class="block">Sets the category label.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Common.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Common.html b/content/site/apidocs/org/apache/juneau/dto/atom/Common.html
index 331822e..62a2535 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Common.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Common.html
@@ -251,7 +251,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>base</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="base")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="base")
public <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Common.html#line.64">base</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> base)</pre>
<div class="block">Sets the URI base of this object.</div>
<dl>
@@ -300,7 +300,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockListLast">
<li class="blockList">
<h4>lang</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="lang")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="lang")
public <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="class in org.apache.juneau.dto.atom">Common</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Common.html#line.97">lang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> lang)</pre>
<div class="block">Sets the language of this object.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html b/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
index d1a7bef..fbe42ca 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
@@ -398,7 +398,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" titl
<ul class="blockList">
<li class="blockList">
<h4>authors</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="authors")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="authors")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.87">authors</a>(<a href="../../../../../org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom">Person</a>... authors)</pre>
<div class="block">Sets the list of authors for this object.</div>
<dl>
@@ -431,7 +431,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Category.html" ti
<ul class="blockList">
<li class="blockList">
<h4>categories</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="categories")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="categories")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.109">categories</a>(<a href="../../../../../org/apache/juneau/dto/atom/Category.html" title="class in org.apache.juneau.dto.atom">Category</a>... categories)</pre>
<div class="block">Sets the list of categories of this object.</div>
<dl>
@@ -464,7 +464,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" titl
<ul class="blockList">
<li class="blockList">
<h4>contributors</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="contributors")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="contributors")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.131">contributors</a>(<a href="../../../../../org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom">Person</a>... contributors)</pre>
<div class="block">Sets the list of contributors of this object.</div>
<dl>
@@ -495,7 +495,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html"
<ul class="blockList">
<li class="blockList">
<h4>id</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="id")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="id")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.152">id</a>(<a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> id)</pre>
<div class="block">Sets the ID of this object.</div>
<dl>
@@ -543,7 +543,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title=
<ul class="blockList">
<li class="blockList">
<h4>links</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="links")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="links")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.185">links</a>(<a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a>... links)</pre>
<div class="block">Sets the list of links of this object.</div>
<dl>
@@ -574,7 +574,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html"
<ul class="blockList">
<li class="blockList">
<h4>rights</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="rights")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="rights")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.206">rights</a>(<a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> rights)</pre>
<div class="block">Sets the rights statement of this object.</div>
<dl>
@@ -621,7 +621,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html"
<ul class="blockList">
<li class="blockList">
<h4>title</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="title")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="title")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.238">title</a>(<a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> title)</pre>
<div class="block">Sets the title of this object.</div>
<dl>
@@ -669,7 +669,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar
<ul class="blockList">
<li class="blockList">
<h4>updated</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="updated")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="updated")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.271">updated</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a> updated)</pre>
<div class="block">Sets the update timestamp of this object.</div>
<dl>
@@ -686,7 +686,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html"
<ul class="blockListLast">
<li class="blockList">
<h4>updated</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="updated")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="updated")
public <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" title="class in org.apache.juneau.dto.atom">CommonEntry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.283">updated</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> updated)</pre>
<div class="block">Sets the update timestamp of this object.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Content.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Content.html b/content/site/apidocs/org/apache/juneau/dto/atom/Content.html
index 8ce944e..147e6cc 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Content.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Content.html
@@ -334,7 +334,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>src</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="src")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="src")
public <a href="../../../../../org/apache/juneau/dto/atom/Content.html" title="class in org.apache.juneau.dto.atom">Content</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Content.html#line.109">src</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> src)</pre>
<div class="block">Sets the source URI.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html b/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
index 310e40d..435d60a 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
@@ -444,7 +444,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" tit
<ul class="blockList">
<li class="blockList">
<h4>content</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="content")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="content")
public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Entry.html#line.104">content</a>(<a href="../../../../../org/apache/juneau/dto/atom/Content.html" title="class in org.apache.juneau.dto.atom">Content</a> content)</pre>
<div class="block">Sets the content of this entry.</div>
<dl>
@@ -476,7 +476,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar
<ul class="blockList">
<li class="blockList">
<h4>published</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="published")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="published")
public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Entry.html#line.126">published</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util">Calendar</a> published)</pre>
<div class="block">Sets the publish timestamp of this entry.</div>
<dl>
@@ -493,7 +493,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title
<ul class="blockList">
<li class="blockList">
<h4>published</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="published")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="published")
public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Entry.html#line.138">published</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> published)</pre>
<div class="block">Sets the publish timestamp of this entry.</div>
<dl>
@@ -524,7 +524,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title
<ul class="blockList">
<li class="blockList">
<h4>source</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="source")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="source")
public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Entry.html#line.159">source</a>(<a href="../../../../../org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a> source)</pre>
<div class="block">Sets the source of this entry.</div>
<dl>
@@ -555,7 +555,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title
<ul class="blockList">
<li class="blockList">
<h4>summary</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="summary")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="summary")
public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Entry.html#line.180">summary</a>(<a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> summary)</pre>
<div class="block">Sets the summary of this entry.</div>
<dl>
@@ -572,7 +572,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title
<ul class="blockList">
<li class="blockList">
<h4>summary</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="summary")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="summary")
public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Entry.html#line.192">summary</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> summary)</pre>
<div class="block">Sets the summary of this entry.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Feed.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Feed.html b/content/site/apidocs/org/apache/juneau/dto/atom/Feed.html
index 599c9e7..c458330 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Feed.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Feed.html
@@ -453,7 +453,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" tit
<ul class="blockList">
<li class="blockList">
<h4>generator</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="generator")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="generator")
public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Feed.html#line.108">generator</a>(<a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> generator)</pre>
<div class="block">Sets the generator information on this feed.</div>
<dl>
@@ -484,7 +484,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title=
<ul class="blockList">
<li class="blockList">
<h4>icon</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="icon")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="icon")
public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Feed.html#line.129">icon</a>(<a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> icon)</pre>
<div class="block">Sets the feed icon.</div>
<dl>
@@ -515,7 +515,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title=
<ul class="blockList">
<li class="blockList">
<h4>logo</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="logo")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="logo")
public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Feed.html#line.150">logo</a>(<a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> logo)</pre>
<div class="block">Sets the feed logo.</div>
<dl>
@@ -532,7 +532,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title=
<ul class="blockList">
<li class="blockList">
<h4>getSubTitle</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="subtitle")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="subtitle")
public <a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Feed.html#line.161">getSubTitle</a>()</pre>
<div class="block">Returns the feed subtitle.</div>
<dl>
@@ -547,7 +547,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Text.html" title=
<ul class="blockList">
<li class="blockList">
<h4>subtitle</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="subtitle")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="subtitle")
public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Feed.html#line.172">subtitle</a>(<a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> subtitle)</pre>
<div class="block">Sets the feed subtitle.</div>
<dl>
@@ -595,7 +595,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title
<ul class="blockList">
<li class="blockList">
<h4>entries</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="entries")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="entries")
public <a href="../../../../../org/apache/juneau/dto/atom/Feed.html" title="class in org.apache.juneau.dto.atom">Feed</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Feed.html#line.205">entries</a>(<a href="../../../../../org/apache/juneau/dto/atom/Entry.html" title="class in org.apache.juneau.dto.atom">Entry</a>... entries)</pre>
<div class="block">Sets the entries in the feed.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html b/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
index 124dd91..693e602 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Generator.html
@@ -307,7 +307,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.81">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
<div class="block">Sets the URI of this generator statement.</div>
<dl>
@@ -324,7 +324,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" t
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.93">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
<div class="block">Sets the URI of this generator statement.</div>
<dl>
@@ -356,7 +356,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>version</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="version")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="version")
public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.115">version</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</pre>
<div class="block">Sets the version of this generator statement.</div>
<dl>
@@ -388,7 +388,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>text</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="text")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="text")
public <a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Generator.html#line.137">text</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
<div class="block">Sets the content of this generator statement.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html b/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
index f070490..546f59b 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Icon.html
@@ -300,7 +300,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.86">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
<div class="block">Sets the URI of this icon.</div>
<dl>
@@ -317,7 +317,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title=
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Icon.html#line.98">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
<div class="block">Sets the URI of this icon.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Id.html b/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
index 8097aa2..90c28b4 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Id.html
@@ -275,7 +275,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>text</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="text")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="text")
public <a href="../../../../../org/apache/juneau/dto/atom/Id.html" title="class in org.apache.juneau.dto.atom">Id</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Id.html#line.75">text</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
<div class="block">Sets the content of this identifier.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Link.html b/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
index 04fd991..2594a3b 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Link.html
@@ -348,7 +348,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>href</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="href")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="href")
public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.90">href</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> href)</pre>
<div class="block">Sets the href of the target of this link.</div>
<dl>
@@ -380,7 +380,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>rel</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="rel")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="rel")
public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.112">rel</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> rel)</pre>
<div class="block">Sets the rel of this link.</div>
<dl>
@@ -412,7 +412,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>type</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="type")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="type")
public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.142">type</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type)</pre>
<div class="block">Sets the content type of the target of this link.
<p>
@@ -452,7 +452,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>hreflang</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="hreflang")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="hreflang")
public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.164">hreflang</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hreflang)</pre>
<div class="block">Sets the language of the target of this link.</div>
<dl>
@@ -484,7 +484,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>title</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="title")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="title")
public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.186">title</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> title)</pre>
<div class="block">Sets the title of the target of this link.</div>
<dl>
@@ -516,7 +516,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.
<ul class="blockList">
<li class="blockList">
<h4>length</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="length")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="length")
public <a href="../../../../../org/apache/juneau/dto/atom/Link.html" title="class in org.apache.juneau.dto.atom">Link</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Link.html#line.208">length</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a> length)</pre>
<div class="block">Sets the length of the contents of the target of this link.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html b/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
index ea8616b..49889d5 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Logo.html
@@ -300,7 +300,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.86">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
<div class="block">Sets the URI of the logo.</div>
<dl>
@@ -317,7 +317,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title=
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Logo.html#line.98">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
<div class="block">Sets the URI of the logo.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Person.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Person.html b/content/site/apidocs/org/apache/juneau/dto/atom/Person.html
index 4b7edcf..34944f7 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Person.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Person.html
@@ -305,7 +305,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/Common.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>name</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="name")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="name")
public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom">Person</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Person.html#line.77">name</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Sets the name of the person.</div>
<dl>
@@ -336,7 +336,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" titl
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom">Person</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Person.html#line.98">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> uri)</pre>
<div class="block">Sets the URI of the person.</div>
<dl>
@@ -353,7 +353,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" titl
<ul class="blockList">
<li class="blockList">
<h4>uri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="uri")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="uri")
public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom">Person</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Person.html#line.110">uri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> uri)</pre>
<div class="block">Sets the URI of the person.</div>
<dl>
@@ -384,7 +384,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" titl
<ul class="blockList">
<li class="blockList">
<h4>email</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="email")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="email")
public <a href="../../../../../org/apache/juneau/dto/atom/Person.html" title="class in org.apache.juneau.dto.atom">Person</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Person.html#line.131">email</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> email)</pre>
<div class="block">Sets the email address of the person.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Source.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Source.html b/content/site/apidocs/org/apache/juneau/dto/atom/Source.html
index c30bd41..ed40b1a 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Source.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Source.html
@@ -384,7 +384,7 @@ extends <a href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html" tit
<ul class="blockList">
<li class="blockList">
<h4>generator</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="generator")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="generator")
public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Source.html#line.75">generator</a>(<a href="../../../../../org/apache/juneau/dto/atom/Generator.html" title="class in org.apache.juneau.dto.atom">Generator</a> generator)</pre>
<div class="block">Sets the generator info of this source.</div>
<dl>
@@ -415,7 +415,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" titl
<ul class="blockList">
<li class="blockList">
<h4>icon</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="icon")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="icon")
public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Source.html#line.96">icon</a>(<a href="../../../../../org/apache/juneau/dto/atom/Icon.html" title="class in org.apache.juneau.dto.atom">Icon</a> icon)</pre>
<div class="block">Sets the icon of this source.</div>
<dl>
@@ -446,7 +446,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" titl
<ul class="blockList">
<li class="blockList">
<h4>logo</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="logo")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="logo")
public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Source.html#line.117">logo</a>(<a href="../../../../../org/apache/juneau/dto/atom/Logo.html" title="class in org.apache.juneau.dto.atom">Logo</a> logo)</pre>
<div class="block">Sets the logo of this source.</div>
<dl>
@@ -477,7 +477,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" titl
<ul class="blockList">
<li class="blockList">
<h4>subtitle</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="subtitle")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="subtitle")
public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Source.html#line.138">subtitle</a>(<a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> subtitle)</pre>
<div class="block">Sets the subtitle of this source.</div>
<dl>
@@ -494,7 +494,7 @@ public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" titl
<ul class="blockList">
<li class="blockList">
<h4>subtitle</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="subtitle")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="subtitle")
public <a href="../../../../../org/apache/juneau/dto/atom/Source.html" title="class in org.apache.juneau.dto.atom">Source</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Source.html#line.150">subtitle</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subtitle)</pre>
<div class="block">Sets the subtitle of this source.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/atom/Text.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Text.html b/content/site/apidocs/org/apache/juneau/dto/atom/Text.html
index 5b8aecc..470d560 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Text.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Text.html
@@ -309,7 +309,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>type</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="type")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="type")
public <a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Text.html#line.96">type</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type)</pre>
<div class="block">Sets the content type of this content.
<p>
@@ -349,7 +349,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.h
<ul class="blockList">
<li class="blockList">
<h4>text</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="text")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="text")
public <a href="../../../../../org/apache/juneau/dto/atom/Text.html" title="class in org.apache.juneau.dto.atom">Text</a> <a href="../../../../../src-html/org/apache/juneau/dto/atom/Text.html#line.118">text</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> text)</pre>
<div class="block">Sets the content of this content.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/cognos/DataSet.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/cognos/DataSet.html b/content/site/apidocs/org/apache/juneau/dto/cognos/DataSet.html
index f7ac1b6..7975bb9 100644
--- a/content/site/apidocs/org/apache/juneau/dto/cognos/DataSet.html
+++ b/content/site/apidocs/org/apache/juneau/dto/cognos/DataSet.html
@@ -321,7 +321,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getMetaData</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="metadata")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="metadata")
public <a href="../../../../../org/apache/juneau/dto/cognos/Column.html" title="class in org.apache.juneau.dto.cognos">Column</a>[] <a href="../../../../../src-html/org/apache/juneau/dto/cognos/DataSet.html#line.165">getMetaData</a>()</pre>
<div class="block">Bean property getter: <property>metadata</property>.</div>
<dl>
@@ -336,7 +336,7 @@ public <a href="../../../../../org/apache/juneau/dto/cognos/Column.html" ti
<ul class="blockList">
<li class="blockList">
<h4>setMetaData</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="metadata")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="metadata")
public <a href="../../../../../org/apache/juneau/dto/cognos/DataSet.html" title="class in org.apache.juneau.dto.cognos">DataSet</a> <a href="../../../../../src-html/org/apache/juneau/dto/cognos/DataSet.html#line.176">setMetaData</a>(<a href="../../../../../org/apache/juneau/dto/cognos/Column.html" title="class in org.apache.juneau.dto.cognos">Column</a>[] metaData)</pre>
<div class="block">Bean property setter: <property>metadata</property>.</div>
<dl>
@@ -353,7 +353,7 @@ public <a href="../../../../../org/apache/juneau/dto/cognos/DataSet.html" t
<ul class="blockList">
<li class="blockList">
<h4>getData</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="data")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="data")
public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/cognos/DataSet.Row.html" title="class in org.apache.juneau.dto.cognos">DataSet.Row</a>> <a href="../../../../../src-html/org/apache/juneau/dto/cognos/DataSet.html#line.187">getData</a>()</pre>
<div class="block">Bean property getter: <property>data</property>.</div>
<dl>
@@ -368,7 +368,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.htm
<ul class="blockListLast">
<li class="blockList">
<h4>setData</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="data")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="data")
public <a href="../../../../../org/apache/juneau/dto/cognos/DataSet.html" title="class in org.apache.juneau.dto.cognos">DataSet</a> <a href="../../../../../src-html/org/apache/juneau/dto/cognos/DataSet.html#line.198">setData</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/juneau/dto/cognos/DataSet.Row.html" title="class in org.apache.juneau.dto.cognos">DataSet.Row</a>> data)</pre>
<div class="block">Bean property setter: <property>data</property>.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElement.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElement.html b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElement.html
index 59acf9a..df81efc 100644
--- a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElement.html
+++ b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElement.html
@@ -603,7 +603,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<li class="blockList">
<h4>getAttrs</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#ATTRS">ATTRS</a>)
- <a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="a")
+ <a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="a")
public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util">LinkedHashMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElement.html#line.40">getAttrs</a>()</pre>
<div class="block">The attributes of this element.</div>
<dl>
@@ -618,7 +618,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHa
<ul class="blockList">
<li class="blockList">
<h4>setAttrs</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="a")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="a")
public <a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html" title="class in org.apache.juneau.dto.html5">HtmlElement</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElement.html#line.50">setAttrs</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util">LinkedHashMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> attrs)</pre>
<div class="block">Sets the attributes for this element.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementContainer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementContainer.html b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementContainer.html
index b4a0c83..40fe1d3 100644
--- a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementContainer.html
+++ b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementContainer.html
@@ -267,7 +267,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedLi
<ul class="blockList">
<li class="blockList">
<h4>setChildren</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="c")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="c")
public <a href="../../../../../org/apache/juneau/dto/html5/HtmlElementContainer.html" title="class in org.apache.juneau.dto.html5">HtmlElementContainer</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html#line.47">setChildren</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util">LinkedList</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> children)</pre>
<div class="block">Sets the children for this container.</div>
<dl>
[15/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/internal/IOUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/IOUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/IOUtils.html
index 68d066d..2e4d479 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/IOUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/IOUtils.html
@@ -61,347 +61,377 @@
<span class="sourceLineNo">053</span> }<a name="line.53"></a>
<span class="sourceLineNo">054</span><a name="line.54"></a>
<span class="sourceLineNo">055</span> /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Writes the contents of the specified <code>Reader</code> to the specified file.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * @param out The file to write the output to.<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @param in The reader to pipe from.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * @return The number of characters written to the file.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * @throws IOException<a name="line.61"></a>
-<span class="sourceLineNo">062</span> */<a name="line.62"></a>
-<span class="sourceLineNo">063</span> public static int write(File out, Reader in) throws IOException {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> assertFieldNotNull(out, "out");<a name="line.64"></a>
-<span class="sourceLineNo">065</span> assertFieldNotNull(in, "in");<a name="line.65"></a>
-<span class="sourceLineNo">066</span> Writer w = new OutputStreamWriter(new FileOutputStream(out), Charset.defaultCharset());<a name="line.66"></a>
-<span class="sourceLineNo">067</span> try {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return IOPipe.create(in, w).closeOut().run();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> } finally {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> w.close();<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * Writes the contents of the specified <code>InputStream</code> to the specified file.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> *<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * @param out The file to write the output to.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * @param in The input stream to pipe from.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * @return The number of characters written to the file.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * @throws IOException<a name="line.80"></a>
-<span class="sourceLineNo">081</span> */<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public static int write(File out, InputStream in) throws IOException {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> assertFieldNotNull(out, "out");<a name="line.83"></a>
-<span class="sourceLineNo">084</span> assertFieldNotNull(in, "in");<a name="line.84"></a>
-<span class="sourceLineNo">085</span> OutputStream os = new FileOutputStream(out);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> try {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> return IOPipe.create(in, os).closeOut().run();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> } finally {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> os.close();<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><a name="line.92"></a>
-<span class="sourceLineNo">093</span> /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * Reads the contents of a reader into a string.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> *<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @param in The input reader.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * @return The contents of the reader as a string.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @throws IOException If a problem occurred trying to read from the reader.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public static String read(Reader in) throws IOException {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> return read(in, 0, 1024);<a name="line.101"></a>
+<span class="sourceLineNo">056</span> * Reads the specified object to a <code>String</code>.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <p><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Can be any of the following object types:<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <ul><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <li>{@link CharSequence}<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <li>{@link File}<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <li>{@link Reader}<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <li>{@link InputStream}<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * <li><code><jk>byte</jk>[]</code><a name="line.64"></a>
+<span class="sourceLineNo">065</span> * </ul><a name="line.65"></a>
+<span class="sourceLineNo">066</span> *<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * @param o The object to read.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * @return The object serialized to a string, or <jk>null</jk> if it wasn't a supported type.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @throws IOException<a name="line.69"></a>
+<span class="sourceLineNo">070</span> */<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public static String read(Object o) throws IOException {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> if (o instanceof CharSequence)<a name="line.72"></a>
+<span class="sourceLineNo">073</span> return o.toString();<a name="line.73"></a>
+<span class="sourceLineNo">074</span> if (o instanceof File)<a name="line.74"></a>
+<span class="sourceLineNo">075</span> return read((File)o);<a name="line.75"></a>
+<span class="sourceLineNo">076</span> if (o instanceof Reader)<a name="line.76"></a>
+<span class="sourceLineNo">077</span> return read((Reader)o);<a name="line.77"></a>
+<span class="sourceLineNo">078</span> if (o instanceof InputStream)<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return read((InputStream)o);<a name="line.79"></a>
+<span class="sourceLineNo">080</span> if (o instanceof byte[])<a name="line.80"></a>
+<span class="sourceLineNo">081</span> return read(new ByteArrayInputStream((byte[])o));<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return null;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * Writes the contents of the specified <code>Reader</code> to the specified file.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> *<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @param out The file to write the output to.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @param in The reader to pipe from.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @return The number of characters written to the file.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * @throws IOException<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span> public static int write(File out, Reader in) throws IOException {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> assertFieldNotNull(out, "out");<a name="line.94"></a>
+<span class="sourceLineNo">095</span> assertFieldNotNull(in, "in");<a name="line.95"></a>
+<span class="sourceLineNo">096</span> Writer w = new OutputStreamWriter(new FileOutputStream(out), Charset.defaultCharset());<a name="line.96"></a>
+<span class="sourceLineNo">097</span> try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> return IOPipe.create(in, w).closeOut().run();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> } finally {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> w.close();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
<span class="sourceLineNo">102</span> }<a name="line.102"></a>
<span class="sourceLineNo">103</span><a name="line.103"></a>
<span class="sourceLineNo">104</span> /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * Reads the contents of an input stream into a string using the specified charset.<a name="line.105"></a>
+<span class="sourceLineNo">105</span> * Writes the contents of the specified <code>InputStream</code> to the specified file.<a name="line.105"></a>
<span class="sourceLineNo">106</span> *<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * @param in The input stream.<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * @param cs The charset of the contents of the input stream.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * @return The contents of the reader as a string. <jk>null</jk> if input stream was null.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * @throws IOException If a problem occurred trying to read from the input stream.<a name="line.110"></a>
+<span class="sourceLineNo">107</span> * @param out The file to write the output to.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * @param in The input stream to pipe from.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * @return The number of characters written to the file.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * @throws IOException<a name="line.110"></a>
<span class="sourceLineNo">111</span> */<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static String read(InputStream in, Charset cs) throws IOException {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (in == null)<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return null;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return read(new InputStreamReader(in, cs));<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Reads the contents of an input stream into a string using the system default charset.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> *<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param in The input stream.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @return The contents of the reader as a string, or <jk>null</jk> if the input stream is null.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @throws IOException If a problem occurred trying to read from the input stream.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> */<a name="line.124"></a>
-<span class="sourceLineNo">125</span> public static String read(InputStream in) throws IOException {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> if (in == null)<a name="line.126"></a>
-<span class="sourceLineNo">127</span> return null;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return read(new InputStreamReader(in, Charset.defaultCharset()));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Read the specified input stream into a byte array and closes the stream.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> *<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @param in The input stream.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * @param bufferSize The expected size of the buffer.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @return The contents of the stream as a byte array.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * @throws IOException Thrown by underlying stream.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> */<a name="line.138"></a>
-<span class="sourceLineNo">139</span> public static byte[] readBytes(InputStream in, int bufferSize) throws IOException {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> if (in == null)<a name="line.140"></a>
-<span class="sourceLineNo">141</span> return null;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> ByteArrayOutputStream buff = new ByteArrayOutputStream(bufferSize);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> int nRead;<a name="line.143"></a>
-<span class="sourceLineNo">144</span> byte[] b = new byte[Math.min(bufferSize, 8192)];<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> try {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> while ((nRead = in.read(b, 0, b.length)) != -1)<a name="line.147"></a>
-<span class="sourceLineNo">148</span> buff.write(b, 0, nRead);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> buff.flush();<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> return buff.toByteArray();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> } finally {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> in.close();<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> /**<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * Reads a raw stream of bytes from the specified file.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> *<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @param f The file to read.<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @return A byte array containing the contents of the file.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * @throws IOException<a name="line.162"></a>
-<span class="sourceLineNo">163</span> */<a name="line.163"></a>
-<span class="sourceLineNo">164</span> public static byte[] readBytes(File f) throws IOException {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if (f == null || ! (f.exists() && f.canRead()))<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return null;<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> FileInputStream fis = new FileInputStream(f);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> try {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> return readBytes(fis, (int)f.length());<a name="line.170"></a>
-<span class="sourceLineNo">171</span> } finally {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> fis.close();<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">112</span> public static int write(File out, InputStream in) throws IOException {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> assertFieldNotNull(out, "out");<a name="line.113"></a>
+<span class="sourceLineNo">114</span> assertFieldNotNull(in, "in");<a name="line.114"></a>
+<span class="sourceLineNo">115</span> OutputStream os = new FileOutputStream(out);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> try {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> return IOPipe.create(in, os).closeOut().run();<a name="line.117"></a>
+<span class="sourceLineNo">118</span> } finally {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> os.close();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> /**<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Reads the contents of a reader into a string.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> *<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * @param in The input reader.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return The contents of the reader as a string.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @throws IOException If a problem occurred trying to read from the reader.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public static String read(Reader in) throws IOException {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> return read(in, 0, 1024);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * Reads the contents of an input stream into a string using the specified charset.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> *<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * @param in The input stream.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * @param cs The charset of the contents of the input stream.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @return The contents of the reader as a string. <jk>null</jk> if input stream was null.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @throws IOException If a problem occurred trying to read from the input stream.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> */<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public static String read(InputStream in, Charset cs) throws IOException {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> if (in == null)<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return null;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return read(new InputStreamReader(in, cs));<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> /**<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * Reads the contents of an input stream into a string using the system default charset.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @param in The input stream.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * @return The contents of the reader as a string, or <jk>null</jk> if the input stream is null.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * @throws IOException If a problem occurred trying to read from the input stream.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> */<a name="line.154"></a>
+<span class="sourceLineNo">155</span> public static String read(InputStream in) throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> if (in == null)<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return null;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return read(new InputStreamReader(in, Charset.defaultCharset()));<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * Read the specified input stream into a byte array and closes the stream.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> *<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @param in The input stream.<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * @param bufferSize The expected size of the buffer.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @return The contents of the stream as a byte array.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @throws IOException Thrown by underlying stream.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> public static byte[] readBytes(InputStream in, int bufferSize) throws IOException {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> if (in == null)<a name="line.170"></a>
+<span class="sourceLineNo">171</span> return null;<a name="line.171"></a>
+<span class="sourceLineNo">172</span> ByteArrayOutputStream buff = new ByteArrayOutputStream(bufferSize);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> int nRead;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> byte[] b = new byte[Math.min(bufferSize, 8192)];<a name="line.174"></a>
<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> /**<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * Reads the specified input into a {@link String} until the end of the input is reached.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * <p><a name="line.178"></a>
-<span class="sourceLineNo">179</span> * The {@code Reader} is automatically closed.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * <p><a name="line.180"></a>
-<span class="sourceLineNo">181</span> * If the {@code Reader} is not an instance of a {@code BufferedReader}, then it gets wrapped in a {@code BufferedReader}.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> *<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @param in The input reader.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * @param length Specify a positive number if the length of the input is known.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * @param bufferSize Specify the buffer size to use.<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @return The contents of the reader as a string. <jk>null</jk> if reader was null.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * @throws IOException If a problem occurred trying to read from the reader.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> */<a name="line.188"></a>
-<span class="sourceLineNo">189</span> public static String read(Reader in, int length, int bufferSize) throws IOException {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (in == null)<a name="line.190"></a>
-<span class="sourceLineNo">191</span> return null;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> length = (length <= 0 ? bufferSize : length);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> StringBuilder sb = new StringBuilder(length); // Assume they're ASCII characters.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> try {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> char[] buf = new char[Math.min(bufferSize, length)];<a name="line.195"></a>
-<span class="sourceLineNo">196</span> int i = 0;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> while ((i = in.read(buf)) != -1)<a name="line.197"></a>
-<span class="sourceLineNo">198</span> sb.append(buf, 0, i);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> return sb.toString();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> } finally {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> in.close();<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> /**<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * Pipes the contents of the specified reader into the writer.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * The reader is closed, the writer is not.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> *<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * @param in The reader to pipe from.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @param out The writer to pipe to.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @throws IOException<a name="line.211"></a>
-<span class="sourceLineNo">212</span> */<a name="line.212"></a>
-<span class="sourceLineNo">213</span> public static void pipe(Reader in, Writer out) throws IOException {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> assertFieldNotNull(out, "out");<a name="line.214"></a>
-<span class="sourceLineNo">215</span> assertFieldNotNull(in, "in");<a name="line.215"></a>
-<span class="sourceLineNo">216</span> IOPipe.create(in, out).run();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> /**<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * Wraps the specified reader in a buffered reader.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> *<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * @param r The reader being wrapped.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * @return The reader wrapped in a {@link BufferedReader}, or the original {@link Reader} if it's already<a name="line.223"></a>
-<span class="sourceLineNo">224</span> * a buffered reader.<a name="line.224"></a>
-<span class="sourceLineNo">225</span> */<a name="line.225"></a>
-<span class="sourceLineNo">226</span> public static Reader getBufferedReader(Reader r) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (r instanceof BufferedReader || r instanceof StringReader)<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return r;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return new BufferedReader(r);<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> * Counts the number of bytes in the input stream and then closes the stream.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> *<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * @param is The input stream to read from.<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @return The number of bytes read.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> * @throws IOException<a name="line.237"></a>
-<span class="sourceLineNo">238</span> */<a name="line.238"></a>
-<span class="sourceLineNo">239</span> public static long count(InputStream is) throws IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> assertFieldNotNull(is, "is");<a name="line.240"></a>
-<span class="sourceLineNo">241</span> long c = 0;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> long i;<a name="line.242"></a>
-<span class="sourceLineNo">243</span> try {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> while ((i = is.skip(1024)) != 0)<a name="line.244"></a>
-<span class="sourceLineNo">245</span> c += i;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } finally {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> is.close();<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return c;<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> /**<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * Counts the number of characters in the reader and then closes the reader.<a name="line.253"></a>
-<span class="sourceLineNo">254</span> *<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @param r The reader to read from.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * @return The number of characters read.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * @throws IOException<a name="line.257"></a>
-<span class="sourceLineNo">258</span> */<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public static long count(Reader r) throws IOException {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> assertFieldNotNull(r, "r");<a name="line.260"></a>
-<span class="sourceLineNo">261</span> long c = 0;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> long i;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> try {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> while ((i = r.skip(1024)) != 0)<a name="line.264"></a>
-<span class="sourceLineNo">265</span> c += i;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> } finally {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> r.close();<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return c;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span> /**<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * Given the specified <js>"Content-Length"</js> header value, return an appropriate buffer size.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * The maximum buffer size is 1MB.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> *<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * @param contentLength The value of the <js>"Content-Length"</js> header.<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * @return The appropriate buffer size.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> */<a name="line.278"></a>
-<span class="sourceLineNo">279</span> public static int getBufferSize(String contentLength) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> try {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> if (! StringUtils.isEmpty(contentLength)) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> long l = Long.decode(contentLength);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (l > 1048576)<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return 1048576;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> if (l <= 0)<a name="line.285"></a>
-<span class="sourceLineNo">286</span> return 8192;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return (int)l;<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } catch (Exception e) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return 8192;<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return 8192;<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> * Close input stream and ignore any exceptions.<a name="line.296"></a>
-<span class="sourceLineNo">297</span> * No-op if input stream is <jk>null</jk>.<a name="line.297"></a>
-<span class="sourceLineNo">298</span> *<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * @param is The input stream to close.<a name="line.299"></a>
-<span class="sourceLineNo">300</span> */<a name="line.300"></a>
-<span class="sourceLineNo">301</span> public static void closeQuietly(InputStream is) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> try {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> if (is != null)<a name="line.303"></a>
-<span class="sourceLineNo">304</span> is.close();<a name="line.304"></a>
-<span class="sourceLineNo">305</span> } catch (IOException e) {}<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> /**<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * Close output stream and ignore any exceptions.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * No-op if output stream is <jk>null</jk>.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> *<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * @param os The output stream to close.<a name="line.312"></a>
-<span class="sourceLineNo">313</span> */<a name="line.313"></a>
-<span class="sourceLineNo">314</span> public static void closeQuietly(OutputStream os) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> try {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> if (os != null)<a name="line.316"></a>
-<span class="sourceLineNo">317</span> os.close();<a name="line.317"></a>
-<span class="sourceLineNo">318</span> } catch (IOException e) {}<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> /**<a name="line.321"></a>
-<span class="sourceLineNo">322</span> * Close reader and ignore any exceptions.<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * No-op if reader is <jk>null</jk>.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> *<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * @param r The reader to close.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> */<a name="line.326"></a>
-<span class="sourceLineNo">327</span> public static void closeQuietly(Reader r) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> try {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> if (r != null)<a name="line.329"></a>
-<span class="sourceLineNo">330</span> r.close();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> } catch (IOException e) {}<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> /**<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * Close writer and ignore any exceptions.<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * No-op if writer is <jk>null</jk>.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> *<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * @param w The writer to close.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> */<a name="line.339"></a>
-<span class="sourceLineNo">340</span> public static void closeQuietly(Writer w) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> try {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> if (w != null)<a name="line.342"></a>
-<span class="sourceLineNo">343</span> w.close();<a name="line.343"></a>
-<span class="sourceLineNo">344</span> } catch (IOException e) {}<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> /**<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * Quietly close all specified input streams, output streams, readers, and writers.<a name="line.348"></a>
-<span class="sourceLineNo">349</span> *<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @param o The list of all objects to quietly close.<a name="line.350"></a>
-<span class="sourceLineNo">351</span> */<a name="line.351"></a>
-<span class="sourceLineNo">352</span> public static void closeQuietly(Object...o) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> for (Object o2 : o) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (o2 instanceof InputStream)<a name="line.354"></a>
-<span class="sourceLineNo">355</span> closeQuietly((InputStream)o2);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> if (o2 instanceof OutputStream)<a name="line.356"></a>
-<span class="sourceLineNo">357</span> closeQuietly((OutputStream)o2);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (o2 instanceof Reader)<a name="line.358"></a>
-<span class="sourceLineNo">359</span> closeQuietly((Reader)o2);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> if (o2 instanceof Writer)<a name="line.360"></a>
-<span class="sourceLineNo">361</span> closeQuietly((Writer)o2);<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> /**<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * Converts an object to an <code>InputStream</code>.<a name="line.366"></a>
+<span class="sourceLineNo">176</span> try {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> while ((nRead = in.read(b, 0, b.length)) != -1)<a name="line.177"></a>
+<span class="sourceLineNo">178</span> buff.write(b, 0, nRead);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> buff.flush();<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> return buff.toByteArray();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> } finally {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> in.close();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span> /**<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * Reads a raw stream of bytes from the specified file.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> *<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * @param f The file to read.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * @return A byte array containing the contents of the file.<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @throws IOException<a name="line.192"></a>
+<span class="sourceLineNo">193</span> */<a name="line.193"></a>
+<span class="sourceLineNo">194</span> public static byte[] readBytes(File f) throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> if (f == null || ! (f.exists() && f.canRead()))<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return null;<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span> FileInputStream fis = new FileInputStream(f);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> try {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> return readBytes(fis, (int)f.length());<a name="line.200"></a>
+<span class="sourceLineNo">201</span> } finally {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> fis.close();<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><a name="line.205"></a>
+<span class="sourceLineNo">206</span> /**<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * Reads the specified input into a {@link String} until the end of the input is reached.<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <p><a name="line.208"></a>
+<span class="sourceLineNo">209</span> * The {@code Reader} is automatically closed.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * <p><a name="line.210"></a>
+<span class="sourceLineNo">211</span> * If the {@code Reader} is not an instance of a {@code BufferedReader}, then it gets wrapped in a {@code BufferedReader}.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> *<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * @param in The input reader.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * @param length Specify a positive number if the length of the input is known.<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * @param bufferSize Specify the buffer size to use.<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * @return The contents of the reader as a string. <jk>null</jk> if reader was null.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * @throws IOException If a problem occurred trying to read from the reader.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> */<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public static String read(Reader in, int length, int bufferSize) throws IOException {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (in == null)<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return null;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> length = (length <= 0 ? bufferSize : length);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> StringBuilder sb = new StringBuilder(length); // Assume they're ASCII characters.<a name="line.223"></a>
+<span class="sourceLineNo">224</span> try {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> char[] buf = new char[Math.min(bufferSize, length)];<a name="line.225"></a>
+<span class="sourceLineNo">226</span> int i = 0;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> while ((i = in.read(buf)) != -1)<a name="line.227"></a>
+<span class="sourceLineNo">228</span> sb.append(buf, 0, i);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> return sb.toString();<a name="line.229"></a>
+<span class="sourceLineNo">230</span> } finally {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> in.close();<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> /**<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * Pipes the contents of the specified reader into the writer.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * The reader is closed, the writer is not.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> *<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @param in The reader to pipe from.<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * @param out The writer to pipe to.<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * @throws IOException<a name="line.241"></a>
+<span class="sourceLineNo">242</span> */<a name="line.242"></a>
+<span class="sourceLineNo">243</span> public static void pipe(Reader in, Writer out) throws IOException {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> assertFieldNotNull(out, "out");<a name="line.244"></a>
+<span class="sourceLineNo">245</span> assertFieldNotNull(in, "in");<a name="line.245"></a>
+<span class="sourceLineNo">246</span> IOPipe.create(in, out).run();<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> /**<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * Wraps the specified reader in a buffered reader.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> *<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * @param r The reader being wrapped.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * @return The reader wrapped in a {@link BufferedReader}, or the original {@link Reader} if it's already<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * a buffered reader.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> public static Reader getBufferedReader(Reader r) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (r instanceof BufferedReader || r instanceof StringReader)<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return r;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return new BufferedReader(r);<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> /**<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * Counts the number of bytes in the input stream and then closes the stream.<a name="line.263"></a>
+<span class="sourceLineNo">264</span> *<a name="line.264"></a>
+<span class="sourceLineNo">265</span> * @param is The input stream to read from.<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * @return The number of bytes read.<a name="line.266"></a>
+<span class="sourceLineNo">267</span> * @throws IOException<a name="line.267"></a>
+<span class="sourceLineNo">268</span> */<a name="line.268"></a>
+<span class="sourceLineNo">269</span> public static long count(InputStream is) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> assertFieldNotNull(is, "is");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> long c = 0;<a name="line.271"></a>
+<span class="sourceLineNo">272</span> long i;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> try {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> while ((i = is.skip(1024)) != 0)<a name="line.274"></a>
+<span class="sourceLineNo">275</span> c += i;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> } finally {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> is.close();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return c;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> /**<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * Counts the number of characters in the reader and then closes the reader.<a name="line.283"></a>
+<span class="sourceLineNo">284</span> *<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * @param r The reader to read from.<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * @return The number of characters read.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * @throws IOException<a name="line.287"></a>
+<span class="sourceLineNo">288</span> */<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public static long count(Reader r) throws IOException {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> assertFieldNotNull(r, "r");<a name="line.290"></a>
+<span class="sourceLineNo">291</span> long c = 0;<a name="line.291"></a>
+<span class="sourceLineNo">292</span> long i;<a name="line.292"></a>
+<span class="sourceLineNo">293</span> try {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> while ((i = r.skip(1024)) != 0)<a name="line.294"></a>
+<span class="sourceLineNo">295</span> c += i;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> } finally {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> r.close();<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return c;<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> * Given the specified <js>"Content-Length"</js> header value, return an appropriate buffer size.<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * The maximum buffer size is 1MB.<a name="line.304"></a>
+<span class="sourceLineNo">305</span> *<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * @param contentLength The value of the <js>"Content-Length"</js> header.<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * @return The appropriate buffer size.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> */<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public static int getBufferSize(String contentLength) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> try {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> if (! StringUtils.isEmpty(contentLength)) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> long l = Long.decode(contentLength);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> if (l > 1048576)<a name="line.313"></a>
+<span class="sourceLineNo">314</span> return 1048576;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> if (l <= 0)<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return 8192;<a name="line.316"></a>
+<span class="sourceLineNo">317</span> return (int)l;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } catch (Exception e) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> return 8192;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return 8192;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * Close input stream and ignore any exceptions.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> * No-op if input stream is <jk>null</jk>.<a name="line.327"></a>
+<span class="sourceLineNo">328</span> *<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param is The input stream to close.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> */<a name="line.330"></a>
+<span class="sourceLineNo">331</span> public static void closeQuietly(InputStream is) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> try {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> if (is != null)<a name="line.333"></a>
+<span class="sourceLineNo">334</span> is.close();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> } catch (IOException e) {}<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> /**<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * Close output stream and ignore any exceptions.<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * No-op if output stream is <jk>null</jk>.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> *<a name="line.341"></a>
+<span class="sourceLineNo">342</span> * @param os The output stream to close.<a name="line.342"></a>
+<span class="sourceLineNo">343</span> */<a name="line.343"></a>
+<span class="sourceLineNo">344</span> public static void closeQuietly(OutputStream os) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> try {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (os != null)<a name="line.346"></a>
+<span class="sourceLineNo">347</span> os.close();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> } catch (IOException e) {}<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> /**<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * Close reader and ignore any exceptions.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * No-op if reader is <jk>null</jk>.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> *<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * @param r The reader to close.<a name="line.355"></a>
+<span class="sourceLineNo">356</span> */<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public static void closeQuietly(Reader r) {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> try {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> if (r != null)<a name="line.359"></a>
+<span class="sourceLineNo">360</span> r.close();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> } catch (IOException e) {}<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> * Close writer and ignore any exceptions.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * No-op if writer is <jk>null</jk>.<a name="line.366"></a>
<span class="sourceLineNo">367</span> *<a name="line.367"></a>
-<span class="sourceLineNo">368</span> * @param o The object to convert to an input stream.<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * Can be any of the following:<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * <ul><a name="line.370"></a>
-<span class="sourceLineNo">371</span> * <li>{@link InputStream}<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * <li>{@link Reader}<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * <li>{@link File}<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * <li>{@link CharSequence} - Converted to UTF-8 stream.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * <li><code><jk>byte</jk>[]</code><a name="line.375"></a>
-<span class="sourceLineNo">376</span> * <li><code><jk>null</jk></code> - Returns null.<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * </ul><a name="line.377"></a>
-<span class="sourceLineNo">378</span> * @return The object converted to an input stream.<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * @throws IOException If invalid object passed in or file could not be read.<a name="line.379"></a>
-<span class="sourceLineNo">380</span> */<a name="line.380"></a>
-<span class="sourceLineNo">381</span> public static InputStream toInputStream(Object o) throws IOException {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> if (o == null)<a name="line.382"></a>
-<span class="sourceLineNo">383</span> return null;<a name="line.383"></a>
-<span class="sourceLineNo">384</span> if (o instanceof InputStream)<a name="line.384"></a>
-<span class="sourceLineNo">385</span> return (InputStream)o;<a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (o instanceof File)<a name="line.386"></a>
-<span class="sourceLineNo">387</span> return new FileInputStream((File)o);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> if (o instanceof byte[])<a name="line.388"></a>
-<span class="sourceLineNo">389</span> return new ByteArrayInputStream((byte[])o);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> if (o instanceof CharSequence)<a name="line.390"></a>
-<span class="sourceLineNo">391</span> return new ByteArrayInputStream(((CharSequence)o).toString().getBytes(UTF8));<a name="line.391"></a>
-<span class="sourceLineNo">392</span> if (o instanceof Reader)<a name="line.392"></a>
-<span class="sourceLineNo">393</span> return new ByteArrayInputStream(IOUtils.read((Reader)o).getBytes(UTF8));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> throw new IOException("Invalid object type passed to IOUtils.toInputStream(Object): " + o.getClass().getName());<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">368</span> * @param w The writer to close.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> */<a name="line.369"></a>
+<span class="sourceLineNo">370</span> public static void closeQuietly(Writer w) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> try {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> if (w != null)<a name="line.372"></a>
+<span class="sourceLineNo">373</span> w.close();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> } catch (IOException e) {}<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Quietly close all specified input streams, output streams, readers, and writers.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> *<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * @param o The list of all objects to quietly close.<a name="line.380"></a>
+<span class="sourceLineNo">381</span> */<a name="line.381"></a>
+<span class="sourceLineNo">382</span> public static void closeQuietly(Object...o) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> for (Object o2 : o) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> if (o2 instanceof InputStream)<a name="line.384"></a>
+<span class="sourceLineNo">385</span> closeQuietly((InputStream)o2);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (o2 instanceof OutputStream)<a name="line.386"></a>
+<span class="sourceLineNo">387</span> closeQuietly((OutputStream)o2);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (o2 instanceof Reader)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> closeQuietly((Reader)o2);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> if (o2 instanceof Writer)<a name="line.390"></a>
+<span class="sourceLineNo">391</span> closeQuietly((Writer)o2);<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> /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * Converts an object to an <code>InputStream</code>.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> *<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * @param o The object to convert to an input stream.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> * Can be any of the following:<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * <ul><a name="line.400"></a>
+<span class="sourceLineNo">401</span> * <li>{@link InputStream}<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * <li>{@link Reader}<a name="line.402"></a>
+<span class="sourceLineNo">403</span> * <li>{@link File}<a name="line.403"></a>
+<span class="sourceLineNo">404</span> * <li>{@link CharSequence} - Converted to UTF-8 stream.<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * <li><code><jk>byte</jk>[]</code><a name="line.405"></a>
+<span class="sourceLineNo">406</span> * <li><code><jk>null</jk></code> - Returns null.<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * </ul><a name="line.407"></a>
+<span class="sourceLineNo">408</span> * @return The object converted to an input stream.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * @throws IOException If invalid object passed in or file could not be read.<a name="line.409"></a>
+<span class="sourceLineNo">410</span> */<a name="line.410"></a>
+<span class="sourceLineNo">411</span> public static InputStream toInputStream(Object o) throws IOException {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> if (o == null)<a name="line.412"></a>
+<span class="sourceLineNo">413</span> return null;<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (o instanceof InputStream)<a name="line.414"></a>
+<span class="sourceLineNo">415</span> return (InputStream)o;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (o instanceof File)<a name="line.416"></a>
+<span class="sourceLineNo">417</span> return new FileInputStream((File)o);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> if (o instanceof byte[])<a name="line.418"></a>
+<span class="sourceLineNo">419</span> return new ByteArrayInputStream((byte[])o);<a name="line.419"></a>
+<span class="sourceLineNo">420</span> if (o instanceof CharSequence)<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return new ByteArrayInputStream(((CharSequence)o).toString().getBytes(UTF8));<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (o instanceof Reader)<a name="line.422"></a>
+<span class="sourceLineNo">423</span> return new ByteArrayInputStream(IOUtils.read((Reader)o).getBytes(UTF8));<a name="line.423"></a>
+<span class="sourceLineNo">424</span> throw new IOException("Invalid object type passed to IOUtils.toInputStream(Object): " + o.getClass().getName());<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span>}<a name="line.426"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/internal/ObjectUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/ObjectUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/ObjectUtils.html
index 1ab4511..5e50520 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/ObjectUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ObjectUtils.html
@@ -20,28 +20,57 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.internal;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>/**<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * Object-related utility methods.<a name="line.16"></a>
-<span class="sourceLineNo">017</span> */<a name="line.17"></a>
-<span class="sourceLineNo">018</span>public class ObjectUtils {<a name="line.18"></a>
-<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span> /**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * Returns <jk>true</jk> if the specified objects are equal.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * <p><a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Gracefully handles <jk>null</jk>s.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> *<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * @param o1 Object #1<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * @param o2 Object #2<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * @return <jk>true</jk> if the objects are equal or both <jk>null</jk>.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> */<a name="line.28"></a>
-<span class="sourceLineNo">029</span> public static boolean equals(Object o1, Object o2) {<a name="line.29"></a>
-<span class="sourceLineNo">030</span> if (o1 == null && o2 == null)<a name="line.30"></a>
-<span class="sourceLineNo">031</span> return true;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> if (o1 == null || o2 == null)<a name="line.32"></a>
-<span class="sourceLineNo">033</span> return false;<a name="line.33"></a>
-<span class="sourceLineNo">034</span> return o1.equals(o2);<a name="line.34"></a>
-<span class="sourceLineNo">035</span> }<a name="line.35"></a>
-<span class="sourceLineNo">036</span>}<a name="line.36"></a>
+<span class="sourceLineNo">015</span>import java.lang.reflect.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import java.util.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>/**<a name="line.18"></a>
+<span class="sourceLineNo">019</span> * Object-related utility methods.<a name="line.19"></a>
+<span class="sourceLineNo">020</span> */<a name="line.20"></a>
+<span class="sourceLineNo">021</span>public class ObjectUtils {<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span> /**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Returns <jk>true</jk> if the specified objects are equal.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * Gracefully handles <jk>null</jk>s.<a name="line.26"></a>
+<span class="sourceLineNo">027</span> *<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * @param o1 Object #1<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * @param o2 Object #2<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * @return <jk>true</jk> if the objects are equal or both <jk>null</jk>.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span> public static boolean equals(Object o1, Object o2) {<a name="line.32"></a>
+<span class="sourceLineNo">033</span> if (o1 == null && o2 == null)<a name="line.33"></a>
+<span class="sourceLineNo">034</span> return true;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> if (o1 == null || o2 == null)<a name="line.35"></a>
+<span class="sourceLineNo">036</span> return false;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> return o1.equals(o2);<a name="line.37"></a>
+<span class="sourceLineNo">038</span> }<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> /**<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Returns <jk>true</jk> if the specified object is empty.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Return <jk>true</jk> if the value is any of the following:<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <ul><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <li><jk>null</jk><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <li>An empty Collection<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <li>An empty array<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <li>An empty CharSequence<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <li>An empty String when serialized to a string using {@link Object#toString()}.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * </ul><a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @param o The object to test.<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @return <jk>true</jk> if the specified object is empty.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span> @SuppressWarnings("rawtypes")<a name="line.55"></a>
+<span class="sourceLineNo">056</span> public static boolean isEmpty(Object o) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> if (o == null)<a name="line.57"></a>
+<span class="sourceLineNo">058</span> return true;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> if (o instanceof Collection)<a name="line.59"></a>
+<span class="sourceLineNo">060</span> return ((Collection)o).isEmpty();<a name="line.60"></a>
+<span class="sourceLineNo">061</span> if (o.getClass().isArray())<a name="line.61"></a>
+<span class="sourceLineNo">062</span> return (Array.getLength(o) == 0);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> return o.toString().isEmpty();<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span>}<a name="line.65"></a>
[07/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
index 7ebe984..008c4e6 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/client/RestClientBuilder.html
@@ -54,1936 +54,1951 @@
<span class="sourceLineNo">046</span>import org.apache.juneau.json.*;<a name="line.46"></a>
<span class="sourceLineNo">047</span>import org.apache.juneau.parser.*;<a name="line.47"></a>
<span class="sourceLineNo">048</span>import org.apache.juneau.serializer.*;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.juneau.urlencoding.*;<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>/**<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * Builder class for the {@link RestClient} class.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>@SuppressWarnings({"hiding"})<a name="line.54"></a>
-<span class="sourceLineNo">055</span>public class RestClientBuilder extends CoreObjectBuilder {<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span> private HttpClientConnectionManager httpClientConnectionManager;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private HttpClientBuilder httpClientBuilder = createHttpClientBuilder();<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private CloseableHttpClient httpClient;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private boolean keepHttpClientOpen;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span> private Class<? extends Serializer> serializerClass = JsonSerializer.class;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> private Class<? extends Parser> parserClass = JsonParser.class;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private Class<? extends PartSerializer> partSerializerClass = UrlEncodingSerializer.class;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> private Serializer serializer;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private Parser parser;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private PartSerializer partSerializer;<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> private Map<String,String> headers = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> private List<RestCallInterceptor> interceptors = new ArrayList<RestCallInterceptor>();<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> private String rootUrl;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private SSLOpts sslOpts;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private boolean pooled;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> private int retries = 1;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private long retryInterval = -1;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private RetryOn retryOn = RetryOn.DEFAULT;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private boolean debug, executorServiceShutdownOnClose;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private ExecutorService executorService;<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * Constructor, default settings.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> public RestClientBuilder() {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> super();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> /**<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * Constructor, default settings.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <p><a name="line.92"></a>
-<span class="sourceLineNo">093</span> * Shortcut for calling <code><jk>new</jk> RestClientBuilder().serializer(s).parser(p);</code><a name="line.93"></a>
-<span class="sourceLineNo">094</span> *<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @param s The serializer to use for output.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @param p The parser to use for input.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> */<a name="line.97"></a>
-<span class="sourceLineNo">098</span> public RestClientBuilder(Serializer s, Parser p) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> super();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> serializer(s);<a name="line.100"></a>
-<span class="sourceLineNo">101</span> parser(p);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * Constructor, default settings.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * <p><a name="line.106"></a>
-<span class="sourceLineNo">107</span> * Shortcut for calling <code><jk>new</jk> RestClientBuilder().serializer(s).parser(p);</code><a name="line.107"></a>
-<span class="sourceLineNo">108</span> *<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * @param s The serializer class to use for output.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * @param p The parser class to use for input.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> */<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public RestClientBuilder(Class<? extends Serializer> s, Class<? extends Parser> p) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> super();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> serializer(s);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> parser(p);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Constructor.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param propertyStore The initial configuration settings for this builder.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> */<a name="line.121"></a>
-<span class="sourceLineNo">122</span> public RestClientBuilder(PropertyStore propertyStore) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> super(propertyStore);<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> @Override /* CoreObjectBuilder */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public RestClient build() {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> try {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> CloseableHttpClient httpClient = this.httpClient;<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (httpClient == null)<a name="line.130"></a>
-<span class="sourceLineNo">131</span> httpClient = createHttpClient();<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> Serializer s =<a name="line.133"></a>
-<span class="sourceLineNo">134</span> this.serializer != null<a name="line.134"></a>
-<span class="sourceLineNo">135</span> ? this.serializer.builder().apply(propertyStore).build()<a name="line.135"></a>
-<span class="sourceLineNo">136</span> : new SerializerBuilder(propertyStore).build(this.serializerClass);<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> Parser p =<a name="line.138"></a>
-<span class="sourceLineNo">139</span> this.parser != null<a name="line.139"></a>
-<span class="sourceLineNo">140</span> ? this.parser.builder().apply(propertyStore).build()<a name="line.140"></a>
-<span class="sourceLineNo">141</span> : new ParserBuilder(propertyStore).build(this.parserClass);<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> UrlEncodingSerializer us = new SerializerBuilder(propertyStore).build(UrlEncodingSerializer.class);<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> PartSerializer pf = null;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (partSerializer != null)<a name="line.146"></a>
-<span class="sourceLineNo">147</span> pf = partSerializer;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> else if (partSerializerClass != null) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> if (partSerializerClass == UrlEncodingSerializer.class)<a name="line.149"></a>
-<span class="sourceLineNo">150</span> pf = us;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> else<a name="line.151"></a>
-<span class="sourceLineNo">152</span> pf = partSerializerClass.newInstance();<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> return new RestClient(propertyStore, httpClient, keepHttpClientOpen, s, p, us, pf, headers, interceptors, rootUrl, retryOn, retries, retryInterval, debug, executorService, executorServiceShutdownOnClose);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> } catch (Exception e) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> throw new RuntimeException(e);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> /**<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * Creates an instance of an {@link HttpClient} to be used to handle all HTTP communications with the target server.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * <p><a name="line.163"></a>
-<span class="sourceLineNo">164</span> * This HTTP client is used when the HTTP client is not specified through one of the constructors or the<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * {@link #httpClient(CloseableHttpClient, boolean)} method.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * <p><a name="line.166"></a>
-<span class="sourceLineNo">167</span> * Subclasses can override this method to provide specially-configured HTTP clients to handle<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * stuff such as SSL/TLS certificate handling, authentication, etc.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * <p><a name="line.169"></a>
-<span class="sourceLineNo">170</span> * The default implementation returns an instance of {@link HttpClient} using the client builder<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * returned by {@link #createHttpClientBuilder()}.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> *<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * @return The HTTP client to use.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * @throws Exception<a name="line.174"></a>
-<span class="sourceLineNo">175</span> */<a name="line.175"></a>
-<span class="sourceLineNo">176</span> protected CloseableHttpClient createHttpClient() throws Exception {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // Don't call createConnectionManager() if RestClient.setConnectionManager() was called.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (httpClientConnectionManager == null)<a name="line.178"></a>
-<span class="sourceLineNo">179</span> httpClientBuilder.setConnectionManager(createConnectionManager());<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return httpClientBuilder.build();<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> * Creates an instance of an {@link HttpClientBuilder} to be used to create<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * the {@link HttpClient}.<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * <p><a name="line.186"></a>
-<span class="sourceLineNo">187</span> * Subclasses can override this method to provide their own client builder.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * <p><a name="line.188"></a>
-<span class="sourceLineNo">189</span> * The predefined method returns an {@link HttpClientBuilder} with the following settings:<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * <ul><a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <li>Lax redirect strategy.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <li>The connection manager returned by {@link #createConnectionManager()}.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * </ul><a name="line.193"></a>
-<span class="sourceLineNo">194</span> *<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * @return The HTTP client builder to use to create the HTTP client.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> protected HttpClientBuilder createHttpClientBuilder() {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> HttpClientBuilder b = HttpClientBuilder.create();<a name="line.198"></a>
-<span class="sourceLineNo">199</span> b.setRedirectStrategy(new AllowAllRedirects());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> return b;<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> * Creates the {@link HttpClientConnectionManager} returned by {@link #createConnectionManager()}.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * <p><a name="line.205"></a>
-<span class="sourceLineNo">206</span> * Subclasses can override this method to provide their own connection manager.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * <p><a name="line.207"></a>
-<span class="sourceLineNo">208</span> * The default implementation returns an instance of a {@link PoolingHttpClientConnectionManager}.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> *<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @return The HTTP client builder to use to create the HTTP client.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> protected HttpClientConnectionManager createConnectionManager() {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> if (sslOpts != null) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> HostnameVerifier hv = null;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> switch (sslOpts.getHostVerify()) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> case LAX: hv = new NoopHostnameVerifier(); break;<a name="line.216"></a>
-<span class="sourceLineNo">217</span> case DEFAULT: hv = new DefaultHostnameVerifier(); break;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> default: throw new RuntimeException("Programmer error");<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> for (String p : StringUtils.split(sslOpts.getProtocols(), ',')) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> try {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> TrustManager tm = new SimpleX509TrustManager(sslOpts.getCertValidate() == SSLOpts.CertValidate.LAX);<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> SSLContext ctx = SSLContext.getInstance(p);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> ctx.init(null, new TrustManager[] { tm }, null);<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> // Create a socket to ensure this algorithm is acceptable.<a name="line.228"></a>
-<span class="sourceLineNo">229</span> // This will correctly disallow certain configurations (such as SSL_TLS under FIPS)<a name="line.229"></a>
-<span class="sourceLineNo">230</span> ctx.getSocketFactory().createSocket().close();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> SSLConnectionSocketFactory sf = new SSLConnectionSocketFactory(ctx, hv);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> setSSLSocketFactory(sf);<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> Registry<ConnectionSocketFactory> r = RegistryBuilder.<ConnectionSocketFactory> create().register("https", sf).build();<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> return (pooled ? new PoolingHttpClientConnectionManager(r) : new BasicHttpClientConnectionManager(r));<a name="line.236"></a>
-<span class="sourceLineNo">237</span> } catch (Throwable t) {}<a name="line.237"></a>
-<span class="sourceLineNo">238</span> }<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> // Using pooling connection so that this client is threadsafe.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return (pooled ? new PoolingHttpClientConnectionManager() : new BasicHttpClientConnectionManager());<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> /**<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * Set a root URL for this client.<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * <p><a name="line.247"></a>
-<span class="sourceLineNo">248</span> * When set, URL strings passed in through the various rest call methods (e.g. {@link RestClient#doGet(Object)}<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * will be prefixed with the specified root.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * This root URL is ignored on those methods if you pass in a {@link URL}, {@link URI}, or an absolute URL string.<a name="line.250"></a>
-<span class="sourceLineNo">251</span> *<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @param rootUrl The root URL to prefix to relative URL strings. Trailing slashes are trimmed.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * Usually a <code>String<code> but you can also pass in <code>URI</code> and <code>URL</code> objects as well.<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * @return This object (for method chaining).<a name="line.254"></a>
-<span class="sourceLineNo">255</span> */<a name="line.255"></a>
-<span class="sourceLineNo">256</span> public RestClientBuilder rootUrl(Object rootUrl) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> String s = rootUrl.toString();<a name="line.257"></a>
-<span class="sourceLineNo">258</span> if (s.endsWith("/"))<a name="line.258"></a>
-<span class="sourceLineNo">259</span> s = s.replaceAll("\\/$", "");<a name="line.259"></a>
-<span class="sourceLineNo">260</span> this.rootUrl = s;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return this;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> /**<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * Enable SSL support on this client.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> *<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * @param opts The SSL configuration options. See {@link SSLOpts} for details.<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * This method is a no-op if <code>sslConfig</code> is <jk>null</jk>.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @return This object (for method chaining).<a name="line.269"></a>
-<span class="sourceLineNo">270</span> * @throws KeyStoreException<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * @throws NoSuchAlgorithmException<a name="line.271"></a>
-<span class="sourceLineNo">272</span> */<a name="line.272"></a>
-<span class="sourceLineNo">273</span> public RestClientBuilder enableSSL(SSLOpts opts) throws KeyStoreException, NoSuchAlgorithmException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> this.sslOpts = opts;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return this;<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> * Enable LAX SSL support.<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * <p><a name="line.280"></a>
-<span class="sourceLineNo">281</span> * Certificate chain validation and hostname verification is disabled.<a name="line.281"></a>
-<span class="sourceLineNo">282</span> *<a name="line.282"></a>
-<span class="sourceLineNo">283</span> * @return This object (for method chaining).<a name="line.283"></a>
-<span class="sourceLineNo">284</span> * @throws KeyStoreException<a name="line.284"></a>
-<span class="sourceLineNo">285</span> * @throws NoSuchAlgorithmException<a name="line.285"></a>
-<span class="sourceLineNo">286</span> */<a name="line.286"></a>
-<span class="sourceLineNo">287</span> public RestClientBuilder enableLaxSSL() throws KeyStoreException, NoSuchAlgorithmException {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> return enableSSL(SSLOpts.LAX);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * Sets the client version by setting the value for the <js>"X-Client-Version"</js> header.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> *<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @param version The version string (e.g. <js>"1.2.3"</js>)<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * @return This object (for method chaining).<a name="line.295"></a>
-<span class="sourceLineNo">296</span> */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public RestClientBuilder clientVersion(String version) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> return header("X-Client-Version", version);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> /**<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * Adds an interceptor that gets called immediately after a connection is made.<a name="line.302"></a>
-<span class="sourceLineNo">303</span> *<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * @param interceptor The interceptor.<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * @return This object (for method chaining).<a name="line.305"></a>
-<span class="sourceLineNo">306</span> */<a name="line.306"></a>
-<span class="sourceLineNo">307</span> public RestClientBuilder interceptor(RestCallInterceptor interceptor) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> interceptors.add(interceptor);<a name="line.308"></a>
-<span class="sourceLineNo">309</span> return this;<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> /**<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * Adds a {@link RestCallLogger} to the list of interceptors on this class.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> *<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * @param level The log level to log messsages at.<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * @param log The logger to log messages to.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @return This object (for method chaining).<a name="line.317"></a>
-<span class="sourceLineNo">318</span> */<a name="line.318"></a>
-<span class="sourceLineNo">319</span> public RestClientBuilder logTo(Level level, Logger log) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> interceptor(new RestCallLogger(level, log));<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return this;<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> /**<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * Make HTTP calls retryable if an error response (>=400) is received.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> *<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * @param retries The number of retries to attempt.<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @param interval The time in milliseconds between attempts.<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * @param retryOn Optional object used for determining whether a retry should be attempted.<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * If <jk>null</jk>, uses {@link RetryOn#DEFAULT}.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * @return This object (for method chaining).<a name="line.331"></a>
-<span class="sourceLineNo">332</span> */<a name="line.332"></a>
-<span class="sourceLineNo">333</span> public RestClientBuilder retryable(int retries, long interval, RetryOn retryOn) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> this.retries = retries;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> this.retryInterval = interval;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> this.retryOn = retryOn;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> return this;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<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> * When called, the {@link #createConnectionManager()} method will return a {@link PoolingHttpClientConnectionManager}<a name="line.341"></a>
-<span class="sourceLineNo">342</span> * instead of a {@link BasicHttpClientConnectionManager}.<a name="line.342"></a>
-<span class="sourceLineNo">343</span> *<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * @return This object (for method chaining).<a name="line.344"></a>
-<span class="sourceLineNo">345</span> */<a name="line.345"></a>
-<span class="sourceLineNo">346</span> public RestClientBuilder pooled() {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> this.pooled = true;<a name="line.347"></a>
-<span class="sourceLineNo">348</span> return this;<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> /**<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * Sets the serializer used for serializing POJOs to the HTTP request message body.<a name="line.352"></a>
-<span class="sourceLineNo">353</span> *<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * @param serializer The serializer.<a name="line.354"></a>
-<span class="sourceLineNo">355</span> * @return This object (for method chaining).<a name="line.355"></a>
-<span class="sourceLineNo">356</span> */<a name="line.356"></a>
-<span class="sourceLineNo">357</span> public RestClientBuilder serializer(Serializer serializer) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> this.serializer = serializer;<a name="line.358"></a>
-<span class="sourceLineNo">359</span> return this;<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> * Same as {@link #serializer(Serializer)}, except takes in a serializer class that<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * will be instantiated through a no-arg constructor.<a name="line.364"></a>
-<span class="sourceLineNo">365</span> *<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * @param serializerClass The serializer class.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * @return This object (for method chaining).<a name="line.367"></a>
-<span class="sourceLineNo">368</span> */<a name="line.368"></a>
-<span class="sourceLineNo">369</span> public RestClientBuilder serializer(Class<? extends Serializer> serializerClass) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> this.serializerClass = serializerClass;<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return this;<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> /**<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * Sets the parser used for parsing POJOs from the HTTP response message body.<a name="line.375"></a>
-<span class="sourceLineNo">376</span> *<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * @param parser The parser.<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * @return This object (for method chaining).<a name="line.378"></a>
-<span class="sourceLineNo">379</span> */<a name="line.379"></a>
-<span class="sourceLineNo">380</span> public RestClientBuilder parser(Parser parser) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> this.parser = parser;<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return this;<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> /**<a name="line.385"></a>
-<span class="sourceLineNo">386</span> * Same as {@link #parser(Parser)}, except takes in a parser class that<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * will be instantiated through a no-arg constructor.<a name="line.387"></a>
-<span class="sourceLineNo">388</span> *<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * @param parserClass The parser class.<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * @return This object (for method chaining).<a name="line.390"></a>
-<span class="sourceLineNo">391</span> */<a name="line.391"></a>
-<span class="sourceLineNo">392</span> public RestClientBuilder parser(Class<? extends Parser> parserClass) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> this.parserClass = parserClass;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> return this;<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> /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * Sets the part serializer to use for converting POJOs to headers, query parameters, form-data parameters, and<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * path variables.<a name="line.399"></a>
-<span class="sourceLineNo">400</span> *<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * @param partSerializer The part serializer instance.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * @return This object (for method chaining).<a name="line.402"></a>
-<span class="sourceLineNo">403</span> */<a name="line.403"></a>
-<span class="sourceLineNo">404</span> public RestClientBuilder partSerializer(PartSerializer partSerializer) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> this.partSerializer = partSerializer;<a name="line.405"></a>
-<span class="sourceLineNo">406</span> return this;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> /**<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * Sets the part formatter to use for converting POJOs to headers, query parameters, form-data parameters, and<a name="line.410"></a>
-<span class="sourceLineNo">411</span> * path variables.<a name="line.411"></a>
-<span class="sourceLineNo">412</span> *<a name="line.412"></a>
-<span class="sourceLineNo">413</span> * @param partSerializerClass The part serializer class.<a name="line.413"></a>
-<span class="sourceLineNo">414</span> * The class must have a no-arg constructor.<a name="line.414"></a>
-<span class="sourceLineNo">415</span> * @return This object (for method chaining).<a name="line.415"></a>
-<span class="sourceLineNo">416</span> */<a name="line.416"></a>
-<span class="sourceLineNo">417</span> public RestClientBuilder partSerializer(Class<? extends PartSerializer> partSerializerClass) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> this.partSerializerClass = partSerializerClass;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return this;<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> * Set up this client to use BASIC auth.<a name="line.423"></a>
-<span class="sourceLineNo">424</span> *<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * @param host The auth scope hostname.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * @param port The auth scope port.<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * @param user The username.<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * @param pw The password.<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * @return This object (for method chaining).<a name="line.429"></a>
-<span class="sourceLineNo">430</span> */<a name="line.430"></a>
-<span class="sourceLineNo">431</span> public RestClientBuilder basicAuth(String host, int port, String user, String pw) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> AuthScope scope = new AuthScope(host, port);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Credentials up = new UsernamePasswordCredentials(user, pw);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> CredentialsProvider p = new BasicCredentialsProvider();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> p.setCredentials(scope, up);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> setDefaultCredentialsProvider(p);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return this;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * Sets the internal {@link HttpClient} to use for handling HTTP communications.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> *<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * @param httpClient The HTTP client.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * @param keepHttpClientOpen Don't close this client when the {@link RestClient#close()} method is called.<a name="line.444"></a>
-<span class="sourceLineNo">445</span> * @return This object (for method chaining).<a name="line.445"></a>
-<span class="sourceLineNo">446</span> */<a name="line.446"></a>
-<span class="sourceLineNo">447</span> public RestClientBuilder httpClient(CloseableHttpClient httpClient, boolean keepHttpClientOpen) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> this.httpClient = httpClient;<a name="line.448"></a>
-<span class="sourceLineNo">449</span> this.keepHttpClientOpen = keepHttpClientOpen;<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return this;<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> /**<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * Defines the executor service to use when calling future methods on the {@link RestCall} class.<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * <p><a name="line.455"></a>
-<span class="sourceLineNo">456</span> * This executor service is used to create {@link Future} objects on the following methods:<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * <ul><a name="line.457"></a>
-<span class="sourceLineNo">458</span> * <li>{@link RestCall#runFuture()}<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * <li>{@link RestCall#getResponseFuture(Class)}<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * <li>{@link RestCall#getResponseFuture(Type,Type...)}<a name="line.460"></a>
-<span class="sourceLineNo">461</span> * <li>{@link RestCall#getResponseAsString()}<a name="line.461"></a>
-<span class="sourceLineNo">462</span> * </ul><a name="line.462"></a>
-<span class="sourceLineNo">463</span> * <p><a name="line.463"></a>
-<span class="sourceLineNo">464</span> * The default executor service is a single-threaded {@link ThreadPoolExecutor} with a 30 second timeout<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * and a queue size of 10.<a name="line.465"></a>
-<span class="sourceLineNo">466</span> *<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * @param executorService The executor service.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * @param shutdownOnClose Call {@link ExecutorService#shutdown()} when {@link RestClient#close()} is called.<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * @return This object (for method chaining).<a name="line.469"></a>
-<span class="sourceLineNo">470</span> */<a name="line.470"></a>
-<span class="sourceLineNo">471</span> public RestClientBuilder executorService(ExecutorService executorService, boolean shutdownOnClose) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> this.executorService = executorService;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> this.executorServiceShutdownOnClose = shutdownOnClose;<a name="line.473"></a>
-<span class="sourceLineNo">474</span> return this;<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">049</span>import org.apache.juneau.uon.*;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.juneau.urlencoding.*;<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>/**<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * Builder class for the {@link RestClient} class.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>@SuppressWarnings({"hiding"})<a name="line.55"></a>
+<span class="sourceLineNo">056</span>public class RestClientBuilder extends CoreObjectBuilder {<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private HttpClientConnectionManager httpClientConnectionManager;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> private HttpClientBuilder httpClientBuilder = createHttpClientBuilder();<a name="line.59"></a>
+<span class="sourceLineNo">060</span> private CloseableHttpClient httpClient;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private boolean keepHttpClientOpen;<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> private Class<? extends Serializer> serializerClass = JsonSerializer.class;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> private Class<? extends Parser> parserClass = JsonParser.class;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> private Class<? extends PartSerializer> partSerializerClass = UrlEncodingSerializer.class;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private Serializer serializer;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private Parser parser;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> private PartSerializer partSerializer;<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> private Map<String,String> headers = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> private List<RestCallInterceptor> interceptors = new ArrayList<RestCallInterceptor>();<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> private String rootUrl;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> private SSLOpts sslOpts;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> private boolean pooled;<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> private int retries = 1;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private long retryInterval = -1;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private RetryOn retryOn = RetryOn.DEFAULT;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private boolean debug, executorServiceShutdownOnClose;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private ExecutorService executorService;<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * Constructor, default settings.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public RestClientBuilder() {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> super();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * Constructor, default settings.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <p><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * Shortcut for calling <code><jk>new</jk> RestClientBuilder().serializer(s).parser(p);</code><a name="line.94"></a>
+<span class="sourceLineNo">095</span> *<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @param s The serializer to use for output.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @param p The parser to use for input.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> */<a name="line.98"></a>
+<span class="sourceLineNo">099</span> public RestClientBuilder(Serializer s, Parser p) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> super();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> serializer(s);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> parser(p);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * Constructor, default settings.<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <p><a name="line.107"></a>
+<span class="sourceLineNo">108</span> * Shortcut for calling <code><jk>new</jk> RestClientBuilder().serializer(s).parser(p);</code><a name="line.108"></a>
+<span class="sourceLineNo">109</span> *<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * @param s The serializer class to use for output.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * @param p The parser class to use for input.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> */<a name="line.112"></a>
+<span class="sourceLineNo">113</span> public RestClientBuilder(Class<? extends Serializer> s, Class<? extends Parser> p) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> super();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> serializer(s);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> parser(p);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * Constructor.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param propertyStore The initial configuration settings for this builder.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public RestClientBuilder(PropertyStore propertyStore) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> super(propertyStore);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> @Override /* CoreObjectBuilder */<a name="line.127"></a>
+<span class="sourceLineNo">128</span> public RestClient build() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> try {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> CloseableHttpClient httpClient = this.httpClient;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (httpClient == null)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> httpClient = createHttpClient();<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> Serializer s =<a name="line.134"></a>
+<span class="sourceLineNo">135</span> this.serializer != null<a name="line.135"></a>
+<span class="sourceLineNo">136</span> ? this.serializer.builder().apply(propertyStore).build()<a name="line.136"></a>
+<span class="sourceLineNo">137</span> : new SerializerBuilder(propertyStore).build(this.serializerClass);<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> Parser p =<a name="line.139"></a>
+<span class="sourceLineNo">140</span> this.parser != null<a name="line.140"></a>
+<span class="sourceLineNo">141</span> ? this.parser.builder().apply(propertyStore).build()<a name="line.141"></a>
+<span class="sourceLineNo">142</span> : new ParserBuilder(propertyStore).build(this.parserClass);<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> UrlEncodingSerializer us = new SerializerBuilder(propertyStore).build(UrlEncodingSerializer.class);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> PartSerializer pf = null;<a name="line.146"></a>
+<span class="sourceLineNo">147</span> if (partSerializer != null)<a name="line.147"></a>
+<span class="sourceLineNo">148</span> pf = partSerializer;<a name="line.148"></a>
+<span class="sourceLineNo">149</span> else if (partSerializerClass != null) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> if (partSerializerClass == UrlEncodingSerializer.class)<a name="line.150"></a>
+<span class="sourceLineNo">151</span> pf = us;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> else<a name="line.152"></a>
+<span class="sourceLineNo">153</span> pf = partSerializerClass.newInstance();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> return new RestClient(propertyStore, httpClient, keepHttpClientOpen, s, p, us, pf, headers, interceptors, rootUrl, retryOn, retries, retryInterval, debug, executorService, executorServiceShutdownOnClose);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> } catch (Exception e) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> throw new RuntimeException(e);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> /**<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * Creates an instance of an {@link HttpClient} to be used to handle all HTTP communications with the target server.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * <p><a name="line.164"></a>
+<span class="sourceLineNo">165</span> * This HTTP client is used when the HTTP client is not specified through one of the constructors or the<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * {@link #httpClient(CloseableHttpClient, boolean)} method.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * <p><a name="line.167"></a>
+<span class="sourceLineNo">168</span> * Subclasses can override this method to provide specially-configured HTTP clients to handle<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * stuff such as SSL/TLS certificate handling, authentication, etc.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * <p><a name="line.170"></a>
+<span class="sourceLineNo">171</span> * The default implementation returns an instance of {@link HttpClient} using the client builder<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * returned by {@link #createHttpClientBuilder()}.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> *<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * @return The HTTP client to use.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * @throws Exception<a name="line.175"></a>
+<span class="sourceLineNo">176</span> */<a name="line.176"></a>
+<span class="sourceLineNo">177</span> protected CloseableHttpClient createHttpClient() throws Exception {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> // Don't call createConnectionManager() if RestClient.setConnectionManager() was called.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> if (httpClientConnectionManager == null)<a name="line.179"></a>
+<span class="sourceLineNo">180</span> httpClientBuilder.setConnectionManager(createConnectionManager());<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return httpClientBuilder.build();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Creates an instance of an {@link HttpClientBuilder} to be used to create<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * the {@link HttpClient}.<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * <p><a name="line.187"></a>
+<span class="sourceLineNo">188</span> * Subclasses can override this method to provide their own client builder.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * <p><a name="line.189"></a>
+<span class="sourceLineNo">190</span> * The predefined method returns an {@link HttpClientBuilder} with the following settings:<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * <ul><a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <li>Lax redirect strategy.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * <li>The connection manager returned by {@link #createConnectionManager()}.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * </ul><a name="line.194"></a>
+<span class="sourceLineNo">195</span> *<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @return The HTTP client builder to use to create the HTTP client.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> */<a name="line.197"></a>
+<span class="sourceLineNo">198</span> protected HttpClientBuilder createHttpClientBuilder() {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> HttpClientBuilder b = HttpClientBuilder.create();<a name="line.199"></a>
+<span class="sourceLineNo">200</span> b.setRedirectStrategy(new AllowAllRedirects());<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return b;<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> * Creates the {@link HttpClientConnectionManager} returned by {@link #createConnectionManager()}.<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * <p><a name="line.206"></a>
+<span class="sourceLineNo">207</span> * Subclasses can override this method to provide their own connection manager.<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <p><a name="line.208"></a>
+<span class="sourceLineNo">209</span> * The default implementation returns an instance of a {@link PoolingHttpClientConnectionManager}.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> *<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @return The HTTP client builder to use to create the HTTP client.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> protected HttpClientConnectionManager createConnectionManager() {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> if (sslOpts != null) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> HostnameVerifier hv = null;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> switch (sslOpts.getHostVerify()) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> case LAX: hv = new NoopHostnameVerifier(); break;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> case DEFAULT: hv = new DefaultHostnameVerifier(); break;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> default: throw new RuntimeException("Programmer error");<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> for (String p : StringUtils.split(sslOpts.getProtocols(), ',')) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> try {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> TrustManager tm = new SimpleX509TrustManager(sslOpts.getCertValidate() == SSLOpts.CertValidate.LAX);<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> SSLContext ctx = SSLContext.getInstance(p);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> ctx.init(null, new TrustManager[] { tm }, null);<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // Create a socket to ensure this algorithm is acceptable.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // This will correctly disallow certain configurations (such as SSL_TLS under FIPS)<a name="line.230"></a>
+<span class="sourceLineNo">231</span> ctx.getSocketFactory().createSocket().close();<a name="line.231"></a>
+<span class="sourceLineNo">232</span> SSLConnectionSocketFactory sf = new SSLConnectionSocketFactory(ctx, hv);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> setSSLSocketFactory(sf);<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> Registry<ConnectionSocketFactory> r = RegistryBuilder.<ConnectionSocketFactory> create().register("https", sf).build();<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> return (pooled ? new PoolingHttpClientConnectionManager(r) : new BasicHttpClientConnectionManager(r));<a name="line.237"></a>
+<span class="sourceLineNo">238</span> } catch (Throwable t) {}<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> // Using pooling connection so that this client is threadsafe.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return (pooled ? new PoolingHttpClientConnectionManager() : new BasicHttpClientConnectionManager());<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> /**<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * Set a root URL for this client.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * <p><a name="line.248"></a>
+<span class="sourceLineNo">249</span> * When set, URL strings passed in through the various rest call methods (e.g. {@link RestClient#doGet(Object)}<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * will be prefixed with the specified root.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * This root URL is ignored on those methods if you pass in a {@link URL}, {@link URI}, or an absolute URL string.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> *<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * @param rootUrl The root URL to prefix to relative URL strings. Trailing slashes are trimmed.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * Usually a <code>String<code> but you can also pass in <code>URI</code> and <code>URL</code> objects as well.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @return This object (for method chaining).<a name="line.255"></a>
+<span class="sourceLineNo">256</span> */<a name="line.256"></a>
+<span class="sourceLineNo">257</span> public RestClientBuilder rootUrl(Object rootUrl) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> String s = rootUrl.toString();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (s.endsWith("/"))<a name="line.259"></a>
+<span class="sourceLineNo">260</span> s = s.replaceAll("\\/$", "");<a name="line.260"></a>
+<span class="sourceLineNo">261</span> this.rootUrl = s;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> return this;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> /**<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * Enable SSL support on this client.<a name="line.266"></a>
+<span class="sourceLineNo">267</span> *<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * @param opts The SSL configuration options. See {@link SSLOpts} for details.<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * This method is a no-op if <code>sslConfig</code> is <jk>null</jk>.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * @return This object (for method chaining).<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * @throws KeyStoreException<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * @throws NoSuchAlgorithmException<a name="line.272"></a>
+<span class="sourceLineNo">273</span> */<a name="line.273"></a>
+<span class="sourceLineNo">274</span> public RestClientBuilder enableSSL(SSLOpts opts) throws KeyStoreException, NoSuchAlgorithmException {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> this.sslOpts = opts;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return this;<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> /**<a name="line.279"></a>
+<span class="sourceLineNo">280</span> * Enable LAX SSL support.<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * <p><a name="line.281"></a>
+<span class="sourceLineNo">282</span> * Certificate chain validation and hostname verification is disabled.<a name="line.282"></a>
+<span class="sourceLineNo">283</span> *<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * @return This object (for method chaining).<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * @throws KeyStoreException<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * @throws NoSuchAlgorithmException<a name="line.286"></a>
+<span class="sourceLineNo">287</span> */<a name="line.287"></a>
+<span class="sourceLineNo">288</span> public RestClientBuilder enableLaxSSL() throws KeyStoreException, NoSuchAlgorithmException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return enableSSL(SSLOpts.LAX);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> /**<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * Sets the client version by setting the value for the <js>"X-Client-Version"</js> header.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> *<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * @param version The version string (e.g. <js>"1.2.3"</js>)<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * @return This object (for method chaining).<a name="line.296"></a>
+<span class="sourceLineNo">297</span> */<a name="line.297"></a>
+<span class="sourceLineNo">298</span> public RestClientBuilder clientVersion(String version) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return header("X-Client-Version", version);<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> * Adds an interceptor that gets called immediately after a connection is made.<a name="line.303"></a>
+<span class="sourceLineNo">304</span> *<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * @param interceptor The interceptor.<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * @return This object (for method chaining).<a name="line.306"></a>
+<span class="sourceLineNo">307</span> */<a name="line.307"></a>
+<span class="sourceLineNo">308</span> public RestClientBuilder interceptor(RestCallInterceptor interceptor) {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> interceptors.add(interceptor);<a name="line.309"></a>
+<span class="sourceLineNo">310</span> return this;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span> /**<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * Adds a {@link RestCallLogger} to the list of interceptors on this class.<a name="line.314"></a>
+<span class="sourceLineNo">315</span> *<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * @param level The log level to log messsages at.<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * @param log The logger to log messages to.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * @return This object (for method chaining).<a name="line.318"></a>
+<span class="sourceLineNo">319</span> */<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public RestClientBuilder logTo(Level level, Logger log) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> interceptor(new RestCallLogger(level, log));<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return this;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * Make HTTP calls retryable if an error response (>=400) is received.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> *<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * @param retries The number of retries to attempt.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param interval The time in milliseconds between attempts.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @param retryOn Optional object used for determining whether a retry should be attempted.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> * If <jk>null</jk>, uses {@link RetryOn#DEFAULT}.<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * @return This object (for method chaining).<a name="line.332"></a>
+<span class="sourceLineNo">333</span> */<a name="line.333"></a>
+<span class="sourceLineNo">334</span> public RestClientBuilder retryable(int retries, long interval, RetryOn retryOn) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> this.retries = retries;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> this.retryInterval = interval;<a name="line.336"></a>
+<span class="sourceLineNo">337</span> this.retryOn = retryOn;<a name="line.337"></a>
+<span class="sourceLineNo">338</span> return this;<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> /**<a name="line.341"></a>
+<span class="sourceLineNo">342</span> * When called, the {@link #createConnectionManager()} method will return a {@link PoolingHttpClientConnectionManager}<a name="line.342"></a>
+<span class="sourceLineNo">343</span> * instead of a {@link BasicHttpClientConnectionManager}.<a name="line.343"></a>
+<span class="sourceLineNo">344</span> *<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * @return This object (for method chaining).<a name="line.345"></a>
+<span class="sourceLineNo">346</span> */<a name="line.346"></a>
+<span class="sourceLineNo">347</span> public RestClientBuilder pooled() {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.pooled = true;<a name="line.348"></a>
+<span class="sourceLineNo">349</span> return this;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span> /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * Sets the serializer used for serializing POJOs to the HTTP request message body.<a name="line.353"></a>
+<span class="sourceLineNo">354</span> *<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * @param serializer The serializer.<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * @return This object (for method chaining).<a name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public RestClientBuilder serializer(Serializer serializer) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> this.serializer = serializer;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> return this;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * Same as {@link #serializer(Serializer)}, except takes in a serializer class that<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * will be instantiated through a no-arg constructor.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> *<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * @param serializerClass The serializer class.<a name="line.367"></a>
+<span class="sourceLineNo">368</span> * @return This object (for method chaining).<a name="line.368"></a>
+<span class="sourceLineNo">369</span> */<a name="line.369"></a>
+<span class="sourceLineNo">370</span> public RestClientBuilder serializer(Class<? extends Serializer> serializerClass) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> this.serializerClass = serializerClass;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> return this;<a name="line.372"></a>
+<span class="sourceLineNo">373</span> }<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span> /**<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * Sets the parser used for parsing POJOs from the HTTP response message body.<a name="line.376"></a>
+<span class="sourceLineNo">377</span> *<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @param parser The parser.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * @return This object (for method chaining).<a name="line.379"></a>
+<span class="sourceLineNo">380</span> */<a name="line.380"></a>
+<span class="sourceLineNo">381</span> public RestClientBuilder parser(Parser parser) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> this.parser = parser;<a name="line.382"></a>
+<span class="sourceLineNo">383</span> return this;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> /**<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * Same as {@link #parser(Parser)}, except takes in a parser class that<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * will be instantiated through a no-arg constructor.<a name="line.388"></a>
+<span class="sourceLineNo">389</span> *<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * @param parserClass The parser class.<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * @return This object (for method chaining).<a name="line.391"></a>
+<span class="sourceLineNo">392</span> */<a name="line.392"></a>
+<span class="sourceLineNo">393</span> public RestClientBuilder parser(Class<? extends Parser> parserClass) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> this.parserClass = parserClass;<a name="line.394"></a>
+<span class="sourceLineNo">395</span> return this;<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> * Sets the part serializer to use for converting POJOs to headers, query parameters, form-data parameters, and<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * path variables.<a name="line.400"></a>
+<span class="sourceLineNo">401</span> *<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * @param partSerializer The part serializer instance.<a name="line.402"></a>
+<span class="sourceLineNo">403</span> * @return This object (for method chaining).<a name="line.403"></a>
+<span class="sourceLineNo">404</span> */<a name="line.404"></a>
+<span class="sourceLineNo">405</span> public RestClientBuilder partSerializer(PartSerializer partSerializer) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> this.partSerializer = partSerializer;<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return this;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> /**<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * Sets the part formatter to use for converting POJOs to headers, query parameters, form-data parameters, and<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * path variables.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> *<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * @param partSerializerClass The part serializer class.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * The class must have a no-arg constructor.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * @return This object (for method chaining).<a name="line.416"></a>
+<span class="sourceLineNo">417</span> */<a name="line.417"></a>
+<span class="sourceLineNo">418</span> public RestClientBuilder partSerializer(Class<? extends PartSerializer> partSerializerClass) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> this.partSerializerClass = partSerializerClass;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return this;<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> * Set up this client to use BASIC auth.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> *<a name="line.425"></a>
+<span class="sourceLineNo">426</span> * @param host The auth scope hostname.<a name="line.426"></a>
+<span class="sourceLineNo">427</span> * @param port The auth scope port.<a name="line.427"></a>
+<span class="sourceLineNo">428</span> * @param user The username.<a name="line.428"></a>
+<span class="sourceLineNo">429</span> * @param pw The password.<a name="line.429"></a>
+<span class="sourceLineNo">430</span> * @return This object (for method chaining).<a name="line.430"></a>
+<span class="sourceLineNo">431</span> */<a name="line.431"></a>
+<span class="sourceLineNo">432</span> public RestClientBuilder basicAuth(String host, int port, String user, String pw) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> AuthScope scope = new AuthScope(host, port);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> Credentials up = new UsernamePasswordCredentials(user, pw);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> CredentialsProvider p = new BasicCredentialsProvider();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> p.setCredentials(scope, up);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> setDefaultCredentialsProvider(p);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> return this;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> /**<a name="line.441"></a>
+<span class="sourceLineNo">442</span> * Sets the internal {@link HttpClient} to use for handling HTTP communications.<a name="line.442"></a>
+<span class="sourceLineNo">443</span> *<a name="line.443"></a>
+<span class="sourceLineNo">444</span> * @param httpClient The HTTP client.<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * @param keepHttpClientOpen Don't close this client when the {@link RestClient#close()} method is called.<a name="line.445"></a>
+<span class="sourceLineNo">446</span> * @return This object (for method chaining).<a name="line.446"></a>
+<span class="sourceLineNo">447</span> */<a name="line.447"></a>
+<span class="sourceLineNo">448</span> public RestClientBuilder httpClient(CloseableHttpClient httpClient, boolean keepHttpClientOpen) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> this.httpClient = httpClient;<a name="line.449"></a>
+<span class="sourceLineNo">450</span> this.keepHttpClientOpen = keepHttpClientOpen;<a name="line.450"></a>
+<span class="sourceLineNo">451</span> return this;<a name="line.451"></a>
+<span class="sourceLineNo">452</span> }<a name="line.452"></a>
+<span class="sourceLineNo">453</span><a name="line.453"></a>
+<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
+<span class="sourceLineNo">455</span> * Defines the executor service to use when calling future methods on the {@link RestCall} class.<a name="line.455"></a>
+<span class="sourceLineNo">456</span> * <p><a name="line.456"></a>
+<span class="sourceLineNo">457</span> * This executor service is used to create {@link Future} objects on the following methods:<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * <ul><a name="line.458"></a>
+<span class="sourceLineNo">459</span> * <li>{@link RestCall#runFuture()}<a name="line.459"></a>
+<span class="sourceLineNo">460</span> * <li>{@link RestCall#getResponseFuture(Class)}<a name="line.460"></a>
+<span class="sourceLineNo">461</span> * <li>{@link RestCall#getResponseFuture(Type,Type...)}<a name="line.461"></a>
+<span class="sourceLineNo">462</span> * <li>{@link RestCall#getResponseAsString()}<a name="line.462"></a>
+<span class="sourceLineNo">463</span> * </ul><a name="line.463"></a>
+<span class="sourceLineNo">464</span> * <p><a name="line.464"></a>
+<span class="sourceLineNo">465</span> * The default executor service is a single-threaded {@link ThreadPoolExecutor} with a 30 second timeout<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * and a queue size of 10.<a name="line.466"></a>
+<span class="sourceLineNo">467</span> *<a name="line.467"></a>
+<span class="sourceLineNo">468</span> * @param executorService The executor service.<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * @param shutdownOnClose Call {@link ExecutorService#shutdown()} when {@link RestClient#close()} is called.<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * @return This object (for method chaining).<a name="line.470"></a>
+<span class="sourceLineNo">471</span> */<a name="line.471"></a>
+<span class="sourceLineNo">472</span> public RestClientBuilder executorService(ExecutorService executorService, boolean shutdownOnClose) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> this.executorService = executorService;<a name="line.473"></a>
+<span class="sourceLineNo">474</span> this.executorServiceShutdownOnClose = shutdownOnClose;<a name="line.474"></a>
+<span class="sourceLineNo">475</span> return this;<a name="line.475"></a>
+<span class="sourceLineNo">476</span> }<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> // HTTP headers<a name="line.479"></a>
-<span class="sourceLineNo">480</span> //--------------------------------------------------------------------------------<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> /**<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * Specifies a request header property to add to all requests created by this client.<a name="line.483"></a>
-<span class="sourceLineNo">484</span> *<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @param name The HTTP header name.<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * @param value The HTTP header value.<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @return This object (for method chaining).<a name="line.487"></a>
-<span class="sourceLineNo">488</span> */<a name="line.488"></a>
-<span class="sourceLineNo">489</span> public RestClientBuilder header(String name, Object value) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> this.headers.put(name, value == null ? null : value.toString());<a name="line.490"></a>
-<span class="sourceLineNo">491</span> return this;<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> /**<a name="line.494"></a>
-<span class="sourceLineNo">495</span> * Sets the value for the <code>Accept</code> request header.<a name="line.495"></a>
-<span class="sourceLineNo">496</span> * <p><a name="line.496"></a>
-<span class="sourceLineNo">497</span> * This overrides the media type specified on the parser, but is overridden by calling <code>header(<js>"Accept"</js>, value);</code><a name="line.497"></a>
-<span class="sourceLineNo">498</span> *<a name="line.498"></a>
-<span class="sourceLineNo">499</span> * @param value The new header value.<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * @return This object (for method chaining).<a name="line.500"></a>
-<span class="sourceLineNo">501</span> */<a name="line.501"></a>
-<span class="sourceLineNo">502</span> public RestClientBuilder accept(Object value) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> return header("Accept", value);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> /**<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * Sets the value for the <code>Accept-Charset</code> request header.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * <p><a name="line.508"></a>
-<span class="sourceLineNo">509</span> * This is a shortcut for calling <code>header(<js>"Accept-Charset"</js>, value);</code><a name="line.509"></a>
-<span class="sourceLineNo">510</span> *<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @param value The new header value.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> * @return This object (for method chaining).<a name="line.512"></a>
-<span class="sourceLineNo">513</span> */<a name="line.513"></a>
-<span class="sourceLineNo">514</span> public RestClientBuilder acceptCharset(Object value) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> return header("Accept-Charset", value);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span> /**<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * Sets the value for the <code>Accept-Encoding</code> request header.<a name="line.519"
<TRUNCATED>
[20/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
index 60c1508..b834457 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
@@ -1056,511 +1056,526 @@
<span class="sourceLineNo">1048</span> * Otherwise, returns a new {@link ClassMeta} object every time.<br><a name="line.1048"></a>
<span class="sourceLineNo">1049</span> */<a name="line.1049"></a>
<span class="sourceLineNo">1050</span> public final <T> ClassMeta<T> getClassMeta(Class<T> type) {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span><a name="line.1051"></a>
-<span class="sourceLineNo">1052</span> // If this is an array, then we want it wrapped in an uncached ClassMeta object.<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span> // Note that if it has a pojo swap, we still want to cache it so that<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span> // we can cache something like byte[] with ByteArrayBase64Swap.<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span> if (type.isArray() && findPojoSwap(type) == null)<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span> return new ClassMeta(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span><a name="line.1057"></a>
-<span class="sourceLineNo">1058</span> // This can happen if we have transforms defined against String or Object.<a name="line.1058"></a>
-<span class="sourceLineNo">1059</span> if (cmCache == null)<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span> return null;<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span><a name="line.1061"></a>
-<span class="sourceLineNo">1062</span> ClassMeta<T> cm = cmCache.get(type);<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span> if (cm == null) {<a name="line.1063"></a>
+<span class="sourceLineNo">1051</span> return getClassMeta(type, true);<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span> }<a name="line.1052"></a>
+<span class="sourceLineNo">1053</span><a name="line.1053"></a>
+<span class="sourceLineNo">1054</span> /**<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span> * Construct a {@code ClassMeta} wrapper around a {@link Class} object.<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span> *<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span> * @param <T> The class type being wrapped.<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span> * @param type The class to resolve.<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span> * @param waitForInit If <jk>true</jk>, wait for the ClassMeta constructor to finish before returning.<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span> * @return If the class is not an array, returns a cached {@link ClassMeta} object.<a name="line.1060"></a>
+<span class="sourceLineNo">1061</span> * Otherwise, returns a new {@link ClassMeta} object every time.<br><a name="line.1061"></a>
+<span class="sourceLineNo">1062</span> */<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span> final <T> ClassMeta<T> getClassMeta(Class<T> type, boolean waitForInit) {<a name="line.1063"></a>
<span class="sourceLineNo">1064</span><a name="line.1064"></a>
-<span class="sourceLineNo">1065</span> synchronized (this) {<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span> // Make sure someone didn't already set it while this thread was blocked.<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span> cm = cmCache.get(type);<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span> if (cm == null)<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span> cm = new ClassMeta<T>(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span> }<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span> }<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span> return cm;<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span> }<a name="line.1073"></a>
+<span class="sourceLineNo">1065</span> // If this is an array, then we want it wrapped in an uncached ClassMeta object.<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span> // Note that if it has a pojo swap, we still want to cache it so that<a name="line.1066"></a>
+<span class="sourceLineNo">1067</span> // we can cache something like byte[] with ByteArrayBase64Swap.<a name="line.1067"></a>
+<span class="sourceLineNo">1068</span> if (type.isArray() && findPojoSwap(type) == null)<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span> return new ClassMeta(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span><a name="line.1070"></a>
+<span class="sourceLineNo">1071</span> // This can happen if we have transforms defined against String or Object.<a name="line.1071"></a>
+<span class="sourceLineNo">1072</span> if (cmCache == null)<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span> return null;<a name="line.1073"></a>
<span class="sourceLineNo">1074</span><a name="line.1074"></a>
-<span class="sourceLineNo">1075</span> /**<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span> * Used to resolve <code>ClassMetas</code> of type <code>Collection</code> and <code>Map</code> that have<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span> * <code>ClassMeta</code> values that themselves could be collections or maps.<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span> * <p><a name="line.1078"></a>
-<span class="sourceLineNo">1079</span> * <code>Collection</code> meta objects are assumed to be followed by zero or one meta objects indicating the element type.<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span> * <p><a name="line.1080"></a>
-<span class="sourceLineNo">1081</span> * <code>Map</code> meta objects are assumed to be followed by zero or two meta objects indicating the key and value types.<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span> * <p><a name="line.1082"></a>
-<span class="sourceLineNo">1083</span> * The array can be arbitrarily long to indicate arbitrarily complex data structures.<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span> *<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span> * <h5 class='section'>Examples:</h5><a name="line.1085"></a>
-<span class="sourceLineNo">1086</span> * <ul><a name="line.1086"></a>
-<span class="sourceLineNo">1087</span> * <li><code>getClassMeta(String.<jk>class</jk>);</code> - A normal type.<a name="line.1087"></a>
-<span class="sourceLineNo">1088</span> * <li><code>getClassMeta(List.<jk>class</jk>);</code> - A list containing objects.<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span> * <li><code>getClassMeta(List.<jk>class</jk>, String.<jk>class</jk>);</code> - A list containing strings.<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span> * <li><code>getClassMeta(LinkedList.<jk>class</jk>, String.<jk>class</jk>);</code> - A linked-list containing strings.<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span> * <li><code>getClassMeta(LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);</code> - A linked-list containing linked-lists of strings.<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span> * <li><code>getClassMeta(Map.<jk>class</jk>);</code> - A map containing object keys/values.<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span> * <li><code>getClassMeta(Map.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);</code> - A map containing string keys/values.<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span> * <li><code>getClassMeta(Map.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);</code> - A map containing string keys and values of lists containing beans.<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span> * </ul><a name="line.1095"></a>
-<span class="sourceLineNo">1096</span> *<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span> * @param type The class to resolve.<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span> * <br>Ignored if the main type is not a map or collection.<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span> * @return The resolved class meta.<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span> */<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span> public final <T> ClassMeta<T> getClassMeta(Type type, Type...args) {<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span> if (type == null)<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span> return null;<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span> ClassMeta<T> cm = type instanceof Class ? getClassMeta((Class)type) : resolveClassMeta(type, null);<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span> if (args.length == 0)<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span> return cm;<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span> ClassMeta<?>[] cma = new ClassMeta[args.length+1];<a name="line.1110"></a>
-<span class="sourceLineNo">1111</span> cma[0] = cm;<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span> for (int i = 0; i < Array.getLength(args); i++) {<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span> Type arg = (Type)Array.get(args, i);<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span> cma[i+1] = arg instanceof Class ? getClassMeta((Class)arg) : resolveClassMeta(arg, null);<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span> }<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span> return (ClassMeta<T>) getTypedClassMeta(cma, 0);<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span> }<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span><a name="line.1118"></a>
-<span class="sourceLineNo">1119</span> /*<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span> * Resolves the 'genericized' class meta at the specified position in the ClassMeta array.<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span> */<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span> private ClassMeta<?> getTypedClassMeta(ClassMeta<?>[] c, int pos) {<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span> ClassMeta<?> cm = c[pos++];<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span> if (cm.isCollection()) {<a name="line.1124"></a>
-<span class="sourceLineNo">1125</span> ClassMeta<?> ce = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span> return (ce.isObject() ? cm : new ClassMeta(cm, null, null, ce));<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span> } else if (cm.isMap()) {<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span> ClassMeta<?> ck = c.length == pos ? object() : c[pos++];<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span> ClassMeta<?> cv = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span> return (ck.isObject() && cv.isObject() ? cm : new ClassMeta(cm, ck, cv, null));<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span> }<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span> return cm;<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> final ClassMeta resolveClassMeta(Type o, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span> if (o == null)<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span> return null;<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span><a name="line.1138"></a>
-<span class="sourceLineNo">1139</span> if (o instanceof ClassMeta) {<a name="line.1139"></a>
-<span class="sourceLineNo">1140</span> ClassMeta<?> cm = (ClassMeta)o;<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span><a name="line.1141"></a>
-<span class="sourceLineNo">1142</span> // This classmeta could have been created by a different context.<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span> // Need to re-resolve it to pick up PojoSwaps and stuff on this context.<a name="line.1143"></a>
-<span class="sourceLineNo">1144</span> if (cm.getBeanContext() == this)<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span> return cm;<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span> if (cm.isMap())<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span> return getClassMeta(cm.innerClass, cm.getKeyType(), cm.getValueType());<a name="line.1147"></a>
-<span class="sourceLineNo">1148</span> if (cm.isCollection())<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span> return getClassMeta(cm.innerClass, cm.getElementType());<a name="line.1149"></a>
-<span class="sourceLineNo">1150</span> return getClassMeta(cm.innerClass);<a name="line.1150"></a>
-<span class="sourceLineNo">1151</span> }<a name="line.1151"></a>
-<span class="sourceLineNo">1152</span><a name="line.1152"></a>
-<span class="sourceLineNo">1153</span> Class c = resolve(o, typeVarImpls);<a name="line.1153"></a>
-<span class="sourceLineNo">1154</span><a name="line.1154"></a>
-<span class="sourceLineNo">1155</span> // This can happen when trying to resolve the "E getFirst()" method on LinkedList, whose type is a TypeVariable<a name="line.1155"></a>
-<span class="sourceLineNo">1156</span> // These should just resolve to Object.<a name="line.1156"></a>
-<span class="sourceLineNo">1157</span> if (c == null)<a name="line.1157"></a>
-<span class="sourceLineNo">1158</span> return object();<a name="line.1158"></a>
-<span class="sourceLineNo">1159</span><a name="line.1159"></a>
-<span class="sourceLineNo">1160</span> ClassMeta rawType = getClassMeta(c);<a name="line.1160"></a>
-<span class="sourceLineNo">1161</span><a name="line.1161"></a>
-<span class="sourceLineNo">1162</span> // If this is a Map or Collection, and the parameter types aren't part<a name="line.1162"></a>
-<span class="sourceLineNo">1163</span> // of the class definition itself (e.g. class AddressBook extends List<Person>),<a name="line.1163"></a>
-<span class="sourceLineNo">1164</span> // then we need to figure out the parameters.<a name="line.1164"></a>
-<span class="sourceLineNo">1165</span> if (rawType.isMap() || rawType.isCollection()) {<a name="line.1165"></a>
-<span class="sourceLineNo">1166</span> ClassMeta[] params = findParameters(o, c);<a name="line.1166"></a>
-<span class="sourceLineNo">1167</span> if (params == null)<a name="line.1167"></a>
-<span class="sourceLineNo">1168</span> return rawType;<a name="line.1168"></a>
-<span class="sourceLineNo">1169</span> if (rawType.isMap()) {<a name="line.1169"></a>
-<span class="sourceLineNo">1170</span> if (params.length != 2)<a name="line.1170"></a>
-<span class="sourceLineNo">1171</span> return rawType;<a name="line.1171"></a>
-<span class="sourceLineNo">1172</span> if (params[0].isObject() && params[1].isObject())<a name="line.1172"></a>
-<span class="sourceLineNo">1173</span> return rawType;<a name="line.1173"></a>
-<span class="sourceLineNo">1174</span> return new ClassMeta(rawType, params[0], params[1], null);<a name="line.1174"></a>
-<span class="sourceLineNo">1175</span> }<a name="line.1175"></a>
-<span class="sourceLineNo">1176</span> if (rawType.isCollection()) {<a name="line.1176"></a>
-<span class="sourceLineNo">1177</span> if (params.length != 1)<a name="line.1177"></a>
-<span class="sourceLineNo">1178</span> return rawType;<a name="line.1178"></a>
-<span class="sourceLineNo">1179</span> if (params[0].isObject())<a name="line.1179"></a>
-<span class="sourceLineNo">1180</span> return rawType;<a name="line.1180"></a>
-<span class="sourceLineNo">1181</span> return new ClassMeta(rawType, null, null, params[0]);<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><a name="line.1184"></a>
-<span class="sourceLineNo">1185</span> return rawType;<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> /**<a name="line.1188"></a>
-<span class="sourceLineNo">1189</span> * Convert a Type to a Class if possible.<a name="line.1189"></a>
-<span class="sourceLineNo">1190</span> * Return null if not possible.<a name="line.1190"></a>
-<span class="sourceLineNo">1191</span> */<a name="line.1191"></a>
-<span class="sourceLineNo">1192</span> final Class resolve(Type t, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1192"></a>
-<span class="sourceLineNo">1193</span><a name="line.1193"></a>
-<span class="sourceLineNo">1194</span> if (t instanceof Class)<a name="line.1194"></a>
-<span class="sourceLineNo">1195</span> return (Class)t;<a name="line.1195"></a>
-<span class="sourceLineNo">1196</span><a name="line.1196"></a>
-<span class="sourceLineNo">1197</span> if (t instanceof ParameterizedType)<a name="line.1197"></a>
-<span class="sourceLineNo">1198</span> // A parameter (e.g. <String>.<a name="line.1198"></a>
-<span class="sourceLineNo">1199</span> return (Class)((ParameterizedType)t).getRawType();<a name="line.1199"></a>
-<span class="sourceLineNo">1200</span><a name="line.1200"></a>
-<span class="sourceLineNo">1201</span> if (t instanceof GenericArrayType) {<a name="line.1201"></a>
-<span class="sourceLineNo">1202</span> // An array parameter (e.g. <byte[]>).<a name="line.1202"></a>
-<span class="sourceLineNo">1203</span> Type gatct = ((GenericArrayType)t).getGenericComponentType();<a name="line.1203"></a>
-<span class="sourceLineNo">1204</span><a name="line.1204"></a>
-<span class="sourceLineNo">1205</span> if (gatct instanceof Class)<a name="line.1205"></a>
-<span class="sourceLineNo">1206</span> return Array.newInstance((Class)gatct, 0).getClass();<a name="line.1206"></a>
-<span class="sourceLineNo">1207</span><a name="line.1207"></a>
-<span class="sourceLineNo">1208</span> if (gatct instanceof ParameterizedType)<a name="line.1208"></a>
-<span class="sourceLineNo">1209</span> return Array.newInstance((Class)((ParameterizedType)gatct).getRawType(), 0).getClass();<a name="line.1209"></a>
-<span class="sourceLineNo">1210</span><a name="line.1210"></a>
-<span class="sourceLineNo">1211</span> if (gatct instanceof GenericArrayType)<a name="line.1211"></a>
-<span class="sourceLineNo">1212</span> return Array.newInstance(resolve(gatct, typeVarImpls), 0).getClass();<a name="line.1212"></a>
-<span class="sourceLineNo">1213</span><a name="line.1213"></a>
-<span class="sourceLineNo">1214</span> return null;<a name="line.1214"></a>
+<span class="sourceLineNo">1075</span> ClassMeta<T> cm = cmCache.get(type);<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span> if (cm == null) {<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span><a name="line.1077"></a>
+<span class="sourceLineNo">1078</span> synchronized (this) {<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span> // Make sure someone didn't already set it while this thread was blocked.<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span> cm = cmCache.get(type);<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span> if (cm == null)<a name="line.1081"></a>
+<span class="sourceLineNo">1082</span> cm = new ClassMeta<T>(type, this, findImplClass(type), findBeanFilter(type), findPojoSwap(type), findChildPojoSwaps(type));<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span> }<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span> }<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span> if (waitForInit)<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span> cm.waitForInit();<a name="line.1086"></a>
+<span class="sourceLineNo">1087</span> return cm;<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span> }<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span><a name="line.1089"></a>
+<span class="sourceLineNo">1090</span> /**<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span> * Used to resolve <code>ClassMetas</code> of type <code>Collection</code> and <code>Map</code> that have<a name="line.1091"></a>
+<span class="sourceLineNo">1092</span> * <code>ClassMeta</code> values that themselves could be collections or maps.<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span> * <p><a name="line.1093"></a>
+<span class="sourceLineNo">1094</span> * <code>Collection</code> meta objects are assumed to be followed by zero or one meta objects indicating the element type.<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span> * <p><a name="line.1095"></a>
+<span class="sourceLineNo">1096</span> * <code>Map</code> meta objects are assumed to be followed by zero or two meta objects indicating the key and value types.<a name="line.1096"></a>
+<span class="sourceLineNo">1097</span> * <p><a name="line.1097"></a>
+<span class="sourceLineNo">1098</span> * The array can be arbitrarily long to indicate arbitrarily complex data structures.<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span> *<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span> * <h5 class='section'>Examples:</h5><a name="line.1100"></a>
+<span class="sourceLineNo">1101</span> * <ul><a name="line.1101"></a>
+<span class="sourceLineNo">1102</span> * <li><code>getClassMeta(String.<jk>class</jk>);</code> - A normal type.<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span> * <li><code>getClassMeta(List.<jk>class</jk>);</code> - A list containing objects.<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span> * <li><code>getClassMeta(List.<jk>class</jk>, String.<jk>class</jk>);</code> - A list containing strings.<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span> * <li><code>getClassMeta(LinkedList.<jk>class</jk>, String.<jk>class</jk>);</code> - A linked-list containing strings.<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span> * <li><code>getClassMeta(LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);</code> - A linked-list containing linked-lists of strings.<a name="line.1106"></a>
+<span class="sourceLineNo">1107</span> * <li><code>getClassMeta(Map.<jk>class</jk>);</code> - A map containing object keys/values.<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span> * <li><code>getClassMeta(Map.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);</code> - A map containing string keys/values.<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span> * <li><code>getClassMeta(Map.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);</code> - A map containing string keys and values of lists containing beans.<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span> * </ul><a name="line.1110"></a>
+<span class="sourceLineNo">1111</span> *<a name="line.1111"></a>
+<span class="sourceLineNo">1112</span> * @param type The class to resolve.<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span> * @param args The type arguments of the class if it's a collection or map.<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span> * <br>Can be any of the following: {@link ClassMeta}, {@link Class}, {@link ParameterizedType}, {@link GenericArrayType}<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span> * <br>Ignored if the main type is not a map or collection.<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span> * @return The resolved class meta.<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span> */<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span> public final <T> ClassMeta<T> getClassMeta(Type type, Type...args) {<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span> if (type == null)<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span> return null;<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span> ClassMeta<T> cm = type instanceof Class ? getClassMeta((Class)type) : resolveClassMeta(type, null);<a name="line.1122"></a>
+<span class="sourceLineNo">1123</span> if (args.length == 0)<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span> return cm;<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span> ClassMeta<?>[] cma = new ClassMeta[args.length+1];<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span> cma[0] = cm;<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span> for (int i = 0; i < Array.getLength(args); i++) {<a name="line.1127"></a>
+<span class="sourceLineNo">1128</span> Type arg = (Type)Array.get(args, i);<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span> cma[i+1] = arg instanceof Class ? getClassMeta((Class)arg) : resolveClassMeta(arg, null);<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span> }<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span> return (ClassMeta<T>) getTypedClassMeta(cma, 0);<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> * Resolves the 'genericized' class meta at the specified position in the ClassMeta array.<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span> */<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span> private ClassMeta<?> getTypedClassMeta(ClassMeta<?>[] c, int pos) {<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span> ClassMeta<?> cm = c[pos++];<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span> if (cm.isCollection()) {<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span> ClassMeta<?> ce = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span> return (ce.isObject() ? cm : new ClassMeta(cm, null, null, ce));<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span> } else if (cm.isMap()) {<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span> ClassMeta<?> ck = c.length == pos ? object() : c[pos++];<a name="line.1143"></a>
+<span class="sourceLineNo">1144</span> ClassMeta<?> cv = c.length == pos ? object() : getTypedClassMeta(c, pos);<a name="line.1144"></a>
+<span class="sourceLineNo">1145</span> return (ck.isObject() && cv.isObject() ? cm : new ClassMeta(cm, ck, cv, null));<a name="line.1145"></a>
+<span class="sourceLineNo">1146</span> }<a name="line.1146"></a>
+<span class="sourceLineNo">1147</span> return cm;<a name="line.1147"></a>
+<span class="sourceLineNo">1148</span> }<a name="line.1148"></a>
+<span class="sourceLineNo">1149</span><a name="line.1149"></a>
+<span class="sourceLineNo">1150</span> final ClassMeta resolveClassMeta(Type o, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1150"></a>
+<span class="sourceLineNo">1151</span> if (o == null)<a name="line.1151"></a>
+<span class="sourceLineNo">1152</span> return null;<a name="line.1152"></a>
+<span class="sourceLineNo">1153</span><a name="line.1153"></a>
+<span class="sourceLineNo">1154</span> if (o instanceof ClassMeta) {<a name="line.1154"></a>
+<span class="sourceLineNo">1155</span> ClassMeta<?> cm = (ClassMeta)o;<a name="line.1155"></a>
+<span class="sourceLineNo">1156</span><a name="line.1156"></a>
+<span class="sourceLineNo">1157</span> // This classmeta could have been created by a different context.<a name="line.1157"></a>
+<span class="sourceLineNo">1158</span> // Need to re-resolve it to pick up PojoSwaps and stuff on this context.<a name="line.1158"></a>
+<span class="sourceLineNo">1159</span> if (cm.getBeanContext() == this)<a name="line.1159"></a>
+<span class="sourceLineNo">1160</span> return cm;<a name="line.1160"></a>
+<span class="sourceLineNo">1161</span> if (cm.isMap())<a name="line.1161"></a>
+<span class="sourceLineNo">1162</span> return getClassMeta(cm.innerClass, cm.getKeyType(), cm.getValueType());<a name="line.1162"></a>
+<span class="sourceLineNo">1163</span> if (cm.isCollection())<a name="line.1163"></a>
+<span class="sourceLineNo">1164</span> return getClassMeta(cm.innerClass, cm.getElementType());<a name="line.1164"></a>
+<span class="sourceLineNo">1165</span> return getClassMeta(cm.innerClass);<a name="line.1165"></a>
+<span class="sourceLineNo">1166</span> }<a name="line.1166"></a>
+<span class="sourceLineNo">1167</span><a name="line.1167"></a>
+<span class="sourceLineNo">1168</span> Class c = resolve(o, typeVarImpls);<a name="line.1168"></a>
+<span class="sourceLineNo">1169</span><a name="line.1169"></a>
+<span class="sourceLineNo">1170</span> // This can happen when trying to resolve the "E getFirst()" method on LinkedList, whose type is a TypeVariable<a name="line.1170"></a>
+<span class="sourceLineNo">1171</span> // These should just resolve to Object.<a name="line.1171"></a>
+<span class="sourceLineNo">1172</span> if (c == null)<a name="line.1172"></a>
+<span class="sourceLineNo">1173</span> return object();<a name="line.1173"></a>
+<span class="sourceLineNo">1174</span><a name="line.1174"></a>
+<span class="sourceLineNo">1175</span> ClassMeta rawType = getClassMeta(c);<a name="line.1175"></a>
+<span class="sourceLineNo">1176</span><a name="line.1176"></a>
+<span class="sourceLineNo">1177</span> // If this is a Map or Collection, and the parameter types aren't part<a name="line.1177"></a>
+<span class="sourceLineNo">1178</span> // of the class definition itself (e.g. class AddressBook extends List<Person>),<a name="line.1178"></a>
+<span class="sourceLineNo">1179</span> // then we need to figure out the parameters.<a name="line.1179"></a>
+<span class="sourceLineNo">1180</span> if (rawType.isMap() || rawType.isCollection()) {<a name="line.1180"></a>
+<span class="sourceLineNo">1181</span> ClassMeta[] params = findParameters(o, c);<a name="line.1181"></a>
+<span class="sourceLineNo">1182</span> if (params == null)<a name="line.1182"></a>
+<span class="sourceLineNo">1183</span> return rawType;<a name="line.1183"></a>
+<span class="sourceLineNo">1184</span> if (rawType.isMap()) {<a name="line.1184"></a>
+<span class="sourceLineNo">1185</span> if (params.length != 2)<a name="line.1185"></a>
+<span class="sourceLineNo">1186</span> return rawType;<a name="line.1186"></a>
+<span class="sourceLineNo">1187</span> if (params[0].isObject() && params[1].isObject())<a name="line.1187"></a>
+<span class="sourceLineNo">1188</span> return rawType;<a name="line.1188"></a>
+<span class="sourceLineNo">1189</span> return new ClassMeta(rawType, params[0], params[1], null);<a name="line.1189"></a>
+<span class="sourceLineNo">1190</span> }<a name="line.1190"></a>
+<span class="sourceLineNo">1191</span> if (rawType.isCollection()) {<a name="line.1191"></a>
+<span class="sourceLineNo">1192</span> if (params.length != 1)<a name="line.1192"></a>
+<span class="sourceLineNo">1193</span> return rawType;<a name="line.1193"></a>
+<span class="sourceLineNo">1194</span> if (params[0].isObject())<a name="line.1194"></a>
+<span class="sourceLineNo">1195</span> return rawType;<a name="line.1195"></a>
+<span class="sourceLineNo">1196</span> return new ClassMeta(rawType, null, null, params[0]);<a name="line.1196"></a>
+<span class="sourceLineNo">1197</span> }<a name="line.1197"></a>
+<span class="sourceLineNo">1198</span> }<a name="line.1198"></a>
+<span class="sourceLineNo">1199</span><a name="line.1199"></a>
+<span class="sourceLineNo">1200</span> return rawType;<a name="line.1200"></a>
+<span class="sourceLineNo">1201</span> }<a name="line.1201"></a>
+<span class="sourceLineNo">1202</span><a name="line.1202"></a>
+<span class="sourceLineNo">1203</span> /**<a name="line.1203"></a>
+<span class="sourceLineNo">1204</span> * Convert a Type to a Class if possible.<a name="line.1204"></a>
+<span class="sourceLineNo">1205</span> * Return null if not possible.<a name="line.1205"></a>
+<span class="sourceLineNo">1206</span> */<a name="line.1206"></a>
+<span class="sourceLineNo">1207</span> final Class resolve(Type t, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1207"></a>
+<span class="sourceLineNo">1208</span><a name="line.1208"></a>
+<span class="sourceLineNo">1209</span> if (t instanceof Class)<a name="line.1209"></a>
+<span class="sourceLineNo">1210</span> return (Class)t;<a name="line.1210"></a>
+<span class="sourceLineNo">1211</span><a name="line.1211"></a>
+<span class="sourceLineNo">1212</span> if (t instanceof ParameterizedType)<a name="line.1212"></a>
+<span class="sourceLineNo">1213</span> // A parameter (e.g. <String>.<a name="line.1213"></a>
+<span class="sourceLineNo">1214</span> return (Class)((ParameterizedType)t).getRawType();<a name="line.1214"></a>
<span class="sourceLineNo">1215</span><a name="line.1215"></a>
-<span class="sourceLineNo">1216</span> } else if (t instanceof TypeVariable) {<a name="line.1216"></a>
-<span class="sourceLineNo">1217</span> if (typeVarImpls != null) {<a name="line.1217"></a>
-<span class="sourceLineNo">1218</span> TypeVariable tv = (TypeVariable)t;<a name="line.1218"></a>
-<span class="sourceLineNo">1219</span> String varName = tv.getName();<a name="line.1219"></a>
-<span class="sourceLineNo">1220</span> int varIndex = -1;<a name="line.1220"></a>
-<span class="sourceLineNo">1221</span> Class gc = (Class)tv.getGenericDeclaration();<a name="line.1221"></a>
-<span class="sourceLineNo">1222</span> TypeVariable[] tvv = gc.getTypeParameters();<a name="line.1222"></a>
-<span class="sourceLineNo">1223</span> for (int i = 0; i < tvv.length; i++) {<a name="line.1223"></a>
-<span class="sourceLineNo">1224</span> if (tvv[i].getName().equals(varName)) {<a name="line.1224"></a>
-<span class="sourceLineNo">1225</span> varIndex = i;<a name="line.1225"></a>
-<span class="sourceLineNo">1226</span> }<a name="line.1226"></a>
-<span class="sourceLineNo">1227</span> }<a name="line.1227"></a>
-<span class="sourceLineNo">1228</span> if (varIndex != -1) {<a name="line.1228"></a>
-<span class="sourceLineNo">1229</span><a name="line.1229"></a>
-<span class="sourceLineNo">1230</span> // If we couldn't find a type variable implementation, that means<a name="line.1230"></a>
-<span class="sourceLineNo">1231</span> // the type was defined at runtime (e.g. Bean b = new Bean<Foo>();)<a name="line.1231"></a>
-<span class="sourceLineNo">1232</span> // in which case the type is lost through erasure.<a name="line.1232"></a>
-<span class="sourceLineNo">1233</span> // Assume java.lang.Object as the type.<a name="line.1233"></a>
-<span class="sourceLineNo">1234</span> if (! typeVarImpls.containsKey(gc))<a name="line.1234"></a>
-<span class="sourceLineNo">1235</span> return null;<a name="line.1235"></a>
-<span class="sourceLineNo">1236</span><a name="line.1236"></a>
-<span class="sourceLineNo">1237</span> return typeVarImpls.get(gc)[varIndex];<a name="line.1237"></a>
-<span class="sourceLineNo">1238</span> }<a name="line.1238"></a>
-<span class="sourceLineNo">1239</span> }<a name="line.1239"></a>
-<span class="sourceLineNo">1240</span> }<a name="line.1240"></a>
-<span class="sourceLineNo">1241</span> return null;<a name="line.1241"></a>
-<span class="sourceLineNo">1242</span> }<a name="line.1242"></a>
-<span class="sourceLineNo">1243</span><a name="line.1243"></a>
-<span class="sourceLineNo">1244</span> final ClassMeta[] findParameters(Type o, Class c) {<a name="line.1244"></a>
-<span class="sourceLineNo">1245</span> if (o == null)<a name="line.1245"></a>
-<span class="sourceLineNo">1246</span> o = c;<a name="line.1246"></a>
-<span class="sourceLineNo">1247</span><a name="line.1247"></a>
-<span class="sourceLineNo">1248</span> // Loop until we find a ParameterizedType<a name="line.1248"></a>
-<span class="sourceLineNo">1249</span> if (! (o instanceof ParameterizedType)) {<a name="line.1249"></a>
-<span class="sourceLineNo">1250</span> loop: do {<a name="line.1250"></a>
-<span class="sourceLineNo">1251</span> o = c.getGenericSuperclass();<a name="line.1251"></a>
-<span class="sourceLineNo">1252</span> if (o instanceof ParameterizedType)<a name="line.1252"></a>
-<span class="sourceLineNo">1253</span> break loop;<a name="line.1253"></a>
-<span class="sourceLineNo">1254</span> for (Type t : c.getGenericInterfaces()) {<a name="line.1254"></a>
-<span class="sourceLineNo">1255</span> o = t;<a name="line.1255"></a>
-<span class="sourceLineNo">1256</span> if (o instanceof ParameterizedType)<a name="line.1256"></a>
-<span class="sourceLineNo">1257</span> break loop;<a name="line.1257"></a>
-<span class="sourceLineNo">1258</span> }<a name="line.1258"></a>
-<span class="sourceLineNo">1259</span> c = c.getSuperclass();<a name="line.1259"></a>
-<span class="sourceLineNo">1260</span> } while (c != null);<a name="line.1260"></a>
-<span class="sourceLineNo">1261</span> }<a name="line.1261"></a>
+<span class="sourceLineNo">1216</span> if (t instanceof GenericArrayType) {<a name="line.1216"></a>
+<span class="sourceLineNo">1217</span> // An array parameter (e.g. <byte[]>).<a name="line.1217"></a>
+<span class="sourceLineNo">1218</span> Type gatct = ((GenericArrayType)t).getGenericComponentType();<a name="line.1218"></a>
+<span class="sourceLineNo">1219</span><a name="line.1219"></a>
+<span class="sourceLineNo">1220</span> if (gatct instanceof Class)<a name="line.1220"></a>
+<span class="sourceLineNo">1221</span> return Array.newInstance((Class)gatct, 0).getClass();<a name="line.1221"></a>
+<span class="sourceLineNo">1222</span><a name="line.1222"></a>
+<span class="sourceLineNo">1223</span> if (gatct instanceof ParameterizedType)<a name="line.1223"></a>
+<span class="sourceLineNo">1224</span> return Array.newInstance((Class)((ParameterizedType)gatct).getRawType(), 0).getClass();<a name="line.1224"></a>
+<span class="sourceLineNo">1225</span><a name="line.1225"></a>
+<span class="sourceLineNo">1226</span> if (gatct instanceof GenericArrayType)<a name="line.1226"></a>
+<span class="sourceLineNo">1227</span> return Array.newInstance(resolve(gatct, typeVarImpls), 0).getClass();<a name="line.1227"></a>
+<span class="sourceLineNo">1228</span><a name="line.1228"></a>
+<span class="sourceLineNo">1229</span> return null;<a name="line.1229"></a>
+<span class="sourceLineNo">1230</span><a name="line.1230"></a>
+<span class="sourceLineNo">1231</span> } else if (t instanceof TypeVariable) {<a name="line.1231"></a>
+<span class="sourceLineNo">1232</span> if (typeVarImpls != null) {<a name="line.1232"></a>
+<span class="sourceLineNo">1233</span> TypeVariable tv = (TypeVariable)t;<a name="line.1233"></a>
+<span class="sourceLineNo">1234</span> String varName = tv.getName();<a name="line.1234"></a>
+<span class="sourceLineNo">1235</span> int varIndex = -1;<a name="line.1235"></a>
+<span class="sourceLineNo">1236</span> Class gc = (Class)tv.getGenericDeclaration();<a name="line.1236"></a>
+<span class="sourceLineNo">1237</span> TypeVariable[] tvv = gc.getTypeParameters();<a name="line.1237"></a>
+<span class="sourceLineNo">1238</span> for (int i = 0; i < tvv.length; i++) {<a name="line.1238"></a>
+<span class="sourceLineNo">1239</span> if (tvv[i].getName().equals(varName)) {<a name="line.1239"></a>
+<span class="sourceLineNo">1240</span> varIndex = i;<a name="line.1240"></a>
+<span class="sourceLineNo">1241</span> }<a name="line.1241"></a>
+<span class="sourceLineNo">1242</span> }<a name="line.1242"></a>
+<span class="sourceLineNo">1243</span> if (varIndex != -1) {<a name="line.1243"></a>
+<span class="sourceLineNo">1244</span><a name="line.1244"></a>
+<span class="sourceLineNo">1245</span> // If we couldn't find a type variable implementation, that means<a name="line.1245"></a>
+<span class="sourceLineNo">1246</span> // the type was defined at runtime (e.g. Bean b = new Bean<Foo>();)<a name="line.1246"></a>
+<span class="sourceLineNo">1247</span> // in which case the type is lost through erasure.<a name="line.1247"></a>
+<span class="sourceLineNo">1248</span> // Assume java.lang.Object as the type.<a name="line.1248"></a>
+<span class="sourceLineNo">1249</span> if (! typeVarImpls.containsKey(gc))<a name="line.1249"></a>
+<span class="sourceLineNo">1250</span> return null;<a name="line.1250"></a>
+<span class="sourceLineNo">1251</span><a name="line.1251"></a>
+<span class="sourceLineNo">1252</span> return typeVarImpls.get(gc)[varIndex];<a name="line.1252"></a>
+<span class="sourceLineNo">1253</span> }<a name="line.1253"></a>
+<span class="sourceLineNo">1254</span> }<a name="line.1254"></a>
+<span class="sourceLineNo">1255</span> }<a name="line.1255"></a>
+<span class="sourceLineNo">1256</span> return null;<a name="line.1256"></a>
+<span class="sourceLineNo">1257</span> }<a name="line.1257"></a>
+<span class="sourceLineNo">1258</span><a name="line.1258"></a>
+<span class="sourceLineNo">1259</span> final ClassMeta[] findParameters(Type o, Class c) {<a name="line.1259"></a>
+<span class="sourceLineNo">1260</span> if (o == null)<a name="line.1260"></a>
+<span class="sourceLineNo">1261</span> o = c;<a name="line.1261"></a>
<span class="sourceLineNo">1262</span><a name="line.1262"></a>
-<span class="sourceLineNo">1263</span> if (o instanceof ParameterizedType) {<a name="line.1263"></a>
-<span class="sourceLineNo">1264</span> ParameterizedType pt = (ParameterizedType)o;<a name="line.1264"></a>
-<span class="sourceLineNo">1265</span> if (! pt.getRawType().equals(Enum.class)) {<a name="line.1265"></a>
-<span class="sourceLineNo">1266</span> List<ClassMeta<?>> l = new LinkedList<ClassMeta<?>>();<a name="line.1266"></a>
-<span class="sourceLineNo">1267</span> for (Type pt2 : pt.getActualTypeArguments()) {<a name="line.1267"></a>
-<span class="sourceLineNo">1268</span> if (pt2 instanceof WildcardType || pt2 instanceof TypeVariable)<a name="line.1268"></a>
-<span class="sourceLineNo">1269</span> return null;<a name="line.1269"></a>
-<span class="sourceLineNo">1270</span> l.add(resolveClassMeta(pt2, null));<a name="line.1270"></a>
-<span class="sourceLineNo">1271</span> }<a name="line.1271"></a>
-<span class="sourceLineNo">1272</span> if (l.isEmpty())<a name="line.1272"></a>
-<span class="sourceLineNo">1273</span> return null;<a name="line.1273"></a>
-<span class="sourceLineNo">1274</span> return l.toArray(new ClassMeta[l.size()]);<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span> }<a name="line.1275"></a>
+<span class="sourceLineNo">1263</span> // Loop until we find a ParameterizedType<a name="line.1263"></a>
+<span class="sourceLineNo">1264</span> if (! (o instanceof ParameterizedType)) {<a name="line.1264"></a>
+<span class="sourceLineNo">1265</span> loop: do {<a name="line.1265"></a>
+<span class="sourceLineNo">1266</span> o = c.getGenericSuperclass();<a name="line.1266"></a>
+<span class="sourceLineNo">1267</span> if (o instanceof ParameterizedType)<a name="line.1267"></a>
+<span class="sourceLineNo">1268</span> break loop;<a name="line.1268"></a>
+<span class="sourceLineNo">1269</span> for (Type t : c.getGenericInterfaces()) {<a name="line.1269"></a>
+<span class="sourceLineNo">1270</span> o = t;<a name="line.1270"></a>
+<span class="sourceLineNo">1271</span> if (o instanceof ParameterizedType)<a name="line.1271"></a>
+<span class="sourceLineNo">1272</span> break loop;<a name="line.1272"></a>
+<span class="sourceLineNo">1273</span> }<a name="line.1273"></a>
+<span class="sourceLineNo">1274</span> c = c.getSuperclass();<a name="line.1274"></a>
+<span class="sourceLineNo">1275</span> } while (c != null);<a name="line.1275"></a>
<span class="sourceLineNo">1276</span> }<a name="line.1276"></a>
<span class="sourceLineNo">1277</span><a name="line.1277"></a>
-<span class="sourceLineNo">1278</span> return null;<a name="line.1278"></a>
-<span class="sourceLineNo">1279</span> }<a name="line.1279"></a>
-<span class="sourceLineNo">1280</span><a name="line.1280"></a>
-<span class="sourceLineNo">1281</span> /**<a name="line.1281"></a>
-<span class="sourceLineNo">1282</span> * Shortcut for calling {@code getClassMeta(o.getClass())}.<a name="line.1282"></a>
-<span class="sourceLineNo">1283</span> *<a name="line.1283"></a>
-<span class="sourceLineNo">1284</span> * @param <T> The class of the object being passed in.<a name="line.1284"></a>
-<span class="sourceLineNo">1285</span> * @param o The class to find the class type for.<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span> * @return The ClassMeta object, or <jk>null</jk> if {@code o} is <jk>null</jk>.<a name="line.1286"></a>
-<span class="sourceLineNo">1287</span> */<a name="line.1287"></a>
-<span class="sourceLineNo">1288</span> public final <T> ClassMeta<T> getClassMetaForObject(T o) {<a name="line.1288"></a>
-<span class="sourceLineNo">1289</span> if (o == null)<a name="line.1289"></a>
-<span class="sourceLineNo">1290</span> return null;<a name="line.1290"></a>
-<span class="sourceLineNo">1291</span> return (ClassMeta<T>)getClassMeta(o.getClass());<a name="line.1291"></a>
-<span class="sourceLineNo">1292</span> }<a name="line.1292"></a>
-<span class="sourceLineNo">1293</span><a name="line.1293"></a>
-<span class="sourceLineNo">1294</span><a name="line.1294"></a>
-<span class="sourceLineNo">1295</span> /**<a name="line.1295"></a>
-<span class="sourceLineNo">1296</span> * Used for determining the class type on a method or field where a {@code @BeanProperty} annotation<a name="line.1296"></a>
-<span class="sourceLineNo">1297</span> * may be present.<a name="line.1297"></a>
+<span class="sourceLineNo">1278</span> if (o instanceof ParameterizedType) {<a name="line.1278"></a>
+<span class="sourceLineNo">1279</span> ParameterizedType pt = (ParameterizedType)o;<a name="line.1279"></a>
+<span class="sourceLineNo">1280</span> if (! pt.getRawType().equals(Enum.class)) {<a name="line.1280"></a>
+<span class="sourceLineNo">1281</span> List<ClassMeta<?>> l = new LinkedList<ClassMeta<?>>();<a name="line.1281"></a>
+<span class="sourceLineNo">1282</span> for (Type pt2 : pt.getActualTypeArguments()) {<a name="line.1282"></a>
+<span class="sourceLineNo">1283</span> if (pt2 instanceof WildcardType || pt2 instanceof TypeVariable)<a name="line.1283"></a>
+<span class="sourceLineNo">1284</span> return null;<a name="line.1284"></a>
+<span class="sourceLineNo">1285</span> l.add(resolveClassMeta(pt2, null));<a name="line.1285"></a>
+<span class="sourceLineNo">1286</span> }<a name="line.1286"></a>
+<span class="sourceLineNo">1287</span> if (l.isEmpty())<a name="line.1287"></a>
+<span class="sourceLineNo">1288</span> return null;<a name="line.1288"></a>
+<span class="sourceLineNo">1289</span> return l.toArray(new ClassMeta[l.size()]);<a name="line.1289"></a>
+<span class="sourceLineNo">1290</span> }<a name="line.1290"></a>
+<span class="sourceLineNo">1291</span> }<a name="line.1291"></a>
+<span class="sourceLineNo">1292</span><a name="line.1292"></a>
+<span class="sourceLineNo">1293</span> return null;<a name="line.1293"></a>
+<span class="sourceLineNo">1294</span> }<a name="line.1294"></a>
+<span class="sourceLineNo">1295</span><a name="line.1295"></a>
+<span class="sourceLineNo">1296</span> /**<a name="line.1296"></a>
+<span class="sourceLineNo">1297</span> * Shortcut for calling {@code getClassMeta(o.getClass())}.<a name="line.1297"></a>
<span class="sourceLineNo">1298</span> *<a name="line.1298"></a>
-<span class="sourceLineNo">1299</span> * @param <T> The class type we're wrapping.<a name="line.1299"></a>
-<span class="sourceLineNo">1300</span> * @param p The property annotation on the type if there is one.<a name="line.1300"></a>
-<span class="sourceLineNo">1301</span> * @param t The type.<a name="line.1301"></a>
-<span class="sourceLineNo">1302</span> * @param typeVarImpls Contains known resolved type parameters on the specified class so<a name="line.1302"></a>
-<span class="sourceLineNo">1303</span> * that we can result {@code ParameterizedTypes} and {@code TypeVariables}.<br><a name="line.1303"></a>
-<span class="sourceLineNo">1304</span> * Can be <jk>null</jk> if the information is not known.<a name="line.1304"></a>
-<span class="sourceLineNo">1305</span> * @return The new {@code ClassMeta} object wrapped around the {@code Type} object.<a name="line.1305"></a>
-<span class="sourceLineNo">1306</span> */<a name="line.1306"></a>
-<span class="sourceLineNo">1307</span> protected final <T> ClassMeta<T> resolveClassMeta(BeanProperty p, Type t, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1307"></a>
-<span class="sourceLineNo">1308</span> ClassMeta<T> cm = resolveClassMeta(t, typeVarImpls);<a name="line.1308"></a>
-<span class="sourceLineNo">1309</span> ClassMeta<T> cm2 = cm;<a name="line.1309"></a>
-<span class="sourceLineNo">1310</span> if (p != null) {<a name="line.1310"></a>
-<span class="sourceLineNo">1311</span><a name="line.1311"></a>
-<span class="sourceLineNo">1312</span> if (p.type() != Object.class)<a name="line.1312"></a>
-<span class="sourceLineNo">1313</span> cm2 = resolveClassMeta(p.type(), typeVarImpls);<a name="line.1313"></a>
-<span class="sourceLineNo">1314</span><a name="line.1314"></a>
-<span class="sourceLineNo">1315</span> if (cm2.isMap()) {<a name="line.1315"></a>
-<span class="sourceLineNo">1316</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class, Object.class} : p.params());<a name="line.1316"></a>
-<span class="sourceLineNo">1317</span> if (pParams.length != 2)<a name="line.1317"></a>
-<span class="sourceLineNo">1318</span> throw new RuntimeException("Invalid number of parameters specified for Map (must be 2): " + pParams.length);<a name="line.1318"></a>
-<span class="sourceLineNo">1319</span> ClassMeta<?> keyType = resolveType(pParams[0], cm2.getKeyType(), cm.getKeyType());<a name="line.1319"></a>
-<span class="sourceLineNo">1320</span> ClassMeta<?> valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());<a name="line.1320"></a>
-<span class="sourceLineNo">1321</span> if (keyType.isObject() && valueType.isObject())<a name="line.1321"></a>
-<span class="sourceLineNo">1322</span> return cm2;<a name="line.1322"></a>
-<span class="sourceLineNo">1323</span> return new ClassMeta<T>(cm2, keyType, valueType, null);<a name="line.1323"></a>
-<span class="sourceLineNo">1324</span> }<a name="line.1324"></a>
-<span class="sourceLineNo">1325</span><a name="line.1325"></a>
-<span class="sourceLineNo">1326</span> if (cm2.isCollection()) {<a name="line.1326"></a>
-<span class="sourceLineNo">1327</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class} : p.params());<a name="line.1327"></a>
-<span class="sourceLineNo">1328</span> if (pParams.length != 1)<a name="line.1328"></a>
-<span class="sourceLineNo">1329</span> throw new RuntimeException("Invalid number of parameters specified for Collection (must be 1): " + pParams.length);<a name="line.1329"></a>
-<span class="sourceLineNo">1330</span> ClassMeta<?> elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());<a name="line.1330"></a>
-<span class="sourceLineNo">1331</span> if (elementType.isObject())<a name="line.1331"></a>
-<span class="sourceLineNo">1332</span> return cm2;<a name="line.1332"></a>
-<span class="sourceLineNo">1333</span> return new ClassMeta<T>(cm2, null, null, elementType);<a name="line.1333"></a>
-<span class="sourceLineNo">1334</span> }<a name="line.1334"></a>
-<span class="sourceLineNo">1335</span><a name="line.1335"></a>
-<span class="sourceLineNo">1336</span> return cm2;<a name="line.1336"></a>
-<span class="sourceLineNo">1337</span> }<a name="line.1337"></a>
-<span class="sourceLineNo">1338</span><a name="line.1338"></a>
-<span class="sourceLineNo">1339</span> return cm;<a name="line.1339"></a>
-<span class="sourceLineNo">1340</span> }<a name="line.1340"></a>
-<span class="sourceLineNo">1341</span><a name="line.1341"></a>
-<span class="sourceLineNo">1342</span> private ClassMeta<?> resolveType(Type...t) {<a name="line.1342"></a>
-<span class="sourceLineNo">1343</span> for (Type tt : t) {<a name="line.1343"></a>
-<span class="sourceLineNo">1344</span> if (tt != null) {<a name="line.1344"></a>
-<span class="sourceLineNo">1345</span> ClassMeta<?> cm = getClassMeta(tt);<a name="line.1345"></a>
-<span class="sourceLineNo">1346</span> if (tt != cmObject)<a name="line.1346"></a>
-<span class="sourceLineNo">1347</span> return cm;<a name="line.1347"></a>
-<span class="sourceLineNo">1348</span> }<a name="line.1348"></a>
-<span class="sourceLineNo">1349</span> }<a name="line.1349"></a>
-<span class="sourceLineNo">1350</span> return cmObject;<a name="line.1350"></a>
-<span class="sourceLineNo">1351</span> }<a name="line.1351"></a>
-<span class="sourceLineNo">1352</span><a name="line.1352"></a>
-<span class="sourceLineNo">1353</span> /**<a name="line.1353"></a>
-<span class="sourceLineNo">1354</span> * Returns the {@link PojoSwap} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1354"></a>
-<span class="sourceLineNo">1355</span> * pojo swap associated with the class.<a name="line.1355"></a>
-<span class="sourceLineNo">1356</span> *<a name="line.1356"></a>
-<span class="sourceLineNo">1357</span> * @param <T> The class associated with the swap.<a name="line.1357"></a>
-<span class="sourceLineNo">1358</span> * @param c The class associated with the swap.<a name="line.1358"></a>
-<span class="sourceLineNo">1359</span> * @return The swap associated with the class, or null if there is no association.<a name="line.1359"></a>
-<span class="sourceLineNo">1360</span> */<a name="line.1360"></a>
-<span class="sourceLineNo">1361</span> private final <T> PojoSwap findPojoSwap(Class<T> c) {<a name="line.1361"></a>
-<span class="sourceLineNo">1362</span> // Note: On first<a name="line.1362"></a>
-<span class="sourceLineNo">1363</span> if (c != null)<a name="line.1363"></a>
-<span class="sourceLineNo">1364</span> for (PojoSwap f : pojoSwaps)<a name="line.1364"></a>
-<span class="sourceLineNo">1365</span> if (isParentClass(f.getNormalClass(), c))<a name="line.1365"></a>
-<span class="sourceLineNo">1366</span> return f;<a name="line.1366"></a>
-<span class="sourceLineNo">1367</span> return null;<a name="line.1367"></a>
-<span class="sourceLineNo">1368</span> }<a name="line.1368"></a>
-<span class="sourceLineNo">1369</span><a name="line.1369"></a>
-<span class="sourceLineNo">1370</span> /**<a name="line.1370"></a>
-<span class="sourceLineNo">1371</span> * Checks whether a class has a {@link PojoSwap} associated with it in this bean context.<a name="line.1371"></a>
-<span class="sourceLineNo">1372</span> * @param c The class to check.<a name="line.1372"></a>
-<span class="sourceLineNo">1373</span> * @return <jk>true</jk> if the specified class or one of its subclasses has a {@link PojoSwap} associated with it.<a name="line.1373"></a>
-<span class="sourceLineNo">1374</span> */<a name="line.1374"></a>
-<span class="sourceLineNo">1375</span> private final PojoSwap[] findChildPojoSwaps(Class<?> c) {<a name="line.1375"></a>
-<span class="sourceLineNo">1376</span> if (c == null || pojoSwaps.length == 0)<a name="line.1376"></a>
-<span class="sourceLineNo">1377</span> return null;<a name="line.1377"></a>
-<span class="sourceLineNo">1378</span> List<PojoSwap> l = null;<a name="line.1378"></a>
-<span class="sourceLineNo">1379</span> for (PojoSwap f : pojoSwaps) {<a name="line.1379"></a>
-<span class="sourceLineNo">1380</span> if (isParentClass(c, f.getNormalClass())) {<a name="line.1380"></a>
-<span class="sourceLineNo">1381</span> if (l == null)<a name="line.1381"></a>
-<span class="sourceLineNo">1382</span> l = new ArrayList<PojoSwap>();<a name="line.1382"></a>
-<span class="sourceLineNo">1383</span> l.add(f);<a name="line.1383"></a>
-<span class="sourceLineNo">1384</span> }<a name="line.1384"></a>
-<span class="sourceLineNo">1385</span> }<a name="line.1385"></a>
-<span class="sourceLineNo">1386</span> return l == null ? null : l.toArray(new PojoSwap[l.size()]);<a name="line.1386"></a>
-<span class="sourceLineNo">1387</span> }<a name="line.1387"></a>
-<span class="sourceLineNo">1388</span><a name="line.1388"></a>
-<span class="sourceLineNo">1389</span> /**<a name="line.1389"></a>
-<span class="sourceLineNo">1390</span> * Returns the {@link BeanFilter} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1390"></a>
-<span class="sourceLineNo">1391</span> * bean filter associated with the class.<a name="line.1391"></a>
-<span class="sourceLineNo">1392</span> *<a name="line.1392"></a>
-<span class="sourceLineNo">1393</span> * @param <T> The class associated with the bean filter.<a name="line.1393"></a>
-<span class="sourceLineNo">1394</span> * @param c The class associated with the bean filter.<a name="line.1394"></a>
-<span class="sourceLineNo">1395</span> * @return The bean filter associated with the class, or null if there is no association.<a name="line.1395"></a>
-<span class="sourceLineNo">1396</span> */<a name="line.1396"></a>
-<span class="sourceLineNo">1397</span> private final <T> BeanFilter findBeanFilter(Class<T> c) {<a name="line.1397"></a>
-<span class="sourceLineNo">1398</span> if (c != null)<a name="line.1398"></a>
-<span class="sourceLineNo">1399</span> for (BeanFilter f : beanFilters)<a name="line.1399"></a>
-<span class="sourceLineNo">1400</span> if (isParentClass(f.getBeanClass(), c))<a name="line.1400"></a>
-<span class="sourceLineNo">1401</span> return f;<a name="line.1401"></a>
-<span class="sourceLineNo">1402</span> return null;<a name="line.1402"></a>
-<span class="sourceLineNo">1403</span> }<a name="line.1403"></a>
-<span class="sourceLineNo">1404</span><a name="line.1404"></a>
-<span class="sourceLineNo">1405</span> /**<a name="line.1405"></a>
-<span class="sourceLineNo">1406</span> * Returns the type property name as defined by {@link BeanContext#BEAN_beanTypePropertyName}.<a name="line.1406"></a>
+<span class="sourceLineNo">1299</span> * @param <T> The class of the object being passed in.<a name="line.1299"></a>
+<span class="sourceLineNo">1300</span> * @param o The class to find the class type for.<a name="line.1300"></a>
+<span class="sourceLineNo">1301</span> * @return The ClassMeta object, or <jk>null</jk> if {@code o} is <jk>null</jk>.<a name="line.1301"></a>
+<span class="sourceLineNo">1302</span> */<a name="line.1302"></a>
+<span class="sourceLineNo">1303</span> public final <T> ClassMeta<T> getClassMetaForObject(T o) {<a name="line.1303"></a>
+<span class="sourceLineNo">1304</span> if (o == null)<a name="line.1304"></a>
+<span class="sourceLineNo">1305</span> return null;<a name="line.1305"></a>
+<span class="sourceLineNo">1306</span> return (ClassMeta<T>)getClassMeta(o.getClass());<a name="line.1306"></a>
+<span class="sourceLineNo">1307</span> }<a name="line.1307"></a>
+<span class="sourceLineNo">1308</span><a name="line.1308"></a>
+<span class="sourceLineNo">1309</span><a name="line.1309"></a>
+<span class="sourceLineNo">1310</span> /**<a name="line.1310"></a>
+<span class="sourceLineNo">1311</span> * Used for determining the class type on a method or field where a {@code @BeanProperty} annotation<a name="line.1311"></a>
+<span class="sourceLineNo">1312</span> * may be present.<a name="line.1312"></a>
+<span class="sourceLineNo">1313</span> *<a name="line.1313"></a>
+<span class="sourceLineNo">1314</span> * @param <T> The class type we're wrapping.<a name="line.1314"></a>
+<span class="sourceLineNo">1315</span> * @param p The property annotation on the type if there is one.<a name="line.1315"></a>
+<span class="sourceLineNo">1316</span> * @param t The type.<a name="line.1316"></a>
+<span class="sourceLineNo">1317</span> * @param typeVarImpls Contains known resolved type parameters on the specified class so<a name="line.1317"></a>
+<span class="sourceLineNo">1318</span> * that we can result {@code ParameterizedTypes} and {@code TypeVariables}.<br><a name="line.1318"></a>
+<span class="sourceLineNo">1319</span> * Can be <jk>null</jk> if the information is not known.<a name="line.1319"></a>
+<span class="sourceLineNo">1320</span> * @return The new {@code ClassMeta} object wrapped around the {@code Type} object.<a name="line.1320"></a>
+<span class="sourceLineNo">1321</span> */<a name="line.1321"></a>
+<span class="sourceLineNo">1322</span> protected final <T> ClassMeta<T> resolveClassMeta(BeanProperty p, Type t, Map<Class<?>,Class<?>[]> typeVarImpls) {<a name="line.1322"></a>
+<span class="sourceLineNo">1323</span> ClassMeta<T> cm = resolveClassMeta(t, typeVarImpls);<a name="line.1323"></a>
+<span class="sourceLineNo">1324</span> ClassMeta<T> cm2 = cm;<a name="line.1324"></a>
+<span class="sourceLineNo">1325</span> if (p != null) {<a name="line.1325"></a>
+<span class="sourceLineNo">1326</span><a name="line.1326"></a>
+<span class="sourceLineNo">1327</span> if (p.type() != Object.class)<a name="line.1327"></a>
+<span class="sourceLineNo">1328</span> cm2 = resolveClassMeta(p.type(), typeVarImpls);<a name="line.1328"></a>
+<span class="sourceLineNo">1329</span><a name="line.1329"></a>
+<span class="sourceLineNo">1330</span> if (cm2.isMap()) {<a name="line.1330"></a>
+<span class="sourceLineNo">1331</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class, Object.class} : p.params());<a name="line.1331"></a>
+<span class="sourceLineNo">1332</span> if (pParams.length != 2)<a name="line.1332"></a>
+<span class="sourceLineNo">1333</span> throw new RuntimeException("Invalid number of parameters specified for Map (must be 2): " + pParams.length);<a name="line.1333"></a>
+<span class="sourceLineNo">1334</span> ClassMeta<?> keyType = resolveType(pParams[0], cm2.getKeyType(), cm.getKeyType());<a name="line.1334"></a>
+<span class="sourceLineNo">1335</span> ClassMeta<?> valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());<a name="line.1335"></a>
+<span class="sourceLineNo">1336</span> if (keyType.isObject() && valueType.isObject())<a name="line.1336"></a>
+<span class="sourceLineNo">1337</span> return cm2;<a name="line.1337"></a>
+<span class="sourceLineNo">1338</span> return new ClassMeta<T>(cm2, keyType, valueType, null);<a name="line.1338"></a>
+<span class="sourceLineNo">1339</span> }<a name="line.1339"></a>
+<span class="sourceLineNo">1340</span><a name="line.1340"></a>
+<span class="sourceLineNo">1341</span> if (cm2.isCollection()) {<a name="line.1341"></a>
+<span class="sourceLineNo">1342</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class} : p.params());<a name="line.1342"></a>
+<span class="sourceLineNo">1343</span> if (pParams.length != 1)<a name="line.1343"></a>
+<span class="sourceLineNo">1344</span> throw new RuntimeException("Invalid number of parameters specified for Collection (must be 1): " + pParams.length);<a name="line.1344"></a>
+<span class="sourceLineNo">1345</span> ClassMeta<?> elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());<a name="line.1345"></a>
+<span class="sourceLineNo">1346</span> if (elementType.isObject())<a name="line.1346"></a>
+<span class="sourceLineNo">1347</span> return cm2;<a name="line.1347"></a>
+<span class="sourceLineNo">1348</span> return new ClassMeta<T>(cm2, null, null, elementType);<a name="line.1348"></a>
+<span class="sourceLineNo">1349</span> }<a name="line.1349"></a>
+<span class="sourceLineNo">1350</span><a name="line.1350"></a>
+<span class="sourceLineNo">1351</span> return cm2;<a name="line.1351"></a>
+<span class="sourceLineNo">1352</span> }<a name="line.1352"></a>
+<span class="sourceLineNo">1353</span><a name="line.1353"></a>
+<span class="sourceLineNo">1354</span> return cm;<a name="line.1354"></a>
+<span class="sourceLineNo">1355</span> }<a name="line.1355"></a>
+<span class="sourceLineNo">1356</span><a name="line.1356"></a>
+<span class="sourceLineNo">1357</span> private ClassMeta<?> resolveType(Type...t) {<a name="line.1357"></a>
+<span class="sourceLineNo">1358</span> for (Type tt : t) {<a name="line.1358"></a>
+<span class="sourceLineNo">1359</span> if (tt != null) {<a name="line.1359"></a>
+<span class="sourceLineNo">1360</span> ClassMeta<?> cm = getClassMeta(tt);<a name="line.1360"></a>
+<span class="sourceLineNo">1361</span> if (tt != cmObject)<a name="line.1361"></a>
+<span class="sourceLineNo">1362</span> return cm;<a name="line.1362"></a>
+<span class="sourceLineNo">1363</span> }<a name="line.1363"></a>
+<span class="sourceLineNo">1364</span> }<a name="line.1364"></a>
+<span class="sourceLineNo">1365</span> return cmObject;<a name="line.1365"></a>
+<span class="sourceLineNo">1366</span> }<a name="line.1366"></a>
+<span class="sourceLineNo">1367</span><a name="line.1367"></a>
+<span class="sourceLineNo">1368</span> /**<a name="line.1368"></a>
+<span class="sourceLineNo">1369</span> * Returns the {@link PojoSwap} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1369"></a>
+<span class="sourceLineNo">1370</span> * pojo swap associated with the class.<a name="line.1370"></a>
+<span class="sourceLineNo">1371</span> *<a name="line.1371"></a>
+<span class="sourceLineNo">1372</span> * @param <T> The class associated with the swap.<a name="line.1372"></a>
+<span class="sourceLineNo">1373</span> * @param c The class associated with the swap.<a name="line.1373"></a>
+<span class="sourceLineNo">1374</span> * @return The swap associated with the class, or null if there is no association.<a name="line.1374"></a>
+<span class="sourceLineNo">1375</span> */<a name="line.1375"></a>
+<span class="sourceLineNo">1376</span> private final <T> PojoSwap findPojoSwap(Class<T> c) {<a name="line.1376"></a>
+<span class="sourceLineNo">1377</span> // Note: On first<a name="line.1377"></a>
+<span class="sourceLineNo">1378</span> if (c != null)<a name="line.1378"></a>
+<span class="sourceLineNo">1379</span> for (PojoSwap f : pojoSwaps)<a name="line.1379"></a>
+<span class="sourceLineNo">1380</span> if (isParentClass(f.getNormalClass(), c))<a name="line.1380"></a>
+<span class="sourceLineNo">1381</span> return f;<a name="line.1381"></a>
+<span class="sourceLineNo">1382</span> return null;<a name="line.1382"></a>
+<span class="sourceLineNo">1383</span> }<a name="line.1383"></a>
+<span class="sourceLineNo">1384</span><a name="line.1384"></a>
+<span class="sourceLineNo">1385</span> /**<a name="line.1385"></a>
+<span class="sourceLineNo">1386</span> * Checks whether a class has a {@link PojoSwap} associated with it in this bean context.<a name="line.1386"></a>
+<span class="sourceLineNo">1387</span> * @param c The class to check.<a name="line.1387"></a>
+<span class="sourceLineNo">1388</span> * @return <jk>true</jk> if the specified class or one of its subclasses has a {@link PojoSwap} associated with it.<a name="line.1388"></a>
+<span class="sourceLineNo">1389</span> */<a name="line.1389"></a>
+<span class="sourceLineNo">1390</span> private final PojoSwap[] findChildPojoSwaps(Class<?> c) {<a name="line.1390"></a>
+<span class="sourceLineNo">1391</span> if (c == null || pojoSwaps.length == 0)<a name="line.1391"></a>
+<span class="sourceLineNo">1392</span> return null;<a name="line.1392"></a>
+<span class="sourceLineNo">1393</span> List<PojoSwap> l = null;<a name="line.1393"></a>
+<span class="sourceLineNo">1394</span> for (PojoSwap f : pojoSwaps) {<a name="line.1394"></a>
+<span class="sourceLineNo">1395</span> if (isParentClass(c, f.getNormalClass())) {<a name="line.1395"></a>
+<span class="sourceLineNo">1396</span> if (l == null)<a name="line.1396"></a>
+<span class="sourceLineNo">1397</span> l = new ArrayList<PojoSwap>();<a name="line.1397"></a>
+<span class="sourceLineNo">1398</span> l.add(f);<a name="line.1398"></a>
+<span class="sourceLineNo">1399</span> }<a name="line.1399"></a>
+<span class="sourceLineNo">1400</span> }<a name="line.1400"></a>
+<span class="sourceLineNo">1401</span> return l == null ? null : l.toArray(new PojoSwap[l.size()]);<a name="line.1401"></a>
+<span class="sourceLineNo">1402</span> }<a name="line.1402"></a>
+<span class="sourceLineNo">1403</span><a name="line.1403"></a>
+<span class="sourceLineNo">1404</span> /**<a name="line.1404"></a>
+<span class="sourceLineNo">1405</span> * Returns the {@link BeanFilter} associated with the specified class, or <jk>null</jk> if there is no<a name="line.1405"></a>
+<span class="sourceLineNo">1406</span> * bean filter associated with the class.<a name="line.1406"></a>
<span class="sourceLineNo">1407</span> *<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span> * @return The type property name. Never <jk>null</jk>.<a name="line.1408"></a>
-<span class="sourceLineNo">1409</span> */<a name="line.1409"></a>
-<span class="sourceLineNo">1410</span> protected final String getBeanTypePropertyName() {<a name="line.1410"></a>
-<span class="sourceLineNo">1411</span> return beanTypePropertyName;<a name="line.1411"></a>
-<span class="sourceLineNo">1412</span> }<a name="line.1412"></a>
-<span class="sourceLineNo">1413</span><a name="line.1413"></a>
-<span class="sourceLineNo">1414</span> /**<a name="line.1414"></a>
-<span class="sourceLineNo">1415</span> * Returns the bean registry defined in this bean context defined by {@link BeanContext#BEAN_beanDictionary}.<a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> *<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> * @return The bean registry defined in this bean context. Never <jk>null</jk>.<a name="line.1417"></a>
-<span class="sourceLineNo">1418</span> */<a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> protected final BeanRegistry getBeanRegistry() {<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span> return beanRegistry;<a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> }<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span><a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> /**<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> * Gets the no-arg constructor for the specified class.<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> *<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> * @param <T> The class to check.<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> * @param c The class to check.<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> * @param v The minimum visibility for the constructor.<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> * @return The no arg constructor, or <jk>null</jk> if the class has no no-arg constructor.<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> */<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> protected final <T> Constructor<? extends T> getImplClassConstructor(Class<T> c, Visibility v) {<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> if (implClasses.isEmpty())<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> return null;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> Class cc = c;<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> while (cc != null) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> Class implClass = implClasses.get(cc);<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> if (implClass != null)<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> return findNoArgConstructor(implClass, v);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> for (Class ic : cc.getInterfaces()) {<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> implClass = implClasses.get(ic);<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> if (implClass != null)<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> return findNoArgConstructor(implClass, v);<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> }<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> cc = cc.getSuperclass();<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> }<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> return null;<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> }<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span><a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> private final <T> Class<? extends T> findImplClass(Class<T> c) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> if (implClasses.isEmpty())<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> return null;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> Class cc = c;<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> while (cc != null) {<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> Class implClass = implClasses.get(cc);<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> if (implClass != null)<a name="line.1455"></a>
-<span class="sourceLineNo">1456</span> return implClass;<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> for (Class ic : cc.getInterfaces()) {<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> implClass = implClasses.get(ic);<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> if (implClass != null)<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> return implClass;<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span> cc = cc.getSuperclass();<a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> }<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> return null;<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> }<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span><a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> /**<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> * Returns a reusable {@link ClassMeta} representation for the class <code>Object</code>.<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> * <p><a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> * This <code>ClassMeta</code> is often used to represent "any object type" when an object type<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span> * is not known.<a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> * <p><a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> * This method is identical to calling <code>getClassMeta(Object.<jk>class</jk>)</code> but uses<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> * a cached copy to avoid a hashmap lookup.<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> *<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span> * @return The {@link ClassMeta} object associated with the <code>Object</code> class.<a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> */<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> protected final ClassMeta<Object> object() {<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> return cmObject;<a name="line.1479"></a>
+<span class="sourceLineNo">1408</span> * @param <T> The class associated with the bean filter.<a name="line.1408"></a>
+<span class="sourceLineNo">1409</span> * @param c The class associated with the bean filter.<a name="line.1409"></a>
+<span class="sourceLineNo">1410</span> * @return The bean filter associated with the class, or null if there is no association.<a name="line.1410"></a>
+<span class="sourceLineNo">1411</span> */<a name="line.1411"></a>
+<span class="sourceLineNo">1412</span> private final <T> BeanFilter findBeanFilter(Class<T> c) {<a name="line.1412"></a>
+<span class="sourceLineNo">1413</span> if (c != null)<a name="line.1413"></a>
+<span class="sourceLineNo">1414</span> for (BeanFilter f : beanFilters)<a name="line.1414"></a>
+<span class="sourceLineNo">1415</span> if (isParentClass(f.getBeanClass(), c))<a name="line.1415"></a>
+<span class="sourceLineNo">1416</span> return f;<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> return null;<a name="line.1417"></a>
+<span class="sourceLineNo">1418</span> }<a name="line.1418"></a>
+<span class="sourceLineNo">1419</span><a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> /**<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span> * Returns the type property name as defined by {@link BeanContext#BEAN_beanTypePropertyName}.<a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> *<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span> * @return The type property name. Never <jk>null</jk>.<a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> */<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> protected final String getBeanTypePropertyName() {<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> return beanTypePropertyName;<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span><a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> /**<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> * Returns the bean registry defined in this bean context defined by {@link BeanContext#BEAN_beanDictionary}.<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> *<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> * @return The bean registry defined in this bean context. Never <jk>null</jk>.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> */<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> protected final BeanRegistry getBeanRegistry() {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> return beanRegistry;<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span><a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> /**<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> * Gets the no-arg constructor for the specified class.<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> *<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> * @param <T> The class to check.<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> * @param c The class to check.<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> * @param v The minimum visibility for the constructor.<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> * @return The no arg constructor, or <jk>null</jk> if the class has no no-arg constructor.<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> */<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> protected final <T> Constructor<? extends T> getImplClassConstructor(Class<T> c, Visibility v) {<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> if (implClasses.isEmpty())<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> return null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> Class cc = c;<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> while (cc != null) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> Class implClass = implClasses.get(cc);<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> if (implClass != null)<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> return findNoArgConstructor(implClass, v);<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> for (Class ic : cc.getInterfaces()) {<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> implClass = implClasses.get(ic);<a name="line.1455"></a>
+<span class="sourceLineNo">1456</span> if (implClass != null)<a name="line.1456"></a>
+<span class="sourceLineNo">1457</span> return findNoArgConstructor(implClass, v);<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> cc = cc.getSuperclass();<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> return null;<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> private final <T> Class<? extends T> findImplClass(Class<T> c) {<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (implClasses.isEmpty())<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> return null;<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> Class cc = c;<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> while (cc != null) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> Class implClass = implC
<TRUNCATED>
[21/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
index eb15a41..526c2e8 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializer.html
@@ -132,7 +132,7 @@ var activeTableTab = "activeTableTab";
</dl>
<dl>
<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></dd>
+<dd><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Expanded</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a>, <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></dd>
</dl>
<hr>
<br>
@@ -266,6 +266,12 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static class </code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a></span></code>
+<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().plainTextParts().build();</code>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class </code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></span></code>
<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.</div>
</td>
@@ -306,6 +312,12 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_PLAINTEXT">DEFAULT_PLAINTEXT</a></span></code>
+<div class="block">Reusable instance of <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer.PlainText</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#DEFAULT_READABLE">DEFAULT_READABLE</a></span></code>
<div class="block">Reusable instance of <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer.Readable</code></a>.</div>
</td>
@@ -405,7 +417,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon">UonSerializer</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializer.html#serializeAnything-org.apache.juneau.uon.UonSerializerSession-org.apache.juneau.uon.UonWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
@@ -459,13 +471,23 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<div class="block">Reusable instance of <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>, all default settings.</div>
</li>
</ul>
+<a name="DEFAULT_PLAINTEXT">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DEFAULT_PLAINTEXT</h4>
+<pre>public static final <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.141">DEFAULT_PLAINTEXT</a></pre>
+<div class="block">Reusable instance of <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer.PlainText</code></a>.</div>
+</li>
+</ul>
<a name="DEFAULT_EXPANDED">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_EXPANDED</h4>
-<pre>public static final <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.141">DEFAULT_EXPANDED</a></pre>
+<pre>public static final <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.144">DEFAULT_EXPANDED</a></pre>
<div class="block">Reusable instance of <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer.Expanded</code></a>.</div>
</li>
</ul>
@@ -475,7 +497,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<ul class="blockListLast">
<li class="blockList">
<h4>DEFAULT_READABLE</h4>
-<pre>public static final <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.144">DEFAULT_READABLE</a></pre>
+<pre>public static final <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.147">DEFAULT_READABLE</a></pre>
<div class="block">Reusable instance of <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer.Readable</code></a>.</div>
</li>
</ul>
@@ -493,7 +515,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<ul class="blockListLast">
<li class="blockList">
<h4>UrlEncodingSerializer</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.192">UrlEncodingSerializer</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.213">UrlEncodingSerializer</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
<div class="block">Constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -515,7 +537,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<ul class="blockList">
<li class="blockList">
<h4>builder</h4>
-<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.198">builder</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.219">builder</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/CoreObject.html#builder--">CoreObject</a></code></span></div>
<div class="block">Creates a new builder class for this object so that a new object can be created
that expands upon the current object's settings.</div>
@@ -533,7 +555,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<ul class="blockList">
<li class="blockList">
<h4>getOverrideProperties</h4>
-<pre>protected <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.203">getOverrideProperties</a>()</pre>
+<pre>protected <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.224">getOverrideProperties</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/CoreObject.html#getOverrideProperties--">CoreObject</a></code></span></div>
<div class="block">Method used by subclasses to override context factory properties for just this
instance without modifying the context factory itself.
@@ -554,7 +576,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<ul class="blockList">
<li class="blockList">
<h4>createSession</h4>
-<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.429">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output,
+<pre>public <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.448">createSession</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> output,
<a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> op,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> javaMethod,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a> locale,
@@ -604,7 +626,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<ul class="blockList">
<li class="blockList">
<h4>doSerialize</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.434">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a> session,
+<pre>protected void <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.453">doSerialize</a>(<a href="../../../../org/apache/juneau/serializer/SerializerSession.html" title="class in org.apache.juneau.serializer">SerializerSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">Serializer</a></code></span></div>
@@ -629,7 +651,7 @@ implements <a href="../../../../org/apache/juneau/serializer/PartSerializer.html
<ul class="blockListLast">
<li class="blockList">
<h4>serialize</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.440">serialize</a>(<a href="../../../../org/apache/juneau/serializer/PartType.html" title="enum in org.apache.juneau.serializer">PartType</a> type,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.html#line.459">serialize</a>(<a href="../../../../org/apache/juneau/serializer/PartType.html" title="enum in org.apache.juneau.serializer">PartType</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../org/apache/juneau/serializer/PartSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-">PartSerializer</a></code></span></div>
<div class="block">Converts the specified value to a string that can be used as an HTTP header value, query parameter value,
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
index 265f0e3..685f259 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html
@@ -889,7 +889,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerBuilder.html" ti
<dt><span class="returnLabel">Returns:</span></dt>
<dd>This object (for method chaining).</dd>
<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a></dd>
+<dd><a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a></dd>
</dl>
</li>
</ul>
@@ -905,7 +905,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerBuilder.html" ti
<dt><span class="returnLabel">Returns:</span></dt>
<dd>This object (for method chaining).</dd>
<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a></dd>
+<dd><a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a></dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
index e18dbc7..a5ab603 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html
@@ -74,13 +74,13 @@ var activeTableTab = "activeTableTab";
<ul class="subNavList">
<li>Summary: </li>
<li>Nested | </li>
-<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#fields.inherited.from.class.org.apache.juneau.uon.UonSerializerContext">Field</a> | </li>
<li><a href="#constructor.summary">Constr</a> | </li>
<li><a href="#method.summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li><a href="#field.detail">Field</a> | </li>
+<li>Field | </li>
<li><a href="#constructor.detail">Constr</a> | </li>
<li><a href="#method.detail">Method</a></li>
</ul>
@@ -148,25 +148,12 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" ti
<!-- -->
</a>
<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat">URLENC_paramFormat</a></span></code>
-<div class="block"><b>Configuration property:</b> Format to use for top-level query names and simple parameters.</div>
-</td>
-</tr>
-</table>
<ul class="blockList">
<li class="blockList"><a name="fields.inherited.from.class.org.apache.juneau.uon.UonSerializerContext">
<!-- -->
</a>
<h3>Fields inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_addBeanTypeProperties">UON_addBeanTypeProperties</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars">UON_encodeChars</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_addBeanTypeProperties">UON_addBeanTypeProperties</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_encodeChars">UON_encodeChars</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat">UON_paramFormat</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="fields.inherited.from.class.org.apache.juneau.serializer.SerializerContext">
@@ -223,6 +210,13 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" ti
</tr>
</table>
<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.uon.UonSerializerContext">
+<!-- -->
+</a>
+<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" title="class in org.apache.juneau.uon">UonSerializerContext</a></h3>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializerContext.html#plainTextParams--">plainTextParams</a></code></li>
+</ul>
+<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.BeanContext">
<!-- -->
</a>
@@ -251,49 +245,6 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" ti
<div class="details">
<ul class="blockList">
<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!-- -->
-</a>
-<h3>Field Detail</h3>
-<a name="URLENC_paramFormat">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>URLENC_paramFormat</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#line.52">URLENC_paramFormat</a></pre>
-<div class="block"><b>Configuration property:</b> Format to use for top-level query names and simple parameters.
- <p>
- <ul>
- <li><b>Name:</b> <js>"UrlEncodingSerializer.paramFormat"</js>
- <li><b>Data type:</b> <code>String</code>
- <li><b>Default:</b> <js>"UON"</js>
- <li><b>Session-overridable:</b> <jk>true</jk>
- </ul>
- <p>
- Specifies the format to use for URL GET parameter keys and values.
- <p>
- The possible values are:
- <ul>
- <li><js>"UON"</js> (default) - Use UON notation for values.
- <br>String values such as <js>"(foo='bar')"</js> will end up being quoted and escaped to <js>"'(foo=bar~'baz~')'"</js>.
- <br>Similarly, boolean and numeric values will also end up quoted.
- <li><js>"PLAINTEXT"</js> (default) - Serialize as plain text.
- <br>Strings will never be quoted or escaped.
- <br>Note that this can cause errors during parsing if you're using the URL-encoding parser to parse
- the results since UON constructs won't be differentiatable.
- <br>However, this is not an issue if you're simply creating queries or form posts against 3rd-party interfaces.
- </ul></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.apache.juneau.urlencoding.UrlEncodingSerializerContext.URLENC_paramFormat">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<ul class="blockList">
<li class="blockList"><a name="constructor.detail">
@@ -306,7 +257,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" ti
<ul class="blockListLast">
<li class="blockList">
<h4>UrlEncodingSerializerContext</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#line.66">UrlEncodingSerializerContext</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> ps)</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#line.39">UrlEncodingSerializerContext</a>(<a href="../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> ps)</pre>
<div class="block">Constructor.
<p>
Typically only called from <a href="../../../../org/apache/juneau/PropertyStore.html#getContext-java.lang.Class-"><code>PropertyStore.getContext(Class)</code></a>.</div>
@@ -330,7 +281,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" ti
<ul class="blockListLast">
<li class="blockList">
<h4>asMap</h4>
-<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#line.73">asMap</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau">ObjectMap</a> <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#line.45">asMap</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/juneau/Context.html#asMap--">Context</a></code></span></div>
<div class="block">Returns the properties defined on this bean context as a simple map for debugging purposes.</div>
<dl>
@@ -394,13 +345,13 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerContext.html" ti
<ul class="subNavList">
<li>Summary: </li>
<li>Nested | </li>
-<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#fields.inherited.from.class.org.apache.juneau.uon.UonSerializerContext">Field</a> | </li>
<li><a href="#constructor.summary">Constr</a> | </li>
<li><a href="#method.summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li><a href="#field.detail">Field</a> | </li>
+<li>Field | </li>
<li><a href="#constructor.detail">Constr</a> | </li>
<li><a href="#method.detail">Method</a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
index 23d59f7..d406233 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10};
+var methods = {"i0":10,"i1":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -194,18 +194,12 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
<th class="colLast" scope="col">Method and Description</th>
</tr>
<tr id="i0" class="altColor">
-<td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#plainTextParams--">plainTextParams</a></span>()</code>
-<div class="block">Returns <jk>true</jk> if the <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#shouldUseExpandedParams-org.apache.juneau.BeanPropertyMeta-">shouldUseExpandedParams</a></span>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a> pMeta)</code>
<div class="block">Returns <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.</div>
</td>
</tr>
-<tr id="i2" class="altColor">
+<tr id="i1" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#shouldUseExpandedParams-java.lang.Object-">shouldUseExpandedParams</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code>
<div class="block">Returns <jk>true</jk> if the specified value should be represented as an expanded parameter list.</div>
@@ -217,7 +211,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.uon.<a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" title="class in org.apache.juneau.uon">UonSerializerSession</a></h3>
-<code><a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#isAddBeanTypeProperties--">isAddBeanTypeProperties</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#isEncodeChars--">isEncodeChars</a></code></li>
+<code><a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#getWriter--">getWriter</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#isAddBeanTypeProperties--">isAddBeanTypeProperties</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#isEncodeChars--">isEncodeChars</a>, <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html#isPlainTextParams--">isPlainTextParams</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.apache.juneau.serializer.SerializerSession">
@@ -310,7 +304,7 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
<ul class="blockList">
<li class="blockList">
<h4>shouldUseExpandedParams</h4>
-<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.67">shouldUseExpandedParams</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a> pMeta)</pre>
+<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.65">shouldUseExpandedParams</a>(<a href="../../../../org/apache/juneau/BeanPropertyMeta.html" title="class in org.apache.juneau">BeanPropertyMeta</a> pMeta)</pre>
<div class="block">Returns <jk>true</jk> if the specified bean property should be expanded as multiple key-value pairs.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -323,10 +317,10 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
<a name="shouldUseExpandedParams-java.lang.Object-">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>shouldUseExpandedParams</h4>
-<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.84">shouldUseExpandedParams</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public final boolean <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.82">shouldUseExpandedParams</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Returns <jk>true</jk> if the specified value should be represented as an expanded parameter list.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -336,20 +330,6 @@ extends <a href="../../../../org/apache/juneau/uon/UonSerializerSession.html" ti
</dl>
</li>
</ul>
-<a name="plainTextParams--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>plainTextParams</h4>
-<pre>protected boolean <a href="../../../../src-html/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html#line.99">plainTextParams</a>()</pre>
-<div class="block">Returns <jk>true</jk> if the <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd><jk>true</jk> if the <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a> is <js>"PLAINTEXT"</js>.</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/package-frame.html b/content/site/apidocs/org/apache/juneau/urlencoding/package-frame.html
index ed07997..1ff8d12 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/package-frame.html
@@ -21,6 +21,7 @@
<li><a href="UrlEncodingParserSession.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingParserSession</a></li>
<li><a href="UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer</a></li>
<li><a href="UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer.Expanded</a></li>
+<li><a href="UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer.PlainText</a></li>
<li><a href="UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializer.Readable</a></li>
<li><a href="UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializerBuilder</a></li>
<li><a href="UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding" target="classFrame">UrlEncodingSerializerContext</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html b/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
index 8c559c1..1850fd9 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/package-summary.html
@@ -134,24 +134,30 @@
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.PlainText</a></td>
+<td class="colLast">
+<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().plainTextParts().build();</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializer.Readable</a></td>
<td class="colLast">
<div class="block">Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerBuilder</a></td>
<td class="colLast">
<div class="block">Builder class for building instances of URL-Encoding serializers.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerContext</a></td>
<td class="colLast">
<div class="block">Configurable properties on the <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a> class.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerSession.html" title="class in org.apache.juneau.urlencoding">UrlEncodingSerializerSession</a></td>
<td class="colLast">
<div class="block">Session object that lives for the duration of a single use of <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.</div>
@@ -596,12 +602,12 @@
<p>
Another useful feature is the <a href="../../../../org/apache/juneau/annotation/Bean.html#propertyNamer--"><code>Bean.propertyNamer()</code></a> annotation that allows you to plug in your own
logic for determining bean property names.<br>
- The <a href="../../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><code>PropertyNamerDashedLC</code></a> is an example of an alternate property namer.
+ The <a href="../../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><code>PropertyNamerDLC</code></a> is an example of an alternate property namer.
It converts bean property names to lowercase-dashed format.
</p>
<h6 class='figure'>Example:</h6>
<p class='bcode'>
- <ja>@Bean</ja>(propertyNamer=PropertyNamerDashedLC.<jk>class</jk>)
+ <ja>@Bean</ja>(propertyNamer=PropertyNamerDLC.<jk>class</jk>)
<jk>public class</jk> Person {
...
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/urlencoding/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/urlencoding/package-tree.html b/content/site/apidocs/org/apache/juneau/urlencoding/package-tree.html
index 56ddbf8..d727fea 100644
--- a/content/site/apidocs/org/apache/juneau/urlencoding/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/urlencoding/package-tree.html
@@ -135,6 +135,7 @@
<li type="circle">org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer</span></a> (implements org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>)
<ul>
<li type="circle">org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.Expanded</span></a></li>
+<li type="circle">org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.PlainText</span></a></li>
<li type="circle">org.apache.juneau.urlencoding.<a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.Readable</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/xml/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/package-summary.html b/content/site/apidocs/org/apache/juneau/xml/package-summary.html
index 7a8276b..96d6567 100644
--- a/content/site/apidocs/org/apache/juneau/xml/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/xml/package-summary.html
@@ -2385,13 +2385,13 @@
<p>
Another useful feature is the <a href="../../../../org/apache/juneau/annotation/Bean.html#propertyNamer--"><code>Bean.propertyNamer()</code></a> annotation that allows you to plug in your own
logic for determining bean property names.<br>
- The <a href="../../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><code>PropertyNamerDashedLC</code></a> is an example of an alternate property namer.
+ The <a href="../../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><code>PropertyNamerDLC</code></a> is an example of an alternate property namer.
It converts bean property names to lowercase-dashed format.
</p>
<h6 class='figure'>Example</h6>
<p class='bcode'>
<ja>@Xml</ja>(prefix=<js>"per"</js>)
- <ja>@Bean</ja>(typeName=<js>"person"</js>,propertyNamer=PropertyNamerDashedLC.<jk>class</jk>)
+ <ja>@Bean</ja>(typeName=<js>"person"</js>,propertyNamer=PropertyNamerDLC.<jk>class</jk>)
<jk>public class</jk> Person {
...
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index 127161f..48e5d7a 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -159,7 +159,9 @@
</tr>
<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/http/package-summary.html">org.apache.juneau.http</a></td>
-<td class="colLast"> </td>
+<td class="colLast">
+<div class="block">RFC2616 HTTP Headers</div>
+</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/ini/package-summary.html">org.apache.juneau.ini</a></td>
@@ -6575,6 +6577,17 @@
<li><a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriRelativity"><code>SerializerContext.SERIALIZER_uriRelativity</code></a>
<li><a href="org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriResolution"><code>SerializerContext.SERIALIZER_uriResolution</code></a>
</ul>
+ <li>New annotation property: <a href="org/apache/juneau/annotation/BeanProperty.html#value--"><code>BeanProperty.value()</code></a>.
+ <br>The following two annotations are considered equivalent:
+ <p class='bcode'>
+ <ja>@BeanProperty</ja>(name=<js>"foo"</js>)
+
+ <ja>@BeanProperty</ja>(<js>"foo"</js>)
+ </p>
+ <li>Fixed a race condition in ClassMeta.
+ <li><jsf>URLENC_paramFormat</jsf> has been moved to <a href="org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a>,
+ and the UON/URL-Encoding serializers will now always serialize all values as plain text.
+ <br>This means that arrays and maps are converted to simple comma-delimited lists.
</ul>
<h6 class='topic'>org.apache.juneau.rest</h6>
@@ -6806,11 +6819,11 @@
<br><ja>@Remoteable</ja> annotation has been moved to this package.
<li>Updated doc: <a class='doclink' href='#Remoteable'>6 - Remoteable Services</a>
<li>New doc: <a class='doclink' href='#Remoteable.3rdParty'>6.1 - Interface proxies against 3rd-party REST interfaces</a>
- <li>New URL-encoding serializer setting: <a href="org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a>
+ <li>New URL-encoding serializer setting: <code><del>UrlEncodingSerializerContext.URLENC_paramFormat</del></code>.
<li>New methods on <a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializerBuilder</code></a>:
<ul>
<li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html#paramFormat-java.lang.String-"><code>paramFormat(String)</code></a>
- <li><a href="org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.html#plainTextParams--"><code>plainTextParams()</code></a>
+ <li><code><del>UrlEncodingSerializerBuilder.plainTextParams()</del></code>
</ul>
</ul>
@@ -6969,7 +6982,7 @@
<ul>
<li><a href="org/apache/juneau/rest/client/RestClientBuilder.html#executorService-java.util.concurrent.ExecutorService-boolean-"><code>executorService(ExecutorService,boolean)</code></a>
<li><a href="org/apache/juneau/rest/client/RestClientBuilder.html#paramFormat-java.lang.String-"><code>paramFormat(ExecutorService,boolean)</code></a>
- <li><a href="org/apache/juneau/rest/client/RestClientBuilder.html#plainTextParams--"><code>plainTextParams()</code></a>
+ <li><code><del>RestClientBuilder.plainTextParams()</del></code>
<li><a href="org/apache/juneau/rest/client/RestClientBuilder.html#noTrace--"><code>noTrace()</code></a> - Adds a <code>No-Trace: true</code> header on all requests to prevent
the servlet from logging errors.
<br>Useful for testing scenarios when you don't want the console to end up showing errors done on purpose.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 683d20a..e457e79 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -465,6 +465,7 @@
<li type="circle">org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer</span></a> (implements org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>)
<ul>
<li type="circle">org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Expanded.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.Expanded</span></a></li>
+<li type="circle">org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.PlainText.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.PlainText</span></a></li>
<li type="circle">org.apache.juneau.urlencoding.<a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html" title="class in org.apache.juneau.urlencoding"><span class="typeNameLink">UrlEncodingSerializer.Readable</span></a></li>
</ul>
</li>
@@ -1004,8 +1005,9 @@
</li>
<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ProcBuilder</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/ProcBuilder.Matcher.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ProcBuilder.Matcher</span></a></li>
-<li type="circle">org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDashedLC</span></a> (implements org.apache.juneau.<a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDefault</span></a> (implements org.apache.juneau.<a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
+<li type="circle">org.apache.juneau.<a href="org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDLC</span></a> (implements org.apache.juneau.<a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
+<li type="circle">org.apache.juneau.<a href="org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerULC</span></a> (implements org.apache.juneau.<a href="org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyStore</span></a></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/PropertyStore.PropertyMap.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyStore.PropertyMap</span></a></li>
<li type="circle">org.apache.juneau.rest.converters.<a href="org/apache/juneau/rest/converters/Queryable.html" title="class in org.apache.juneau.rest.converters"><span class="typeNameLink">Queryable</span></a> (implements org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestConverter.html" title="interface in org.apache.juneau.rest">RestConverter</a>)</li>
[27/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html b/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html
index 664e39e..91b354b 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/RemoteableMethodMeta.html
@@ -194,7 +194,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</td>
</tr>
<tr id="i7" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>[]</code></td>
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/RemoteableMethodMeta.html#getRequestBeanArgs--">getRequestBeanArgs</a></span>()</code>
<div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>@RequestBean</code></a> annotated arguments on this Java method.</div>
</td>
@@ -341,7 +341,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getRequestBeanArgs</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>[] <a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.185">getRequestBeanArgs</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html" title="class in org.apache.juneau.remoteable">RemoteMethodArg</a>[] <a href="../../../../src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html#line.185">getRequestBeanArgs</a>()</pre>
<div class="block">Returns the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>@RequestBean</code></a> annotated arguments on this Java method.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/RequestBean.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/RequestBean.html b/content/site/apidocs/org/apache/juneau/remoteable/RequestBean.html
index 3a0342a..cdf899e 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/RequestBean.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/RequestBean.html
@@ -69,12 +69,12 @@
<li>Summary: </li>
<li>Field | </li>
<li>Required | </li>
-<li>Optional</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
<li>Field | </li>
-<li>Element</li>
+<li><a href="#annotation.type.element.detail">Element</a></li>
</ul>
</div>
<a name="skip.navbar.top">
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.annotation">PARAMETER</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/RequestBean.html#line.85">RequestBean</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/RequestBean.html#line.88">RequestBean</a></pre>
<div class="block">Annotation applied to Java method arguments of interface proxies to denote a bean with remoteable annotations.
<p>
<h5 class='section'>Example:</h5>
@@ -159,6 +159,66 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Req
</li>
</ul>
</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation.type.optional.element.summary">
+<!-- -->
+</a>
+<h3>Optional Element Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<caption><span>Optional Elements</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Optional Element and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/RequestBean.html#serializer--">serializer</a></span></code>
+<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation.type.element.detail">
+<!-- -->
+</a>
+<h3>Element Detail</h3>
+<a name="serializer--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>serializer</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/RequestBean.html#line.98">serializer</a></pre>
+<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
+ <p>
+ The default value defaults to the using the part serializer defined on the client which by default is
+ <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
+ <p>
+ This annotation is provided to allow values to be custom serialized.</div>
+<dl>
+<dt>Default:</dt>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
</div>
<!-- ========= END OF CLASS DATA ========= -->
<!-- ======= START OF BOTTOM NAVBAR ====== -->
@@ -208,12 +268,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Req
<li>Summary: </li>
<li>Field | </li>
<li>Required | </li>
-<li>Optional</li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
<li>Field | </li>
-<li>Element</li>
+<li><a href="#annotation.type.element.detail">Element</a></li>
</ul>
</div>
<a name="skip.navbar.bottom">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/rest/RequestFormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RequestFormData.html b/content/site/apidocs/org/apache/juneau/rest/RequestFormData.html
index d5db9b6..238f2d2 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RequestFormData.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RequestFormData.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.27">RequestFormData</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.28">RequestFormData</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util">LinkedHashMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></pre>
<div class="block">Represents the parsed form data parameters in an HTTP request.</div>
<dl>
@@ -252,6 +252,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<div class="block">Sets a request form data parameter value.</div>
</td>
</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestFormData.html#toString--">toString</a></span>()</code> </td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestFormData.html#toString-boolean-">toString</a></span>(boolean sorted)</code>
+<div class="block">Converts the form data parameters to a readable string.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.util.LinkedHashMap">
@@ -272,7 +282,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<!-- -->
</a>
<h3>Methods inherited from class java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true" title="class or interface in java.util">AbstractMap</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.util">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#hashCode--" title="class or interface in java.util">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#toString--" title="class or interface in java.util">toString</a></code></li>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.util">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#hashCode--" title="class or interface in java.util">hashCode</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -308,7 +318,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockListLast">
<li class="blockList">
<h4>RequestFormData</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.27">RequestFormData</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.28">RequestFormData</a>()</pre>
</li>
</ul>
</li>
@@ -325,7 +335,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>addDefault</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.51">addDefault</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> defaultEntries)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RequestFormData.html" title="class in org.apache.juneau.rest">RequestFormData</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.52">addDefault</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> defaultEntries)</pre>
<div class="block">Adds default entries to these form-data parameters.
<p>
This includes the default form-data parameters defined on the servlet and method levels.</div>
@@ -343,7 +353,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>put</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.69">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.70">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets a request form data parameter value.</div>
<dl>
@@ -359,7 +369,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>getFirst</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.94">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.95">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns a form data parameter value.
<p>
Parameter lookup is case-insensitive (consistent with WAS, but differs from Tomcat).
@@ -390,7 +400,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>getFirst</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.115">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.116">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> def)</pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RequestFormData.html#getFirst-java.lang.String-"><code>getFirst(String)</code></a> except returns a default value if <jk>null</jk> or empty.</div>
<dl>
@@ -408,7 +418,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.153">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.154">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Returns the specified form data parameter value converted to a POJO using the
@@ -457,7 +467,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.167">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.168">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
T def,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -482,7 +492,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>getAll</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.182">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.183">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RequestFormData.html#get-java.lang.String-java.lang.Class-"><code>get(String, Class)</code></a> except for use on multi-part parameters
@@ -506,7 +516,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.220">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.221">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -551,10 +561,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<a name="getAll-java.lang.String-java.lang.reflect.Type-java.lang.reflect.Type...-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>getAll</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.239">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.240">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -577,6 +587,35 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
</dl>
</li>
</ul>
+<a name="toString-boolean-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.297">toString</a>(boolean sorted)</pre>
+<div class="block">Converts the form data parameters to a readable string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sorted</code> - Sort the form data parameters by name.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A JSON string containing the contents of the form data parameters.</dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestFormData.html#line.307">toString</a>()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#toString--" title="class or interface in java.util">toString</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true" title="class or interface in java.util">AbstractMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></code></dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/rest/RequestHeaders.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RequestHeaders.html b/content/site/apidocs/org/apache/juneau/rest/RequestHeaders.html
index b50243f..646adf3 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RequestHeaders.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RequestHeaders.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.30">RequestHeaders</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.31">RequestHeaders</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html?is-external=true" title="class or interface in java.util">TreeMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></pre>
<div class="block">Represents the headers in an HTTP request.
<p>
@@ -394,6 +394,28 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<div class="block">Sets a request header value.</div>
</td>
</tr>
+<tr id="i37" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestHeaders.html#subset-java.lang.String...-">subset</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... headers)</code>
+<div class="block">Returns a copy of this object, but only with the specified header names copied.</div>
+</td>
+</tr>
+<tr id="i38" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestHeaders.html#subset-java.lang.String-">subset</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> headers)</code>
+<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RequestHeaders.html#subset-java.lang.String...-"><code>subset(String...)</code></a>, but allows you to specify header names as a comma-delimited list.</div>
+</td>
+</tr>
+<tr id="i39" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestHeaders.html#toString--">toString</a></span>()</code> </td>
+</tr>
+<tr id="i40" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestHeaders.html#toString-boolean-">toString</a></span>(boolean sorted)</code>
+<div class="block">Converts the headers to a readable string.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.util.TreeMap">
@@ -407,7 +429,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<!-- -->
</a>
<h3>Methods inherited from class java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true" title="class or interface in java.util">AbstractMap</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.util">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#hashCode--" title="class or interface in java.util">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#isEmpty--" title="class or interface in java.util">isEmpty</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#toString--" title="class or interface in java.util">toString</a></code></li>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.util">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#hashCode--" title="class or interface in java.util">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#isEmpty--" title="class or interface in java.util">isEmpty</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -443,7 +465,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>addDefault</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.64">addDefault</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> defaultEntries)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.65">addDefault</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> defaultEntries)</pre>
<div class="block">Adds default entries to these headers.
<p>
This includes the default headers defined on the servlet and method levels.</div>
@@ -461,7 +483,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>put</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.83">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.84">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true" title="class or interface in java.util">Enumeration</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> values)</pre>
<div class="block">Adds a set of header values to this object.</div>
<dl>
@@ -479,7 +501,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getFirst</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.103">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.104">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns the specified header value, or <jk>null</jk> if the header doesn't exist.
<p>
If <code>allowHeaderParams</code> init parameter is <jk>true</jk>, then first looks for <code>&HeaderName=x</code> in the URL query string.
@@ -498,7 +520,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getFirst</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.123">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.124">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> def)</pre>
<div class="block">Returns the specified header value, or a default value if the header doesn't exist.
<p>
@@ -518,7 +540,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>put</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.134">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.135">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets a request header value.</div>
<dl>
@@ -534,7 +556,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.158">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.159">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)</pre>
<div class="block">Returns the specified header value converted to a POJO.
<p>
@@ -568,7 +590,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.172">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.173">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
T def,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)</pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RequestHeaders.html#get-java.lang.String-java.lang.Class-"><code>get(String, Class)</code></a> but returns a default value if not found.</div>
@@ -590,7 +612,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.201">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.202">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -621,13 +643,45 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
</dl>
</li>
</ul>
+<a name="subset-java.lang.String...-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>subset</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.212">subset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... headers)</pre>
+<div class="block">Returns a copy of this object, but only with the specified header names copied.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>headers</code> - The headers to include in the copy.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new headers object.</dd>
+</dl>
+</li>
+</ul>
+<a name="subset-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>subset</h4>
+<pre>public <a href="../../../../org/apache/juneau/rest/RequestHeaders.html" title="class in org.apache.juneau.rest">RequestHeaders</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.225">subset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> headers)</pre>
+<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RequestHeaders.html#subset-java.lang.String...-"><code>subset(String...)</code></a>, but allows you to specify header names as a comma-delimited list.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>headers</code> - The headers to include in the copy.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new headers object.</dd>
+</dl>
+</li>
+</ul>
<a name="getAccept--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>getAccept</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Accept.html" title="class in org.apache.juneau.http">Accept</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.219">getAccept</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Accept.html" title="class in org.apache.juneau.http">Accept</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.242">getAccept</a>()</pre>
<div class="block">Returns the <code>Accept</code> header on the request.
<p>
Content-Types that are acceptable for the response.
@@ -648,7 +702,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getAcceptCharset</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/AcceptCharset.html" title="class in org.apache.juneau.http">AcceptCharset</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.235">getAcceptCharset</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/AcceptCharset.html" title="class in org.apache.juneau.http">AcceptCharset</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.258">getAcceptCharset</a>()</pre>
<div class="block">Returns the <code>Accept-Charset</code> header on the request.
<p>
Character sets that are acceptable.
@@ -669,7 +723,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getAcceptEncoding</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/AcceptEncoding.html" title="class in org.apache.juneau.http">AcceptEncoding</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.251">getAcceptEncoding</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/AcceptEncoding.html" title="class in org.apache.juneau.http">AcceptEncoding</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.274">getAcceptEncoding</a>()</pre>
<div class="block">Returns the <code>Accept-Encoding</code> header on the request.
<p>
List of acceptable encodings.
@@ -690,7 +744,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getAcceptLanguage</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/AcceptLanguage.html" title="class in org.apache.juneau.http">AcceptLanguage</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.267">getAcceptLanguage</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/AcceptLanguage.html" title="class in org.apache.juneau.http">AcceptLanguage</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.290">getAcceptLanguage</a>()</pre>
<div class="block">Returns the <code>Accept-Language</code> header on the request.
<p>
List of acceptable human languages for response.
@@ -711,7 +765,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getAuthorization</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Authorization.html" title="class in org.apache.juneau.http">Authorization</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.283">getAuthorization</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Authorization.html" title="class in org.apache.juneau.http">Authorization</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.306">getAuthorization</a>()</pre>
<div class="block">Returns the <code>Authorization</code> header on the request.
<p>
Authentication credentials for HTTP authentication.
@@ -732,7 +786,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getCacheControl</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/CacheControl.html" title="class in org.apache.juneau.http">CacheControl</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.299">getCacheControl</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/CacheControl.html" title="class in org.apache.juneau.http">CacheControl</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.322">getCacheControl</a>()</pre>
<div class="block">Returns the <code>Cache-Control</code> header on the request.
<p>
Used to specify directives that must be obeyed by all caching mechanisms along the request-response chain.
@@ -753,7 +807,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getConnection</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Connection.html" title="class in org.apache.juneau.http">Connection</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.316">getConnection</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Connection.html" title="class in org.apache.juneau.http">Connection</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.339">getConnection</a>()</pre>
<div class="block">Returns the <code>Connection</code> header on the request.
<p>
Control options for the current connection and list of hop-by-hop request fields.
@@ -775,7 +829,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getContentLength</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/ContentLength.html" title="class in org.apache.juneau.http">ContentLength</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.332">getContentLength</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/ContentLength.html" title="class in org.apache.juneau.http">ContentLength</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.355">getContentLength</a>()</pre>
<div class="block">Returns the <code>Content-Length</code> header on the request.
<p>
The length of the request body in octets (8-bit bytes).
@@ -796,7 +850,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getContentType</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/ContentType.html" title="class in org.apache.juneau.http">ContentType</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.348">getContentType</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/ContentType.html" title="class in org.apache.juneau.http">ContentType</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.371">getContentType</a>()</pre>
<div class="block">Returns the <code>Content-Type</code> header on the request.
<p>
The MIME type of the body of the request (used with POST and PUT requests).
@@ -817,7 +871,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getDate</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Date.html" title="class in org.apache.juneau.http">Date</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.364">getDate</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Date.html" title="class in org.apache.juneau.http">Date</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.387">getDate</a>()</pre>
<div class="block">Returns the <code>Date</code> header on the request.
<p>
The date and time that the message was originated (in "HTTP-date" format as defined by RFC 7231 Date/Time Formats).
@@ -838,7 +892,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getExpect</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Expect.html" title="class in org.apache.juneau.http">Expect</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.380">getExpect</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Expect.html" title="class in org.apache.juneau.http">Expect</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.403">getExpect</a>()</pre>
<div class="block">Returns the <code>Expect</code> header on the request.
<p>
Indicates that particular server behaviors are required by the client.
@@ -859,7 +913,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getFrom</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/From.html" title="class in org.apache.juneau.http">From</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.396">getFrom</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/From.html" title="class in org.apache.juneau.http">From</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.419">getFrom</a>()</pre>
<div class="block">Returns the <code>From</code> header on the request.
<p>
The email address of the user making the request.
@@ -880,7 +934,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getHost</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Host.html" title="class in org.apache.juneau.http">Host</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.414">getHost</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Host.html" title="class in org.apache.juneau.http">Host</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.437">getHost</a>()</pre>
<div class="block">Returns the <code>Host</code> header on the request.
<p>
The domain name of the server (for virtual hosting), and the TCP port number on which the server is listening.
@@ -903,7 +957,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getIfMatch</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/IfMatch.html" title="class in org.apache.juneau.http">IfMatch</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.431">getIfMatch</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/IfMatch.html" title="class in org.apache.juneau.http">IfMatch</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.454">getIfMatch</a>()</pre>
<div class="block">Returns the <code>If-Match</code> header on the request.
<p>
Only perform the action if the client supplied entity matches the same entity on the server.
@@ -925,7 +979,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getIfModifiedSince</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/IfModifiedSince.html" title="class in org.apache.juneau.http">IfModifiedSince</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.447">getIfModifiedSince</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/IfModifiedSince.html" title="class in org.apache.juneau.http">IfModifiedSince</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.470">getIfModifiedSince</a>()</pre>
<div class="block">Returns the <code>If-Modified-Since</code> header on the request.
<p>
Allows a 304 Not Modified to be returned if content is unchanged.
@@ -946,7 +1000,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getIfNoneMatch</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/IfNoneMatch.html" title="class in org.apache.juneau.http">IfNoneMatch</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.463">getIfNoneMatch</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/IfNoneMatch.html" title="class in org.apache.juneau.http">IfNoneMatch</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.486">getIfNoneMatch</a>()</pre>
<div class="block">Returns the <code>If-None-Match</code> header on the request.
<p>
Allows a 304 Not Modified to be returned if content is unchanged, see HTTP ETag.
@@ -967,7 +1021,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getIfRange</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/IfRange.html" title="class in org.apache.juneau.http">IfRange</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.479">getIfRange</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/IfRange.html" title="class in org.apache.juneau.http">IfRange</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.502">getIfRange</a>()</pre>
<div class="block">Returns the <code>If-Range</code> header on the request.
<p>
If the entity is unchanged, send me the part(s) that I am missing; otherwise, send me the entire new entity.
@@ -988,7 +1042,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getIfUnmodifiedSince</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/IfUnmodifiedSince.html" title="class in org.apache.juneau.http">IfUnmodifiedSince</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.495">getIfUnmodifiedSince</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/IfUnmodifiedSince.html" title="class in org.apache.juneau.http">IfUnmodifiedSince</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.518">getIfUnmodifiedSince</a>()</pre>
<div class="block">Returns the <code>If-Unmodified-Since</code> header on the request.
<p>
Only send the response if the entity has not been modified since a specific time.
@@ -1009,7 +1063,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getMaxForwards</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/MaxForwards.html" title="class in org.apache.juneau.http">MaxForwards</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.511">getMaxForwards</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/MaxForwards.html" title="class in org.apache.juneau.http">MaxForwards</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.534">getMaxForwards</a>()</pre>
<div class="block">Returns the <code>Max-Forwards</code> header on the request.
<p>
Limit the number of times the message can be forwarded through proxies or gateways.
@@ -1030,7 +1084,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getPragma</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Pragma.html" title="class in org.apache.juneau.http">Pragma</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.527">getPragma</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Pragma.html" title="class in org.apache.juneau.http">Pragma</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.550">getPragma</a>()</pre>
<div class="block">Returns the <code>Pragma</code> header on the request.
<p>
Implementation-specific fields that may have various effects anywhere along the request-response chain.
@@ -1051,7 +1105,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getProxyAuthorization</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/ProxyAuthorization.html" title="class in org.apache.juneau.http">ProxyAuthorization</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.543">getProxyAuthorization</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/ProxyAuthorization.html" title="class in org.apache.juneau.http">ProxyAuthorization</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.566">getProxyAuthorization</a>()</pre>
<div class="block">Returns the <code>Proxy-Authorization</code> header on the request.
<p>
Authorization credentials for connecting to a proxy.
@@ -1072,7 +1126,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getRange</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Range.html" title="class in org.apache.juneau.http">Range</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.559">getRange</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Range.html" title="class in org.apache.juneau.http">Range</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.582">getRange</a>()</pre>
<div class="block">Returns the <code>Range</code> header on the request.
<p>
Request only part of an entity. Bytes are numbered from 0.
@@ -1093,7 +1147,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getReferer</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Referer.html" title="class in org.apache.juneau.http">Referer</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.575">getReferer</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Referer.html" title="class in org.apache.juneau.http">Referer</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.598">getReferer</a>()</pre>
<div class="block">Returns the <code>Referer</code> header on the request.
<p>
This is the address of the previous web page from which a link to the currently requested page was followed.
@@ -1114,7 +1168,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getTE</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/TE.html" title="class in org.apache.juneau.http">TE</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.593">getTE</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/TE.html" title="class in org.apache.juneau.http">TE</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.616">getTE</a>()</pre>
<div class="block">Returns the <code>TE</code> header on the request.
<p>
The transfer encodings the user agent is willing to accept: the same values as for the response header field
@@ -1137,7 +1191,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getTimeZone</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.604">getTimeZone</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.627">getTimeZone</a>()</pre>
<div class="block">Returns the <code>Time-Zone</code> header value on the request if there is one.
<p>
Example: <js>"GMT"</js>.</div>
@@ -1153,7 +1207,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getUserAgent</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/UserAgent.html" title="class in org.apache.juneau.http">UserAgent</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.623">getUserAgent</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/UserAgent.html" title="class in org.apache.juneau.http">UserAgent</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.646">getUserAgent</a>()</pre>
<div class="block">Returns the <code>User-Agent</code> header on the request.
<p>
The user agent string of the user agent.
@@ -1174,7 +1228,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getUpgrade</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Upgrade.html" title="class in org.apache.juneau.http">Upgrade</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.639">getUpgrade</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Upgrade.html" title="class in org.apache.juneau.http">Upgrade</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.662">getUpgrade</a>()</pre>
<div class="block">Returns the <code>Upgrade</code> header on the request.
<p>
Ask the server to upgrade to another protocol.
@@ -1195,7 +1249,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<ul class="blockList">
<li class="blockList">
<h4>getVia</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Via.html" title="class in org.apache.juneau.http">Via</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.655">getVia</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Via.html" title="class in org.apache.juneau.http">Via</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.678">getVia</a>()</pre>
<div class="block">Returns the <code>Via</code> header on the request.
<p>
Informs the server of proxies through which the request was sent.
@@ -1213,10 +1267,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
<a name="getWarning--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>getWarning</h4>
-<pre>public <a href="../../../../org/apache/juneau/http/Warning.html" title="class in org.apache.juneau.http">Warning</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.671">getWarning</a>()</pre>
+<pre>public <a href="../../../../org/apache/juneau/http/Warning.html" title="class in org.apache.juneau.http">Warning</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.694">getWarning</a>()</pre>
<div class="block">Returns the <code>Warning</code> header on the request.
<p>
A general warning about possible problems with the entity body.
@@ -1231,6 +1285,35 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TreeMap.html
</dl>
</li>
</ul>
+<a name="toString-boolean-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.704">toString</a>(boolean sorted)</pre>
+<div class="block">Converts the headers to a readable string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sorted</code> - Sort the headers by name.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A JSON string containing the contents of the headers.</dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestHeaders.html#line.714">toString</a>()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#toString--" title="class or interface in java.util">toString</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true" title="class or interface in java.util">AbstractMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></code></dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
[28/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/FormData.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/FormData.html b/content/site/apidocs/org/apache/juneau/remoteable/FormData.html
index fa12b66..6785fa1 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/FormData.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/FormData.html
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>={<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.annotation">PARAMETER</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</a>})
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.83">FormData</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.128">FormData</a></pre>
<div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are FORM post parameters on the request.
<p>
<h5 class='section'>Example:</h5>
@@ -104,27 +104,39 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
<jk>public interface</jk> MyProxy {
+ <jc>// Explicit names specified for form data parameters.</jc>
+ <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)
String myProxyMethod1(<ja>@FormData</ja>(<js>"foo"</js>)</ja> String foo, <ja>@FormData</ja>(<js>"bar"</js>)</ja> MyPojo pojo);
+ <jc>// Multiple values pulled from a NameValuePairs object.</jc>
+ <jc>// Same as @FormData("*").</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)
- String myProxyMethod2(<ja>@FormData</ja> NameValuePairs form);
+ String myProxyMethod2(<ja>@FormData</ja> NameValuePairs nameValuePairs);
+ <jc>// Multiple values pulled from a Map.</jc>
+ <jc>// Same as @FormData("*").</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)
- String myProxyMethod2(<ja>@FormData</ja> Map<String,Object> form);
+ String myProxyMethod3(<ja>@FormData</ja> Map<String,Object> map);
+
+ <jc>// Multiple values pulled from a bean.</jc>
+ <jc>// Same as @FormData("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod4"</js>)
+ String myProxyMethod4(<ja>@FormData</ja> MyBean myBean);
+
+ <jc>// An entire form-data HTTP body as a String.</jc>
+ <jc>// Same as @FormData("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod5"</js>)
+ String myProxyMethod5(<ja>@FormData</ja> String string);
+
+ <jc>// An entire form-data HTTP body as a Reader.</jc>
+ <jc>// Sames as @FormData("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod6"</js>)
+ String myProxyMethod6(<ja>@FormData</ja> Reader reader);
+
}
</p>
<p>
- The argument can be any of the following types:
- <ul class='spaced-list'>
- <li>Any serializable POJO - Converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li><code>NameValuePairs</code> - Individual name-value pairs.
- <li><code>Map<String,Object></code> - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li>A bean - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- </ul>
- <p>
The annotation can also be applied to a bean property field or getter when the argument is annotated with
<a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>@RequestBean</code></a>:
<p>
@@ -138,18 +150,52 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
}
<jk>public interface</jk> MyRequestBean {
+
+ <jc>// Name explicitly specified.</jc>
+ <ja>@FormData</ja>(<js>"foo"</js>)
+ String getX();
+
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @FormData("bar")</jc>
<ja>@FormData</ja>
- String getFoo();
+ String getBar();
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @FormData("baz")</jc>
<ja>@FormData</ja>
- MyPojo getBar();
+ <ja>@BeanProperty</ja>(<js>"baz"</js>)
+ String getY();
+
+ <jc>// Multiple values pulled from NameValuePairs object.</jc>
+ <jc>// Same as @FormData("*")</jc>
+ <ja>@FormData</ja>
+ NameValuePairs getNameValuePairs();
+
+ <jc>// Multiple values pulled from Map.</jc>
+ <jc>// Same as @FormData("*")</jc>
+ <ja>@FormData</ja>
+ Map<String,Object> getMap();
+
+ <jc>// Multiple values pulled from bean.</jc>
+ <jc>// Same as @FormData("*")</jc>
+ <ja>@FormData</ja>
+ MyBean getMyBean();
+
+ <jc>// An entire form-data HTTP body as a Reader.</jc>
+ <jc>// Same as @FormData("*")</jc>
+ <ja>@FormData</ja>
+ Reader getReader();
}
</p>
<p>
- When used in a request bean, the <a href="../../../../org/apache/juneau/remoteable/FormData.html#value--"><code>value()</code></a> can be used to override the form data parameter name.
- It can also be overridden via the <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>@BeanProperty.name()</code></a> annotation.
- A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the
- map or bean to be expanded to form data parameters.</div>
+ The <a href="../../../../org/apache/juneau/remoteable/FormData.html#name--"><code>name()</code></a> and <a href="../../../../org/apache/juneau/remoteable/FormData.html#value--"><code>value()</code></a> elements are synonyms for specifying the parameter name. Only one should be used.
+ <br>The following annotations are fully equivalent:
+ <p>
+ <p class='bcode'>
+ <ja>@FormData</ja>(name=<js>"foo"</js>)
+
+ <ja>@FormData</ja>(<js>"foo"</js>)
+ </p></div>
</li>
</ul>
</div>
@@ -169,15 +215,27 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/FormData.html#name--">name</a></span></code>
+<div class="block">The form post parameter name.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/FormData.html#serializer--">serializer</a></span></code>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/FormData.html#skipIfEmpty--">skipIfEmpty</a></span></code>
+<div class="block">Skips this value if it's an empty string or empty collection/array.</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/FormData.html#value--">value</a></span></code>
-<div class="block">The form post parameter name.</div>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/FormData.html#name--"><code>name()</code></a>.</div>
</td>
</tr>
</table>
@@ -195,25 +253,97 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
<!-- -->
</a>
<h3>Element Detail</h3>
-<a name="value--">
+<a name="name--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.96">value</a></pre>
+<h4>name</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.175">name</a></pre>
<div class="block">The form post parameter name.
<p>
- A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
- for the following data types:
- <ul>
- <li><code>NameValuePairs</code>
- <li><code>Map<String,Object></code>
- <li>A bean
+ Note that <a href="../../../../org/apache/juneau/remoteable/FormData.html#name--"><code>name()</code></a> and <a href="../../../../org/apache/juneau/remoteable/FormData.html#value--"><code>value()</code></a> are synonyms.
+ <p>
+ The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the
+ form data parameter name.
+ <p>
+ A blank value (the default) has the following behavior:
+ <ul class='spaced-list'>
+ <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
+ then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jc>// When used on a remote method parameter</jc>
+ <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
+ <jk>public interface</jk> MyProxy {
+
+ <jc>// Equivalent to @FormData("*")</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)
+ String myProxyMethod1(<ja>@FormData</ja> Map<String,Object> formData);
+ }
+
+ <jc>// When used on a request bean method</jc>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @FormData("*")</jc>
+ <ja>@FormData</ja>
+ Map<String,Object> getFoo();
+ }
+ </p>
+ <br>
+ <li>If used on a request bean method, uses the bean property name.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @FormData("foo")</jc>
+ <ja>@FormData</ja>
+ String getFoo();
+ }
+ </p>
+ </ul>
</ul></div>
<dl>
<dt>Default:</dt>
-<dd>"*"</dd>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="value--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>value</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.182">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/FormData.html#name--"><code>name()</code></a>.
+ <p>
+ Allows you to use shortened notation if you're only specifying the name.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="skipIfEmpty--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>skipIfEmpty</h4>
+<pre>public abstract boolean <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.189">skipIfEmpty</a></pre>
+<div class="block">Skips this value if it's an empty string or empty collection/array.
+ <p>
+ Note that <jk>null</jk> values are already ignored.</div>
+<dl>
+<dt>Default:</dt>
+<dd>false</dd>
</dl>
</li>
</ul>
@@ -226,15 +356,16 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
<ul class="blockListLast">
<li class="blockList">
<h4>serializer</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.105">serializer</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/FormData.html#line.199">serializer</a></pre>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
<p>
- The default serializer converters values to UON notation.
+ The default value defaults to the using the part serializer defined on the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>RequestBean</code></a> annotation,
+ then on the client which by default is <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
<p>
This annotation is provided to allow values to be custom serialized.</div>
<dl>
<dt>Default:</dt>
-<dd>org.apache.juneau.urlencoding.UrlEncodingSerializer.class</dd>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html b/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
index a1b4590..bc17fa5 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/FormDataIfNE.html
@@ -117,15 +117,21 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/FormDataIfNE.html#name--">name</a></span></code>
+<div class="block">The form post parameter name.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/FormDataIfNE.html#serializer--">serializer</a></span></code>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/FormDataIfNE.html#value--">value</a></span></code>
-<div class="block">The form post parameter name.</div>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/FormDataIfNE.html#name--"><code>name()</code></a>.</div>
</td>
</tr>
</table>
@@ -143,25 +149,42 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
<!-- -->
</a>
<h3>Element Detail</h3>
-<a name="value--">
+<a name="name--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>name</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/FormDataIfNE.html#line.36">name</a></pre>
+<div class="block">The form post parameter name.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/apache/juneau/remoteable/FormData.html#name--"><code>FormData.name()</code></a></dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="value--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/FormDataIfNE.html#line.43">value</a></pre>
-<div class="block">The form post parameter name.
- <p>
- A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
- for the following data types:
- <ul>
- <li><code>NameValuePairs</code>
- <li><code>Map<String,Object></code>
- <li>A bean
- </ul></div>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/FormDataIfNE.html#line.42">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/FormDataIfNE.html#name--"><code>name()</code></a>.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/apache/juneau/remoteable/FormData.html#value--"><code>FormData.value()</code></a></dd>
+</dl>
<dl>
<dt>Default:</dt>
-<dd>"*"</dd>
+<dd>""</dd>
</dl>
</li>
</ul>
@@ -177,12 +200,13 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/For
<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/FormDataIfNE.html#line.52">serializer</a></pre>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
<p>
- The default serializer converters values to UON notation.
+ The default value defaults to the using the part serializer defined on the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>RequestBean</code></a> annotation,
+ then on the client which by default is <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
<p>
This annotation is provided to allow values to be custom serialized.</div>
<dl>
<dt>Default:</dt>
-<dd>org.apache.juneau.urlencoding.UrlEncodingSerializer.class</dd>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/Header.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/Header.html b/content/site/apidocs/org/apache/juneau/remoteable/Header.html
index 5e25c80..6bffe3c 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/Header.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/Header.html
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>={<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.annotation">PARAMETER</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</a>})
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.80">Header</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.112">Header</a></pre>
<div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are serialized as an HTTP header value.
<p>
<h5 class='section'>Example:</h5>
@@ -104,24 +104,28 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
<jk>public interface</jk> MyProxy {
+ <jc>// Explicit names specified for form data parameters.</jc>
+ <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)
String myProxyMethod1(<ja>@Header</ja>(<js>"Foo"</js>)</ja> String foo, <ja>@Header</ja>(<js>"Bar"</js>)</ja> MyPojo pojo);
+ <jc>// Multiple values pulled from a NameValuePairs object.</jc>
+ <jc>// Same as @Header("*").</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)
- String myProxyMethod2(<ja>@Header</ja> Map<String,Object> headers);
+ String myProxyMethod2(<ja>@Header</ja> NameValuePairs nameValuePairs);
+
+ <jc>// Multiple values pulled from a Map.</jc>
+ <jc>// Same as @Header("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)
+ String myProxyMethod3(<ja>@Header</ja> Map<String,Object> map);
+
+ <jc>// Multiple values pulled from a bean.</jc>
+ <jc>// Same as @Header("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod4"</js>)
+ String myProxyMethod4(<ja>@Header</ja> MyBean myBean);
}
</p>
<p>
- The argument can be any of the following types:
- <ul class='spaced-list'>
- <li><code>NameValuePairs</code> - Individual name-value pairs.
- <li>Any serializable POJO - Converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li><code>Map<String,Object></code> - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li>A bean - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- </ul>
- <p>
The annotation can also be applied to a bean property field or getter when the argument is annotated with
<a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>@RequestBean</code></a>:
<p>
@@ -135,18 +139,47 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
}
<jk>public interface</jk> MyRequestBean {
+
+ <jc>// Name explicitly specified.</jc>
<ja>@Header</ja>(<js>"Foo"</js>)
- String getFoo();
+ String getX();
+
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @Header("bar")</jc>
+ <ja>@Header</ja>
+ String getBar();
+
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @Header("Baz")</jc>
+ <ja>@Header</ja>
+ <ja>@BeanProperty</ja>(<js>"Baz"</js>)
+ String getY();
+
+ <jc>// Multiple values pulled from NameValuePairs object.</jc>
+ <jc>// Same as @Header("*")</jc>
+ <ja>@Header</ja>
+ NameValuePairs getNameValuePairs();
- <ja>@Header</ja>(<js>"Bar"</js>)
- MyPojo getBar();
+ <jc>// Multiple values pulled from Map.</jc>
+ <jc>// Same as @Header("*")</jc>
+ <ja>@Header</ja>
+ Map<String,Object> getMap();
+
+ <jc>// Multiple values pulled from bean.</jc>
+ <jc>// Same as @Header("*")</jc>
+ <ja>@Header</ja>
+ MyBean getBean();
}
</p>
<p>
- When used in a request bean, the <a href="../../../../org/apache/juneau/remoteable/Header.html#value--"><code>value()</code></a> can be used to override the header name.
- It can also be overridden via the <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>@BeanProperty.name()</code></a> annotation.
- A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the
- map or bean to be expanded to headers.</div>
+ The <a href="../../../../org/apache/juneau/remoteable/Header.html#name--"><code>name()</code></a> and <a href="../../../../org/apache/juneau/remoteable/Header.html#value--"><code>value()</code></a> elements are synonyms for specifying the header name. Only one should be used.
+ <br>The following annotations are fully equivalent:
+ <p>
+ <p class='bcode'>
+ <ja>@Header</ja>(name=<js>"Foo"</js>)
+
+ <ja>@Header</ja>(<js>"Foo"</js>)
+ </p></div>
</li>
</ul>
</div>
@@ -166,15 +199,27 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Header.html#name--">name</a></span></code>
+<div class="block">The HTTP header name.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Header.html#serializer--">serializer</a></span></code>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Header.html#skipIfEmpty--">skipIfEmpty</a></span></code>
+<div class="block">Skips this value if it's an empty string or empty collection/array.</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Header.html#value--">value</a></span></code>
-<div class="block">The HTTP header name.</div>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/Header.html#name--"><code>name()</code></a>.</div>
</td>
</tr>
</table>
@@ -192,25 +237,99 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
<!-- -->
</a>
<h3>Element Detail</h3>
-<a name="value--">
+<a name="name--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.93">value</a></pre>
+<h4>name</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.161">name</a></pre>
<div class="block">The HTTP header name.
<p>
- A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
- for the following data types:
- <ul>
- <li><code>NameValuePairs</code>
- <li><code>Map<String,Object></code>
- <li>A bean
+ A blank value (the default) indicates to reuse the bean property name when used on a request bean property.
+ <p>
+ <p>
+ The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the
+ header name.
+ <p>
+ A blank value (the default) has the following behavior:
+ <ul class='spaced-list'>
+ <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
+ then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jc>// When used on a remote method parameter</jc>
+ <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
+ <jk>public interface</jk> MyProxy {
+
+ <jc>// Equivalent to @Header("*")</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)
+ String myProxyMethod1(<ja>@Header</ja> Map<String,Object> headers);
+ }
+
+ <jc>// When used on a request bean method</jc>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @Header("*")</jc>
+ <ja>@Header</ja>
+ Map<String,Object> getFoo();
+ }
+ </p>
+ <br>
+ <li>If used on a request bean method, uses the bean property name.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @Header("Foo")</jc>
+ <ja>@Header</ja>
+ <ja>@BeanProperty</ja>(<js>"Foo"</js>)
+ String getFoo();
+ }
+ </p>
+ </ul>
</ul></div>
<dl>
<dt>Default:</dt>
-<dd>"*"</dd>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="value--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>value</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.168">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/Header.html#name--"><code>name()</code></a>.
+ <p>
+ Allows you to use shortened notation if you're only specifying the name.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="skipIfEmpty--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>skipIfEmpty</h4>
+<pre>public abstract boolean <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.175">skipIfEmpty</a></pre>
+<div class="block">Skips this value if it's an empty string or empty collection/array.
+ <p>
+ Note that <jk>null</jk> values are already ignored.</div>
+<dl>
+<dt>Default:</dt>
+<dd>false</dd>
</dl>
</li>
</ul>
@@ -223,15 +342,16 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
<ul class="blockListLast">
<li class="blockList">
<h4>serializer</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.102">serializer</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/Header.html#line.185">serializer</a></pre>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
<p>
- The default serializer converters values to UON notation.
+ The default value defaults to the using the part serializer defined on the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>RequestBean</code></a> annotation,
+ then on the client which by default is <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
<p>
This annotation is provided to allow values to be custom serialized.</div>
<dl>
<dt>Default:</dt>
-<dd>org.apache.juneau.urlencoding.UrlEncodingSerializer.class</dd>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html b/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
index 980df78..6233d7b 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/HeaderIfNE.html
@@ -117,15 +117,21 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html#name--">name</a></span></code>
+<div class="block">The HTTP header name.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html#serializer--">serializer</a></span></code>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html#value--">value</a></span></code>
-<div class="block">The HTTP header name.</div>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html#name--"><code>name()</code></a>.</div>
</td>
</tr>
</table>
@@ -143,25 +149,42 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
<!-- -->
</a>
<h3>Element Detail</h3>
-<a name="value--">
+<a name="name--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>name</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/HeaderIfNE.html#line.36">name</a></pre>
+<div class="block">The HTTP header name.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/apache/juneau/remoteable/Header.html#name--"><code>Header.name()</code></a></dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="value--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/HeaderIfNE.html#line.43">value</a></pre>
-<div class="block">The HTTP header name.
- <p>
- A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
- for the following data types:
- <ul>
- <li><code>NameValuePairs</code>
- <li><code>Map<String,Object></code>
- <li>A bean
- </ul></div>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/HeaderIfNE.html#line.42">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/HeaderIfNE.html#name--"><code>name()</code></a>.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/apache/juneau/remoteable/Header.html#value--"><code>Header.value()</code></a></dd>
+</dl>
<dl>
<dt>Default:</dt>
-<dd>"*"</dd>
+<dd>""</dd>
</dl>
</li>
</ul>
@@ -177,12 +200,13 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Hea
<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/HeaderIfNE.html#line.52">serializer</a></pre>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
<p>
- The default serializer converters values to UON notation.
+ The default value defaults to the using the part serializer defined on the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>RequestBean</code></a> annotation,
+ then on the client which by default is <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
<p>
This annotation is provided to allow values to be custom serialized.</div>
<dl>
<dt>Default:</dt>
-<dd>org.apache.juneau.urlencoding.UrlEncodingSerializer.class</dd>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/Path.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/Path.html b/content/site/apidocs/org/apache/juneau/remoteable/Path.html
index c19972b..ad7dbca 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/Path.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/Path.html
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>={<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.annotation">PARAMETER</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</a>})
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.74">Path</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.112">Path</a></pre>
<div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.
<p>
<h5 class='section'>Example:</h5>
@@ -104,21 +104,28 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Pat
<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
<jk>public interface</jk> MyProxy {
- <ja>@RemoteMethod</ja>(path=<js>"/mymethod1/{foo}"</js>)
- String myProxyMethod1(<ja>@Path</ja>(<js>"foo"</js>)</ja> String foo);
+ <jc>// Explicit names specified for path parameters.</jc>
+ <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod1/{foo}/{bar}"</js>)
+ String myProxyMethod1(<ja>@Path</ja>(<js>"foo"</js>)</ja> String foo, <ja>@Path</ja>(<js>"bar"</js>)</ja> MyPojo pojo);
+
+ <jc>// Multiple values pulled from a NameValuePairs object.</jc>
+ <jc>// Same as @Path("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod2/{foo}/{bar}/{baz}"</js>)
+ String myProxyMethod2(<ja>@Path</ja> NameValuePairs nameValuePairs);
+
+ <jc>// Multiple values pulled from a Map.</jc>
+ <jc>// Same as @Path("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod3/{foo}/{bar}/{baz}"</js>)
+ String myProxyMethod3(<ja>@Path</ja> Map<String,Object> map);
+
+ <jc>// Multiple values pulled from a bean.</jc>
+ <jc>// Same as @Path("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod4/{foo}/{bar}/{baz}"</js>)
+ String myProxyMethod4(<ja>@Path</ja> MyBean myBean);
}
</p>
<p>
- The argument can be any of the following types:
- <ul class='spaced-list'>
- <li><code>NameValuePairs</code> - Individual name-value pairs.
- <li>Any serializable POJO - Converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li><code>Map<String,Object></code> - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li>A bean - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- </ul>
- <p>
The annotation can also be applied to a bean property field or getter when the argument is annotated with
<a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>@RequestBean</code></a>:
<p>
@@ -127,20 +134,52 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Pat
<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
<jk>public interface</jk> MyProxy {
- <ja>@RemoteMethod</ja>(path=<js>"/mymethod1/{foo}"</js>)
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod/{foo}/{bar}/{baz}"</js>)
String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);
}
<jk>public interface</jk> MyRequestBean {
+
+ <jc>// Name explicitly specified.</jc>
+ <ja>@Path</ja>(<js>"foo"</js>)
+ String getX();
+
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @Path("bar")</jc>
<ja>@Path</ja>
- String getFoo();
+ String getBar();
+
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @Path("baz")</jc>
+ <ja>@Path</ja>
+ <ja>@BeanProperty</ja>(<js>"baz"</js>)
+ String getY();
+
+ <jc>// Multiple values pulled from NameValuePairs object.</jc>
+ <jc>// Same as @Path("*")</jc>
+ <ja>@Path</ja>
+ NameValuePairs getNameValuePairs();
+
+ <jc>// Multiple values pulled from Map.</jc>
+ <jc>// Same as @Path("*")</jc>
+ <ja>@Path</ja>
+ Map<String,Object> getMap();
+
+ <jc>// Multiple values pulled from bean.</jc>
+ <jc>// Same as @Path("*")</jc>
+ <ja>@Path</ja>
+ MyBean getMyBean();
}
</p>
<p>
- When used in a request bean, the <a href="../../../../org/apache/juneau/remoteable/Path.html#value--"><code>value()</code></a> can be used to override the path variable name.
- It can also be overridden via the <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>@BeanProperty.name()</code></a> annotation.
- A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the
- map or bean to be expanded to path variables.</div>
+ The <a href="../../../../org/apache/juneau/remoteable/Path.html#name--"><code>name()</code></a> and <a href="../../../../org/apache/juneau/remoteable/Path.html#value--"><code>value()</code></a> elements are synonyms for specifying the path variable name. Only one should be used.
+ <br>The following annotations are fully equivalent:
+ <p>
+ <p class='bcode'>
+ <ja>@Path</ja>(name=<js>"foo"</js>)
+
+ <ja>@Path</ja>(<js>"foo"</js>)
+ </p></div>
</li>
</ul>
</div>
@@ -160,15 +199,21 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Pat
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Path.html#name--">name</a></span></code>
+<div class="block">The path parameter name.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Path.html#serializer--">serializer</a></span></code>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Path.html#value--">value</a></span></code>
-<div class="block">The path parameter name.</div>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/Path.html#name--"><code>name()</code></a>.</div>
</td>
</tr>
</table>
@@ -186,25 +231,76 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Pat
<!-- -->
</a>
<h3>Element Detail</h3>
-<a name="value--">
+<a name="name--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.87">value</a></pre>
+<h4>name</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.157">name</a></pre>
<div class="block">The path parameter name.
<p>
- A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
- for the following data types:
- <ul>
- <li><code>NameValuePairs</code>
- <li><code>Map<String,Object></code>
- <li>A bean
+ Note that <a href="../../../../org/apache/juneau/remoteable/Path.html#name--"><code>name()</code></a> and <a href="../../../../org/apache/juneau/remoteable/Path.html#value--"><code>value()</code></a> are synonyms.
+ <p>
+ The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the
+ path variable name.
+ <p>
+ A blank value (the default) has the following behavior:
+ <ul class='spaced-list'>
+ <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
+ then it's the equivalent to <js>"*"</js> which will cause the value to be treated as name/value pairs.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jc>// When used on a remote method parameter</jc>
+ <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
+ <jk>public interface</jk> MyProxy {
+
+ <jc>// Equivalent to @Path("*")</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod/{foo}/{bar}"</js>)
+ String myProxyMethod1(<ja>@FormData</ja> Map<String,Object> pathVars);
+ }
+
+ <jc>// When used on a request bean method</jc>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @Path("*")</jc>
+ <ja>@Path</ja>
+ Map<String,Object> getPathVars();
+ }
+ </p>
+ <br>
+ <li>If used on a request bean method, uses the bean property name.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @Path("foo")</jc>
+ <ja>@Path</ja>
+ String getFoo();
+ }
</ul></div>
<dl>
<dt>Default:</dt>
-<dd>"*"</dd>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="value--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>value</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.164">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/Path.html#name--"><code>name()</code></a>.
+ <p>
+ Allows you to use shortened notation if you're only specifying the name.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
</dl>
</li>
</ul>
@@ -217,15 +313,16 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Pat
<ul class="blockListLast">
<li class="blockList">
<h4>serializer</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.96">serializer</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/Path.html#line.174">serializer</a></pre>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
<p>
- The default serializer converters values to UON notation.
+ The default value defaults to the using the part serializer defined on the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>RequestBean</code></a> annotation,
+ then on the client which by default is <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
<p>
This annotation is provided to allow values to be custom serialized.</div>
<dl>
<dt>Default:</dt>
-<dd>org.apache.juneau.urlencoding.UrlEncodingSerializer.class</dd>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/Query.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/Query.html b/content/site/apidocs/org/apache/juneau/remoteable/Query.html
index 383552e..b395b62 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/Query.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/Query.html
@@ -96,7 +96,7 @@
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>={<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PARAMETER" title="class or interface in java.lang.annotation">PARAMETER</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</a>})
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--" title="class or interface in java.lang.annotation">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</a>)
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true" title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.84">Query</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.127">Query</a></pre>
<div class="block">Annotation applied to Java method arguments of interface proxies to denote that they are QUERY parameters on the request.
<p>
<h5 class='section'>Example:</h5>
@@ -104,28 +104,38 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
<jk>public interface</jk> MyProxy {
+ <jc>// Explicit names specified for query parameters.</jc>
+ <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)
String myProxyMethod1(<ja>@Query</ja>(<js>"foo"</js>)</ja> String foo, <ja>@Query</ja>(<js>"bar"</js>)</ja> MyPojo pojo);
+ <jc>// Multiple values pulled from a NameValuePairs object.</jc>
+ <jc>// Same as @Query("*").</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)
- String myProxyMethod2(<ja>@Query</ja> Map<String,Object> query);
+ String myProxyMethod2(<ja>@Query</ja> NameValuePairs nameValuePairs);
+ <jc>// Multiple values pulled from a Map.</jc>
+ <jc>// Same as @Query("*").</jc>
<ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)
- String myProxyMethod2(<ja>@Query</ja> String queryString);
+ String myProxyMethod3(<ja>@Query</ja> Map<String,Object> map);
+
+ <jc>// Multiple values pulled from a bean.</jc>
+ <jc>// Same as @Query("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod4"</js>)
+ String myProxyMethod4(<ja>@Query</ja> MyBean myBean);
+
+ <jc>// An entire query string as a String.</jc>
+ <jc>// Same as @FQuery("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod5"</js>)
+ String myProxyMethod5(<ja>@Query</ja> String string);
+
+ <jc>// An entire query string as a Reader.</jc>
+ <jc>// Same as @Query("*").</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod6"</js>)
+ String myProxyMethod6(<ja>@Query</ja> Reader reader);
}
</p>
<p>
- The argument can be any of the following types:
- <ul class='spaced-list'>
- <li><code>NameValuePairs</code> - Individual name-value pairs.
- <li>Any serializable POJO - Converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li><code>Map<String,Object></code> - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li>A bean - Individual name-value pairs.
- Values are converted to text using <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serialize-org.apache.juneau.serializer.PartType-java.lang.Object-"><code>UrlEncodingSerializer.serialize(PartType,Object)</code></a>.
- <li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a> - Treated as a query string.
- </ul>
- <p>
The annotation can also be applied to a bean property field or getter when the argument is annotated with
<a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>@RequestBean</code></a>:
<p>
@@ -139,18 +149,52 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
}
<jk>public interface</jk> MyRequestBean {
+
+ <jc>// Name explicitly specified.</jc>
+ <ja>@Query</ja>(<js>"foo"</js>)
+ String getX();
+
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @Query("bar")</jc>
<ja>@Query</ja>
- String getFoo();
+ String getBar();
+
+ <jc>// Name inherited from bean property.</jc>
+ <jc>// Same as @Query("baz")</jc>
+ <ja>@Query</ja>
+ <ja>@BeanProperty</ja>(<js>"baz"</js>)
+ String getY();
+ <jc>// Multiple values pulled from NameValuePairs object.</jc>
+ <jc>// Same as @Query("*")</jc>
<ja>@Query</ja>
- MyPojo getBar();
+ NameValuePairs getNameValuePairs();
+
+ <jc>// Multiple values pulled from Map.</jc>
+ <jc>// Same as @Query("*")</jc>
+ <ja>@Query</ja>
+ Map<String,Object> getMap();
+
+ <jc>// Multiple values pulled from bean.</jc>
+ <jc>// Same as @Query("*")</jc>
+ <ja>@Query</ja>
+ MyBean getMyBean();
+
+ <jc>// An entire query string as a Reader.</jc>
+ <jc>// Same as @Query("*")</jc>
+ <ja>@Query</ja>
+ Reader getReader();
}
</p>
<p>
- When used in a request bean, the <a href="../../../../org/apache/juneau/remoteable/Query.html#value--"><code>value()</code></a> can be used to override the query parameter name.
- It can also be overridden via the <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>@BeanProperty.name()</code></a> annotation.
- A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the
- map or bean to be expanded to query parameters.</div>
+ The <a href="../../../../org/apache/juneau/remoteable/Query.html#name--"><code>name()</code></a> and <a href="../../../../org/apache/juneau/remoteable/Query.html#value--"><code>value()</code></a> elements are synonyms for specifying the parameter name. Only one should be used.
+ <br>The following annotations are fully equivalent:
+ <p>
+ <p class='bcode'>
+ <ja>@Query</ja>(name=<js>"foo"</js>)
+
+ <ja>@Query</ja>(<js>"foo"</js>)
+ </p></div>
</li>
</ul>
</div>
@@ -170,15 +214,27 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Query.html#name--">name</a></span></code>
+<div class="block">The query parameter name.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Query.html#serializer--">serializer</a></span></code>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
</td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Query.html#skipIfEmpty--">skipIfEmpty</a></span></code>
+<div class="block">Skips this value if it's an empty string or empty collection/array.</div>
+</td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/Query.html#value--">value</a></span></code>
-<div class="block">The query parameter name.</div>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/Query.html#name--"><code>name()</code></a>.</div>
</td>
</tr>
</table>
@@ -196,26 +252,97 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
<!-- -->
</a>
<h3>Element Detail</h3>
-<a name="value--">
+<a name="name--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.98">value</a></pre>
+<h4>name</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.174">name</a></pre>
<div class="block">The query parameter name.
<p>
- A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
- for the following data types:
- <ul>
- <li><code>String</code> - A complete query string.
- <li><code>NameValuePairs</code>
- <li><code>Map<String,Object></code>
- <li>A bean
+ Note that <a href="../../../../org/apache/juneau/remoteable/Query.html#name--"><code>name()</code></a> and <a href="../../../../org/apache/juneau/remoteable/Query.html#value--"><code>value()</code></a> are synonyms.
+ <p>
+ The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the
+ query parameter name.
+ <p>
+ A blank value (the default) has the following behavior:
+ <ul class='spaced-list'>
+ <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
+ then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jc>// When used on a remote method parameter</jc>
+ <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
+ <jk>public interface</jk> MyProxy {
+
+ <jc>// Equivalent to @Query("*")</jc>
+ <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)
+ String myProxyMethod1(<ja>@Query</ja> Map<String,Object> formData);
+ }
+
+ <jc>// When used on a request bean method</jc>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @Query("*")</jc>
+ <ja>@Query</ja>
+ Map<String,Object> getFoo();
+ }
+ </p>
+ <br>
+ <li>If used on a request bean method, uses the bean property name.
+ <h6 class='figure'>Example:</h6>
+ <p class='bcode'>
+ <jk>public interface</jk> MyRequestBean {
+
+ <jc>// Equivalent to @Query("foo")</jc>
+ <ja>@Query</ja>
+ String getFoo();
+ }
+ </p>
+ </ul>
</ul></div>
<dl>
<dt>Default:</dt>
-<dd>"*"</dd>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="value--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>value</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.181">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/Query.html#name--"><code>name()</code></a>.
+ <p>
+ Allows you to use shortened notation if you're only specifying the name.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="skipIfEmpty--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>skipIfEmpty</h4>
+<pre>public abstract boolean <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.188">skipIfEmpty</a></pre>
+<div class="block">Skips this value if it's an empty string or empty collection/array.
+ <p>
+ Note that <jk>null</jk> values are already ignored.</div>
+<dl>
+<dt>Default:</dt>
+<dd>false</dd>
</dl>
</li>
</ul>
@@ -228,15 +355,16 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
<ul class="blockListLast">
<li class="blockList">
<h4>serializer</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.107">serializer</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/Query.html#line.198">serializer</a></pre>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
<p>
- The default serializer converters values to UON notation.
+ The default value defaults to the using the part serializer defined on the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>RequestBean</code></a> annotation,
+ then on the client which by default is <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
<p>
This annotation is provided to allow values to be custom serialized.</div>
<dl>
<dt>Default:</dt>
-<dd>org.apache.juneau.urlencoding.UrlEncodingSerializer.class</dd>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html b/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
index 17e5113..5016f6f 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/QueryIfNE.html
@@ -117,15 +117,21 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html#name--">name</a></span></code>
+<div class="block">The query parameter name.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html#serializer--">serializer</a></span></code>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html#value--">value</a></span></code>
-<div class="block">The query parameter name.</div>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html#name--"><code>name()</code></a>.</div>
</td>
</tr>
</table>
@@ -143,26 +149,42 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
<!-- -->
</a>
<h3>Element Detail</h3>
-<a name="value--">
+<a name="name--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>name</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/QueryIfNE.html#line.36">name</a></pre>
+<div class="block">The query parameter name.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/apache/juneau/remoteable/Query.html#name--"><code>Query.name()</code></a></dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="value--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>value</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/QueryIfNE.html#line.44">value</a></pre>
-<div class="block">The query parameter name.
- <p>
- A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable
- for the following data types:
- <ul>
- <li><code>String</code> - A complete query string.
- <li><code>NameValuePairs</code>
- <li><code>Map<String,Object></code>
- <li>A bean
- </ul></div>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/remoteable/QueryIfNE.html#line.42">value</a></pre>
+<div class="block">A synonym for <a href="../../../../org/apache/juneau/remoteable/QueryIfNE.html#name--"><code>name()</code></a>.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/apache/juneau/remoteable/Query.html#value--"><code>Query.value()</code></a></dd>
+</dl>
<dl>
<dt>Default:</dt>
-<dd>"*"</dd>
+<dd>""</dd>
</dl>
</li>
</ul>
@@ -175,15 +197,16 @@ public @interface <a href="../../../../src-html/org/apache/juneau/remoteable/Que
<ul class="blockListLast">
<li class="blockList">
<h4>serializer</h4>
-<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/QueryIfNE.html#line.53">serializer</a></pre>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> <a href="../../../../src-html/org/apache/juneau/remoteable/QueryIfNE.html#line.52">serializer</a></pre>
<div class="block">Specifies the <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer"><code>PartSerializer</code></a> class used for serializing values to strings.
<p>
- The default serializer converters values to UON notation.
+ The default value defaults to the using the part serializer defined on the <a href="../../../../org/apache/juneau/remoteable/RequestBean.html" title="annotation in org.apache.juneau.remoteable"><code>RequestBean</code></a> annotation,
+ then on the client which by default is <a href="../../../../org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>.
<p>
This annotation is provided to allow values to be custom serialized.</div>
<dl>
<dt>Default:</dt>
-<dd>org.apache.juneau.urlencoding.UrlEncodingSerializer.class</dd>
+<dd>org.apache.juneau.serializer.PartSerializer.class</dd>
</dl>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/remoteable/RemoteMethodArg.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/remoteable/RemoteMethodArg.html b/content/site/apidocs/org/apache/juneau/remoteable/RemoteMethodArg.html
index 5adb4a7..792e557 100644
--- a/content/site/apidocs/org/apache/juneau/remoteable/RemoteMethodArg.html
+++ b/content/site/apidocs/org/apache/juneau/remoteable/RemoteMethodArg.html
@@ -164,7 +164,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr class="altColor">
<td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html#RemoteMethodArg-java.lang.String-int-boolean-java.lang.Class-">RemoteMethodArg</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/remoteable/RemoteMethodArg.html#RemoteMethodArg-java.lang.String-java.lang.String-int-boolean-java.lang.Class-">RemoteMethodArg</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name2,
int index,
boolean skipIfNE,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> serializer)</code>
@@ -249,20 +250,22 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<!-- -->
</a>
<h3>Constructor Detail</h3>
-<a name="RemoteMethodArg-java.lang.String-int-boolean-java.lang.Class-">
+<a name="RemoteMethodArg-java.lang.String-java.lang.String-int-boolean-java.lang.Class-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>RemoteMethodArg</h4>
-<pre>protected <a href="../../../../src-html/org/apache/juneau/remoteable/RemoteMethodArg.html#line.45">RemoteMethodArg</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>protected <a href="../../../../src-html/org/apache/juneau/remoteable/RemoteMethodArg.html#line.46">RemoteMethodArg</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name2,
int index,
boolean skipIfNE,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> serializer)</pre>
<div class="block">Constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - The argument name. Can be blank.</dd>
+<dd><code>name</code> - The argument name pulled from name().</dd>
+<dd><code>name2</code> - The argument name pulled from value().</dd>
<dd><code>index</code> - The zero-based index of the argument on the Java method.</dd>
<dd><code>skipIfNE</code> - The value is skipped if it's null/empty.</dd>
<dd><code>serializer</code> - The class to use for serializing headers, query paramters, form-data parameters, and
[31/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/ClassMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/ClassMeta.html b/content/site/apidocs/org/apache/juneau/ClassMeta.html
index 3cce0e3..3da8126 100644
--- a/content/site/apidocs/org/apache/juneau/ClassMeta.html
+++ b/content/site/apidocs/org/apache/juneau/ClassMeta.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre><a href="../../../org/apache/juneau/annotation/Bean.html" title="annotation in org.apache.juneau.annotation">@Bean</a>(<a href="../../../org/apache/juneau/annotation/Bean.html#properties--">properties</a>="innerClass,classCategory,elementType,keyType,valueType,notABeanReason,initException,beanMeta")
-public final class <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.54">ClassMeta</a><T>
+public final class <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.55">ClassMeta</a><T>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a></pre>
<div class="block">A wrapper class around the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> object that provides cached information
@@ -655,7 +655,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getBeanTypePropertyName</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.706">getBeanTypePropertyName</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.723">getBeanTypePropertyName</a>()</pre>
<div class="block">Returns the type property name associated with this class and subclasses.
<p>
If <jk>null</jk>, <js>"_type"</js> should be assumed.</div>
@@ -671,7 +671,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getDictionaryName</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.717">getDictionaryName</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.734">getDictionaryName</a>()</pre>
<div class="block">Returns the bean dictionary name associated with this class.
<p>
The lexical name is defined by <a href="../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>Bean.typeName()</code></a>.</div>
@@ -687,7 +687,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getBeanRegistry</h4>
-<pre>public <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.730">getBeanRegistry</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/BeanRegistry.html" title="class in org.apache.juneau">BeanRegistry</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.747">getBeanRegistry</a>()</pre>
<div class="block">Returns the bean registry for this class.
<p>
This bean registry contains names specified in the <a href="../../../org/apache/juneau/annotation/Bean.html#beanDictionary--"><code>Bean.beanDictionary()</code></a> annotation defined
@@ -705,7 +705,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getClassCategory</h4>
-<pre>public org.apache.juneau.ClassMeta.ClassCategory <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.739">getClassCategory</a>()</pre>
+<pre>public org.apache.juneau.ClassMeta.ClassCategory <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.756">getClassCategory</a>()</pre>
<div class="block">Returns the category of this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -719,7 +719,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>isAssignableFrom</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.749">isAssignableFrom</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.766">isAssignableFrom</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
<div class="block">Returns <jk>true</jk> if this class is a superclass of or the same as the specified class.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -735,7 +735,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>isInstanceOf</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.759">isInstanceOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.776">isInstanceOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c)</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of or the same as the specified class.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -751,7 +751,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>hasChildPojoSwaps</h4>
-<pre>protected boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.771">hasChildPojoSwaps</a>()</pre>
+<pre>protected boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.788">hasChildPojoSwaps</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class or any child classes has a <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with it.
<p>
Used when transforming bean properties to prevent having to look up transforms if we know for certain
@@ -768,7 +768,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getChildPojoSwapForSwap</h4>
-<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.782">getChildPojoSwapForSwap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> normalClass)</pre>
+<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.799">getChildPojoSwapForSwap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> normalClass)</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> where the specified class is the same/subclass of the normal class of
one of the child pojo swaps associated with this class.</div>
<dl>
@@ -785,7 +785,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getChildPojoSwapForUnswap</h4>
-<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.809">getChildPojoSwapForUnswap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> swapClass)</pre>
+<pre>protected <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><?,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.826">getChildPojoSwapForUnswap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> swapClass)</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> where the specified class is the same/subclass of the swap class of
one of the child pojo swaps associated with this class.</div>
<dl>
@@ -802,7 +802,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>findNoArgConstructor</h4>
-<pre>protected static <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.840">findNoArgConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c,
+<pre>protected static <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends T> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.857">findNoArgConstructor</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><?> c,
<a href="../../../org/apache/juneau/Visibility.html" title="enum in org.apache.juneau">Visibility</a> v)</pre>
<div class="block">Locates the no-arg constructor for the specified class.
Constructor must match the visibility requirements specified by parameter 'v'.
@@ -823,7 +823,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<ul class="blockList">
<li class="blockList">
<h4>getInnerClass</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.858">getInnerClass</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.875">getInnerClass</a>()</pre>
<div class="block">Returns the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> object that this class type wraps.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -838,7 +838,7 @@ implements <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
<li class="blockList">
<h4>getSerializedClassMeta</h4>
<pre><a href="../../../org/apache/juneau/annotation/BeanIgnore.html" title="annotation in org.apache.juneau.annotation">@BeanIgnore</a>
-public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.868">getSerializedClassMeta</a>()</pre>
+public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.885">getSerializedClassMeta</a>()</pre>
<div class="block">Returns the serialized (swapped) form of this class if there is an <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with it.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -852,7 +852,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getElementType</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.877">getElementType</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.894">getElementType</a>()</pre>
<div class="block">For array and <code>Collection</code> types, returns the class type of the components of the array or <code>Collection</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -866,7 +866,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getKeyType</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.886">getKeyType</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.903">getKeyType</a>()</pre>
<div class="block">For <code>Map</code> types, returns the class type of the keys of the <code>Map</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -880,7 +880,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getValueType</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.895">getValueType</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.912">getValueType</a>()</pre>
<div class="block">For <code>Map</code> types, returns the class type of the values of the <code>Map</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -894,7 +894,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isDelegate</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.905">isDelegate</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.922">isDelegate</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class implements <a href="../../../org/apache/juneau/Delegate.html" title="interface in org.apache.juneau"><code>Delegate</code></a>, meaning
it's a representation of some other object.</div>
<dl>
@@ -909,7 +909,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isMap</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.914">isMap</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.931">isMap</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -923,7 +923,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isMapOrBean</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.923">isMapOrBean</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.940">isMapOrBean</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> or it's a bean.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -937,7 +937,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isBeanMap</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.932">isBeanMap</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.949">isBeanMap</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="../../../org/apache/juneau/BeanMap.html" title="class in org.apache.juneau"><code>BeanMap</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -951,7 +951,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isCollection</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.941">isCollection</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.958">isCollection</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -965,7 +965,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isCollectionOrArray</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.950">isCollectionOrArray</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.967">isCollectionOrArray</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> or is an array.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -979,7 +979,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isClass</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.959">isClass</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.976">isClass</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -993,7 +993,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isEnum</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.968">isEnum</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.985">isEnum</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><code>Enum</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1007,7 +1007,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isArray</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.977">isArray</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.994">isArray</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an array.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1021,7 +1021,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isBean</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.986">isBean</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1003">isBean</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a bean.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1035,7 +1035,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isObject</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.995">isObject</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1012">isObject</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><code>Object</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1049,7 +1049,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isNotObject</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1004">isNotObject</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1021">isNotObject</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is not <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><code>Object</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1063,7 +1063,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isNumber</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1013">isNumber</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1030">isNumber</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1077,7 +1077,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isDecimal</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1022">isDecimal</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1039">isDecimal</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Float.html?is-external=true" title="class or interface in java.lang"><code>Float</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Double.html?is-external=true" title="class or interface in java.lang"><code>Double</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1091,7 +1091,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isBoolean</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1031">isBoolean</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1048">isBoolean</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang"><code>Boolean</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1105,7 +1105,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isCharSequence</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1040">isCharSequence</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1057">isCharSequence</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a subclass of <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang"><code>CharSequence</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1119,7 +1119,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isString</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1049">isString</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1066">isString</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1133,7 +1133,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isChar</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1058">isChar</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1075">isChar</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Character.html?is-external=true" title="class or interface in java.lang"><code>Character</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1147,7 +1147,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isPrimitive</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1067">isPrimitive</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1084">isPrimitive</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a primitive.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1161,7 +1161,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isDate</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1076">isDate</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1093">isDate</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util"><code>Calendar</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1175,7 +1175,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isUri</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1085">isUri</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1102">isUri</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net"><code>URI</code></a> or <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1189,7 +1189,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isReader</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1094">isReader</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1111">isReader</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is a <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1203,7 +1203,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isInputStream</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1103">isInputStream</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1120">isInputStream</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><code>InputStream</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1217,7 +1217,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isVoid</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1112">isVoid</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1129">isVoid</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Void.html?is-external=true" title="class or interface in java.lang"><code>Void</code></a> or <jk>void</jk>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1231,7 +1231,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isArgs</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1121">isArgs</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1138">isArgs</a>()</pre>
<div class="block">Returns <jk>true</jk> if this metadata represents an array of argument types.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1245,7 +1245,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getArgs</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1130">getArgs</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?>[] <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1147">getArgs</a>()</pre>
<div class="block">Returns the argument types of this meta.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1259,7 +1259,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getArg</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1141">getArg</a>(int index)</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1158">getArg</a>(int index)</pre>
<div class="block">Returns the argument metadata at the specified index if this is an args metadata object.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1277,7 +1277,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isNullable</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1155">isNullable</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1172">isNullable</a>()</pre>
<div class="block">Returns <jk>true</jk> if instance of this object can be <jk>null</jk>.
<p>
Objects can be <jk>null</jk>, but primitives cannot, except for chars which can be represented
@@ -1294,7 +1294,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isRemoteable</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1166">isRemoteable</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1183">isRemoteable</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class or one of it's methods are annotated with <a href="../../../org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable"><code>@Remotable</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1308,7 +1308,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isAbstract</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1174">isAbstract</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1191">isAbstract</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is abstract.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1322,7 +1322,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isMemberClass</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1182">isMemberClass</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1199">isMemberClass</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class is an inner class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1336,7 +1336,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getRemoteableMethods</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1192">getRemoteableMethods</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1209">getRemoteableMethods</a>()</pre>
<div class="block">All methods on this class annotated with <a href="../../../org/apache/juneau/remoteable/Remoteable.html" title="annotation in org.apache.juneau.remoteable"><code>@Remotable</code></a>, or all public methods if class is annotated.
Keys are method signatures.</div>
<dl>
@@ -1351,7 +1351,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getPublicMethods</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1202">getPublicMethods</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1219">getPublicMethods</a>()</pre>
<div class="block">All public methods on this class including static methods.
Keys are method signatures.</div>
<dl>
@@ -1366,7 +1366,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getPojoSwap</h4>
-<pre>public <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1212">getPojoSwap</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform">PojoSwap</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>,?> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1229">getPojoSwap</a>()</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><code>PojoSwap</code></a> associated with this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1381,7 +1381,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getBeanMeta</h4>
-<pre>public <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1222">getBeanMeta</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau">BeanMeta</a><<a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1239">getBeanMeta</a>()</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/BeanMeta.html" title="class in org.apache.juneau"><code>BeanMeta</code></a> associated with this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1396,7 +1396,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getConstructor</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1231">getConstructor</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Constructor.html?is-external=true" title="class or interface in java.lang.reflect">Constructor</a><? extends <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1248">getConstructor</a>()</pre>
<div class="block">Returns the no-arg constructor for this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1410,7 +1410,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getExtendedMeta</h4>
-<pre>public <M extends <a href="../../../org/apache/juneau/ClassMetaExtended.html" title="class in org.apache.juneau">ClassMetaExtended</a>> M <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1241">getExtendedMeta</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><M> c)</pre>
+<pre>public <M extends <a href="../../../org/apache/juneau/ClassMetaExtended.html" title="class in org.apache.juneau">ClassMetaExtended</a>> M <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1258">getExtendedMeta</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><M> c)</pre>
<div class="block">Returns the language-specified extended metadata on this class.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1426,7 +1426,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getProxyInvocationHandler</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/InvocationHandler.html?is-external=true" title="class or interface in java.lang.reflect">InvocationHandler</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1250">getProxyInvocationHandler</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/InvocationHandler.html?is-external=true" title="class or interface in java.lang.reflect">InvocationHandler</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1267">getProxyInvocationHandler</a>()</pre>
<div class="block">Returns the interface proxy invocation handler for this class.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1440,7 +1440,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>canCreateNewInstance</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1259">canCreateNewInstance</a>()</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1276">canCreateNewInstance</a>()</pre>
<div class="block">Returns <jk>true</jk> if this class has a no-arg constructor or invocation handler.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1454,7 +1454,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>canCreateNewInstance</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1279">canCreateNewInstance</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1296">canCreateNewInstance</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
<div class="block">Returns <jk>true</jk> if this class has a no-arg constructor or invocation handler.
Returns <jk>false</jk> if this is a non-static member class and the outer object does not match
the class type of the defining class.</div>
@@ -1472,7 +1472,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>canCreateNewBean</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1293">canCreateNewBean</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1310">canCreateNewBean</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
<div class="block">Returns <jk>true</jk> if this class can be instantiated as a bean.
Returns <jk>false</jk> if this is a non-static member class and the outer object does not match
the class type of the defining class.</div>
@@ -1490,7 +1490,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>canCreateNewInstanceFromString</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1309">canCreateNewInstanceFromString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1326">canCreateNewInstanceFromString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
<div class="block">Returns <jk>true</jk> if this class can call the <a href="../../../org/apache/juneau/ClassMeta.html#newInstanceFromString-java.lang.Object-java.lang.String-"><code>newInstanceFromString(Object, String)</code></a> method.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1506,7 +1506,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>canCreateNewInstanceFromNumber</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1326">canCreateNewInstanceFromNumber</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1343">canCreateNewInstanceFromNumber</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)</pre>
<div class="block">Returns <jk>true</jk> if this class can call the <a href="../../../org/apache/juneau/ClassMeta.html#newInstanceFromString-java.lang.Object-java.lang.String-"><code>newInstanceFromString(Object, String)</code></a> method.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1522,7 +1522,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getNewInstanceFromNumberClass</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1341">getNewInstanceFromNumberClass</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1358">getNewInstanceFromNumberClass</a>()</pre>
<div class="block">Returns the class type of the parameter of the numeric constructor.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1536,7 +1536,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getNameProperty</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1350">getNameProperty</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1367">getNameProperty</a>()</pre>
<div class="block">Returns the method annotated with <a href="../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><code>@NameProperty</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1550,7 +1550,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getParentProperty</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1359">getParentProperty</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1376">getParentProperty</a>()</pre>
<div class="block">Returns the method annotated with <a href="../../../org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation"><code>@ParentProperty</code></a>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1564,7 +1564,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getNotABeanReason</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1368">getNotABeanReason</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1385">getNotABeanReason</a>()</pre>
<div class="block">Returns the reason why this class is not a bean, or <jk>null</jk> if it is a bean.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1578,7 +1578,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getInitException</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1377">getInitException</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1394">getInitException</a>()</pre>
<div class="block">Returns any exception that was throw in the <code>init()</code> method.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1592,7 +1592,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getBeanContext</h4>
-<pre>public <a href="../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1386">getBeanContext</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau">BeanContext</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1403">getBeanContext</a>()</pre>
<div class="block">Returns the <a href="../../../org/apache/juneau/BeanContext.html" title="class in org.apache.juneau"><code>BeanContext</code></a> that created this object.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1606,7 +1606,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getPrimitiveDefault</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1396">getPrimitiveDefault</a>()</pre>
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1413">getPrimitiveDefault</a>()</pre>
<div class="block">Returns the default value for primitives such as <jk>int</jk> or <jk>Integer</jk>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1620,7 +1620,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>newInstanceFromString</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1420">newInstanceFromString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer,
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1437">newInstanceFromString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> arg)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalAccessException.html?is-external=true" title="class or interface in java.lang">IllegalAccessException</a>,
@@ -1655,7 +1655,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>newInstanceFromNumber</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1451">newInstanceFromNumber</a>(<a href="../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a> session,
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1468">newInstanceFromNumber</a>(<a href="../../../org/apache/juneau/BeanSession.html" title="class in org.apache.juneau">BeanSession</a> session,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a> arg)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a>,
@@ -1690,7 +1690,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>newInstance</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1478">newInstance</a>()
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1495">newInstance</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/InstantiationException.html?is-external=true" title="class or interface in java.lang">InstantiationException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalAccessException.html?is-external=true" title="class or interface in java.lang">IllegalAccessException</a>,
@@ -1719,7 +1719,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>newInstance</h4>
-<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1508">newInstance</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)
+<pre>public <a href="../../../org/apache/juneau/ClassMeta.html" title="type parameter in ClassMeta">T</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1525">newInstance</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> outer)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/InstantiationException.html?is-external=true" title="class or interface in java.lang">InstantiationException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/IllegalAccessException.html?is-external=true" title="class or interface in java.lang">IllegalAccessException</a>,
@@ -1750,7 +1750,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1521">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> t)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1538">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> t)</pre>
<div class="block">Checks to see if the specified class type is the same as this one.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -1768,7 +1768,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>same</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1535">same</a>(<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1552">same</a>(<a href="../../../org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau">ClassMeta</a><?> cm)</pre>
<div class="block">Similar to <a href="../../../org/apache/juneau/ClassMeta.html#equals-java.lang.Object-"><code>equals(Object)</code></a> except primitive and Object types that are similar
are considered the same. (e.g. <jk>boolean</jk> == <code>Boolean</code>).</div>
<dl>
@@ -1785,7 +1785,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1542">toString</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1559">toString</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -1798,7 +1798,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1552">toString</a>(boolean simple)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1569">toString</a>(boolean simple)</pre>
<div class="block">Same as <a href="../../../org/apache/juneau/ClassMeta.html#toString--"><code>toString()</code></a> except use simple class names.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1814,7 +1814,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1563">toString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> sb,
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1580">toString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuilder.html?is-external=true" title="class or interface in java.lang">StringBuilder</a> sb,
boolean simple)</pre>
<div class="block">Appends this object as a readable string to the specified string builder.</div>
<dl>
@@ -1832,7 +1832,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>isInstance</h4>
-<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1596">isInstance</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public boolean <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1613">isInstance</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<div class="block">Returns <jk>true</jk> if the specified object is an instance of this class.
This is a simple comparison on the base class itself and not on
any generic parameters.</div>
@@ -1850,7 +1850,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockList">
<li class="blockList">
<h4>getReadableName</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1607">getReadableName</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1624">getReadableName</a>()</pre>
<div class="block">Returns a readable name for this class (e.g. <js>"java.lang.String"</js>, <js>"boolean[]"</js>).</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1864,7 +1864,7 @@ public <a href="../../../org/apache/juneau/ClassMeta.html" title="class in
<ul class="blockListLast">
<li class="blockList">
<h4>hashCode</h4>
-<pre>public int <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1642">hashCode</a>()</pre>
+<pre>public int <a href="../../../src-html/org/apache/juneau/ClassMeta.html#line.1659">hashCode</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/PropertyNamer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/PropertyNamer.html b/content/site/apidocs/org/apache/juneau/PropertyNamer.html
index 59257ce..6b217cc 100644
--- a/content/site/apidocs/org/apache/juneau/PropertyNamer.html
+++ b/content/site/apidocs/org/apache/juneau/PropertyNamer.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../index.html?org/apache/juneau/PropertyNamer.html" target="_top">Frames</a></li>
@@ -100,14 +100,14 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau">PropertyNamerDashedLC</a>, <a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a></dd>
+<dd><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a>, <a href="../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau">PropertyNamerDLC</a>, <a href="../../../org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau">PropertyNamerULC</a></dd>
</dl>
<hr>
<br>
<pre>public interface <a href="../../../src-html/org/apache/juneau/PropertyNamer.html#line.25">PropertyNamer</a></pre>
<div class="block">Defines an API for converting conventional bean property names to some other form.
<p>
- For example, given the bean property <js>"fooBarURL"</js>, the <a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><code>PropertyNamerDashedLC</code></a>
+ For example, given the bean property <js>"fooBarURL"</js>, the <a href="../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><code>PropertyNamerDLC</code></a>
property namer will convert this to <js>"foo-bar-url"</js>.
<p>
Property namers are associated with beans through the <a href="../../../org/apache/juneau/annotation/Bean.html#propertyNamer--"><code>Bean.propertyNamer()</code></a> annotation.</div>
@@ -194,7 +194,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../index.html?org/apache/juneau/PropertyNamer.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/PropertyNamerDashedLC.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/PropertyNamerDashedLC.html b/content/site/apidocs/org/apache/juneau/PropertyNamerDashedLC.html
deleted file mode 100644
index ea36b2c..0000000
--- a/content/site/apidocs/org/apache/juneau/PropertyNamerDashedLC.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PropertyNamerDashedLC (Apache Juneau (incubating) 6.2.1-incubating-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../javadoc.css" title="Style">
-<script type="text/javascript" src="../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
- try {
- if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="PropertyNamerDashedLC (Apache Juneau (incubating) 6.2.1-incubating-SNAPSHOT)";
- }
- }
- catch(err) {
- }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!-- -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!-- -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../index-all.html">Index</a></li>
-<li><a href="../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../index.html?org/apache/juneau/PropertyNamerDashedLC.html" target="_top">Frames</a></li>
-<li><a href="PropertyNamerDashedLC.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_top");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!-- -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau</div>
-<h2 title="Class PropertyNamerDashedLC" class="title">Class PropertyNamerDashedLC</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.PropertyNamerDashedLC</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public final class <a href="../../../src-html/org/apache/juneau/PropertyNamerDashedLC.html#line.25">PropertyNamerDashedLC</a>
-extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
-implements <a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a></pre>
-<div class="block">Converts property names to dashed-lower-case format.
-
- <h5 class='section'>Examples:</h5>
- <ul>
- <li><js>"fooBar"</js> -> <js>"foo-bar"</js>
- <li><js>"fooBarURL"</js> -> <js>"foo-bar-url"</js>
- <li><js>"FooBarURL"</js> -> <js>"foo-bar-url"</js>
- </ul></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!-- -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html#PropertyNamerDashedLC--">PropertyNamerDashedLC</a></span>()</code> </td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!-- -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html#getPropertyName-java.lang.String-">getPropertyName</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</code>
-<div class="block">Convert the specified default property name to some other value.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!-- -->
-</a>
-<h3>Methods inherited from class java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang
/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!-- -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="PropertyNamerDashedLC--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>PropertyNamerDashedLC</h4>
-<pre>public <a href="../../../src-html/org/apache/juneau/PropertyNamerDashedLC.html#line.25">PropertyNamerDashedLC</a>()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!-- -->
-</a>
-<h3>Method Detail</h3>
-<a name="getPropertyName-java.lang.String-">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getPropertyName</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/org/apache/juneau/PropertyNamerDashedLC.html#line.28">getPropertyName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../org/apache/juneau/PropertyNamer.html#getPropertyName-java.lang.String-">PropertyNamer</a></code></span></div>
-<div class="block">Convert the specified default property name to some other value.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../org/apache/juneau/PropertyNamer.html#getPropertyName-java.lang.String-">getPropertyName</a></code> in interface <code><a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - The original bean property name.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The converted property name.</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!-- -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!-- -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../index-all.html">Index</a></li>
-<li><a href="../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../index.html?org/apache/juneau/PropertyNamerDashedLC.html" target="_top">Frames</a></li>
-<li><a href="PropertyNamerDashedLC.html" target="_top">No Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../allclasses-noframe.html">All Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
- allClassesLink = document.getElementById("allclasses_navbar_bottom");
- if(window==top) {
- allClassesLink.style.display = "block";
- }
- else {
- allClassesLink.style.display = "none";
- }
- //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary: </li>
-<li>Nested | </li>
-<li>Field | </li>
-<li><a href="#constructor.summary">Constr</a> | </li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li><a href="#constructor.detail">Constr</a> | </li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!-- -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
[23/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html b/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
index 99e5eaa..6ae709a 100644
--- a/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/rest/client/RestClientBuilder.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.55">RestClientBuilder</a>
+<pre>public class <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.56">RestClientBuilder</a>
extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title="class in org.apache.juneau">CoreObjectBuilder</a></pre>
<div class="block">Builder class for the <a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client"><code>RestClient</code></a> class.</div>
</li>
@@ -697,7 +697,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<tr id="i87" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#paramFormat-java.lang.String-">paramFormat</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> value)</code>
-<div class="block">Sets the <a href="../../../../../org/apache/juneau/urlencoding/UrlEncodingSerializerContext.html#URLENC_paramFormat"><code>UrlEncodingSerializerContext.URLENC_paramFormat</code></a> property on the URL-encoding serializers in this group.</div>
+<div class="block">Sets the <a href="../../../../../org/apache/juneau/uon/UonSerializerContext.html#UON_paramFormat"><code>UonSerializerContext.UON_paramFormat</code></a> property on the URL-encoding serializers in this group.</div>
</td>
</tr>
<tr id="i88" class="altColor">
@@ -729,7 +729,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
</tr>
<tr id="i92" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#plainTextParams--">plainTextParams</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#plainTextParts--">plainTextParts</a></span>()</code>
<div class="block">Shortcut for calling <code>paramFormat(<js>"PLAINTEXT"</js>)</code>.</div>
</td>
</tr>
@@ -1266,7 +1266,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>RestClientBuilder</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.86">RestClientBuilder</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.87">RestClientBuilder</a>()</pre>
<div class="block">Constructor, default settings.</div>
</li>
</ul>
@@ -1276,7 +1276,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>RestClientBuilder</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.98">RestClientBuilder</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> s,
+<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.99">RestClientBuilder</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> s,
<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> p)</pre>
<div class="block">Constructor, default settings.
<p>
@@ -1294,7 +1294,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>RestClientBuilder</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.112">RestClientBuilder</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>> s,
+<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.113">RestClientBuilder</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>> s,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>> p)</pre>
<div class="block">Constructor, default settings.
<p>
@@ -1312,7 +1312,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockListLast">
<li class="blockList">
<h4>RestClientBuilder</h4>
-<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.122">RestClientBuilder</a>(<a href="../../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
+<pre>public <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.123">RestClientBuilder</a>(<a href="../../../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a> propertyStore)</pre>
<div class="block">Constructor.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1334,7 +1334,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>build</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.127">build</a>()</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClient.html" title="class in org.apache.juneau.rest.client">RestClient</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.128">build</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../org/apache/juneau/CoreObjectBuilder.html#build--">CoreObjectBuilder</a></code></span></div>
<div class="block">Build the object.</div>
<dl>
@@ -1352,7 +1352,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>createHttpClient</h4>
-<pre>protected org.apache.http.impl.client.CloseableHttpClient <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.176">createHttpClient</a>()
+<pre>protected org.apache.http.impl.client.CloseableHttpClient <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.177">createHttpClient</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Creates an instance of an <code>HttpClient</code> to be used to handle all HTTP communications with the target server.
<p>
@@ -1378,7 +1378,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>createHttpClientBuilder</h4>
-<pre>protected org.apache.http.impl.client.HttpClientBuilder <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.197">createHttpClientBuilder</a>()</pre>
+<pre>protected org.apache.http.impl.client.HttpClientBuilder <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.198">createHttpClientBuilder</a>()</pre>
<div class="block">Creates an instance of an <code>HttpClientBuilder</code> to be used to create
the <code>HttpClient</code>.
<p>
@@ -1401,7 +1401,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>createConnectionManager</h4>
-<pre>protected org.apache.http.conn.HttpClientConnectionManager <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.212">createConnectionManager</a>()</pre>
+<pre>protected org.apache.http.conn.HttpClientConnectionManager <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.213">createConnectionManager</a>()</pre>
<div class="block">Creates the <code>HttpClientConnectionManager</code> returned by <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#createConnectionManager--"><code>createConnectionManager()</code></a>.
<p>
Subclasses can override this method to provide their own connection manager.
@@ -1419,7 +1419,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>rootUrl</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.256">rootUrl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> rootUrl)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.257">rootUrl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> rootUrl)</pre>
<div class="block">Set a root URL for this client.
<p>
When set, URL strings passed in through the various rest call methods (e.g. <a href="../../../../../org/apache/juneau/rest/client/RestClient.html#doGet-java.lang.Object-"><code>RestClient.doGet(Object)</code></a>
@@ -1440,7 +1440,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>enableSSL</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.273">enableSSL</a>(<a href="../../../../../org/apache/juneau/rest/client/SSLOpts.html" title="class in org.apache.juneau.rest.client">SSLOpts</a> opts)
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.274">enableSSL</a>(<a href="../../../../../org/apache/juneau/rest/client/SSLOpts.html" title="class in org.apache.juneau.rest.client">SSLOpts</a> opts)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/security/KeyStoreException.html?is-external=true" title="class or interface in java.security">KeyStoreException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/security/NoSuchAlgorithmException.html?is-external=true" title="class or interface in java.security">NoSuchAlgorithmException</a></pre>
<div class="block">Enable SSL support on this client.</div>
@@ -1462,7 +1462,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>enableLaxSSL</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.287">enableLaxSSL</a>()
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.288">enableLaxSSL</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/security/KeyStoreException.html?is-external=true" title="class or interface in java.security">KeyStoreException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/security/NoSuchAlgorithmException.html?is-external=true" title="class or interface in java.security">NoSuchAlgorithmException</a></pre>
<div class="block">Enable LAX SSL support.
@@ -1483,7 +1483,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>clientVersion</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.297">clientVersion</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.298">clientVersion</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> version)</pre>
<div class="block">Sets the client version by setting the value for the <js>"X-Client-Version"</js> header.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1499,7 +1499,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>interceptor</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.307">interceptor</a>(<a href="../../../../../org/apache/juneau/rest/client/RestCallInterceptor.html" title="class in org.apache.juneau.rest.client">RestCallInterceptor</a> interceptor)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.308">interceptor</a>(<a href="../../../../../org/apache/juneau/rest/client/RestCallInterceptor.html" title="class in org.apache.juneau.rest.client">RestCallInterceptor</a> interceptor)</pre>
<div class="block">Adds an interceptor that gets called immediately after a connection is made.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1515,7 +1515,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>logTo</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.319">logTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Level.html?is-external=true" title="class or interface in java.util.logging">Level</a> level,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.320">logTo</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Level.html?is-external=true" title="class or interface in java.util.logging">Level</a> level,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/logging/Logger.html?is-external=true" title="class or interface in java.util.logging">Logger</a> log)</pre>
<div class="block">Adds a <a href="../../../../../org/apache/juneau/rest/client/RestCallLogger.html" title="class in org.apache.juneau.rest.client"><code>RestCallLogger</code></a> to the list of interceptors on this class.</div>
<dl>
@@ -1533,7 +1533,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>retryable</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.333">retryable</a>(int retries,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.334">retryable</a>(int retries,
long interval,
<a href="../../../../../org/apache/juneau/rest/client/RetryOn.html" title="class in org.apache.juneau.rest.client">RetryOn</a> retryOn)</pre>
<div class="block">Make HTTP calls retryable if an error response (>=400) is received.</div>
@@ -1554,7 +1554,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>pooled</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.346">pooled</a>()</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.347">pooled</a>()</pre>
<div class="block">When called, the <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#createConnectionManager--"><code>createConnectionManager()</code></a> method will return a <code>PoolingHttpClientConnectionManager</code>
instead of a <code>BasicHttpClientConnectionManager</code>.</div>
<dl>
@@ -1569,7 +1569,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>serializer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.357">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.358">serializer</a>(<a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a> serializer)</pre>
<div class="block">Sets the serializer used for serializing POJOs to the HTTP request message body.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1585,7 +1585,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>serializer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.369">serializer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>> serializerClass)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.370">serializer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer">Serializer</a>> serializerClass)</pre>
<div class="block">Same as <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#serializer-org.apache.juneau.serializer.Serializer-"><code>serializer(Serializer)</code></a>, except takes in a serializer class that
will be instantiated through a no-arg constructor.</div>
<dl>
@@ -1602,7 +1602,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>parser</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.380">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.381">parser</a>(<a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a> parser)</pre>
<div class="block">Sets the parser used for parsing POJOs from the HTTP response message body.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1618,7 +1618,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>parser</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.392">parser</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>> parserClass)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.393">parser</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/parser/Parser.html" title="class in org.apache.juneau.parser">Parser</a>> parserClass)</pre>
<div class="block">Same as <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html#parser-org.apache.juneau.parser.Parser-"><code>parser(Parser)</code></a>, except takes in a parser class that
will be instantiated through a no-arg constructor.</div>
<dl>
@@ -1635,7 +1635,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>partSerializer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.404">partSerializer</a>(<a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a> partSerializer)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.405">partSerializer</a>(<a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a> partSerializer)</pre>
<div class="block">Sets the part serializer to use for converting POJOs to headers, query parameters, form-data parameters, and
path variables.</div>
<dl>
@@ -1652,7 +1652,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>partSerializer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.417">partSerializer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> partSerializerClass)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.418">partSerializer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../org/apache/juneau/serializer/PartSerializer.html" title="interface in org.apache.juneau.serializer">PartSerializer</a>> partSerializerClass)</pre>
<div class="block">Sets the part formatter to use for converting POJOs to headers, query parameters, form-data parameters, and
path variables.</div>
<dl>
@@ -1670,7 +1670,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>basicAuth</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.431">basicAuth</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.432">basicAuth</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host,
int port,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> user,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> pw)</pre>
@@ -1692,7 +1692,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>httpClient</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.447">httpClient</a>(org.apache.http.impl.client.CloseableHttpClient httpClient,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.448">httpClient</a>(org.apache.http.impl.client.CloseableHttpClient httpClient,
boolean keepHttpClientOpen)</pre>
<div class="block">Sets the internal <code>HttpClient</code> to use for handling HTTP communications.</div>
<dl>
@@ -1710,7 +1710,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>executorService</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.471">executorService</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a> executorService,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.472">executorService</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a> executorService,
boolean shutdownOnClose)</pre>
<div class="block">Defines the executor service to use when calling future methods on the <a href="../../../../../org/apache/juneau/rest/client/RestCall.html" title="class in org.apache.juneau.rest.client"><code>RestCall</code></a> class.
<p>
@@ -1739,7 +1739,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>header</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.489">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.490">header</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Specifies a request header property to add to all requests created by this client.</div>
<dl>
@@ -1757,7 +1757,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>accept</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.502">accept</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.503">accept</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept</code> request header.
<p>
This overrides the media type specified on the parser, but is overridden by calling <code>header(<js>"Accept"</js>, value);</code></div>
@@ -1775,7 +1775,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>acceptCharset</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.514">acceptCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.515">acceptCharset</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept-Charset</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Accept-Charset"</js>, value);</code></div>
@@ -1793,7 +1793,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>acceptEncoding</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.526">acceptEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.527">acceptEncoding</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept-Encoding</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Accept-Encoding"</js>, value);</code></div>
@@ -1811,7 +1811,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>acceptLanguage</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.538">acceptLanguage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.539">acceptLanguage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Accept-Language</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Accept-Language"</js>, value);</code></div>
@@ -1829,7 +1829,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>authorization</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.550">authorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.551">authorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Authorization</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Authorization"</js>, value);</code></div>
@@ -1847,7 +1847,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>cacheControl</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.562">cacheControl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.563">cacheControl</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Cache-Control</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Cache-Control"</js>, value);</code></div>
@@ -1865,7 +1865,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>connection</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.574">connection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.575">connection</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Connection</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Connection"</js>, value);</code></div>
@@ -1883,7 +1883,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>contentLength</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.586">contentLength</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.587">contentLength</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Content-Length</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Content-Length"</js>, value);</code></div>
@@ -1901,7 +1901,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>contentType</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.598">contentType</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.599">contentType</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Content-Type</code> request header.
<p>
This overrides the media type specified on the serializer, but is overridden by calling <code>header(<js>"Content-Type"</js>, value);</code></div>
@@ -1919,7 +1919,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>date</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.610">date</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.611">date</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Date</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Date"</js>, value);</code></div>
@@ -1937,7 +1937,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>expect</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.622">expect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.623">expect</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Expect</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Expect"</js>, value);</code></div>
@@ -1955,7 +1955,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>forwarded</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.634">forwarded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.635">forwarded</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Forwarded</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Forwarded"</js>, value);</code></div>
@@ -1973,7 +1973,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>from</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.646">from</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.647">from</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>From</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"From"</js>, value);</code></div>
@@ -1991,7 +1991,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>host</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.658">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.659">host</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Host</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Host"</js>, value);</code></div>
@@ -2009,7 +2009,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>ifMatch</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.670">ifMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.671">ifMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Match</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Match"</js>, value);</code></div>
@@ -2027,7 +2027,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>ifModifiedSince</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.682">ifModifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.683">ifModifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Modified-Since</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Modified-Since"</js>, value);</code></div>
@@ -2045,7 +2045,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>ifNoneMatch</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.694">ifNoneMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.695">ifNoneMatch</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-None-Match</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-None-Match"</js>, value);</code></div>
@@ -2063,7 +2063,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>ifRange</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.706">ifRange</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.707">ifRange</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Range</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Range"</js>, value);</code></div>
@@ -2081,7 +2081,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>ifUnmodifiedSince</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.718">ifUnmodifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.719">ifUnmodifiedSince</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>If-Unmodified-Since</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"If-Unmodified-Since"</js>, value);</code></div>
@@ -2099,7 +2099,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>maxForwards</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.730">maxForwards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.731">maxForwards</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Max-Forwards</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Max-Forwards"</js>, value);</code></div>
@@ -2117,7 +2117,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>origin</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.742">origin</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.743">origin</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Origin</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Origin"</js>, value);</code></div>
@@ -2135,7 +2135,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>pragma</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.754">pragma</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.755">pragma</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Pragma</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Pragma"</js>, value);</code></div>
@@ -2153,7 +2153,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>proxyAuthorization</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.766">proxyAuthorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.767">proxyAuthorization</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Proxy-Authorization</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Proxy-Authorization"</js>, value);</code></div>
@@ -2171,7 +2171,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>range</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.778">range</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.779">range</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Range</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Range"</js>, value);</code></div>
@@ -2189,7 +2189,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>referer</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.790">referer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.791">referer</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Referer</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Referer"</js>, value);</code></div>
@@ -2207,7 +2207,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>te</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.802">te</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.803">te</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>TE</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"TE"</js>, value);</code></div>
@@ -2225,7 +2225,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>userAgent</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.814">userAgent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.815">userAgent</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>User-Agent</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"User-Agent"</js>, value);</code></div>
@@ -2243,7 +2243,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>upgrade</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.826">upgrade</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.827">upgrade</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Upgrade</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Upgrade"</js>, value);</code></div>
@@ -2261,7 +2261,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>via</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.838">via</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.839">via</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Via</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Via"</js>, value);</code></div>
@@ -2279,7 +2279,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>warning</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.850">warning</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.851">warning</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets the value for the <code>Warning</code> request header.
<p>
This is a shortcut for calling <code>header(<js>"Warning"</js>, value);</code></div>
@@ -2297,7 +2297,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>maxDepth</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.866">maxDepth</a>(int value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.867">maxDepth</a>(int value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_maxDepth"><code>SerializerContext.SERIALIZER_maxDepth</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2315,7 +2315,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>initialDepth</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.877">initialDepth</a>(int value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.878">initialDepth</a>(int value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_initialDepth"><code>SerializerContext.SERIALIZER_initialDepth</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2333,7 +2333,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>detectRecursions</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.888">detectRecursions</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.889">detectRecursions</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_detectRecursions"><code>SerializerContext.SERIALIZER_detectRecursions</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2351,7 +2351,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>ignoreRecursions</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.899">ignoreRecursions</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.900">ignoreRecursions</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_ignoreRecursions"><code>SerializerContext.SERIALIZER_ignoreRecursions</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2369,7 +2369,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>useWhitespace</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.910">useWhitespace</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.911">useWhitespace</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_useWhitespace"><code>SerializerContext.SERIALIZER_useWhitespace</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2387,7 +2387,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>addBeanTypeProperties</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.921">addBeanTypeProperties</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.922">addBeanTypeProperties</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_addBeanTypeProperties"><code>SerializerContext.SERIALIZER_addBeanTypeProperties</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2405,7 +2405,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>quoteChar</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.932">quoteChar</a>(char value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.933">quoteChar</a>(char value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_quoteChar"><code>SerializerContext.SERIALIZER_quoteChar</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2423,7 +2423,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>trimNullProperties</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.943">trimNullProperties</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.944">trimNullProperties</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimNullProperties"><code>SerializerContext.SERIALIZER_trimNullProperties</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2441,7 +2441,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>trimEmptyCollections</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.954">trimEmptyCollections</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.955">trimEmptyCollections</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyCollections"><code>SerializerContext.SERIALIZER_trimEmptyCollections</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2459,7 +2459,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>trimEmptyMaps</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.965">trimEmptyMaps</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.966">trimEmptyMaps</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimEmptyMaps"><code>SerializerContext.SERIALIZER_trimEmptyMaps</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2477,7 +2477,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>trimStrings</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.976">trimStrings</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.977">trimStrings</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_trimStrings"><code>SerializerContext.SERIALIZER_trimStrings</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2495,7 +2495,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>uriContext</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.987">uriContext</a>(<a href="../../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.988">uriContext</a>(<a href="../../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a> value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriContext"><code>SerializerContext.SERIALIZER_uriContext</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2513,7 +2513,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>uriResolution</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.998">uriResolution</a>(<a href="../../../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.999">uriResolution</a>(<a href="../../../../../org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau">UriResolution</a> value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriResolution"><code>SerializerContext.SERIALIZER_uriResolution</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2531,7 +2531,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>uriRelativity</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.1009">uriRelativity</a>(<a href="../../../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a> value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.1010">uriRelativity</a>(<a href="../../../../../org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau">UriRelativity</a> value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_uriRelativity"><code>SerializerContext.SERIALIZER_uriRelativity</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2549,7 +2549,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>sortCollections</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.1020">sortCollections</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.1021">sortCollections</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortCollections"><code>SerializerContext.SERIALIZER_sortCollections</code></a> property on all serializers in this group.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -2567,7 +2567,7 @@ extends <a href="../../../../../org/apache/juneau/CoreObjectBuilder.html" title=
<ul class="blockList">
<li class="blockList">
<h4>sortMaps</h4>
-<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.1031">sortMaps</a>(boolean value)</pre>
+<pre>public <a href="../../../../../org/apache/juneau/rest/client/RestClientBuilder.html" title="class in org.apache.juneau.rest.client">RestClientBuilder</a> <a href="../../../../../src-html/org/apache/juneau/rest/client/RestClientBuilder.html#line.1032">sortMaps</a>(boolean value)</pre>
<div class="block">Sets the <a href="../../../../../org/apache/juneau/serializer/SerializerContext.html#SERIALIZER_sortMaps">
<TRUNCATED>
[05/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
index 925d438..a90bf34 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializer.html
@@ -212,188 +212,195 @@
<span class="sourceLineNo">204</span> * @param eType The expected type of the object if this is a bean property.<a name="line.204"></a>
<span class="sourceLineNo">205</span> * @param attrName The bean property name if this is a bean property. <jk>null</jk> if this isn't a bean property being serialized.<a name="line.205"></a>
<span class="sourceLineNo">206</span> * @param pMeta The bean property metadata.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @param plainTextParams <jk>true</jk> if this is a top level parameter key or value and paramFormat is PLAINTEXT.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> *<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * @return The same writer passed in.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @throws Exception<a name="line.210"></a>
-<span class="sourceLineNo">211</span> */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.212"></a>
-<span class="sourceLineNo">213</span> protected SerializerWriter serializeAnything(UonSerializerSession session, UonWriter out, Object o, ClassMeta<?> eType,<a name="line.213"></a>
-<span class="sourceLineNo">214</span> String attrName, BeanPropertyMeta pMeta, boolean plainTextParams) throws Exception {<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (o == null) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> out.appendObject(null, false, plainTextParams);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return out;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (eType == null)<a name="line.221"></a>
-<span class="sourceLineNo">222</span> eType = object();<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> ClassMeta<?> aType; // The actual type<a name="line.224"></a>
-<span class="sourceLineNo">225</span> ClassMeta<?> sType; // The serialized type<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> aType = session.push(attrName, o, eType);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> boolean isRecursion = aType == null;<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // Handle recursion<a name="line.230"></a>
-<span class="sourceLineNo">231</span> if (aType == null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> o = null;<a name="line.232"></a>
-<span class="sourceLineNo">233</span> aType = object();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> sType = aType.getSerializedClassMeta();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> String typeName = session.getBeanTypeName(eType, aType, pMeta);<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> // Swap if necessary<a name="line.239"></a>
-<span class="sourceLineNo">240</span> PojoSwap swap = aType.getPojoSwap();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (swap != null) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> o = swap.swap(session, o);<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.244"></a>
-<span class="sourceLineNo">245</span> // the actual type now.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (sType.isObject())<a name="line.246"></a>
-<span class="sourceLineNo">247</span> sType = session.getClassMetaForObject(o);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> // '\0' characters are considered null.<a name="line.250"></a>
-<span class="sourceLineNo">251</span> if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))<a name="line.251"></a>
-<span class="sourceLineNo">252</span> out.appendObject(null, false, plainTextParams);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> else if (sType.isBoolean())<a name="line.253"></a>
-<span class="sourceLineNo">254</span> out.appendBoolean(o);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> else if (sType.isNumber())<a name="line.255"></a>
-<span class="sourceLineNo">256</span> out.appendNumber(o);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> else if (sType.isBean())<a name="line.257"></a>
-<span class="sourceLineNo">258</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> else if (sType.isUri() || (pMeta != null && pMeta.isUri()))<a name="line.259"></a>
-<span class="sourceLineNo">260</span> out.appendUri(o);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> else if (sType.isMap()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (o instanceof BeanMap)<a name="line.262"></a>
-<span class="sourceLineNo">263</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> else<a name="line.264"></a>
-<span class="sourceLineNo">265</span> serializeMap(session, out, (Map)o, eType);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> else if (sType.isCollection()) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> serializeCollection(session, out, (Collection) o, eType);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> else if (sType.isArray()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> else {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> out.appendObject(o, false, plainTextParams);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (! isRecursion)<a name="line.277"></a>
-<span class="sourceLineNo">278</span> session.pop();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return out;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.282"></a>
-<span class="sourceLineNo">283</span> private SerializerWriter serializeMap(UonSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> m = session.sort(m);<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> int depth = session.getIndent();<a name="line.289"></a>
-<span class="sourceLineNo">290</span> out.append('(');<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> while (mapEntries.hasNext()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> Object value = e.getValue();<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> out.cr(depth).appendObject(key, false, false).append('=');<a name="line.298"></a>
-<span class="sourceLineNo">299</span> serializeAnything(session, out, value, valueType, (key == null ? null : session.toString(key)), null, false);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (mapEntries.hasNext())<a name="line.300"></a>
-<span class="sourceLineNo">301</span> out.append(',');<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (m.size() > 0)<a name="line.304"></a>
-<span class="sourceLineNo">305</span> out.cr(depth-1);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> out.append(')');<a name="line.306"></a>
+<span class="sourceLineNo">207</span> *<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * @return The same writer passed in.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @throws Exception<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.211"></a>
+<span class="sourceLineNo">212</span> protected SerializerWriter serializeAnything(UonSerializerSession session, UonWriter out, Object o, ClassMeta<?> eType,<a name="line.212"></a>
+<span class="sourceLineNo">213</span> String attrName, BeanPropertyMeta pMeta) throws Exception {<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (o == null) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> out.appendObject(null, false);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return out;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (eType == null)<a name="line.220"></a>
+<span class="sourceLineNo">221</span> eType = object();<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> ClassMeta<?> aType; // The actual type<a name="line.223"></a>
+<span class="sourceLineNo">224</span> ClassMeta<?> sType; // The serialized type<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> aType = session.push(attrName, o, eType);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> boolean isRecursion = aType == null;<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // Handle recursion<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (aType == null) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> o = null;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> aType = object();<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> sType = aType.getSerializedClassMeta();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> String typeName = session.getBeanTypeName(eType, aType, pMeta);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> // Swap if necessary<a name="line.238"></a>
+<span class="sourceLineNo">239</span> PojoSwap swap = aType.getPojoSwap();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (swap != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> o = swap.swap(session, o);<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.243"></a>
+<span class="sourceLineNo">244</span> // the actual type now.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (sType.isObject())<a name="line.245"></a>
+<span class="sourceLineNo">246</span> sType = session.getClassMetaForObject(o);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> // '\0' characters are considered null.<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))<a name="line.250"></a>
+<span class="sourceLineNo">251</span> out.appendObject(null, false);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> else if (sType.isBoolean())<a name="line.252"></a>
+<span class="sourceLineNo">253</span> out.appendBoolean(o);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> else if (sType.isNumber())<a name="line.254"></a>
+<span class="sourceLineNo">255</span> out.appendNumber(o);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> else if (sType.isBean())<a name="line.256"></a>
+<span class="sourceLineNo">257</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> else if (sType.isUri() || (pMeta != null && pMeta.isUri()))<a name="line.258"></a>
+<span class="sourceLineNo">259</span> out.appendUri(o);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> else if (sType.isMap()) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (o instanceof BeanMap)<a name="line.261"></a>
+<span class="sourceLineNo">262</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> else<a name="line.263"></a>
+<span class="sourceLineNo">264</span> serializeMap(session, out, (Map)o, eType);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> else if (sType.isCollection()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> serializeCollection(session, out, (Collection) o, eType);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> else if (sType.isArray()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> else {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> out.appendObject(o, false);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> if (! isRecursion)<a name="line.276"></a>
+<span class="sourceLineNo">277</span> session.pop();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return out;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private SerializerWriter serializeMap(UonSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> m = session.sort(m);<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> int depth = session.getIndent();<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> if (! session.isPlainTextParams())<a name="line.290"></a>
+<span class="sourceLineNo">291</span> out.append('(');<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> while (mapEntries.hasNext()) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Object value = e.getValue();<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> out.cr(depth).appendObject(key, false).append('=');<a name="line.299"></a>
+<span class="sourceLineNo">300</span> serializeAnything(session, out, value, valueType, (key == null ? null : session.toString(key)), null);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> if (mapEntries.hasNext())<a name="line.301"></a>
+<span class="sourceLineNo">302</span> out.append(',');<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> if (m.size() > 0)<a name="line.305"></a>
+<span class="sourceLineNo">306</span> out.cr(depth-1);<a name="line.306"></a>
<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> return out;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">308</span> if (! session.isPlainTextParams())<a name="line.308"></a>
+<span class="sourceLineNo">309</span> out.append(')');<a name="line.309"></a>
<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> private SerializerWriter serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> int depth = session.getIndent();<a name="line.312"></a>
+<span class="sourceLineNo">311</span> return out;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> out.append('(');<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> boolean addComma = false;<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.320"></a>
+<span class="sourceLineNo">314</span> private SerializerWriter serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> int depth = session.getIndent();<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (! session.isPlainTextParams())<a name="line.317"></a>
+<span class="sourceLineNo">318</span> out.append('(');<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> boolean addComma = false;<a name="line.320"></a>
<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> String key = p.getName();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> Object value = p.getValue();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Throwable t = p.getThrown();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> if (t != null)<a name="line.325"></a>
-<span class="sourceLineNo">326</span> session.addBeanGetterWarning(pMeta, t);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.328"></a>
-<span class="sourceLineNo">329</span> continue;<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> if (addComma)<a name="line.331"></a>
-<span class="sourceLineNo">332</span> out.append(',');<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> out.cr(depth).appendObject(key, false, false).append('=');<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> serializeAnything(session, out, value, cMeta, key, pMeta, false);<a name="line.336"></a>
+<span class="sourceLineNo">322</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> String key = p.getName();<a name="line.326"></a>
+<span class="sourceLineNo">327</span> Object value = p.getValue();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> Throwable t = p.getThrown();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> if (t != null)<a name="line.329"></a>
+<span class="sourceLineNo">330</span> session.addBeanGetterWarning(pMeta, t);<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.332"></a>
+<span class="sourceLineNo">333</span> continue;<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> if (addComma)<a name="line.335"></a>
+<span class="sourceLineNo">336</span> out.append(',');<a name="line.336"></a>
<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> addComma = true;<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> if (m.size() > 0)<a name="line.341"></a>
-<span class="sourceLineNo">342</span> out.cr(depth-1);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> out.append(')');<a name="line.343"></a>
+<span class="sourceLineNo">338</span> out.cr(depth).appendObject(key, false).append('=');<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> addComma = true;<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> return out;<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.348"></a>
-<span class="sourceLineNo">349</span> private SerializerWriter serializeCollection(UonSerializerSession session, UonWriter out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> ClassMeta<?> elementType = type.getElementType();<a name="line.351"></a>
+<span class="sourceLineNo">345</span> if (m.size() > 0)<a name="line.345"></a>
+<span class="sourceLineNo">346</span> out.cr(depth-1);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (! session.isPlainTextParams())<a name="line.347"></a>
+<span class="sourceLineNo">348</span> out.append(')');<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> return out;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> c = session.sort(c);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> out.append('@').append('(');<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> int depth = session.getIndent();<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> out.cr(depth);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> serializeAnything(session, out, i.next(), elementType, "<iterator>", null, false);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (i.hasNext())<a name="line.362"></a>
-<span class="sourceLineNo">363</span> out.append(',');<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (c.size() > 0)<a name="line.366"></a>
-<span class="sourceLineNo">367</span> out.cr(depth-1);<a name="line.367"></a>
-<span class="sourceLineNo">368</span> out.append(')');<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> return out;<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> //--------------------------------------------------------------------------------<a name="line.374"></a>
-<span class="sourceLineNo">375</span> // Entry point methods<a name="line.375"></a>
-<span class="sourceLineNo">376</span> //--------------------------------------------------------------------------------<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> @Override /* Serializer */<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<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> @Override /* Serializer */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> UonSerializerSession s = (UonSerializerSession)session;<a name="line.385"></a>
-<span class="sourceLineNo">386</span> serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), "root", null, false);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>}<a name="line.388"></a>
+<span class="sourceLineNo">353</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private SerializerWriter serializeCollection(UonSerializerSession session, UonWriter out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> ClassMeta<?> elementType = type.getElementType();<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> c = session.sort(c);<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (! session.isPlainTextParams())<a name="line.360"></a>
+<span class="sourceLineNo">361</span> out.append('@').append('(');<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> int depth = session.getIndent();<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> out.cr(depth);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> serializeAnything(session, out, i.next(), elementType, "<iterator>", null);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> if (i.hasNext())<a name="line.368"></a>
+<span class="sourceLineNo">369</span> out.append(',');<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> if (c.size() > 0)<a name="line.372"></a>
+<span class="sourceLineNo">373</span> out.cr(depth-1);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> if (! session.isPlainTextParams())<a name="line.374"></a>
+<span class="sourceLineNo">375</span> out.append(')');<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> return out;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> //--------------------------------------------------------------------------------<a name="line.381"></a>
+<span class="sourceLineNo">382</span> // Entry point methods<a name="line.382"></a>
+<span class="sourceLineNo">383</span> //--------------------------------------------------------------------------------<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> @Override /* Serializer */<a name="line.385"></a>
+<span class="sourceLineNo">386</span> public UonSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> return new UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> @Override /* Serializer */<a name="line.390"></a>
+<span class="sourceLineNo">391</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> UonSerializerSession s = (UonSerializerSession)session;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), "root", 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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerContext.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerContext.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerContext.html
index 1dfab66..cbef60c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerContext.html
@@ -79,33 +79,71 @@
<span class="sourceLineNo">071</span> */<a name="line.71"></a>
<span class="sourceLineNo">072</span> public static final String UON_addBeanTypeProperties = "UonSerializer.addBeanTypeProperties";<a name="line.72"></a>
<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> final boolean<a name="line.75"></a>
-<span class="sourceLineNo">076</span> encodeChars,<a name="line.76"></a>
-<span class="sourceLineNo">077</span> addBeanTypeProperties;<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * Constructor.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <p><a name="line.81"></a>
-<span class="sourceLineNo">082</span> * Typically only called from {@link PropertyStore#getContext(Class)}.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> *<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @param ps The property store that created this context.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> public UonSerializerContext(PropertyStore ps) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> super(ps);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> encodeChars = ps.getProperty(UON_encodeChars, boolean.class, false);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> addBeanTypeProperties = ps.getProperty(UON_addBeanTypeProperties, boolean.class, ps.getProperty(SERIALIZER_addBeanTypeProperties, boolean.class, true));<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> @Override /* Context */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public ObjectMap asMap() {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return super.asMap()<a name="line.94"></a>
-<span class="sourceLineNo">095</span> .append("UonSerializerContext", new ObjectMap()<a name="line.95"></a>
-<span class="sourceLineNo">096</span> .append("encodeChars", encodeChars)<a name="line.96"></a>
-<span class="sourceLineNo">097</span> .append("addBeanTypeProperties", addBeanTypeProperties)<a name="line.97"></a>
-<span class="sourceLineNo">098</span> );<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span>}<a name="line.100"></a>
+<span class="sourceLineNo">074</span> /**<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <b>Configuration property:</b> Format to use for top-level query names and simple parameters.<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * <p><a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <ul><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <li><b>Name:</b> <js>"UrlEncodingSerializer.paramFormat"</js><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <li><b>Data type:</b> <code>String</code><a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <li><b>Default:</b> <js>"UON"</js><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <li><b>Session-overridable:</b> <jk>true</jk><a name="line.81"></a>
+<span class="sourceLineNo">082</span> * </ul><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <p><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * Specifies the format to use for URL GET parameter keys and values.<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * <p><a name="line.85"></a>
+<span class="sourceLineNo">086</span> * The possible values are:<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <ul><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <li><js>"UON"</js> (default) - Use UON notation for values.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <br>String values such as <js>"(foo='bar')"</js> will end up being quoted and escaped to <js>"'(foo=bar~'baz~')'"</js>.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <br>Boolean strings (<js>"true"</js>/<js>"false"</js>) and numeric values (<js>"123"</js>) will also end up<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * quoted (<js>"'true'"</js>, <js>"'false'"</js>, <js>"'123'"</js>.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <li><js>"PLAINTEXT"</js> (default) - Serialize as plain text.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <br>Strings will never be quoted or escaped.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <br>Note that this can cause errors during parsing if you're using the URL-encoding parser to parse<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * the results since UON constructs won't be differentiatable.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * <br>However, this is not an issue if you're simply creating queries or form posts against 3rd-party interfaces.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * </ul><a name="line.97"></a>
+<span class="sourceLineNo">098</span> */<a name="line.98"></a>
+<span class="sourceLineNo">099</span> public static final String UON_paramFormat = "UonSerializer.paramFormat";<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> final boolean<a name="line.102"></a>
+<span class="sourceLineNo">103</span> encodeChars,<a name="line.103"></a>
+<span class="sourceLineNo">104</span> addBeanTypeProperties,<a name="line.104"></a>
+<span class="sourceLineNo">105</span> plainTextParams;<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * Constructor.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <p><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * Typically only called from {@link PropertyStore#getContext(Class)}.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> *<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @param ps The property store that created this context.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> */<a name="line.113"></a>
+<span class="sourceLineNo">114</span> public UonSerializerContext(PropertyStore ps) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> super(ps);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> encodeChars = ps.getProperty(UON_encodeChars, boolean.class, false);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> addBeanTypeProperties = ps.getProperty(UON_addBeanTypeProperties, boolean.class, ps.getProperty(SERIALIZER_addBeanTypeProperties, boolean.class, true));<a name="line.117"></a>
+<span class="sourceLineNo">118</span> plainTextParams = ps.getProperty(UON_paramFormat, String.class, "UON").equals("PLAINTEXT");<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> @Override /* Context */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> public ObjectMap asMap() {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> return super.asMap()<a name="line.123"></a>
+<span class="sourceLineNo">124</span> .append("UonSerializerContext", new ObjectMap()<a name="line.124"></a>
+<span class="sourceLineNo">125</span> .append("encodeChars", encodeChars)<a name="line.125"></a>
+<span class="sourceLineNo">126</span> .append("addBeanTypeProperties", addBeanTypeProperties)<a name="line.126"></a>
+<span class="sourceLineNo">127</span> .append("plainTextParams", plainTextParams)<a name="line.127"></a>
+<span class="sourceLineNo">128</span> );<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * Returns <jk>true</jk> if the {@link UonSerializerContext#UON_paramFormat} is <js>"PLAINTEXT"</js>.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * @return <jk>true</jk> if the {@link UonSerializerContext#UON_paramFormat} is <js>"PLAINTEXT"</js>.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> */<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public boolean plainTextParams() {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> return plainTextParams;<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>}<a name="line.138"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
index b6e57ba..24fa531 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
@@ -40,64 +40,75 @@
<span class="sourceLineNo">032</span><a name="line.32"></a>
<span class="sourceLineNo">033</span> private final boolean<a name="line.33"></a>
<span class="sourceLineNo">034</span> encodeChars,<a name="line.34"></a>
-<span class="sourceLineNo">035</span> addBeanTypeProperties;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span> /**<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * Create a new session using properties specified in the context.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * @param ctx The context creating this session object.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * The context contains all the configuration settings for this object.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * @param encode Override the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * @param output The output object. See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * @param op The override properties.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * These override any context properties defined in the context.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @param locale The session locale.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * If <jk>null</jk>, then the locale defined on the context is used.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * @param timeZone The session timezone.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * If <jk>null</jk>, then the timezone defined on the context is used.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * @param mediaType The session media type (e.g. <js>"application/json"</js>).<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * @param uriContext The URI context.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span> protected UonSerializerSession(UonSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> if (op == null || op.isEmpty()) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> encodeChars = encode == null ? ctx.encodeChars : encode;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> } else {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> encodeChars = encode == null ? op.getBoolean(UON_encodeChars, ctx.encodeChars) : encode;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span> }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * Returns the {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> *<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @return The {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> */<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public final boolean isEncodeChars() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return encodeChars;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * Returns the {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> *<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * @return The {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> @Override /* SerializerSession */<a name="line.80"></a>
-<span class="sourceLineNo">081</span> public final boolean isAddBeanTypeProperties() {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> return addBeanTypeProperties;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> @Override /* SerializerSession */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> public final UonWriter getWriter() throws Exception {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> Object output = getOutput();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> if (output instanceof UonWriter)<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return (UonWriter)output;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> return new UonWriter(this, super.getWriter(), isUseWhitespace(), isEncodeChars(), isTrimStrings(), getUriResolver());<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>}<a name="line.92"></a>
+<span class="sourceLineNo">035</span> addBeanTypeProperties,<a name="line.35"></a>
+<span class="sourceLineNo">036</span> plainTextParams;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> /**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * Create a new session using properties specified in the context.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * @param ctx The context creating this session object.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * The context contains all the configuration settings for this object.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * @param encode Override the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * @param output The output object. See {@link JsonSerializerSession#getWriter()} for valid class types.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * @param op The override properties.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * These override any context properties defined in the context.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * @param javaMethod The java method that called this serializer, usually the method in a REST servlet.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * @param locale The session locale.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * If <jk>null</jk>, then the locale defined on the context is used.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * @param timeZone The session timezone.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * If <jk>null</jk>, then the timezone defined on the context is used.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @param mediaType The session media type (e.g. <js>"application/json"</js>).<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @param uriContext The URI context.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * Identifies the current request URI used for resolution of URIs to absolute or root-relative form.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> */<a name="line.55"></a>
+<span class="sourceLineNo">056</span> protected UonSerializerSession(UonSerializerContext ctx, Boolean encode, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.57"></a>
+<span class="sourceLineNo">058</span> if (op == null || op.isEmpty()) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> encodeChars = encode == null ? ctx.encodeChars : encode;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> addBeanTypeProperties = ctx.addBeanTypeProperties;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> plainTextParams = ctx.plainTextParams;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> } else {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> encodeChars = encode == null ? op.getBoolean(UON_encodeChars, ctx.encodeChars) : encode;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> addBeanTypeProperties = op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<a name="line.64"></a>
+<span class="sourceLineNo">065</span> plainTextParams = op.getString(UonSerializerContext.UON_paramFormat, "UON").equals("PLAINTEXT");<a name="line.65"></a>
+<span class="sourceLineNo">066</span> }<a name="line.66"></a>
+<span class="sourceLineNo">067</span> }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> /**<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * Returns the {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> *<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * @return The {@link UonSerializerContext#UON_encodeChars} setting value for this session.<a name="line.72"></a>
+<span class="sourceLineNo">073</span> */<a name="line.73"></a>
+<span class="sourceLineNo">074</span> public final boolean isEncodeChars() {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> return encodeChars;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * Returns the {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> *<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @return The {@link UonSerializerContext#UON_addBeanTypeProperties} setting value for this session.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> */<a name="line.82"></a>
+<span class="sourceLineNo">083</span> @Override /* SerializerSession */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public final boolean isAddBeanTypeProperties() {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> return addBeanTypeProperties;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * Returns <jk>true</jk> if the {@link UonSerializerContext#UON_paramFormat} is <js>"PLAINTEXT"</js>.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @return <jk>true</jk> if the {@link UonSerializerContext#UON_paramFormat} is <js>"PLAINTEXT"</js>.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> */<a name="line.91"></a>
+<span class="sourceLineNo">092</span> public boolean isPlainTextParams() {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> return plainTextParams;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span> @Override /* SerializerSession */<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public final UonWriter getWriter() throws Exception {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> Object output = getOutput();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> if (output instanceof UonWriter)<a name="line.99"></a>
+<span class="sourceLineNo">100</span> return (UonWriter)output;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> return new UonWriter(this, super.getWriter(), isUseWhitespace(), isEncodeChars(), isTrimStrings(), isPlainTextParams(), getUriResolver());<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span>}<a name="line.103"></a>
[29/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementMixed.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementMixed.html b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementMixed.html
index f7c4c27..7707252 100644
--- a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementMixed.html
+++ b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementMixed.html
@@ -267,7 +267,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedLi
<ul class="blockList">
<li class="blockList">
<h4>setChildren</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="c")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="c")
public <a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html" title="class in org.apache.juneau.dto.html5">HtmlElement</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html#line.48">setChildren</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util">LinkedList</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>> children)</pre>
<div class="block">Sets the children of this element.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementRawText.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementRawText.html b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementRawText.html
index 9c2f280..6521081 100644
--- a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementRawText.html
+++ b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementRawText.html
@@ -226,7 +226,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html" ti
<li class="blockList">
<h4>getText</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#TEXT_PWS">TEXT_PWS</a>)
- <a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="c")
+ <a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="c")
public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html#line.33">getText</a>()</pre>
<div class="block">Returns the inner text of this element.</div>
<dl>
@@ -241,7 +241,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.h
<ul class="blockList">
<li class="blockList">
<h4>setText</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="c")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="c")
public <a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html" title="class in org.apache.juneau.dto.html5">HtmlElement</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html#line.44">setText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> text)</pre>
<div class="block">Sets the inner text of this element.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementText.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementText.html b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementText.html
index 932e37b..8a65e65 100644
--- a/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementText.html
+++ b/content/site/apidocs/org/apache/juneau/dto/html5/HtmlElementText.html
@@ -226,7 +226,7 @@ extends <a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html" ti
<li class="blockList">
<h4>getText</h4>
<pre><a href="../../../../../org/apache/juneau/xml/annotation/Xml.html" title="annotation in org.apache.juneau.xml.annotation">@Xml</a>(<a href="../../../../../org/apache/juneau/xml/annotation/Xml.html#format--">format</a>=<a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html#TEXT">TEXT</a>)
- <a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="c")
+ <a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="c")
public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElementText.html#line.33">getText</a>()</pre>
<div class="block">Returns the inner text of this element.</div>
<dl>
@@ -241,7 +241,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.h
<ul class="blockList">
<li class="blockList">
<h4>setText</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="c")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="c")
public <a href="../../../../../org/apache/juneau/dto/html5/HtmlElement.html" title="class in org.apache.juneau.dto.html5">HtmlElement</a> <a href="../../../../../src-html/org/apache/juneau/dto/html5/HtmlElementText.html#line.44">setText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> text)</pre>
<div class="block">Sets the innter text of this element.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
index 92efe79..2af9ee4 100644
--- a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
+++ b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
@@ -900,7 +900,7 @@ public <a href="../../../../../org/apache/juneau/dto/jsonschema/Schema.html
<ul class="blockList">
<li class="blockList">
<h4>getSchemaVersionUri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="$schema")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="$schema")
public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.147">getSchemaVersionUri</a>()</pre>
<div class="block">Bean property getter: <property>$schema</property>.</div>
<dl>
@@ -915,7 +915,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>setSchemaVersionUri</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="$schema")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="$schema")
public <a href="../../../../../org/apache/juneau/dto/jsonschema/Schema.html" title="class in org.apache.juneau.dto.jsonschema">Schema</a> <a href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.158">setSchemaVersionUri</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> schemaVersion)</pre>
<div class="block">Bean property setter: <property>$schema</property>.</div>
<dl>
@@ -2251,7 +2251,7 @@ public <a href="../../../../../org/apache/juneau/dto/jsonschema/Schema.html
<ul class="blockList">
<li class="blockList">
<h4>getRef</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="$ref")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="$ref")
public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> <a href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.1276">getRef</a>()</pre>
<div class="block">Bean property getter: <property>$ref</property>.</div>
<dl>
@@ -2266,7 +2266,7 @@ public <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?
<ul class="blockList">
<li class="blockList">
<h4>setRef</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#name--">name</a>="$ref")
+<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a href="../../../../../org/apache/juneau/annotation/BeanProperty.html#value--">value</a>="$ref")
public <a href="../../../../../org/apache/juneau/dto/jsonschema/Schema.html" title="class in org.apache.juneau.dto.jsonschema">Schema</a> <a href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.1287">setRef</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/URI.html?is-external=true" title="class or interface in java.net">URI</a> ref)</pre>
<div class="block">Bean property setter: <property>$ref</property>.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/http/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/http/package-summary.html b/content/site/apidocs/org/apache/juneau/http/package-summary.html
index c317ff9..c8b1de3 100644
--- a/content/site/apidocs/org/apache/juneau/http/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/http/package-summary.html
@@ -70,6 +70,10 @@
<!-- ========= END OF TOP NAVBAR ========= -->
<div class="header">
<h1 title="Package" class="title">Package org.apache.juneau.http</h1>
+<div class="docSummary">
+<div class="block">RFC2616 HTTP Headers</div>
+</div>
+<p>See: <a href="#package.description">Description</a></p>
</div>
<div class="contentContainer">
<ul class="blockList">
@@ -471,6 +475,11 @@
</table>
</li>
</ul>
+<a name="package.description">
+<!-- -->
+</a>
+<h2 title="Package org.apache.juneau.http Description">Package org.apache.juneau.http Description</h2>
+<div class="block"><p>RFC2616 HTTP Headers</p></div>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a name="navbar.bottom">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/internal/ArrayUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/internal/ArrayUtils.html b/content/site/apidocs/org/apache/juneau/internal/ArrayUtils.html
index 745d0e1..6d1d9bf 100644
--- a/content/site/apidocs/org/apache/juneau/internal/ArrayUtils.html
+++ b/content/site/apidocs/org/apache/juneau/internal/ArrayUtils.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -189,7 +189,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</td>
</tr>
<tr id="i6" class="altColor">
-<td class="colFirst"><code>static void</code></td>
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#copyToList-java.lang.Object-java.util.List-">copyToList</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a> list)</code>
<div class="block">Copies the specified array into the specified list.</div>
@@ -212,32 +212,45 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</td>
</tr>
<tr id="i9" class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#isArray-java.lang.Object-">isArray</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array)</code>
+<div class="block">Returns <jk>true</jk> if the specified object is an array.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#iterator-java.lang.Object-">iterator</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array)</code>
<div class="block">Returns an iterator against an array.</div>
</td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code>static <T> T[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#reverse-T:A-">reverse</a></span>(T[] array)</code>
<div class="block">Creates a new array with reversed entries.</div>
</td>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
<td class="colFirst"><code>static <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#toArray-java.util.Collection-java.lang.Class-">toArray</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><?> c,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> componentType)</code>
<div class="block">Converts the specified collection to an array.</div>
</td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>static <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><T></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#toList-java.lang.Object-java.lang.Class-">toList</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> componentType)</code>
+<div class="block">Converts the specified array to an <code>ArrayList</code></div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
<td class="colFirst"><code>static <T> T[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#toObjectArray-java.util.Collection-java.lang.Class-">toObjectArray</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><?> c,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> componentType)</code>
<div class="block">Shortcut for calling <code>myList.toArray(new T[myList.size()]);</code></div>
</td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ArrayUtils.html#toPrimitiveArray-java.lang.Object-">toPrimitiveArray</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</code>
<div class="block">Converts a primitive wrapper array (e.g.</div>
@@ -422,13 +435,48 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</dl>
</li>
</ul>
+<a name="isArray-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isArray</h4>
+<pre>public static boolean <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.212">isArray</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array)</pre>
+<div class="block">Returns <jk>true</jk> if the specified object is an array.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>array</code> - The array to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if the specified object is an array.</dd>
+</dl>
+</li>
+</ul>
+<a name="toList-java.lang.Object-java.lang.Class-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toList</h4>
+<pre>public static <T> <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><T> <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.225">toList</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> componentType)</pre>
+<div class="block">Converts the specified array to an <code>ArrayList</code></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>array</code> - The array to convert.</dd>
+<dd><code>componentType</code> - The type of objects in the array.
+ It must match the actual component type in the array.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A new <a href="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util"><code>ArrayList</code></a></dd>
+</dl>
+</li>
+</ul>
<a name="toObjectArray-java.util.Collection-java.lang.Class-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>toObjectArray</h4>
-<pre>public static <T> T[] <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.215">toObjectArray</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><?> c,
+<pre>public static <T> T[] <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.240">toObjectArray</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><?> c,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> componentType)</pre>
<div class="block">Shortcut for calling <code>myList.toArray(new T[myList.size()]);</code></div>
<dl>
@@ -446,7 +494,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>copyToList</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.232">copyToList</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array,
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a> <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.258">copyToList</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> array,
<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a> list)</pre>
<div class="block">Copies the specified array into the specified list.
Works on both object and primitive arrays.</div>
@@ -454,6 +502,8 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>array</code> - The array to copy into a list.</dd>
<dd><code>list</code> - The list to copy the values into.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The same list passed in.</dd>
</dl>
</li>
</ul>
@@ -465,7 +515,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>contains</h4>
-<pre>public static <T> boolean <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.249">contains</a>(T element,
+<pre>public static <T> boolean <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.276">contains</a>(T element,
T[] array)</pre>
<div class="block">Returns <jk>true</jk> if the specified array contains the specified element
using the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang"><code>Object.equals(Object)</code></a> method.</div>
@@ -487,7 +537,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>indexOf</h4>
-<pre>public static <T> int <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.262">indexOf</a>(T element,
+<pre>public static <T> int <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.289">indexOf</a>(T element,
T[] array)</pre>
<div class="block">Returns the index position of the element in the specified array
using the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang"><code>Object.equals(Object)</code></a> method.</div>
@@ -507,7 +557,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>contains</h4>
-<pre>public static boolean <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.282">contains</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> element,
+<pre>public static boolean <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.309">contains</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> element,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] array)</pre>
<div class="block">Returns <jk>true</jk> if the specified array contains the specified element
using the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang"><code>String.equals(Object)</code></a> method.</div>
@@ -527,7 +577,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>indexOf</h4>
-<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.295">indexOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> element,
+<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.322">indexOf</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> element,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] array)</pre>
<div class="block">Returns the index position of the element in the specified array
using the <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang"><code>String.equals(Object)</code></a> method.</div>
@@ -547,7 +597,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>toPrimitiveArray</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.313">toPrimitiveArray</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../src-html/org/apache/juneau/internal/ArrayUtils.html#line.340">toPrimitiveArray</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
<div class="block">Converts a primitive wrapper array (e.g. <code>Integer[]</code>) to a primitive array (e.g. <code><jk>int</jk>[]</code>).</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/internal/IOUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/internal/IOUtils.html b/content/site/apidocs/org/apache/juneau/internal/IOUtils.html
index a183b85..4f58055 100644
--- a/content/site/apidocs/org/apache/juneau/internal/IOUtils.html
+++ b/content/site/apidocs/org/apache/juneau/internal/IOUtils.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -249,11 +249,17 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr id="i13" class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#read-java.lang.Object-">read</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</code>
+<div class="block">Reads the specified object to a <code>String</code>.</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#read-java.io.Reader-">read</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in)</code>
<div class="block">Reads the contents of a reader into a string.</div>
</td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#read-java.io.Reader-int-int-">read</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in,
int length,
@@ -261,39 +267,39 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="block">Reads the specified input into a <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a> until the end of the input is reached.</div>
</td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
<td class="colFirst"><code>static byte[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#readBytes-java.io.File-">readBytes</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)</code>
<div class="block">Reads a raw stream of bytes from the specified file.</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code>static byte[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#readBytes-java.io.InputStream-int-">readBytes</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in,
int bufferSize)</code>
<div class="block">Read the specified input stream into a byte array and closes the stream.</div>
</td>
</tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#readFile-java.lang.String-">readFile</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</code>
<div class="block">Reads the contents of a file into a string.</div>
</td>
</tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#toInputStream-java.lang.Object-">toInputStream</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</code>
<div class="block">Converts an object to an <code>InputStream</code>.</div>
</td>
</tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
<td class="colFirst"><code>static int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#write-java.io.File-java.io.InputStream-">write</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> out,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in)</code>
<div class="block">Writes the contents of the specified <code>InputStream</code> to the specified file.</div>
</td>
</tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
<td class="colFirst"><code>static int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/IOUtils.html#write-java.io.File-java.io.Reader-">write</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> out,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in)</code>
@@ -395,13 +401,41 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</dl>
</li>
</ul>
+<a name="read-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>read</h4>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.71">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
+ throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Reads the specified object to a <code>String</code>.
+ <p>
+ Can be any of the following object types:
+ <ul>
+ <li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang"><code>CharSequence</code></a>
+ <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io"><code>File</code></a>
+ <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a>
+ <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io"><code>InputStream</code></a>
+ <li><code><jk>byte</jk>[]</code>
+ </ul></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>o</code> - The object to read.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The object serialized to a string, or <jk>null</jk> if it wasn't a supported type.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
<a name="write-java.io.File-java.io.Reader-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>write</h4>
-<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.63">write</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> out,
+<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.93">write</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> out,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Writes the contents of the specified <code>Reader</code> to the specified file.</div>
@@ -422,7 +456,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>write</h4>
-<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.82">write</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> out,
+<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.112">write</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> out,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Writes the contents of the specified <code>InputStream</code> to the specified file.</div>
@@ -443,7 +477,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>read</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.100">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in)
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.130">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Reads the contents of a reader into a string.</div>
<dl>
@@ -462,7 +496,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>read</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.112">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in,
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.142">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in,
<a href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html?is-external=true" title="class or interface in java.nio.charset">Charset</a> cs)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Reads the contents of an input stream into a string using the specified charset.</div>
@@ -483,7 +517,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>read</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.125">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in)
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.155">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Reads the contents of an input stream into a string using the system default charset.</div>
<dl>
@@ -502,7 +536,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>readBytes</h4>
-<pre>public static byte[] <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.139">readBytes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in,
+<pre>public static byte[] <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.169">readBytes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> in,
int bufferSize)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Read the specified input stream into a byte array and closes the stream.</div>
@@ -523,7 +557,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>readBytes</h4>
-<pre>public static byte[] <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.164">readBytes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
+<pre>public static byte[] <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.194">readBytes</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a> f)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Reads a raw stream of bytes from the specified file.</div>
<dl>
@@ -542,7 +576,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>read</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.189">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in,
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.219">read</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in,
int length,
int bufferSize)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -569,7 +603,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>pipe</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.213">pipe</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in,
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.243">pipe</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> in,
<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> out)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Pipes the contents of the specified reader into the writer.
@@ -589,7 +623,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getBufferedReader</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.226">getBufferedReader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)</pre>
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.256">getBufferedReader</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)</pre>
<div class="block">Wraps the specified reader in a buffered reader.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -606,7 +640,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>count</h4>
-<pre>public static long <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.239">count</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> is)
+<pre>public static long <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.269">count</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> is)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Counts the number of bytes in the input stream and then closes the stream.</div>
<dl>
@@ -625,7 +659,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>count</h4>
-<pre>public static long <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.259">count</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)
+<pre>public static long <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.289">count</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Counts the number of characters in the reader and then closes the reader.</div>
<dl>
@@ -644,7 +678,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getBufferSize</h4>
-<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.279">getBufferSize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> contentLength)</pre>
+<pre>public static int <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.309">getBufferSize</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> contentLength)</pre>
<div class="block">Given the specified <js>"Content-Length"</js> header value, return an appropriate buffer size.
The maximum buffer size is 1MB.</div>
<dl>
@@ -661,7 +695,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>closeQuietly</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.301">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> is)</pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.331">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> is)</pre>
<div class="block">Close input stream and ignore any exceptions.
No-op if input stream is <jk>null</jk>.</div>
<dl>
@@ -676,7 +710,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>closeQuietly</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.314">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a> os)</pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.344">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true" title="class or interface in java.io">OutputStream</a> os)</pre>
<div class="block">Close output stream and ignore any exceptions.
No-op if output stream is <jk>null</jk>.</div>
<dl>
@@ -691,7 +725,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>closeQuietly</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.327">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)</pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.357">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a> r)</pre>
<div class="block">Close reader and ignore any exceptions.
No-op if reader is <jk>null</jk>.</div>
<dl>
@@ -706,7 +740,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>closeQuietly</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.340">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)</pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.370">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a> w)</pre>
<div class="block">Close writer and ignore any exceptions.
No-op if writer is <jk>null</jk>.</div>
<dl>
@@ -721,7 +755,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>closeQuietly</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.352">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... o)</pre>
+<pre>public static void <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.382">closeQuietly</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>... o)</pre>
<div class="block">Quietly close all specified input streams, output streams, readers, and writers.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -735,7 +769,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>toInputStream</h4>
-<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.381">toInputStream</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
+<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a> <a href="../../../../src-html/org/apache/juneau/internal/IOUtils.html#line.411">toInputStream</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Converts an object to an <code>InputStream</code>.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/internal/ObjectUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/internal/ObjectUtils.html b/content/site/apidocs/org/apache/juneau/internal/ObjectUtils.html
index 4324dbf..2924519 100644
--- a/content/site/apidocs/org/apache/juneau/internal/ObjectUtils.html
+++ b/content/site/apidocs/org/apache/juneau/internal/ObjectUtils.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":9};
+var methods = {"i0":9,"i1":9};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.18">ObjectUtils</a>
+<pre>public class <a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.21">ObjectUtils</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Object-related utility methods.</div>
</li>
@@ -153,6 +153,12 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<div class="block">Returns <jk>true</jk> if the specified objects are equal.</div>
</td>
</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/internal/ObjectUtils.html#isEmpty-java.lang.Object-">isEmpty</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</code>
+<div class="block">Returns <jk>true</jk> if the specified object is empty.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -181,7 +187,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>ObjectUtils</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.18">ObjectUtils</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.21">ObjectUtils</a>()</pre>
</li>
</ul>
</li>
@@ -195,10 +201,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<a name="equals-java.lang.Object-java.lang.Object-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>equals</h4>
-<pre>public static boolean <a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.29">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o1,
+<pre>public static boolean <a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.32">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o1,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o2)</pre>
<div class="block">Returns <jk>true</jk> if the specified objects are equal.
<p>
@@ -212,6 +218,31 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</dl>
</li>
</ul>
+<a name="isEmpty-java.lang.Object-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isEmpty</h4>
+<pre>public static boolean <a href="../../../../src-html/org/apache/juneau/internal/ObjectUtils.html#line.56">isEmpty</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre>
+<div class="block">Returns <jk>true</jk> if the specified object is empty.
+ <p>
+ Return <jk>true</jk> if the value is any of the following:
+ <ul>
+ <li><jk>null</jk>
+ <li>An empty Collection
+ <li>An empty array
+ <li>An empty CharSequence
+ <li>An empty String when serialized to a string using <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang"><code>Object.toString()</code></a>.
+ </ul></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>o</code> - The object to test.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><jk>true</jk> if the specified object is empty.</dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/json/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/json/package-summary.html b/content/site/apidocs/org/apache/juneau/json/package-summary.html
index 691068b..1f6ef10 100644
--- a/content/site/apidocs/org/apache/juneau/json/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/json/package-summary.html
@@ -518,12 +518,12 @@
<p>
Another useful feature is the <a href="../../../../org/apache/juneau/annotation/Bean.html#propertyNamer--"><code>Bean.propertyNamer()</code></a> annotation that allows you to plug in your own
logic for determining bean property names.<br>
- The <a href="../../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><code>PropertyNamerDashedLC</code></a> is an example of an alternate property namer.
+ The <a href="../../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><code>PropertyNamerDLC</code></a> is an example of an alternate property namer.
It converts bean property names to lowercase-dashed format.
</p>
<h6 class='topic'>Example:</h6>
<p class='bcode'>
- <ja>@Bean</ja>(propertyNamer=PropertyNamerDashedLC.<jk>class</jk>)
+ <ja>@Bean</ja>(propertyNamer=PropertyNamerDLC.<jk>class</jk>)
<jk>public class</jk> Person {
...
</p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/package-frame.html b/content/site/apidocs/org/apache/juneau/package-frame.html
index d3e4b19..749942b 100644
--- a/content/site/apidocs/org/apache/juneau/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/package-frame.html
@@ -42,8 +42,9 @@
<li><a href="CoreObjectBuilder.html" title="class in org.apache.juneau" target="classFrame">CoreObjectBuilder</a></li>
<li><a href="ObjectList.html" title="class in org.apache.juneau" target="classFrame">ObjectList</a></li>
<li><a href="ObjectMap.html" title="class in org.apache.juneau" target="classFrame">ObjectMap</a></li>
-<li><a href="PropertyNamerDashedLC.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDashedLC</a></li>
<li><a href="PropertyNamerDefault.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDefault</a></li>
+<li><a href="PropertyNamerDLC.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerDLC</a></li>
+<li><a href="PropertyNamerULC.html" title="class in org.apache.juneau" target="classFrame">PropertyNamerULC</a></li>
<li><a href="PropertyStore.html" title="class in org.apache.juneau" target="classFrame">PropertyStore</a></li>
<li><a href="Session.html" title="class in org.apache.juneau" target="classFrame">Session</a></li>
<li><a href="UriContext.html" title="class in org.apache.juneau" target="classFrame">UriContext</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/package-summary.html b/content/site/apidocs/org/apache/juneau/package-summary.html
index 939f1b8..9c4473b 100644
--- a/content/site/apidocs/org/apache/juneau/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/package-summary.html
@@ -255,36 +255,42 @@
</td>
</tr>
<tr class="altColor">
-<td class="colFirst"><a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau">PropertyNamerDashedLC</a></td>
+<td class="colFirst"><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a></td>
<td class="colLast">
-<div class="block">Converts property names to dashed-lower-case format.</div>
+<div class="block">Default property namer.</div>
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau">PropertyNamerDefault</a></td>
+<td class="colFirst"><a href="../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau">PropertyNamerDLC</a></td>
<td class="colLast">
-<div class="block">Default property namer.</div>
+<div class="block">Converts property names to dashed-lower-case format.</div>
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a href="../../../org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau">PropertyNamerULC</a></td>
+<td class="colLast">
+<div class="block">Converts property names to underscore-lower-case format.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau">PropertyStore</a></td>
<td class="colLast">
<div class="block">A store for instantiating <a href="../../../org/apache/juneau/Context.html" title="class in org.apache.juneau"><code>Context</code></a> objects.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../org/apache/juneau/Session.html" title="class in org.apache.juneau">Session</a></td>
<td class="colLast">
<div class="block">A one-time-use non-thread-safe object that's meant to be used once and then thrown away.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau">UriContext</a></td>
<td class="colLast">
<div class="block">Represents a URL broken into authority/context-root/servlet-path/path-info parts.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau">UriResolver</a></td>
<td class="colLast">
<div class="block">Class used to create absolute and root-relative URIs based on your current URI 'location' and rules about how to
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/package-tree.html b/content/site/apidocs/org/apache/juneau/package-tree.html
index 08133b6..f065e71 100644
--- a/content/site/apidocs/org/apache/juneau/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/package-tree.html
@@ -139,8 +139,9 @@
</li>
<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/CoreObject.html" title="class in org.apache.juneau"><span class="typeNameLink">CoreObject</span></a></li>
<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/CoreObjectBuilder.html" title="class in org.apache.juneau"><span class="typeNameLink">CoreObjectBuilder</span></a></li>
-<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamerDashedLC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDashedLC</span></a> (implements org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamerDefault.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDefault</span></a> (implements org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
+<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamerDLC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerDLC</span></a> (implements org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
+<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamerULC.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyNamerULC</span></a> (implements org.apache.juneau.<a href="../../../org/apache/juneau/PropertyNamer.html" title="interface in org.apache.juneau">PropertyNamer</a>)</li>
<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/PropertyStore.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyStore</span></a></li>
<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/PropertyStore.PropertyMap.html" title="class in org.apache.juneau"><span class="typeNameLink">PropertyStore.PropertyMap</span></a></li>
<li type="circle">org.apache.juneau.<a href="../../../org/apache/juneau/Session.html" title="class in org.apache.juneau"><span class="typeNameLink">Session</span></a>
[13/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
index b878a33..7beaf45 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/Query.html
@@ -25,95 +25,186 @@
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.annotation.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.serializer.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.juneau.urlencoding.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * Annotation applied to Java method arguments of interface proxies to denote that they are QUERY parameters on the request.<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <h5 class='section'>Example:</h5><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <p class='bcode'><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <jk>public interface</jk> MyProxy {<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * String myProxyMethod1(<ja>@Query</ja>(<js>"foo"</js>)</ja> String foo, <ja>@Query</ja>(<js>"bar"</js>)</ja> MyPojo pojo);<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * String myProxyMethod2(<ja>@Query</ja> Map&lt;String,Object&gt; query);<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * String myProxyMethod2(<ja>@Query</ja> String queryString);<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * }<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * </p><a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * The argument can be any of the following types:<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <ul class='spaced-list'><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li><code>NameValuePairs</code> - Individual name-value pairs.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <li>Any serializable POJO - Converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <li><code>Map&lt;String,Object&gt;</code> - Individual name-value pairs.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <li>A bean - Individual name-value pairs.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Values are converted to text using {@link UrlEncodingSerializer#serialize(PartType,Object)}.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <li>{@link String} - Treated as a query string.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * </ul><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <p><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * {@link RequestBean @RequestBean}:<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <p><a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <h5 class='section'>Example:</h5><a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <p class='bcode'><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <jk>public interface</jk> MyProxy {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * }<a name="line.64"></a>
-<span class="sourceLineNo">065</span> *<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <jk>public interface</jk> MyRequestBean {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * <ja>@Query</ja><a name="line.67"></a>
-<span class="sourceLineNo">068</span> * String getFoo();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <ja>@Query</ja><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * MyPojo getBar();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * }<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * </p><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <p><a name="line.74"></a>
-<span class="sourceLineNo">075</span> * When used in a request bean, the {@link #value()} can be used to override the query parameter name.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * It can also be overridden via the {@link BeanProperty#name @BeanProperty.name()} annotation.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * A name of <js>"*"</js> where the bean property value is a map or bean will cause the individual entries in the<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * map or bean to be expanded to query parameters.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>@Documented<a name="line.80"></a>
-<span class="sourceLineNo">081</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.81"></a>
-<span class="sourceLineNo">082</span>@Retention(RUNTIME)<a name="line.82"></a>
-<span class="sourceLineNo">083</span>@Inherited<a name="line.83"></a>
-<span class="sourceLineNo">084</span>public @interface Query {<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * The query parameter name.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <p><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * for the following data types:<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <ul><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <li><code>String</code> - A complete query string.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * <li><code>NameValuePairs</code><a name="line.93"></a>
-<span class="sourceLineNo">094</span> * <li><code>Map&lt;String,Object&gt;</code><a name="line.94"></a>
-<span class="sourceLineNo">095</span> * <li>A bean<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * </ul><a name="line.96"></a>
-<span class="sourceLineNo">097</span> */<a name="line.97"></a>
-<span class="sourceLineNo">098</span> String value() default "*";<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> /**<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <p><a name="line.102"></a>
-<span class="sourceLineNo">103</span> * The default serializer converters values to UON notation.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * <p><a name="line.104"></a>
-<span class="sourceLineNo">105</span> * This annotation is provided to allow values to be custom serialized.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> Class<? extends PartSerializer> serializer() default UrlEncodingSerializer.class;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>}<a name="line.108"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.serializer.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.urlencoding.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Annotation applied to Java method arguments of interface proxies to denote that they are QUERY parameters on the request.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <h5 class='section'>Example:</h5><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <p class='bcode'><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <jk>public interface</jk> MyProxy {<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <jc>// Explicit names specified for query parameters.</jc><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <jc>// pojo will be converted to UON notation (unless plain-text parts enabled).</jc><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod1"</js>)<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * String myProxyMethod1(<ja>@Query</ja>(<js>"foo"</js>)</ja> String foo, <ja>@Query</ja>(<js>"bar"</js>)</ja> MyPojo pojo);<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * <jc>// Multiple values pulled from a NameValuePairs object.</jc><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * <jc>// Same as @Query("*").</jc><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod2"</js>)<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * String myProxyMethod2(<ja>@Query</ja> NameValuePairs nameValuePairs);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <jc>// Multiple values pulled from a Map.</jc><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <jc>// Same as @Query("*").</jc><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod3"</js>)<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * String myProxyMethod3(<ja>@Query</ja> Map&lt;String,Object&gt; map);<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <jc>// Multiple values pulled from a bean.</jc><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <jc>// Same as @Query("*").</jc><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod4"</js>)<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * String myProxyMethod4(<ja>@Query</ja> MyBean myBean);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> *<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * <jc>// An entire query string as a String.</jc><a name="line.51"></a>
+<span class="sourceLineNo">052</span> * <jc>// Same as @FQuery("*").</jc><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod5"</js>)<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * String myProxyMethod5(<ja>@Query</ja> String string);<a name="line.54"></a>
+<span class="sourceLineNo">055</span> *<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <jc>// An entire query string as a Reader.</jc><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <jc>// Same as @Query("*").</jc><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod6"</js>)<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * String myProxyMethod6(<ja>@Query</ja> Reader reader);<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * }<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * </p><a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <p><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * The annotation can also be applied to a bean property field or getter when the argument is annotated with<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * {@link RequestBean @RequestBean}:<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <p><a name="line.65"></a>
+<span class="sourceLineNo">066</span> * <h5 class='section'>Example:</h5><a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <p class='bcode'><a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * <jk>public interface</jk> MyProxy {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> *<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> *<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <jk>public interface</jk> MyRequestBean {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> *<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <jc>// Name explicitly specified.</jc><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <ja>@Query</ja>(<js>"foo"</js>)<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * String getX();<a name="line.79"></a>
+<span class="sourceLineNo">080</span> *<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <jc>// Name inherited from bean property.</jc><a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <jc>// Same as @Query("bar")</jc><a name="line.82"></a>
+<span class="sourceLineNo">083</span> * <ja>@Query</ja><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * String getBar();<a name="line.84"></a>
+<span class="sourceLineNo">085</span> *<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <jc>// Name inherited from bean property.</jc><a name="line.86"></a>
+<span class="sourceLineNo">087</span> * <jc>// Same as @Query("baz")</jc><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <ja>@Query</ja><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <ja>@BeanProperty</ja>(<js>"baz"</js>)<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * String getY();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <jc>// Multiple values pulled from NameValuePairs object.</jc><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <jc>// Same as @Query("*")</jc><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <ja>@Query</ja><a name="line.94"></a>
+<span class="sourceLineNo">095</span> * NameValuePairs getNameValuePairs();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> *<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * <jc>// Multiple values pulled from Map.</jc><a name="line.97"></a>
+<span class="sourceLineNo">098</span> * <jc>// Same as @Query("*")</jc><a name="line.98"></a>
+<span class="sourceLineNo">099</span> * <ja>@Query</ja><a name="line.99"></a>
+<span class="sourceLineNo">100</span> * Map&lt;String,Object&gt; getMap();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> *<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * <jc>// Multiple values pulled from bean.</jc><a name="line.102"></a>
+<span class="sourceLineNo">103</span> * <jc>// Same as @Query("*")</jc><a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <ja>@Query</ja><a name="line.104"></a>
+<span class="sourceLineNo">105</span> * MyBean getMyBean();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> *<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * <jc>// An entire query string as a Reader.</jc><a name="line.107"></a>
+<span class="sourceLineNo">108</span> * <jc>// Same as @Query("*")</jc><a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <ja>@Query</ja><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * Reader getReader();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * }<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * </p><a name="line.112"></a>
+<span class="sourceLineNo">113</span> * <p><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * The {@link #name()} and {@link #value()} elements are synonyms for specifying the parameter name. Only one should be used.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <br>The following annotations are fully equivalent:<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <p><a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <p class='bcode'><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * <ja>@Query</ja>(name=<js>"foo"</js>)<a name="line.118"></a>
+<span class="sourceLineNo">119</span> *<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * <ja>@Query</ja>(<js>"foo"</js>)<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * </p><a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span>@Documented<a name="line.123"></a>
+<span class="sourceLineNo">124</span>@Target({PARAMETER,FIELD,METHOD})<a name="line.124"></a>
+<span class="sourceLineNo">125</span>@Retention(RUNTIME)<a name="line.125"></a>
+<span class="sourceLineNo">126</span>@Inherited<a name="line.126"></a>
+<span class="sourceLineNo">127</span>public @interface Query {<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * The query parameter name.<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <p><a name="line.131"></a>
+<span class="sourceLineNo">132</span> * Note that {@link #name()} and {@link #value()} are synonyms.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * <p><a name="line.133"></a>
+<span class="sourceLineNo">134</span> * The value should be either <js>"*"</js> to represent multiple name/value pairs, or a label that defines the<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * query parameter name.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * <p><a name="line.136"></a>
+<span class="sourceLineNo">137</span> * A blank value (the default) has the following behavior:<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <ul class='spaced-list'><a name="line.138"></a>
+<span class="sourceLineNo">139</span> * <li>If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * <h6 class='figure'>Example:</h6><a name="line.141"></a>
+<span class="sourceLineNo">142</span> * <p class='bcode'><a name="line.142"></a>
+<span class="sourceLineNo">143</span> * <jc>// When used on a remote method parameter</jc><a name="line.143"></a>
+<span class="sourceLineNo">144</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * <jk>public interface</jk> MyProxy {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> *<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <jc>// Equivalent to @Query("*")</jc><a name="line.147"></a>
+<span class="sourceLineNo">148</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod"</js>)<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * String myProxyMethod1(<ja>@Query</ja> Map&lt;String,Object&gt; formData);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> *<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * <jc>// When used on a request bean method</jc><a name="line.152"></a>
+<span class="sourceLineNo">153</span> * <jk>public interface</jk> MyRequestBean {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> *<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * <jc>// Equivalent to @Query("*")</jc><a name="line.155"></a>
+<span class="sourceLineNo">156</span> * <ja>@Query</ja><a name="line.156"></a>
+<span class="sourceLineNo">157</span> * Map&lt;String,Object&gt; getFoo();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * }<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * </p><a name="line.159"></a>
+<span class="sourceLineNo">160</span> * <br><a name="line.160"></a>
+<span class="sourceLineNo">161</span> * <li>If used on a request bean method, uses the bean property name.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * <h6 class='figure'>Example:</h6><a name="line.162"></a>
+<span class="sourceLineNo">163</span> * <p class='bcode'><a name="line.163"></a>
+<span class="sourceLineNo">164</span> * <jk>public interface</jk> MyRequestBean {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> *<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * <jc>// Equivalent to @Query("foo")</jc><a name="line.166"></a>
+<span class="sourceLineNo">167</span> * <ja>@Query</ja><a name="line.167"></a>
+<span class="sourceLineNo">168</span> * String getFoo();<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * </p><a name="line.170"></a>
+<span class="sourceLineNo">171</span> * </ul><a name="line.171"></a>
+<span class="sourceLineNo">172</span> * </ul><a name="line.172"></a>
+<span class="sourceLineNo">173</span> */<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String name() default "";<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> /**<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * A synonym for {@link #name()}.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * <p><a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Allows you to use shortened notation if you're only specifying the name.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> String value() default "";<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> * Skips this value if it's an empty string or empty collection/array.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * <p><a name="line.185"></a>
+<span class="sourceLineNo">186</span> * Note that <jk>null</jk> values are already ignored.<a name="line.186"></a>
+<span class="sourceLineNo">187</span> */<a name="line.187"></a>
+<span class="sourceLineNo">188</span> boolean skipIfEmpty() default false;<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span> /**<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <p><a name="line.192"></a>
+<span class="sourceLineNo">193</span> * The default value defaults to the using the part serializer defined on the {@link RequestBean} annotation,<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * then on the client which by default is {@link UrlEncodingSerializer}.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * <p><a name="line.195"></a>
+<span class="sourceLineNo">196</span> * This annotation is provided to allow values to be custom serialized.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> */<a name="line.197"></a>
+<span class="sourceLineNo">198</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.198"></a>
+<span class="sourceLineNo">199</span>}<a name="line.199"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
index e19965a..df29006 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/QueryIfNE.html
@@ -39,27 +39,26 @@
<span class="sourceLineNo">031</span><a name="line.31"></a>
<span class="sourceLineNo">032</span> /**<a name="line.32"></a>
<span class="sourceLineNo">033</span> * The query parameter name.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * A value of <js>"*"</js> indicates the value should be serialized as name/value pairs and is applicable<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * for the following data types:<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <ul><a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <li><code>String</code> - A complete query string.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <li><code>NameValuePairs</code><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <li><code>Map&lt;String,Object&gt;</code><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * <li>A bean<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * </ul><a name="line.42"></a>
-<span class="sourceLineNo">043</span> */<a name="line.43"></a>
-<span class="sourceLineNo">044</span> String value() default "*";<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> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
-<span class="sourceLineNo">049</span> * The default serializer converters values to UON notation.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <p><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * This annotation is provided to allow values to be custom serialized.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> */<a name="line.52"></a>
-<span class="sourceLineNo">053</span> Class<? extends PartSerializer> serializer() default UrlEncodingSerializer.class;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>}<a name="line.54"></a>
+<span class="sourceLineNo">034</span> * @see Query#name()<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span> String name() default "";<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> /**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * A synonym for {@link #name()}.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * @see Query#value()<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span> String value() default "";<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> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * The default value defaults to the using the part serializer defined on the {@link RequestBean} annotation,<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * then on the client which by default is {@link UrlEncodingSerializer}.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * This annotation is provided to allow values to be custom serialized.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> */<a name="line.51"></a>
+<span class="sourceLineNo">052</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>}<a name="line.53"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteMethodArg.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteMethodArg.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteMethodArg.html
index 4b9f520..89fa83a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteMethodArg.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteMethodArg.html
@@ -43,24 +43,25 @@
<span class="sourceLineNo">035</span> /**<a name="line.35"></a>
<span class="sourceLineNo">036</span> * Constructor.<a name="line.36"></a>
<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * @param name The argument name. Can be blank.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * @param index The zero-based index of the argument on the Java method.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * @param skipIfNE The value is skipped if it's null/empty.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * @param serializer The class to use for serializing headers, query paramters, form-data parameters, and<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * path variables.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * If {@link UrlEncodingSerializer}, then the url-encoding serializer defined on the client will be used.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span> protected RemoteMethodArg(String name, int index, boolean skipIfNE, Class<? extends PartSerializer> serializer) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span> this.name = name;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> this.index = index;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> this.skipIfNE = skipIfNE;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> try {<a name="line.49"></a>
-<span class="sourceLineNo">050</span> this.serializer = (serializer == UrlEncodingSerializer.class ? null : serializer.newInstance());<a name="line.50"></a>
-<span class="sourceLineNo">051</span> } catch (Exception e) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> throw new RuntimeException(e);<a name="line.52"></a>
-<span class="sourceLineNo">053</span> }<a name="line.53"></a>
-<span class="sourceLineNo">054</span> }<a name="line.54"></a>
-<span class="sourceLineNo">055</span>}<a name="line.55"></a>
+<span class="sourceLineNo">038</span> * @param name The argument name pulled from name().<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * @param name2 The argument name pulled from value().<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * @param index The zero-based index of the argument on the Java method.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * @param skipIfNE The value is skipped if it's null/empty.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * @param serializer The class to use for serializing headers, query paramters, form-data parameters, and<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * path variables.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * If {@link UrlEncodingSerializer}, then the url-encoding serializer defined on the client will be used.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span> protected RemoteMethodArg(String name, String name2, int index, boolean skipIfNE, Class<? extends PartSerializer> serializer) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span> this.name = name.isEmpty() ? name2 : name;<a name="line.47"></a>
+<span class="sourceLineNo">048</span> this.index = index;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> this.skipIfNE = skipIfNE;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> try {<a name="line.50"></a>
+<span class="sourceLineNo">051</span> this.serializer = (serializer == PartSerializer.class ? null : serializer.newInstance());<a name="line.51"></a>
+<span class="sourceLineNo">052</span> } catch (Exception e) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> throw new RuntimeException(e);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> }<a name="line.54"></a>
+<span class="sourceLineNo">055</span> }<a name="line.55"></a>
+<span class="sourceLineNo">056</span>}<a name="line.56"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
index 883cc38..7b3476a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RemoteableMethodMeta.html
@@ -37,8 +37,8 @@
<span class="sourceLineNo">029</span><a name="line.29"></a>
<span class="sourceLineNo">030</span> private final String httpMethod;<a name="line.30"></a>
<span class="sourceLineNo">031</span> private final String url;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> private final RemoteMethodArg[] pathArgs, queryArgs, headerArgs, formDataArgs;<a name="line.32"></a>
-<span class="sourceLineNo">033</span> private final Integer[] requestBeanArgs, otherArgs;<a name="line.33"></a>
+<span class="sourceLineNo">032</span> private final RemoteMethodArg[] pathArgs, queryArgs, headerArgs, formDataArgs, requestBeanArgs;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> private final Integer[] otherArgs;<a name="line.33"></a>
<span class="sourceLineNo">034</span> private final Integer bodyArg;<a name="line.34"></a>
<span class="sourceLineNo">035</span><a name="line.35"></a>
<span class="sourceLineNo">036</span> /**<a name="line.36"></a>
@@ -55,7 +55,7 @@
<span class="sourceLineNo">047</span> this.queryArgs = b.queryArgs.toArray(new RemoteMethodArg[b.queryArgs.size()]);<a name="line.47"></a>
<span class="sourceLineNo">048</span> this.formDataArgs = b.formDataArgs.toArray(new RemoteMethodArg[b.formDataArgs.size()]);<a name="line.48"></a>
<span class="sourceLineNo">049</span> this.headerArgs = b.headerArgs.toArray(new RemoteMethodArg[b.headerArgs.size()]);<a name="line.49"></a>
-<span class="sourceLineNo">050</span> this.requestBeanArgs = b.requestBeanArgs.toArray(new Integer[b.requestBeanArgs.size()]);<a name="line.50"></a>
+<span class="sourceLineNo">050</span> this.requestBeanArgs = b.requestBeanArgs.toArray(new RemoteMethodArg[b.requestBeanArgs.size()]);<a name="line.50"></a>
<span class="sourceLineNo">051</span> this.otherArgs = b.otherArgs.toArray(new Integer[b.otherArgs.size()]);<a name="line.51"></a>
<span class="sourceLineNo">052</span> this.bodyArg = b.bodyArg;<a name="line.52"></a>
<span class="sourceLineNo">053</span> }<a name="line.53"></a>
@@ -66,9 +66,9 @@
<span class="sourceLineNo">058</span> pathArgs = new LinkedList<RemoteMethodArg>(),<a name="line.58"></a>
<span class="sourceLineNo">059</span> queryArgs = new LinkedList<RemoteMethodArg>(),<a name="line.59"></a>
<span class="sourceLineNo">060</span> headerArgs = new LinkedList<RemoteMethodArg>(),<a name="line.60"></a>
-<span class="sourceLineNo">061</span> formDataArgs = new LinkedList<RemoteMethodArg>();<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private List<Integer><a name="line.62"></a>
-<span class="sourceLineNo">063</span> requestBeanArgs = new LinkedList<Integer>(),<a name="line.63"></a>
+<span class="sourceLineNo">061</span> formDataArgs = new LinkedList<RemoteMethodArg>(),<a name="line.61"></a>
+<span class="sourceLineNo">062</span> requestBeanArgs = new LinkedList<RemoteMethodArg>();<a name="line.62"></a>
+<span class="sourceLineNo">063</span> private List<Integer><a name="line.63"></a>
<span class="sourceLineNo">064</span> otherArgs = new LinkedList<Integer>();<a name="line.64"></a>
<span class="sourceLineNo">065</span> private Integer bodyArg;<a name="line.65"></a>
<span class="sourceLineNo">066</span><a name="line.66"></a>
@@ -98,28 +98,28 @@
<span class="sourceLineNo">090</span> Class<?> ca = a.annotationType();<a name="line.90"></a>
<span class="sourceLineNo">091</span> if (ca == Path.class) {<a name="line.91"></a>
<span class="sourceLineNo">092</span> Path p = (Path)a;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> annotated = pathArgs.add(new RemoteMethodArg(p.value(), index, false, p.serializer()));<a name="line.93"></a>
+<span class="sourceLineNo">093</span> annotated = pathArgs.add(new RemoteMethodArg(p.name(), p.value(), index, false, p.serializer()));<a name="line.93"></a>
<span class="sourceLineNo">094</span> } else if (ca == Query.class) {<a name="line.94"></a>
<span class="sourceLineNo">095</span> Query q = (Query)a;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> annotated = queryArgs.add(new RemoteMethodArg(q.value(), index, false, q.serializer()));<a name="line.96"></a>
+<span class="sourceLineNo">096</span> annotated = queryArgs.add(new RemoteMethodArg(q.name(), q.value(), index, q.skipIfEmpty(), q.serializer()));<a name="line.96"></a>
<span class="sourceLineNo">097</span> } else if (ca == QueryIfNE.class) {<a name="line.97"></a>
<span class="sourceLineNo">098</span> QueryIfNE q = (QueryIfNE)a;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> annotated = queryArgs.add(new RemoteMethodArg(q.value(), index, true, q.serializer()));<a name="line.99"></a>
+<span class="sourceLineNo">099</span> annotated = queryArgs.add(new RemoteMethodArg(q.name(), q.value(), index, true, q.serializer()));<a name="line.99"></a>
<span class="sourceLineNo">100</span> } else if (ca == FormData.class) {<a name="line.100"></a>
<span class="sourceLineNo">101</span> FormData f = (FormData)a;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> annotated = formDataArgs.add(new RemoteMethodArg(f.value(), index, false, f.serializer()));<a name="line.102"></a>
+<span class="sourceLineNo">102</span> annotated = formDataArgs.add(new RemoteMethodArg(f.name(), f.value(), index, f.skipIfEmpty(), f.serializer()));<a name="line.102"></a>
<span class="sourceLineNo">103</span> } else if (ca == FormDataIfNE.class) {<a name="line.103"></a>
<span class="sourceLineNo">104</span> FormDataIfNE f = (FormDataIfNE)a;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> annotated = formDataArgs.add(new RemoteMethodArg(f.value(), index, true, f.serializer()));<a name="line.105"></a>
+<span class="sourceLineNo">105</span> annotated = formDataArgs.add(new RemoteMethodArg(f.name(), f.value(), index, true, f.serializer()));<a name="line.105"></a>
<span class="sourceLineNo">106</span> } else if (ca == Header.class) {<a name="line.106"></a>
<span class="sourceLineNo">107</span> Header h = (Header)a;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> annotated = headerArgs.add(new RemoteMethodArg(h.value(), index, false, h.serializer()));<a name="line.108"></a>
+<span class="sourceLineNo">108</span> annotated = headerArgs.add(new RemoteMethodArg(h.name(), h.value(), index, h.skipIfEmpty(), h.serializer()));<a name="line.108"></a>
<span class="sourceLineNo">109</span> } else if (ca == HeaderIfNE.class) {<a name="line.109"></a>
<span class="sourceLineNo">110</span> HeaderIfNE h = (HeaderIfNE)a;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> annotated = headerArgs.add(new RemoteMethodArg(h.value(), index, true, h.serializer()));<a name="line.111"></a>
+<span class="sourceLineNo">111</span> annotated = headerArgs.add(new RemoteMethodArg(h.name(), h.value(), index, true, h.serializer()));<a name="line.111"></a>
<span class="sourceLineNo">112</span> } else if (ca == RequestBean.class) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> annotated = true;<a name="line.113"></a>
-<span class="sourceLineNo">114</span> requestBeanArgs.add(index);<a name="line.114"></a>
+<span class="sourceLineNo">113</span> RequestBean rb = (RequestBean)a;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> annotated = requestBeanArgs.add(new RemoteMethodArg("", "", index, false, rb.serializer()));<a name="line.114"></a>
<span class="sourceLineNo">115</span> } else if (ca == Body.class) {<a name="line.115"></a>
<span class="sourceLineNo">116</span> annotated = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> if (bodyArg == null)<a name="line.117"></a>
@@ -190,7 +190,7 @@
<span class="sourceLineNo">182</span> * Returns the {@link RequestBean @RequestBean} annotated arguments on this Java method.<a name="line.182"></a>
<span class="sourceLineNo">183</span> * @return A list of zero-indexed argument indices.<a name="line.183"></a>
<span class="sourceLineNo">184</span> */<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public Integer[] getRequestBeanArgs() {<a name="line.185"></a>
+<span class="sourceLineNo">185</span> public RemoteMethodArg[] getRequestBeanArgs() {<a name="line.185"></a>
<span class="sourceLineNo">186</span> return requestBeanArgs;<a name="line.186"></a>
<span class="sourceLineNo">187</span> }<a name="line.187"></a>
<span class="sourceLineNo">188</span><a name="line.188"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/remoteable/RequestBean.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RequestBean.html b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RequestBean.html
index 99b1bcf..07ac8e8 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/remoteable/RequestBean.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/remoteable/RequestBean.html
@@ -25,72 +25,86 @@
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.lang.annotation.*;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>/**<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * Annotation applied to Java method arguments of interface proxies to denote a bean with remoteable annotations.<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * <p><a name="line.22"></a>
-<span class="sourceLineNo">023</span> * <h5 class='section'>Example:</h5><a name="line.23"></a>
-<span class="sourceLineNo">024</span> * <p class='bcode'><a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <jk>public interface</jk> MyProxy {<a name="line.26"></a>
-<span class="sourceLineNo">027</span> *<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod/{p1}/{p2}"</js>)<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * }<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <jk>public interface</jk> MyRequestBean {<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <ja>@Path</ja><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * String getP1();<a name="line.35"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.serializer.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.urlencoding.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Annotation applied to Java method arguments of interface proxies to denote a bean with remoteable annotations.<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * <h5 class='section'>Example:</h5><a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <p class='bcode'><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <jk>public interface</jk> MyProxy {<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <ja>@RemoteMethod</ja>(path=<js>"/mymethod/{p1}/{p2}"</js>)<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * String myProxyMethod(<ja>@RequestBean</ja> MyRequestBean bean);<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * }<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <jk>public interface</jk> MyRequestBean {<a name="line.35"></a>
<span class="sourceLineNo">036</span> *<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <ja>@Path</ja>(<js>"p2"</js>)<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * String getX();<a name="line.38"></a>
+<span class="sourceLineNo">037</span> * <ja>@Path</ja><a name="line.37"></a>
+<span class="sourceLineNo">038</span> * String getP1();<a name="line.38"></a>
<span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <ja>@Query</ja><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * String getQ1();<a name="line.41"></a>
+<span class="sourceLineNo">040</span> * <ja>@Path</ja>(<js>"p2"</js>)<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * String getX();<a name="line.41"></a>
<span class="sourceLineNo">042</span> *<a name="line.42"></a>
<span class="sourceLineNo">043</span> * <ja>@Query</ja><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <ja>@BeanProperty</ja>(name=<js>"q2"</js>)<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * String getQuery2();<a name="line.45"></a>
-<span class="sourceLineNo">046</span> *<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <ja>@QueryIfNE</ja>(<js>"q3"</js>)<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * String getQuery3();<a name="line.48"></a>
+<span class="sourceLineNo">044</span> * String getQ1();<a name="line.44"></a>
+<span class="sourceLineNo">045</span> *<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <ja>@Query</ja><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <ja>@BeanProperty</ja>(name=<js>"q2"</js>)<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * String getQuery2();<a name="line.48"></a>
<span class="sourceLineNo">049</span> *<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <ja>@QueryIfNE</ja><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * Map&lt;String,Object&gt; getExtraQueries();<a name="line.51"></a>
+<span class="sourceLineNo">050</span> * <ja>@QueryIfNE</ja>(<js>"q3"</js>)<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * String getQuery3();<a name="line.51"></a>
<span class="sourceLineNo">052</span> *<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * <ja>@FormData</ja><a name="line.53"></a>
-<span class="sourceLineNo">054</span> * String getF1();<a name="line.54"></a>
+<span class="sourceLineNo">053</span> * <ja>@QueryIfNE</ja><a name="line.53"></a>
+<span class="sourceLineNo">054</span> * Map&lt;String,Object&gt; getExtraQueries();<a name="line.54"></a>
<span class="sourceLineNo">055</span> *<a name="line.55"></a>
<span class="sourceLineNo">056</span> * <ja>@FormData</ja><a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <ja>@BeanProperty</ja>(name=<js>"f2"</js>)<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * String getFormData2();<a name="line.58"></a>
-<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * <ja>@FormDataIfNE</ja>(<js>"f3"</js>)<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * String getFormData3();<a name="line.61"></a>
+<span class="sourceLineNo">057</span> * String getF1();<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <ja>@FormData</ja><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <ja>@BeanProperty</ja>(name=<js>"f2"</js>)<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * String getFormData2();<a name="line.61"></a>
<span class="sourceLineNo">062</span> *<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <ja>@FormDataIfNE</ja><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * Map&lt;String,Object&gt; getExtraFormData();<a name="line.64"></a>
+<span class="sourceLineNo">063</span> * <ja>@FormDataIfNE</ja>(<js>"f3"</js>)<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * String getFormData3();<a name="line.64"></a>
<span class="sourceLineNo">065</span> *<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <ja>@Header</ja><a name="line.66"></a>
-<span class="sourceLineNo">067</span> * String getH1();<a name="line.67"></a>
+<span class="sourceLineNo">066</span> * <ja>@FormDataIfNE</ja><a name="line.66"></a>
+<span class="sourceLineNo">067</span> * Map&lt;String,Object&gt; getExtraFormData();<a name="line.67"></a>
<span class="sourceLineNo">068</span> *<a name="line.68"></a>
<span class="sourceLineNo">069</span> * <ja>@Header</ja><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <ja>@BeanProperty</ja>(name=<js>"H2"</js>)<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * String getHeader2();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> *<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * <ja>@HeaderIfNE</ja>(<js>"H3"</js>)<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * String getHeader3();<a name="line.74"></a>
+<span class="sourceLineNo">070</span> * String getH1();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> *<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <ja>@Header</ja><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * <ja>@BeanProperty</ja>(name=<js>"H2"</js>)<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * String getHeader2();<a name="line.74"></a>
<span class="sourceLineNo">075</span> *<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <ja>@HeaderIfNE</ja><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * Map&lt;String,Object&gt; getExtraHeaders();<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * }<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * </p><a name="line.79"></a>
-<span class="sourceLineNo">080</span> */<a name="line.80"></a>
-<span class="sourceLineNo">081</span>@Documented<a name="line.81"></a>
-<span class="sourceLineNo">082</span>@Target(PARAMETER)<a name="line.82"></a>
-<span class="sourceLineNo">083</span>@Retention(RUNTIME)<a name="line.83"></a>
-<span class="sourceLineNo">084</span>@Inherited<a name="line.84"></a>
-<span class="sourceLineNo">085</span>public @interface RequestBean {}<a name="line.85"></a>
+<span class="sourceLineNo">076</span> * <ja>@HeaderIfNE</ja>(<js>"H3"</js>)<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * String getHeader3();<a name="line.77"></a>
+<span class="sourceLineNo">078</span> *<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <ja>@HeaderIfNE</ja><a name="line.79"></a>
+<span class="sourceLineNo">080</span> * Map&lt;String,Object&gt; getExtraHeaders();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * }<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * </p><a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span>@Documented<a name="line.84"></a>
+<span class="sourceLineNo">085</span>@Target(PARAMETER)<a name="line.85"></a>
+<span class="sourceLineNo">086</span>@Retention(RUNTIME)<a name="line.86"></a>
+<span class="sourceLineNo">087</span>@Inherited<a name="line.87"></a>
+<span class="sourceLineNo">088</span>public @interface RequestBean {<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> /**<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * Specifies the {@link PartSerializer} class used for serializing values to strings.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <p><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * The default value defaults to the using the part serializer defined on the client which by default is<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * {@link UrlEncodingSerializer}.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * <p><a name="line.95"></a>
+<span class="sourceLineNo">096</span> * This annotation is provided to allow values to be custom serialized.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> */<a name="line.97"></a>
+<span class="sourceLineNo">098</span> Class<? extends PartSerializer> serializer() default PartSerializer.class;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>}<a name="line.99"></a>
[02/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
index 95ff724..409861a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingSerializer.Readable.html
@@ -145,316 +145,335 @@
<span class="sourceLineNo">137</span> /** Reusable instance of {@link UrlEncodingSerializer}, all default settings. */<a name="line.137"></a>
<span class="sourceLineNo">138</span> public static final UrlEncodingSerializer DEFAULT = new UrlEncodingSerializer(PropertyStore.create());<a name="line.138"></a>
<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> /** Reusable instance of {@link UrlEncodingSerializer.Expanded}. */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public static final UrlEncodingSerializer DEFAULT_EXPANDED = new Expanded(PropertyStore.create());<a name="line.141"></a>
+<span class="sourceLineNo">140</span> /** Reusable instance of {@link UrlEncodingSerializer.PlainText}. */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public static final UrlEncodingSerializer DEFAULT_PLAINTEXT = new PlainText(PropertyStore.create());<a name="line.141"></a>
<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> /** Reusable instance of {@link UrlEncodingSerializer.Readable}. */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final UrlEncodingSerializer DEFAULT_READABLE = new Readable(PropertyStore.create());<a name="line.144"></a>
+<span class="sourceLineNo">143</span> /** Reusable instance of {@link UrlEncodingSerializer.Expanded}. */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> public static final UrlEncodingSerializer DEFAULT_EXPANDED = new Expanded(PropertyStore.create());<a name="line.144"></a>
<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> */<a name="line.148"></a>
-<span class="sourceLineNo">149</span> @Produces(value="application/x-www-form-urlencoded",contentType="application/x-www-form-urlencoded")<a name="line.149"></a>
-<span class="sourceLineNo">150</span> public static class Expanded extends UrlEncodingSerializer {<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * Constructor.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> */<a name="line.155"></a>
-<span class="sourceLineNo">156</span> public Expanded(PropertyStore propertyStore) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> super(propertyStore);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Override /* CoreObject */<a name="line.160"></a>
-<span class="sourceLineNo">161</span> protected ObjectMap getOverrideProperties() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return super.getOverrideProperties().append(UrlEncodingContext.URLENC_expandedParams, true);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> /**<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public static class Readable extends UrlEncodingSerializer {<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> * Constructor.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> */<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public Readable(PropertyStore propertyStore) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> super(propertyStore);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> @Override /* CoreObject */<a name="line.179"></a>
-<span class="sourceLineNo">180</span> protected ObjectMap getOverrideProperties() {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> return super.getOverrideProperties().append(SERIALIZER_useWhitespace, true);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> private final UrlEncodingSerializerContext ctx;<a name="line.186"></a>
+<span class="sourceLineNo">146</span> /** Reusable instance of {@link UrlEncodingSerializer.Readable}. */<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final UrlEncodingSerializer DEFAULT_READABLE = new Readable(PropertyStore.create());<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> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().expandedParams(<jk>true</jk>).build();</code>.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span> @Produces(value="application/x-www-form-urlencoded",contentType="application/x-www-form-urlencoded")<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public static class Expanded extends UrlEncodingSerializer {<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * Constructor.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public Expanded(PropertyStore propertyStore) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> super(propertyStore);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> @Override /* CoreObject */<a name="line.163"></a>
+<span class="sourceLineNo">164</span> protected ObjectMap getOverrideProperties() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> return super.getOverrideProperties().append(UrlEncodingContext.URLENC_expandedParams, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().useWhitespace(<jk>true</jk>).build();</code>.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> */<a name="line.171"></a>
+<span class="sourceLineNo">172</span> public static class Readable extends UrlEncodingSerializer {<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Constructor.<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public Readable(PropertyStore propertyStore) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> super(propertyStore);<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> @Override /* CoreObject */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> protected ObjectMap getOverrideProperties() {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return super.getOverrideProperties().append(SERIALIZER_useWhitespace, true);<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> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Constructor.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.190"></a>
-<span class="sourceLineNo">191</span> */<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public UrlEncodingSerializer(PropertyStore propertyStore) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> super(propertyStore);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> this.ctx = createContext(UrlEncodingSerializerContext.class);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> @Override /* CoreObject */<a name="line.197"></a>
-<span class="sourceLineNo">198</span> public UrlEncodingSerializerBuilder builder() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> return new UrlEncodingSerializerBuilder(propertyStore);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> @Override /* CoreObject */<a name="line.202"></a>
-<span class="sourceLineNo">203</span> protected ObjectMap getOverrideProperties() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return super.getOverrideProperties().append(UON_encodeChars, true);<a name="line.204"></a>
+<span class="sourceLineNo">189</span> * Equivalent to <code><jk>new</jk> UrlEncodingSerializerBuilder().plainTextParts().build();</code>.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> */<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public static class PlainText extends UrlEncodingSerializer {<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> * Constructor.<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> */<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public PlainText(PropertyStore propertyStore) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> super(propertyStore);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> @Override /* CoreObject */<a name="line.201"></a>
+<span class="sourceLineNo">202</span> protected ObjectMap getOverrideProperties() {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return super.getOverrideProperties().append(UonSerializerContext.UON_paramFormat, "PLAINTEXT");<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> * Workhorse method. Determines the type of object, and then calls the<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * appropriate type-specific serialization method.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> */<a name="line.210"></a>
-<span class="sourceLineNo">211</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private SerializerWriter serializeAnything(UrlEncodingSerializerSession session, UonWriter out, Object o) throws Exception {<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> ClassMeta<?> aType; // The actual type<a name="line.214"></a>
-<span class="sourceLineNo">215</span> ClassMeta<?> sType; // The serialized type<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> aType = session.push("root", o, object());<a name="line.217"></a>
-<span class="sourceLineNo">218</span> session.indent--;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (aType == null)<a name="line.219"></a>
-<span class="sourceLineNo">220</span> aType = object();<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> sType = aType.getSerializedClassMeta();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> String typeName = session.getBeanTypeName(session.object(), aType, null);<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> // Swap if necessary<a name="line.225"></a>
-<span class="sourceLineNo">226</span> PojoSwap swap = aType.getPojoSwap();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (swap != null) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> o = swap.swap(session, o);<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.230"></a>
-<span class="sourceLineNo">231</span> // the actual type now.<a name="line.231"></a>
-<span class="sourceLineNo">232</span> if (sType.isObject())<a name="line.232"></a>
-<span class="sourceLineNo">233</span> sType = session.getClassMetaForObject(o);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (sType.isMap()) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (o instanceof BeanMap)<a name="line.237"></a>
-<span class="sourceLineNo">238</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> else<a name="line.239"></a>
-<span class="sourceLineNo">240</span> serializeMap(session, out, (Map)o, sType);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> } else if (sType.isBean()) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.247"></a>
-<span class="sourceLineNo">248</span> // mock key/value pair with a "_value" key.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> out.append("_value=");<a name="line.249"></a>
-<span class="sourceLineNo">250</span> super.serializeAnything(session, out, o, null, null, null, session.plainTextParams());<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> session.pop();<a name="line.253"></a>
-<span class="sourceLineNo">254</span> return out;<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">207</span> private final UrlEncodingSerializerContext ctx;<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> /**<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * Constructor.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public UrlEncodingSerializer(PropertyStore propertyStore) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> super(propertyStore);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> this.ctx = createContext(UrlEncodingSerializerContext.class);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override /* CoreObject */<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public UrlEncodingSerializerBuilder builder() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> return new UrlEncodingSerializerBuilder(propertyStore);<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> @Override /* CoreObject */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> protected ObjectMap getOverrideProperties() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return super.getOverrideProperties().append(UON_encodeChars, true);<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> * Workhorse method. Determines the type of object, and then calls the<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * appropriate type-specific serialization method.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> */<a name="line.231"></a>
+<span class="sourceLineNo">232</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.232"></a>
+<span class="sourceLineNo">233</span> private SerializerWriter serializeAnything(UrlEncodingSerializerSession session, UonWriter out, Object o) throws Exception {<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> ClassMeta<?> aType; // The actual type<a name="line.235"></a>
+<span class="sourceLineNo">236</span> ClassMeta<?> sType; // The serialized type<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> aType = session.push("root", o, object());<a name="line.238"></a>
+<span class="sourceLineNo">239</span> session.indent--;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (aType == null)<a name="line.240"></a>
+<span class="sourceLineNo">241</span> aType = object();<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> sType = aType.getSerializedClassMeta();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> String typeName = session.getBeanTypeName(session.object(), aType, null);<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> // Swap if necessary<a name="line.246"></a>
+<span class="sourceLineNo">247</span> PojoSwap swap = aType.getPojoSwap();<a name="line.247"></a>
+<span class="sourceLineNo">248</span> if (swap != null) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> o = swap.swap(session, o);<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> // If the getSwapClass() method returns Object, we need to figure out<a name="line.251"></a>
+<span class="sourceLineNo">252</span> // the actual type now.<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (sType.isObject())<a name="line.253"></a>
+<span class="sourceLineNo">254</span> sType = session.getClassMetaForObject(o);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * Converts a Collection into an integer-indexed map.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> */<a name="line.259"></a>
-<span class="sourceLineNo">260</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> int i = 0;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> for (Object o : c)<a name="line.263"></a>
-<span class="sourceLineNo">264</span> m.put(i++, o);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return m;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> /**<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * Converts an array into an integer-indexed map.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.273"></a>
-<span class="sourceLineNo">274</span> m.put(i, Array.get(array, i));<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return m;<a name="line.275"></a>
+<span class="sourceLineNo">257</span> if (sType.isMap()) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (o instanceof BeanMap)<a name="line.258"></a>
+<span class="sourceLineNo">259</span> serializeBeanMap(session, out, (BeanMap)o, typeName);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> else<a name="line.260"></a>
+<span class="sourceLineNo">261</span> serializeMap(session, out, (Map)o, sType);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } else if (sType.isBean()) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.266"></a>
+<span class="sourceLineNo">267</span> } else {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.268"></a>
+<span class="sourceLineNo">269</span> // mock key/value pair with a "_value" key.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> out.append("_value=");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> super.serializeAnything(session, out, o, null, null, null);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> session.pop();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return out;<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> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.278"></a>
-<span class="sourceLineNo">279</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> boolean plainTextParams = session.plainTextParams();<a name="line.281"></a>
-<span class="sourceLineNo">282</span> m = session.sort(m);<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> int depth = session.getIndent();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> boolean addAmp = false;<a name="line.287"></a>
+<span class="sourceLineNo">278</span> /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * Converts a Collection into an integer-indexed map.<a name="line.279"></a>
+<span class="sourceLineNo">280</span> */<a name="line.280"></a>
+<span class="sourceLineNo">281</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> int i = 0;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> for (Object o : c)<a name="line.284"></a>
+<span class="sourceLineNo">285</span> m.put(i++, o);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return m;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> Object value = e.getValue();<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> if (session.shouldUseExpandedParams(value)) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> while (i.hasNext()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> if (addAmp)<a name="line.296"></a>
-<span class="sourceLineNo">297</span> out.cr(depth).append('&');<a name="line.297"></a>
-<span class="sourceLineNo">298</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.298"></a>
-<span class="sourceLineNo">299</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null, plainTextParams);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> addAmp = true;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> if (addAmp)<a name="line.303"></a>
-<span class="sourceLineNo">304</span> out.cr(depth).append('&');<a name="line.304"></a>
-<span class="sourceLineNo">305</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.305"></a>
-<span class="sourceLineNo">306</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null, plainTextParams);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> addAmp = true;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> return out;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.314"></a>
-<span class="sourceLineNo">315</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> ClassMeta<?> valueType = type.getValueType();<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> int depth = session.getIndent();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> boolean addAmp = false;<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> if (addAmp)<a name="line.323"></a>
-<span class="sourceLineNo">324</span> out.cr(depth).append('&');<a name="line.324"></a>
-<span class="sourceLineNo">325</span> out.append(e.getKey()).append('=');<a name="line.325"></a>
-<span class="sourceLineNo">326</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null, session.plainTextParams());<a name="line.326"></a>
-<span class="sourceLineNo">327</span> addAmp = true;<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> return out;<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> @SuppressWarnings({ "rawtypes" })<a name="line.333"></a>
-<span class="sourceLineNo">334</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> int depth = session.getIndent();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> boolean plainTextParams = session.plainTextParams();<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> boolean addAmp = false;<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> String key = p.getName();<a name="line.344"></a>
-<span class="sourceLineNo">345</span> Object value = p.getValue();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> Throwable t = p.getThrown();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (t != null)<a name="line.347"></a>
-<span class="sourceLineNo">348</span> session.addBeanGetterWarning(pMeta, t);<a name="line.348"></a>
+<span class="sourceLineNo">289</span> /**<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * Converts an array into an integer-indexed map.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.294"></a>
+<span class="sourceLineNo">295</span> m.put(i, Array.get(array, i));<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return m;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.299"></a>
+<span class="sourceLineNo">300</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> m = session.sort(m);<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> int depth = session.getIndent();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> boolean addAmp = false;<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> Object value = e.getValue();<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span> if (session.shouldUseExpandedParams(value)) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> while (i.hasNext()) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (addAmp)<a name="line.316"></a>
+<span class="sourceLineNo">317</span> out.cr(depth).append('&');<a name="line.317"></a>
+<span class="sourceLineNo">318</span> out.appendObject(key, true).append('=');<a name="line.318"></a>
+<span class="sourceLineNo">319</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> addAmp = true;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> } else {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (addAmp)<a name="line.323"></a>
+<span class="sourceLineNo">324</span> out.cr(depth).append('&');<a name="line.324"></a>
+<span class="sourceLineNo">325</span> out.appendObject(key, true).append('=');<a name="line.325"></a>
+<span class="sourceLineNo">326</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> addAmp = true;<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><a name="line.330"></a>
+<span class="sourceLineNo">331</span> return out;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.334"></a>
+<span class="sourceLineNo">335</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> ClassMeta<?> valueType = type.getValueType();<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> int depth = session.getIndent();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> boolean addAmp = false;<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (addAmp)<a name="line.343"></a>
+<span class="sourceLineNo">344</span> out.cr(depth).append('&');<a name="line.344"></a>
+<span class="sourceLineNo">345</span> out.append(e.getKey()).append('=');<a name="line.345"></a>
+<span class="sourceLineNo">346</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> addAmp = true;<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> if (session.canIgnoreValue(cMeta, key, value))<a name="line.350"></a>
-<span class="sourceLineNo">351</span> continue;<a name="line.351"></a>
+<span class="sourceLineNo">350</span> return out;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.354"></a>
-<span class="sourceLineNo">355</span> // so we need to check type if we think it's an array.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> while (i.hasNext()) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (addAmp)<a name="line.358"></a>
-<span class="sourceLineNo">359</span> out.cr(depth).append('&');<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.361"></a>
+<span class="sourceLineNo">353</span> @SuppressWarnings({ "rawtypes" })<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> int depth = session.getIndent();<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> boolean addAmp = false;<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.361"></a>
<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta, plainTextParams);<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> addAmp = true;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } else {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (addAmp)<a name="line.368"></a>
-<span class="sourceLineNo">369</span> out.cr(depth).append('&');<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> out.appendObject(key, true, plainTextParams).append('=');<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> super.serializeAnything(session, out, value, cMeta, key, pMeta, plainTextParams);<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> addAmp = true;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> }<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return out;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">363</span> String key = p.getName();<a name="line.363"></a>
+<span class="sourceLineNo">364</span> Object value = p.getValue();<a name="line.364"></a>
+<span class="sourceLineNo">365</span> Throwable t = p.getThrown();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> if (t != null)<a name="line.366"></a>
+<span class="sourceLineNo">367</span> session.addBeanGetterWarning(pMeta, t);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.369"></a>
+<span class="sourceLineNo">370</span> continue;<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.373"></a>
+<span class="sourceLineNo">374</span> // so we need to check type if we think it's an array.<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> while (i.hasNext()) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (addAmp)<a name="line.377"></a>
+<span class="sourceLineNo">378</span> out.cr(depth).append('&');<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> out.appendObject(key, true).append('=');<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> //--------------------------------------------------------------------------------<a name="line.383"></a>
-<span class="sourceLineNo">384</span> // Methods for constructing individual parameter values.<a name="line.384"></a>
-<span class="sourceLineNo">385</span> //--------------------------------------------------------------------------------<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * Useful for constructing URL parts.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> *<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * @param o The object to serialize.<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * @param urlEncode URL-encode the string if necessary.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * If <jk>null</jk>, then uses the value of the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @param plainTextParams Whether we're using plain-text params.<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * If <jk>null</jk>, then uses the value from the {@link UrlEncodingSerializerContext#URLENC_paramFormat} setting.<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * @return The serialized object.<a name="line.397"></a>
-<span class="sourceLineNo">398</span> */<a name="line.398"></a>
-<span class="sourceLineNo">399</span> private String serializePart(Object o, Boolean urlEncode, Boolean plainTextParams) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> // Shortcut for simple types.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (cm != null) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (cm.isNumber() || cm.isBoolean())<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return o.toString();<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (cm.isCharSequence()) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> String s = o.toString();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> boolean ptt = (plainTextParams != null ? plainTextParams : ctx.plainTextParams);<a name="line.408"></a>
-<span class="sourceLineNo">409</span> if (ptt || ! UonUtils.needsQuotes(s))<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return (urlEncode ? StringUtils.urlEncode(s) : s);<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> StringWriter w = new StringWriter();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super.doSerialize(s, o);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return w.toString();<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 RuntimeException(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> //--------------------------------------------------------------------------------<a name="line.424"></a>
-<span class="sourceLineNo">425</span> // Entry point methods<a name="line.425"></a>
-<span class="sourceLineNo">426</span> //--------------------------------------------------------------------------------<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> @Override /* Serializer */<a name="line.428"></a>
-<span class="sourceLineNo">429</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
+<span class="sourceLineNo">382</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> addAmp = true;<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span> } else {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (addAmp)<a name="line.387"></a>
+<span class="sourceLineNo">388</span> out.cr(depth).append('&');<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> out.appendObject(key, true).append('=');<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> addAmp = true;<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> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return out;<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> //--------------------------------------------------------------------------------<a name="line.402"></a>
+<span class="sourceLineNo">403</span> // Methods for constructing individual parameter values.<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> /**<a name="line.406"></a>
+<span class="sourceLineNo">407</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Useful for constructing URL parts.<a name="line.409"></a>
+<span class="sourceLineNo">410</span> *<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * @param o The object to serialize.<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * @param urlEncode URL-encode the string if necessary.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * If <jk>null</jk>, then uses the value of the {@link UonSerializerContext#UON_encodeChars} setting.<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * @param plainTextParams Whether we're using plain-text params.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * If <jk>null</jk>, then uses the value from the {@link UrlEncodingSerializerContext#URLENC_paramFormat} setting.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * @return The serialized object.<a name="line.416"></a>
+<span class="sourceLineNo">417</span> */<a name="line.417"></a>
+<span class="sourceLineNo">418</span> private String serializePart(Object o, Boolean urlEncode, Boolean plainTextParams) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> try {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> // Shortcut for simple types.<a name="line.420"></a>
+<span class="sourceLineNo">421</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (cm != null) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (cm.isNumber() || cm.isBoolean())<a name="line.423"></a>
+<span class="sourceLineNo">424</span> return o.toString();<a name="line.424"></a>
+<span class="sourceLineNo">425</span> if (cm.isCharSequence()) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> String s = o.toString();<a name="line.426"></a>
+<span class="sourceLineNo">427</span> boolean ptt = (plainTextParams != null ? plainTextParams : ctx.plainTextParams());<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (ptt || s.isEmpty() || ! UonUtils.needsQuotes(s))<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return (urlEncode ? StringUtils.urlEncode(s) : s);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span> }<a name="line.431"></a>
<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override /* Serializer */<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> serializeAnything(s, s.getWriter(), o);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> @Override /* PartSerializer */<a name="line.439"></a>
-<span class="sourceLineNo">440</span> public String serialize(PartType type, Object value) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> switch(type) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span> case HEADER: return serializePart(value, false, true);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> case FORM_DATA: return serializePart(value, false, null);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> case PATH: return serializePart(value, false, null);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> case QUERY: return serializePart(value, false, null);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> default: return StringUtils.toString(value);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>}<a name="line.449"></a>
+<span class="sourceLineNo">433</span> StringWriter w = new StringWriter();<a name="line.433"></a>
+<span class="sourceLineNo">434</span> UonSerializerSession s = new UrlEncodingSerializerSession(ctx, urlEncode, null, w, null, null, null, MediaType.UON, null);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> super.doSerialize(s, o);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> return w.toString();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> } catch (Exception e) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> throw new RuntimeException(e);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span> //--------------------------------------------------------------------------------<a name="line.443"></a>
+<span class="sourceLineNo">444</span> // Entry point methods<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 /* Serializer */<a name="line.447"></a>
+<span class="sourceLineNo">448</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> return new UrlEncodingSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> @Override /* Serializer */<a name="line.452"></a>
+<span class="sourceLineNo">453</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.454"></a>
+<span class="sourceLineNo">455</span> serializeAnything(s, s.getWriter(), o);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> @Override /* PartSerializer */<a name="line.458"></a>
+<span class="sourceLineNo">459</span> public String serialize(PartType type, Object value) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> switch(type) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> case HEADER: return serializePart(value, false, true);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> case FORM_DATA: return serializePart(value, false, null);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> case PATH: return serializePart(value, false, null);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> case QUERY: return serializePart(value, false, null);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> default: return StringUtils.toString(value);<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>}<a name="line.468"></a>
[18/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html b/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
index 9c4a23f..772bef3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
@@ -30,1299 +30,1299 @@
<span class="sourceLineNo">022</span>import java.net.URI;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import java.util.*;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import java.util.concurrent.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.annotation.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.internal.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.parser.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.remoteable.*;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.juneau.serializer.*;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.juneau.transform.*;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.juneau.utils.*;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * A wrapper class around the {@link Class} object that provides cached information<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * about that class.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <p><a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Instances of this class can be created through the {@link BeanContext#getClassMeta(Class)} method.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <p><a name="line.40"></a>
-<span class="sourceLineNo">041</span> * The {@link BeanContext} class will cache and reuse instances of this class except for the following class types:<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <ul><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <li>Arrays<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <li>Maps with non-Object key/values.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * <li>Collections with non-Object key/values.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * </ul><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * <p><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * This class is tied to the {@link BeanContext} class because it's that class that makes the determination<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * of what is a bean.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> *<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * @param <T> The class type of the wrapped class.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>@Bean(properties="innerClass,classCategory,elementType,keyType,valueType,notABeanReason,initException,beanMeta")<a name="line.53"></a>
-<span class="sourceLineNo">054</span>public final class ClassMeta<T> implements Type {<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> /** Class categories. */<a name="line.56"></a>
-<span class="sourceLineNo">057</span> enum ClassCategory {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> MAP, COLLECTION, CLASS, NUMBER, DECIMAL, BOOLEAN, CHAR, DATE, ARRAY, ENUM, OTHER, CHARSEQ, STR, OBJ, URI, BEANMAP, READER, INPUTSTREAM, VOID, ARGS<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> final Class<T> innerClass; // The class being wrapped.<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span> private final Class<? extends T> implClass; // The implementation class to use if this is an interface.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private final ClassCategory cc; // The class category.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> private final Method fromStringMethod; // The static valueOf(String) or fromString(String) or forString(String) method (if it has one).<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private final Constructor<? extends T><a name="line.66"></a>
-<span class="sourceLineNo">067</span> noArgConstructor; // The no-arg constructor for this class (if it has one).<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private final Constructor<T><a name="line.68"></a>
-<span class="sourceLineNo">069</span> stringConstructor, // The X(String) constructor (if it has one).<a name="line.69"></a>
-<span class="sourceLineNo">070</span> numberConstructor, // The X(Number) constructor (if it has one).<a name="line.70"></a>
-<span class="sourceLineNo">071</span> swapConstructor; // The X(Swappable) constructor (if it has one).<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private final Class<?><a name="line.72"></a>
-<span class="sourceLineNo">073</span> swapMethodType, // The class type of the object in the number constructor.<a name="line.73"></a>
-<span class="sourceLineNo">074</span> numberConstructorType;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private final Method<a name="line.75"></a>
-<span class="sourceLineNo">076</span> swapMethod, // The swap() method (if it has one).<a name="line.76"></a>
-<span class="sourceLineNo">077</span> unswapMethod, // The unswap() method (if it has one).<a name="line.77"></a>
-<span class="sourceLineNo">078</span> namePropertyMethod, // The method to set the name on an object (if it has one).<a name="line.78"></a>
-<span class="sourceLineNo">079</span> parentPropertyMethod; // The method to set the parent on an object (if it has one).<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private final boolean<a name="line.80"></a>
-<span class="sourceLineNo">081</span> isDelegate, // True if this class extends Delegate.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> isAbstract, // True if this class is abstract.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> isMemberClass; // True if this is a non-static member class.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private final Object primitiveDefault; // Default value for primitive type classes.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> private final Map<String,Method><a name="line.85"></a>
-<span class="sourceLineNo">086</span> remoteableMethods, // Methods annotated with @RemoteMethod.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> publicMethods; // All public methods, including static methods.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private final PojoSwap<?,?>[] childPojoSwaps; // Any PojoSwaps where the normal type is a subclass of this class.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> private final ConcurrentHashMap<Class<?>,PojoSwap<?,?>><a name="line.89"></a>
-<span class="sourceLineNo">090</span> childSwapMap, // Maps normal subclasses to PojoSwaps.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> childUnswapMap; // Maps swap subclasses to PojoSwaps.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> private final PojoSwap<T,?> pojoSwap; // The object POJO swap associated with this bean (if it has one).<a name="line.92"></a>
-<span class="sourceLineNo">093</span> private final BeanFilter beanFilter; // The bean filter associated with this bean (if it has one).<a name="line.93"></a>
-<span class="sourceLineNo">094</span> private final MetadataMap extMeta; // Extended metadata<a name="line.94"></a>
-<span class="sourceLineNo">095</span> private final BeanContext beanContext; // The bean context that created this object.<a name="line.95"></a>
-<span class="sourceLineNo">096</span> private final ClassMeta<?><a name="line.96"></a>
-<span class="sourceLineNo">097</span> serializedClassMeta, // The transformed class type (if class has swap associated with it).<a name="line.97"></a>
-<span class="sourceLineNo">098</span> elementType, // If ARRAY or COLLECTION, the element class type.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> keyType, // If MAP, the key class type.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> valueType; // If MAP, the value class type.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private final BeanMeta<T> beanMeta; // The bean meta for this bean class (if it's a bean).<a name="line.101"></a>
-<span class="sourceLineNo">102</span> private final String<a name="line.102"></a>
-<span class="sourceLineNo">103</span> typePropertyName, // The property name of the _type property for this class and subclasses.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> notABeanReason, // If this isn't a bean, the reason why.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> dictionaryName; // The dictionary name of this class if it has one.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> private final Throwable initException; // Any exceptions thrown in the init() method.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> private final InvocationHandler invocationHandler; // The invocation handler for this class (if it has one).<a name="line.107"></a>
-<span class="sourceLineNo">108</span> private final BeanRegistry beanRegistry; // The bean registry of this class meta (if it has one).<a name="line.108"></a>
-<span class="sourceLineNo">109</span> private final ClassMeta<?>[] args; // Arg types if this is an array of args.<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> private static final Boolean BOOLEAN_DEFAULT = false;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> private static final Character CHARACTER_DEFAULT = (char)0;<a name="line.112"></a>
-<span class="sourceLineNo">113</span> private static final Short SHORT_DEFAULT = (short)0;<a name="line.113"></a>
-<span class="sourceLineNo">114</span> private static final Integer INTEGER_DEFAULT = 0;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> private static final Long LONG_DEFAULT = 0l;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private static final Float FLOAT_DEFAULT = 0f;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private static final Double DOUBLE_DEFAULT = 0d;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> private static final Byte BYTE_DEFAULT = (byte)0;<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Construct a new {@code ClassMeta} based on the specified {@link Class}.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> *<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @param innerClass The class being wrapped.<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @param beanContext The bean context that created this object.<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @param implClass For interfaces and abstract classes, this represents the "real" class to instantiate.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * Can be <jk>null</jk>.<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @param beanFilter The {@link BeanFilter} programmatically associated with this class.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * Can be <jk>null</jk>.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @param pojoSwap The {@link PojoSwap} programmatically associated with this class.<a name="line.129"></a>
+<span class="sourceLineNo">025</span>import java.util.concurrent.locks.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.annotation.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.internal.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.parser.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.remoteable.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.juneau.serializer.*;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.juneau.transform.*;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.juneau.utils.*;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * A wrapper class around the {@link Class} object that provides cached information<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * about that class.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <p><a name="line.39"></a>
+<span class="sourceLineNo">040</span> * Instances of this class can be created through the {@link BeanContext#getClassMeta(Class)} method.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * <p><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * The {@link BeanContext} class will cache and reuse instances of this class except for the following class types:<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <ul><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <li>Arrays<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * <li>Maps with non-Object key/values.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <li>Collections with non-Object key/values.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * </ul><a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <p><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * This class is tied to the {@link BeanContext} class because it's that class that makes the determination<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * of what is a bean.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @param <T> The class type of the wrapped class.<a name="line.52"></a>
+<span class="sourceLineNo">053</span> */<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@Bean(properties="innerClass,classCategory,elementType,keyType,valueType,notABeanReason,initException,beanMeta")<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public final class ClassMeta<T> implements Type {<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> /** Class categories. */<a name="line.57"></a>
+<span class="sourceLineNo">058</span> enum ClassCategory {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> MAP, COLLECTION, CLASS, NUMBER, DECIMAL, BOOLEAN, CHAR, DATE, ARRAY, ENUM, OTHER, CHARSEQ, STR, OBJ, URI, BEANMAP, READER, INPUTSTREAM, VOID, ARGS<a name="line.59"></a>
+<span class="sourceLineNo">060</span> }<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span> final Class<T> innerClass; // The class being wrapped.<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span> private final Class<? extends T> implClass; // The implementation class to use if this is an interface.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> private final ClassCategory cc; // The class category.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private final Method fromStringMethod; // The static valueOf(String) or fromString(String) or forString(String) method (if it has one).<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private final Constructor<? extends T><a name="line.67"></a>
+<span class="sourceLineNo">068</span> noArgConstructor; // The no-arg constructor for this class (if it has one).<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private final Constructor<T><a name="line.69"></a>
+<span class="sourceLineNo">070</span> stringConstructor, // The X(String) constructor (if it has one).<a name="line.70"></a>
+<span class="sourceLineNo">071</span> numberConstructor, // The X(Number) constructor (if it has one).<a name="line.71"></a>
+<span class="sourceLineNo">072</span> swapConstructor; // The X(Swappable) constructor (if it has one).<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private final Class<?><a name="line.73"></a>
+<span class="sourceLineNo">074</span> swapMethodType, // The class type of the object in the number constructor.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> numberConstructorType;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> private final Method<a name="line.76"></a>
+<span class="sourceLineNo">077</span> swapMethod, // The swap() method (if it has one).<a name="line.77"></a>
+<span class="sourceLineNo">078</span> unswapMethod, // The unswap() method (if it has one).<a name="line.78"></a>
+<span class="sourceLineNo">079</span> namePropertyMethod, // The method to set the name on an object (if it has one).<a name="line.79"></a>
+<span class="sourceLineNo">080</span> parentPropertyMethod; // The method to set the parent on an object (if it has one).<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private final boolean<a name="line.81"></a>
+<span class="sourceLineNo">082</span> isDelegate, // True if this class extends Delegate.<a name="line.82"></a>
+<span class="sourceLineNo">083</span> isAbstract, // True if this class is abstract.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> isMemberClass; // True if this is a non-static member class.<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private final Object primitiveDefault; // Default value for primitive type classes.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> private final Map<String,Method><a name="line.86"></a>
+<span class="sourceLineNo">087</span> remoteableMethods, // Methods annotated with @RemoteMethod.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> publicMethods; // All public methods, including static methods.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> private final PojoSwap<?,?>[] childPojoSwaps; // Any PojoSwaps where the normal type is a subclass of this class.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> private final ConcurrentHashMap<Class<?>,PojoSwap<?,?>><a name="line.90"></a>
+<span class="sourceLineNo">091</span> childSwapMap, // Maps normal subclasses to PojoSwaps.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> childUnswapMap; // Maps swap subclasses to PojoSwaps.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> private final PojoSwap<T,?> pojoSwap; // The object POJO swap associated with this bean (if it has one).<a name="line.93"></a>
+<span class="sourceLineNo">094</span> private final BeanFilter beanFilter; // The bean filter associated with this bean (if it has one).<a name="line.94"></a>
+<span class="sourceLineNo">095</span> private final MetadataMap extMeta; // Extended metadata<a name="line.95"></a>
+<span class="sourceLineNo">096</span> private final BeanContext beanContext; // The bean context that created this object.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> private final ClassMeta<?><a name="line.97"></a>
+<span class="sourceLineNo">098</span> serializedClassMeta, // The transformed class type (if class has swap associated with it).<a name="line.98"></a>
+<span class="sourceLineNo">099</span> elementType, // If ARRAY or COLLECTION, the element class type.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> keyType, // If MAP, the key class type.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> valueType; // If MAP, the value class type.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private final BeanMeta<T> beanMeta; // The bean meta for this bean class (if it's a bean).<a name="line.102"></a>
+<span class="sourceLineNo">103</span> private final String<a name="line.103"></a>
+<span class="sourceLineNo">104</span> typePropertyName, // The property name of the _type property for this class and subclasses.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> notABeanReason, // If this isn't a bean, the reason why.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> dictionaryName; // The dictionary name of this class if it has one.<a name="line.106"></a>
+<span class="sourceLineNo">107</span> private final Throwable initException; // Any exceptions thrown in the init() method.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> private final InvocationHandler invocationHandler; // The invocation handler for this class (if it has one).<a name="line.108"></a>
+<span class="sourceLineNo">109</span> private final BeanRegistry beanRegistry; // The bean registry of this class meta (if it has one).<a name="line.109"></a>
+<span class="sourceLineNo">110</span> private final ClassMeta<?>[] args; // Arg types if this is an array of args.<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> private static final Boolean BOOLEAN_DEFAULT = false;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> private static final Character CHARACTER_DEFAULT = (char)0;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> private static final Short SHORT_DEFAULT = (short)0;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> private static final Integer INTEGER_DEFAULT = 0;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> private static final Long LONG_DEFAULT = 0l;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private static final Float FLOAT_DEFAULT = 0f;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private static final Double DOUBLE_DEFAULT = 0d;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> private static final Byte BYTE_DEFAULT = (byte)0;<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> private ReadWriteLock lock = new ReentrantReadWriteLock(false);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> private Lock rLock = lock.readLock(), wLock = lock.writeLock();<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> /**<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * Construct a new {@code ClassMeta} based on the specified {@link Class}.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> *<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @param innerClass The class being wrapped.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @param beanContext The bean context that created this object.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * @param implClass For interfaces and abstract classes, this represents the "real" class to instantiate.<a name="line.129"></a>
<span class="sourceLineNo">130</span> * Can be <jk>null</jk>.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * @param childPojoSwap The child {@link PojoSwap PojoSwaps} programmatically associated with this class.<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * These are the <code>PojoSwaps</code> that have normal classes that are subclasses of this class.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * Can be <jk>null</jk>.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @param delayedInit Don't call init() in constructor.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * Used for delayed initialization when the possibility of class reference loops exist.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> */<a name="line.136"></a>
-<span class="sourceLineNo">137</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.137"></a>
-<span class="sourceLineNo">138</span> ClassMeta(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span> this.innerClass = innerClass;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> this.beanContext = beanContext;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> // We always immediately add this class meta to the bean context cache so that we can resolve recursive references.<a name="line.142"></a>
-<span class="sourceLineNo">143</span> if (beanContext != null && beanContext.cmCache != null)<a name="line.143"></a>
-<span class="sourceLineNo">144</span> beanContext.cmCache.put(innerClass, this);<a name="line.144"></a>
+<span class="sourceLineNo">131</span> * @param beanFilter The {@link BeanFilter} programmatically associated with this class.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * Can be <jk>null</jk>.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * @param pojoSwap The {@link PojoSwap} programmatically associated with this class.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * Can be <jk>null</jk>.<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * @param childPojoSwap The child {@link PojoSwap PojoSwaps} programmatically associated with this class.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * These are the <code>PojoSwaps</code> that have normal classes that are subclasses of this class.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * Can be <jk>null</jk>.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * @param delayedInit Don't call init() in constructor.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * Used for delayed initialization when the possibility of class reference loops exist.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.141"></a>
+<span class="sourceLineNo">142</span> ClassMeta(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> this.innerClass = innerClass;<a name="line.143"></a>
+<span class="sourceLineNo">144</span> this.beanContext = beanContext;<a name="line.144"></a>
<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> ClassMetaBuilder<T> builder = new ClassMetaBuilder(innerClass, beanContext, implClass, beanFilter, pojoSwap, childPojoSwaps);<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> this.cc = builder.cc;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> this.isDelegate = builder.isDelegate;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> this.fromStringMethod = builder.fromStringMethod;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> this.swapMethod = builder.swapMethod;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> this.unswapMethod = builder.unswapMethod;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> this.swapMethodType = builder.swapMethodType;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> this.parentPropertyMethod = builder.parentPropertyMethod;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> this.namePropertyMethod = builder.namePropertyMethod;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> this.noArgConstructor = builder.noArgConstructor;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> this.stringConstructor = builder.stringConstructor;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> this.swapConstructor = builder.swapConstructor;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> this.numberConstructor = builder.numberConstructor;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> this.numberConstructorType = builder.numberConstructorType;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> this.primitiveDefault = builder.primitiveDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> this.publicMethods = builder.publicMethods;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> this.remoteableMethods = builder.remoteableMethods;<a name="line.163"></a>
-<span class="sourceLineNo">164</span> this.beanFilter = beanFilter;<a name="line.164"></a>
-<span class="sourceLineNo">165</span> this.pojoSwap = builder.pojoSwap;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> this.extMeta = new MetadataMap();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> this.keyType = builder.keyType;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> this.valueType = builder.valueType;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> this.elementType = builder.elementType;<a name="line.169"></a>
-<span class="sourceLineNo">170</span> this.notABeanReason = builder.notABeanReason;<a name="line.170"></a>
-<span class="sourceLineNo">171</span> this.beanMeta = builder.beanMeta;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> this.initException = builder.initException;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> this.typePropertyName = builder.typePropertyName;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> this.dictionaryName = builder.dictionaryName;<a name="line.174"></a>
-<span class="sourceLineNo">175</span> this.serializedClassMeta = builder.serializedClassMeta;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> this.invocationHandler = builder.invocationHandler;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> this.beanRegistry = builder.beanRegistry;<a name="line.177"></a>
-<span class="sourceLineNo">178</span> this.isMemberClass = builder.isMemberClass;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> this.isAbstract = builder.isAbstract;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> this.implClass = builder.implClass;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> this.childUnswapMap = builder.childUnswapMap;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> this.childSwapMap = builder.childSwapMap;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> this.childPojoSwaps = builder.childPojoSwaps;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> this.args = null;<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> * Copy constructor.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Used for creating Map and Collection class metas that shouldn't be cached.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> ClassMeta(ClassMeta<T> mainType, ClassMeta<?> keyType, ClassMeta<?> valueType, ClassMeta<?> elementType) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> this.innerClass = mainType.innerClass;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> this.implClass = mainType.implClass;<a name="line.193"></a>
-<span class="sourceLineNo">194</span> this.childPojoSwaps = mainType.childPojoSwaps;<a name="line.194"></a>
-<span class="sourceLineNo">195</span> this.childSwapMap = mainType.childSwapMap;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> this.childUnswapMap = mainType.childUnswapMap;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> this.cc = mainType.cc;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> this.fromStringMethod = mainType.fromStringMethod;<a name="line.198"></a>
-<span class="sourceLineNo">199</span> this.noArgConstructor = mainType.noArgConstructor;<a name="line.199"></a>
-<span class="sourceLineNo">200</span> this.stringConstructor = mainType.stringConstructor;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> this.numberConstructor = mainType.numberConstructor;<a name="line.201"></a>
-<span class="sourceLineNo">202</span> this.swapConstructor = mainType.swapConstructor;<a name="line.202"></a>
-<span class="sourceLineNo">203</span> this.swapMethodType = mainType.swapMethodType;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> this.numberConstructorType = mainType.numberConstructorType;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> this.swapMethod = mainType.swapMethod;<a name="line.205"></a>
-<span class="sourceLineNo">206</span> this.unswapMethod = mainType.unswapMethod;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> this.namePropertyMethod = mainType.namePropertyMethod;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> this.parentPropertyMethod = mainType.parentPropertyMethod;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> this.isDelegate = mainType.isDelegate;<a name="line.209"></a>
-<span class="sourceLineNo">210</span> this.isAbstract = mainType.isAbstract;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> this.isMemberClass = mainType.isMemberClass;<a name="line.211"></a>
-<span class="sourceLineNo">212</span> this.primitiveDefault = mainType.primitiveDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> this.remoteableMethods = mainType.remoteableMethods;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> this.publicMethods = mainType.publicMethods;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> this.beanContext = mainType.beanContext;<a name="line.215"></a>
-<span class="sourceLineNo">216</span> this.serializedClassMeta = this;<a name="line.216"></a>
-<span class="sourceLineNo">217</span> this.elementType = elementType;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> this.keyType = keyType;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> this.valueType = valueType;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> this.invocationHandler = mainType.invocationHandler;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> this.beanMeta = mainType.beanMeta;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> this.typePropertyName = mainType.typePropertyName;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> this.dictionaryName = mainType.dictionaryName;<a name="line.223"></a>
-<span class="sourceLineNo">224</span> this.notABeanReason = mainType.notABeanReason;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> this.pojoSwap = mainType.pojoSwap;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> this.beanFilter = mainType.beanFilter;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> this.extMeta = mainType.extMeta;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> this.initException = mainType.initException;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> this.beanRegistry = mainType.beanRegistry;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> this.args = null;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * Constructor for args-arrays.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> @SuppressWarnings("unchecked")<a name="line.236"></a>
-<span class="sourceLineNo">237</span> ClassMeta(ClassMeta<?>[] args) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> this.innerClass = (Class<T>) Object[].class;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> this.args = args;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> this.implClass = null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> this.childPojoSwaps = null;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> this.childSwapMap = null;<a name="line.242"></a>
-<span class="sourceLineNo">243</span> this.childUnswapMap = null;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> this.cc = ARGS;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> this.fromStringMethod = null;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> this.noArgConstructor = null;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> this.stringConstructor = null;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> this.numberConstructor = null;<a name="line.248"></a>
-<span class="sourceLineNo">249</span> this.swapConstructor = null;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> this.swapMethodType = null;<a name="line.250"></a>
-<span class="sourceLineNo">251</span> this.numberConstructorType = null;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> this.swapMethod = null;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> this.unswapMethod = null;<a name="line.253"></a>
-<span class="sourceLineNo">254</span> this.namePropertyMethod = null;<a name="line.254"></a>
-<span class="sourceLineNo">255</span> this.parentPropertyMethod = null;<a name="line.255"></a>
-<span class="sourceLineNo">256</span> this.isDelegate = false;<a name="line.256"></a>
-<span class="sourceLineNo">257</span> this.isAbstract = false;<a name="line.257"></a>
-<span class="sourceLineNo">258</span> this.isMemberClass = false;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> this.primitiveDefault = null;<a name="line.259"></a>
-<span class="sourceLineNo">260</span> this.remoteableMethods = null;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> this.publicMethods = null;<a name="line.261"></a>
-<span class="sourceLineNo">262</span> this.beanContext = null;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> this.serializedClassMeta = this;<a name="line.263"></a>
-<span class="sourceLineNo">264</span> this.elementType = null;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> this.keyType = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> this.valueType = null;<a name="line.266"></a>
-<span class="sourceLineNo">267</span> this.invocationHandler = null;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> this.beanMeta = null;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> this.typePropertyName = null;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> this.dictionaryName = null;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> this.notABeanReason = null;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> this.pojoSwap = null;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> this.beanFilter = null;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> this.extMeta = new MetadataMap();<a name="line.274"></a>
-<span class="sourceLineNo">275</span> this.initException = null;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> this.beanRegistry = null;<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> @SuppressWarnings({"unchecked","rawtypes","hiding"})<a name="line.279"></a>
-<span class="sourceLineNo">280</span> private class ClassMetaBuilder<T> {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> Class<T> innerClass;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> Class<? extends T> implClass;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> BeanContext beanContext;<a name="line.283"></a>
-<span class="sourceLineNo">284</span> ClassCategory cc = ClassCategory.OTHER;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> boolean<a name="line.285"></a>
-<span class="sourceLineNo">286</span> isDelegate = false,<a name="line.286"></a>
-<span class="sourceLineNo">287</span> isMemberClass = false,<a name="line.287"></a>
-<span class="sourceLineNo">288</span> isAbstract = false;<a name="line.288"></a>
-<span class="sourceLineNo">289</span> Method<a name="line.289"></a>
-<span class="sourceLineNo">290</span> fromStringMethod = null,<a name="line.290"></a>
-<span class="sourceLineNo">291</span> swapMethod = null,<a name="line.291"></a>
-<span class="sourceLineNo">292</span> unswapMethod = null,<a name="line.292"></a>
-<span class="sourceLineNo">293</span> parentPropertyMethod = null,<a name="line.293"></a>
-<span class="sourceLineNo">294</span> namePropertyMethod = null;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> Constructor<T><a name="line.295"></a>
-<span class="sourceLineNo">296</span> noArgConstructor = null,<a name="line.296"></a>
-<span class="sourceLineNo">297</span> stringConstructor = null,<a name="line.297"></a>
-<span class="sourceLineNo">298</span> swapConstructor = null,<a name="line.298"></a>
-<span class="sourceLineNo">299</span> numberConstructor = null;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> Class<?><a name="line.300"></a>
-<span class="sourceLineNo">301</span> swapMethodType = null,<a name="line.301"></a>
-<span class="sourceLineNo">302</span> numberConstructorType = null;<a name="line.302"></a>
-<span class="sourceLineNo">303</span> Object primitiveDefault = null;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> Map<String,Method><a name="line.304"></a>
-<span class="sourceLineNo">305</span> publicMethods = new LinkedHashMap<String,Method>(),<a name="line.305"></a>
-<span class="sourceLineNo">306</span> remoteableMethods = new LinkedHashMap<String,Method>();<a name="line.306"></a>
-<span class="sourceLineNo">307</span> ClassMeta<?><a name="line.307"></a>
-<span class="sourceLineNo">308</span> keyType = null,<a name="line.308"></a>
-<span class="sourceLineNo">309</span> valueType = null,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> elementType = null,<a name="line.310"></a>
-<span class="sourceLineNo">311</span> serializedClassMeta = null;<a name="line.311"></a>
-<span class="sourceLineNo">312</span> String<a name="line.312"></a>
-<span class="sourceLineNo">313</span> typePropertyName = null,<a name="line.313"></a>
-<span class="sourceLineNo">314</span> notABeanReason = null,<a name="line.314"></a>
-<span class="sourceLineNo">315</span> dictionaryName = null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Throwable initException = null;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> BeanMeta beanMeta = null;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> PojoSwap pojoSwap = null;<a name="line.318"></a>
-<span class="sourceLineNo">319</span> InvocationHandler invocationHandler = null;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> BeanRegistry beanRegistry = null;<a name="line.320"></a>
-<span class="sourceLineNo">321</span> PojoSwap<?,?>[] childPojoSwaps;<a name="line.321"></a>
-<span class="sourceLineNo">322</span> ConcurrentHashMap<Class<?>,PojoSwap<?,?>><a name="line.322"></a>
-<span class="sourceLineNo">323</span> childSwapMap,<a name="line.323"></a>
-<span class="sourceLineNo">324</span> childUnswapMap;<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> private ClassMetaBuilder(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> this.innerClass = innerClass;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> this.beanContext = beanContext;<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> this.implClass = implClass;<a name="line.330"></a>
-<span class="sourceLineNo">331</span> this.childPojoSwaps = childPojoSwaps;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> this.childSwapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();<a name="line.332"></a>
-<span class="sourceLineNo">333</span> this.childUnswapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> Class<T> c = innerClass;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (c.isPrimitive()) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (c == Boolean.TYPE)<a name="line.337"></a>
-<span class="sourceLineNo">338</span> cc = BOOLEAN;<a name="line.338"></a>
-<span class="sourceLineNo">339</span> else if (c == Byte.TYPE || c == Short.TYPE || c == Integer.TYPE || c == Long.TYPE || c == Float.TYPE || c == Double.TYPE) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (c == Float.TYPE || c == Double.TYPE)<a name="line.340"></a>
-<span class="sourceLineNo">341</span> cc = DECIMAL;<a name="line.341"></a>
-<span class="sourceLineNo">342</span> else<a name="line.342"></a>
-<span class="sourceLineNo">343</span> cc = NUMBER;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> else if (c == Character.TYPE)<a name="line.345"></a>
-<span class="sourceLineNo">346</span> cc = CHAR;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> else if (c == void.class || c == Void.class)<a name="line.347"></a>
-<span class="sourceLineNo">348</span> cc = VOID;<a name="line.348"></a>
-<span class="sourceLineNo">349</span> } else {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> if (isParentClass(Delegate.class, c))<a name="line.350"></a>
-<span class="sourceLineNo">351</span> isDelegate = true;<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (c == Object.class)<a name="line.353"></a>
-<span class="sourceLineNo">354</span> cc = OBJ;<a name="line.354"></a>
-<span class="sourceLineNo">355</span> else if (c.isEnum())<a name="line.355"></a>
-<span class="sourceLineNo">356</span> cc = ENUM;<a name="line.356"></a>
-<span class="sourceLineNo">357</span> else if (c.equals(Class.class))<a name="line.357"></a>
-<span class="sourceLineNo">358</span> cc = CLASS;<a name="line.358"></a>
-<span class="sourceLineNo">359</span> else if (isParentClass(CharSequence.class, c)) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> if (c.equals(String.class))<a name="line.360"></a>
-<span class="sourceLineNo">361</span> cc = STR;<a name="line.361"></a>
-<span class="sourceLineNo">362</span> else<a name="line.362"></a>
-<span class="sourceLineNo">363</span> cc = CHARSEQ;<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> else if (isParentClass(Number.class, c)) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (isParentClass(Float.class, c) || isParentClass(Double.class, c))<a name="line.366"></a>
-<span class="sourceLineNo">367</span> cc = DECIMAL;<a name="line.367"></a>
-<span class="sourceLineNo">368</span> else<a name="line.368"></a>
-<span class="sourceLineNo">369</span> cc = NUMBER;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span> else if (isParentClass(Collection.class, c))<a name="line.371"></a>
-<span class="sourceLineNo">372</span> cc = COLLECTION;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> else if (isParentClass(Map.class, c)) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (isParentClass(BeanMap.class, c))<a name="line.374"></a>
-<span class="sourceLineNo">375</span> cc = BEANMAP;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> else<a name="line.376"></a>
-<span class="sourceLineNo">377</span> cc = MAP;<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> else if (c == Character.class)<a name="line.379"></a>
-<span class="sourceLineNo">380</span> cc = CHAR;<a name="line.380"></a>
-<span class="sourceLineNo">381</span> else if (c == Boolean.class)<a name="line.381"></a>
-<span class="sourceLineNo">382</span> cc = BOOLEAN;<a name="line.382"></a>
-<span class="sourceLineNo">383</span> else if (isParentClass(Date.class, c) || isParentClass(Calendar.class, c))<a name="line.383"></a>
-<span class="sourceLineNo">384</span> cc = DATE;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> else if (c.isArray())<a name="line.385"></a>
-<span class="sourceLineNo">386</span> cc = ARRAY;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> else if (isParentClass(URL.class, c) || isParentClass(URI.class, c) || c.isAnnotationPresent(org.apache.juneau.annotation.URI.class))<a name="line.387"></a>
-<span class="sourceLineNo">388</span> cc = URI;<a name="line.388"></a>
-<span class="sourceLineNo">389</span> else if (isParentClass(Reader.class, c))<a name="line.389"></a>
-<span class="sourceLineNo">390</span> cc = READER;<a name="line.390"></a>
-<span class="sourceLineNo">391</span> else if (isParentClass(InputStream.class, c))<a name="line.391"></a>
-<span class="sourceLineNo">392</span> cc = INPUTSTREAM;<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> isMemberClass = c.isMemberClass() && ! isStatic(c);<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> // Find static fromString(String) or equivalent method.<a name="line.397"></a>
-<span class="sourceLineNo">398</span> // fromString() must be checked before valueOf() so that Enum classes can create their own<a name="line.398"></a>
-<span class="sourceLineNo">399</span> // specialized fromString() methods to override the behavior of Enum.valueOf(String).<a name="line.399"></a>
-<span class="sourceLineNo">400</span> // valueOf() is used by enums.<a name="line.400"></a>
-<span class="sourceLineNo">401</span> // parse() is used by the java logging Level class.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> // forName() is used by Class and Charset<a name="line.402"></a>
-<span class="sourceLineNo">403</span> for (String methodName : new String[]{"fromString","valueOf","parse","parseString","forName","forString"}) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (fromStringMethod == null) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> for (Method m : c.getMethods()) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (isStatic(m) && isPublic(m) && isNotDeprecated(m)) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> String mName = m.getName();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> if (mName.equals(methodName) && m.getReturnType() == c) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> Class<?>[] args = m.getParameterTypes();<a name="line.409"></a>
-<span class="sourceLineNo">410</span> if (args.length == 1 && args[0] == String.class) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> fromStringMethod = m;<a name="line.411"></a>
-<span class="sourceLineNo">412</span> break;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<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> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> // Special cases<a name="line.420"></a>
-<span class="sourceLineNo">421</span> try {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> if (c == TimeZone.class)<a name="line.422"></a>
-<span class="sourceLineNo">423</span> fromStringMethod = c.getMethod("getTimeZone", String.class);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> else if (c == Locale.class)<a name="line.424"></a>
-<span class="sourceLineNo">425</span> fromStringMethod = LocaleAsString.class.getMethod("fromString", String.class);<a name="line.425"></a>
-<span class="sourceLineNo">426</span> } catch (NoSuchMethodException e1) {}<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> // Find swap() method if present.<a name="line.428"></a>
-<span class="sourceLineNo">429</span> for (Method m : c.getMethods()) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (isPublic(m) && isNotDeprecated(m) && ! isStatic(m)) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> String mName = m.getName();<a name="line.431"></a>
-<span class="sourceLineNo">432</span> if (mName.equals("swap")) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> Class<?>[] pt = m.getParameterTypes();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> if (pt.length == 1 && pt[0] == BeanSession.class) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> swapMethod = m;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> swapMethodType = m.getReturnType();<a name="line.436"></a>
-<span class="sourceLineNo">437</span> break;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span> // Find unswap() method if present.<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if (swapMethod != null) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> for (Method m : c.getMethods()) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> if (isPublic(m) && isNotDeprecated(m) && isStatic(m)) {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> String mName = m.getName();<a name="line.446"></a>
-<span class="sourceLineNo">447</span> if (mName.equals("unswap")) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> Class<?>[] pt = m.getParameterTypes();<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (pt.length == 2 && pt[0] == BeanSession.class && pt[1] == swapMethodType) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> unswapMethod = m;<a name="line.450"></a>
-<span class="sourceLineNo">451</span> break;<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> // Find @NameProperty and @ParentProperty methods if present.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> for (Method m : c.getDeclaredMethods()) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> if (m.isAnnotationPresent(ParentProperty.class) && m.getParameterTypes().length == 1) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> m.setAccessible(true);<a name="line.461"></a>
-<span class="sourceLineNo">462</span> parentPropertyMethod = m;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span> if (m.isAnnotationPresent(NameProperty.class) && m.getParameterTypes().length == 1) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> m.setAccessible(true);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> namePropertyMethod = m;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> // Note: Primitive types are normally abstract.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> isAbstract = Modifier.isAbstract(c.getModifiers()) && ! c.isPrimitive();<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span> // Find constructor(String) method if present.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> for (Constructor cs : c.getConstructors()) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (isPublic(cs) && isNotDeprecated(cs)) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> Class<?>[] args = cs.getParameterTypes();<a name="line.476"></a>
-<span class="sourceLineNo">477</span> if (args.length == (isMemberClass ? 1 : 0) && c != Object.class && ! isAbstract) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> noArgConstructor = cs;<a name="line.478"></a>
-<span class="sourceLineNo">479</span> } else if (args.length == (isMemberClass ? 2 : 1)) {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> Class<?> arg = args[(isMemberClass ? 1 : 0)];<a name="line.480"></a>
-<span class="sourceLineNo">481</span> if (arg == String.class)<a name="line.481"></a>
-<span class="sourceLineNo">482</span> stringConstructor = cs;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> else if (swapMethodType != null && swapMethodType.isAssignableFrom(arg))<a name="line.483"></a>
-<span class="sourceLineNo">484</span> swapConstructor = cs;<a name="line.484"></a>
-<span class="sourceLineNo">485</span> else if (cc != NUMBER && (Number.class.isAssignableFrom(arg) || (arg.isPrimitive() && (arg == int.class || arg == short.class || arg == long.class || arg == float.class || arg == double.class)))) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> numberConstructor = cs;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> numberConstructorType = ClassUtils.getWrapperIfPrimitive(arg);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span> }<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span> if (c.isPrimitive()) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> if (c == Boolean.TYPE)<a name="line.494"></a>
-<span class="sourceLineNo">495</span> primitiveDefault = BOOLEAN_DEFAULT;<a name="line.495"></a>
-<span class="sourceLineNo">496</span> else if (c == Character.TYPE)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> primitiveDefault = CHARACTER_DEFAULT;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> else if (c == Short.TYPE)<a name="line.498"></a>
-<span class="sourceLineNo">499</span> primitiveDefault = SHORT_DEFAULT;<a name="line.499"></a>
-<span class="sourceLineNo">500</span> else if (c == Integer.TYPE)<a name="line.500"></a>
-<span class="sourceLineNo">501</span> primitiveDefault = INTEGER_DEFAULT;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> else if (c == Long.TYPE)<a name="line.502"></a>
-<span class="sourceLineNo">503</span> primitiveDefault = LONG_DEFAULT;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> else if (c == Float.TYPE)<a name="line.504"></a>
-<span class="sourceLineNo">505</span> primitiveDefault = FLOAT_DEFAULT;<a name="line.505"></a>
-<span class="sourceLineNo">506</span> else if (c == Double.TYPE)<a name="line.506"></a>
-<span class="sourceLineNo">507</span> primitiveDefault = DOUBLE_DEFAULT;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> else if (c == Byte.TYPE)<a name="line.508"></a>
-<span class="sourceLineNo">509</span> primitiveDefault = BYTE_DEFAULT;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> if (c == Boolean.class)<a name="line.511"></a>
+<span class="sourceLineNo">146</span> wLock.lock();<a name="line.146"></a>
+<span class="sourceLineNo">147</span> try {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> // We always immediately add this class meta to the bean context cache so that we can resolve recursive references.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> if (beanContext != null && beanContext.cmCache != null)<a name="line.149"></a>
+<span class="sourceLineNo">150</span> beanContext.cmCache.put(innerClass, this);<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> ClassMetaBuilder<T> builder = new ClassMetaBuilder(innerClass, beanContext, implClass, beanFilter, pojoSwap, childPojoSwaps);<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> this.cc = builder.cc;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> this.isDelegate = builder.isDelegate;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> this.fromStringMethod = builder.fromStringMethod;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> this.swapMethod = builder.swapMethod;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.unswapMethod = builder.unswapMethod;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> this.swapMethodType = builder.swapMethodType;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> this.parentPropertyMethod = builder.parentPropertyMethod;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> this.namePropertyMethod = builder.namePropertyMethod;<a name="line.161"></a>
+<span class="sourceLineNo">162</span> this.noArgConstructor = builder.noArgConstructor;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> this.stringConstructor = builder.stringConstructor;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.swapConstructor = builder.swapConstructor;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> this.numberConstructor = builder.numberConstructor;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> this.numberConstructorType = builder.numberConstructorType;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> this.primitiveDefault = builder.primitiveDefault;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> this.publicMethods = builder.publicMethods;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> this.remoteableMethods = builder.remoteableMethods;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> this.beanFilter = beanFilter;<a name="line.170"></a>
+<span class="sourceLineNo">171</span> this.pojoSwap = builder.pojoSwap;<a name="line.171"></a>
+<span class="sourceLineNo">172</span> this.extMeta = new MetadataMap();<a name="line.172"></a>
+<span class="sourceLineNo">173</span> this.keyType = builder.keyType;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> this.valueType = builder.valueType;<a name="line.174"></a>
+<span class="sourceLineNo">175</span> this.elementType = builder.elementType;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> this.notABeanReason = builder.notABeanReason;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> this.beanMeta = builder.beanMeta;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> this.initException = builder.initException;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> this.typePropertyName = builder.typePropertyName;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> this.dictionaryName = builder.dictionaryName;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> this.serializedClassMeta = builder.serializedClassMeta;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> this.invocationHandler = builder.invocationHandler;<a name="line.182"></a>
+<span class="sourceLineNo">183</span> this.beanRegistry = builder.beanRegistry;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> this.isMemberClass = builder.isMemberClass;<a name="line.184"></a>
+<span class="sourceLineNo">185</span> this.isAbstract = builder.isAbstract;<a name="line.185"></a>
+<span class="sourceLineNo">186</span> this.implClass = builder.implClass;<a name="line.186"></a>
+<span class="sourceLineNo">187</span> this.childUnswapMap = builder.childUnswapMap;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> this.childSwapMap = builder.childSwapMap;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> this.childPojoSwaps = builder.childPojoSwaps;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> this.args = null;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> } finally {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> wLock.unlock();<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> /**<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * Causes thread to wait until constructor has exited.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> */<a name="line.198"></a>
+<span class="sourceLineNo">199</span> final void waitForInit() {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> rLock.lock();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> rLock.unlock();<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> * Copy constructor.<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * Used for creating Map and Collection class metas that shouldn't be cached.<a name="line.206"></a>
+<span class="sourceLineNo">207</span> */<a name="line.207"></a>
+<span class="sourceLineNo">208</span> ClassMeta(ClassMeta<T> mainType, ClassMeta<?> keyType, ClassMeta<?> valueType, ClassMeta<?> elementType) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> this.innerClass = mainType.innerClass;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> this.implClass = mainType.implClass;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> this.childPojoSwaps = mainType.childPojoSwaps;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> this.childSwapMap = mainType.childSwapMap;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> this.childUnswapMap = mainType.childUnswapMap;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> this.cc = mainType.cc;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> this.fromStringMethod = mainType.fromStringMethod;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> this.noArgConstructor = mainType.noArgConstructor;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> this.stringConstructor = mainType.stringConstructor;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> this.numberConstructor = mainType.numberConstructor;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> this.swapConstructor = mainType.swapConstructor;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> this.swapMethodType = mainType.swapMethodType;<a name="line.220"></a>
+<span class="sourceLineNo">221</span> this.numberConstructorType = mainType.numberConstructorType;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> this.swapMethod = mainType.swapMethod;<a name="line.222"></a>
+<span class="sourceLineNo">223</span> this.unswapMethod = mainType.unswapMethod;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> this.namePropertyMethod = mainType.namePropertyMethod;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> this.parentPropertyMethod = mainType.parentPropertyMethod;<a name="line.225"></a>
+<span class="sourceLineNo">226</span> this.isDelegate = mainType.isDelegate;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> this.isAbstract = mainType.isAbstract;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> this.isMemberClass = mainType.isMemberClass;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> this.primitiveDefault = mainType.primitiveDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> this.remoteableMethods = mainType.remoteableMethods;<a name="line.230"></a>
+<span class="sourceLineNo">231</span> this.publicMethods = mainType.publicMethods;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> this.beanContext = mainType.beanContext;<a name="line.232"></a>
+<span class="sourceLineNo">233</span> this.serializedClassMeta = this;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> this.elementType = elementType;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> this.keyType = keyType;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> this.valueType = valueType;<a name="line.236"></a>
+<span class="sourceLineNo">237</span> this.invocationHandler = mainType.invocationHandler;<a name="line.237"></a>
+<span class="sourceLineNo">238</span> this.beanMeta = mainType.beanMeta;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> this.typePropertyName = mainType.typePropertyName;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> this.dictionaryName = mainType.dictionaryName;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> this.notABeanReason = mainType.notABeanReason;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> this.pojoSwap = mainType.pojoSwap;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> this.beanFilter = mainType.beanFilter;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> this.extMeta = mainType.extMeta;<a name="line.244"></a>
+<span class="sourceLineNo">245</span> this.initException = mainType.initException;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> this.beanRegistry = mainType.beanRegistry;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> this.args = null;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<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> * Constructor for args-arrays.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> */<a name="line.252"></a>
+<span class="sourceLineNo">253</span> @SuppressWarnings("unchecked")<a name="line.253"></a>
+<span class="sourceLineNo">254</span> ClassMeta(ClassMeta<?>[] args) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> this.innerClass = (Class<T>) Object[].class;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> this.args = args;<a name="line.256"></a>
+<span class="sourceLineNo">257</span> this.implClass = null;<a name="line.257"></a>
+<span class="sourceLineNo">258</span> this.childPojoSwaps = null;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> this.childSwapMap = null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span> this.childUnswapMap = null;<a name="line.260"></a>
+<span class="sourceLineNo">261</span> this.cc = ARGS;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> this.fromStringMethod = null;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> this.noArgConstructor = null;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> this.stringConstructor = null;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> this.numberConstructor = null;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> this.swapConstructor = null;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> this.swapMethodType = null;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> this.numberConstructorType = null;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> this.swapMethod = null;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> this.unswapMethod = null;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> this.namePropertyMethod = null;<a name="line.271"></a>
+<span class="sourceLineNo">272</span> this.parentPropertyMethod = null;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> this.isDelegate = false;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> this.isAbstract = false;<a name="line.274"></a>
+<span class="sourceLineNo">275</span> this.isMemberClass = false;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> this.primitiveDefault = null;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> this.remoteableMethods = null;<a name="line.277"></a>
+<span class="sourceLineNo">278</span> this.publicMethods = null;<a name="line.278"></a>
+<span class="sourceLineNo">279</span> this.beanContext = null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> this.serializedClassMeta = this;<a name="line.280"></a>
+<span class="sourceLineNo">281</span> this.elementType = null;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> this.keyType = null;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> this.valueType = null;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> this.invocationHandler = null;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> this.beanMeta = null;<a name="line.285"></a>
+<span class="sourceLineNo">286</span> this.typePropertyName = null;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> this.dictionaryName = null;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> this.notABeanReason = null;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> this.pojoSwap = null;<a name="line.289"></a>
+<span class="sourceLineNo">290</span> this.beanFilter = null;<a name="line.290"></a>
+<span class="sourceLineNo">291</span> this.extMeta = new MetadataMap();<a name="line.291"></a>
+<span class="sourceLineNo">292</span> this.initException = null;<a name="line.292"></a>
+<span class="sourceLineNo">293</span> this.beanRegistry = null;<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> @SuppressWarnings({"unchecked","rawtypes","hiding"})<a name="line.296"></a>
+<span class="sourceLineNo">297</span> private class ClassMetaBuilder<T> {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Class<T> innerClass;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> Class<? extends T> implClass;<a name="line.299"></a>
+<span class="sourceLineNo">300</span> BeanContext beanContext;<a name="line.300"></a>
+<span class="sourceLineNo">301</span> ClassCategory cc = ClassCategory.OTHER;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> boolean<a name="line.302"></a>
+<span class="sourceLineNo">303</span> isDelegate = false,<a name="line.303"></a>
+<span class="sourceLineNo">304</span> isMemberClass = false,<a name="line.304"></a>
+<span class="sourceLineNo">305</span> isAbstract = false;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> Method<a name="line.306"></a>
+<span class="sourceLineNo">307</span> fromStringMethod = null,<a name="line.307"></a>
+<span class="sourceLineNo">308</span> swapMethod = null,<a name="line.308"></a>
+<span class="sourceLineNo">309</span> unswapMethod = null,<a name="line.309"></a>
+<span class="sourceLineNo">310</span> parentPropertyMethod = null,<a name="line.310"></a>
+<span class="sourceLineNo">311</span> namePropertyMethod = null;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> Constructor<T><a name="line.312"></a>
+<span class="sourceLineNo">313</span> noArgConstructor = null,<a name="line.313"></a>
+<span class="sourceLineNo">314</span> stringConstructor = null,<a name="line.314"></a>
+<span class="sourceLineNo">315</span> swapConstructor = null,<a name="line.315"></a>
+<span class="sourceLineNo">316</span> numberConstructor = null;<a name="line.316"></a>
+<span class="sourceLineNo">317</span> Class<?><a name="line.317"></a>
+<span class="sourceLineNo">318</span> swapMethodType = null,<a name="line.318"></a>
+<span class="sourceLineNo">319</span> numberConstructorType = null;<a name="line.319"></a>
+<span class="sourceLineNo">320</span> Object primitiveDefault = null;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> Map<String,Method><a name="line.321"></a>
+<span class="sourceLineNo">322</span> publicMethods = new LinkedHashMap<String,Method>(),<a name="line.322"></a>
+<span class="sourceLineNo">323</span> remoteableMethods = new LinkedHashMap<String,Method>();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> ClassMeta<?><a name="line.324"></a>
+<span class="sourceLineNo">325</span> keyType = null,<a name="line.325"></a>
+<span class="sourceLineNo">326</span> valueType = null,<a name="line.326"></a>
+<span class="sourceLineNo">327</span> elementType = null,<a name="line.327"></a>
+<span class="sourceLineNo">328</span> serializedClassMeta = null;<a name="line.328"></a>
+<span class="sourceLineNo">329</span> String<a name="line.329"></a>
+<span class="sourceLineNo">330</span> typePropertyName = null,<a name="line.330"></a>
+<span class="sourceLineNo">331</span> notABeanReason = null,<a name="line.331"></a>
+<span class="sourceLineNo">332</span> dictionaryName = null;<a name="line.332"></a>
+<span class="sourceLineNo">333</span> Throwable initException = null;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> BeanMeta beanMeta = null;<a name="line.334"></a>
+<span class="sourceLineNo">335</span> PojoSwap pojoSwap = null;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> InvocationHandler invocationHandler = null;<a name="line.336"></a>
+<span class="sourceLineNo">337</span> BeanRegistry beanRegistry = null;<a name="line.337"></a>
+<span class="sourceLineNo">338</span> PojoSwap<?,?>[] childPojoSwaps;<a name="line.338"></a>
+<span class="sourceLineNo">339</span> ConcurrentHashMap<Class<?>,PojoSwap<?,?>><a name="line.339"></a>
+<span class="sourceLineNo">340</span> childSwapMap,<a name="line.340"></a>
+<span class="sourceLineNo">341</span> childUnswapMap;<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> private ClassMetaBuilder(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?> pojoSwap, PojoSwap<?,?>[] childPojoSwaps) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> this.innerClass = innerClass;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.beanContext = beanContext;<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span> this.implClass = implClass;<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.childPojoSwaps = childPojoSwaps;<a name="line.348"></a>
<TRUNCATED>
[16/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html b/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
index a51c435..7e6218c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/cognos/DataSet.html
@@ -169,7 +169,7 @@
<span class="sourceLineNo">161</span> *<a name="line.161"></a>
<span class="sourceLineNo">162</span> * @return The value of the <property>metadata</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.162"></a>
<span class="sourceLineNo">163</span> */<a name="line.163"></a>
-<span class="sourceLineNo">164</span> @BeanProperty(name="metadata")<a name="line.164"></a>
+<span class="sourceLineNo">164</span> @BeanProperty("metadata")<a name="line.164"></a>
<span class="sourceLineNo">165</span> public Column[] getMetaData() {<a name="line.165"></a>
<span class="sourceLineNo">166</span> return metaData;<a name="line.166"></a>
<span class="sourceLineNo">167</span> }<a name="line.167"></a>
@@ -180,7 +180,7 @@
<span class="sourceLineNo">172</span> * @param metaData The new value for the <property>metadata</property> property on this bean.<a name="line.172"></a>
<span class="sourceLineNo">173</span> * @return This object (for method chaining).<a name="line.173"></a>
<span class="sourceLineNo">174</span> */<a name="line.174"></a>
-<span class="sourceLineNo">175</span> @BeanProperty(name="metadata")<a name="line.175"></a>
+<span class="sourceLineNo">175</span> @BeanProperty("metadata")<a name="line.175"></a>
<span class="sourceLineNo">176</span> public DataSet setMetaData(Column[] metaData) {<a name="line.176"></a>
<span class="sourceLineNo">177</span> this.metaData = metaData;<a name="line.177"></a>
<span class="sourceLineNo">178</span> return this;<a name="line.178"></a>
@@ -191,7 +191,7 @@
<span class="sourceLineNo">183</span> *<a name="line.183"></a>
<span class="sourceLineNo">184</span> * @return The value of the <property>data</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.184"></a>
<span class="sourceLineNo">185</span> */<a name="line.185"></a>
-<span class="sourceLineNo">186</span> @BeanProperty(name="data")<a name="line.186"></a>
+<span class="sourceLineNo">186</span> @BeanProperty("data")<a name="line.186"></a>
<span class="sourceLineNo">187</span> public List<Row> getData() {<a name="line.187"></a>
<span class="sourceLineNo">188</span> return data;<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
@@ -202,7 +202,7 @@
<span class="sourceLineNo">194</span> * @param data The new value for the <property>data</property> property on this bean.<a name="line.194"></a>
<span class="sourceLineNo">195</span> * @return This object (for method chaining).<a name="line.195"></a>
<span class="sourceLineNo">196</span> */<a name="line.196"></a>
-<span class="sourceLineNo">197</span> @BeanProperty(name="data")<a name="line.197"></a>
+<span class="sourceLineNo">197</span> @BeanProperty("data")<a name="line.197"></a>
<span class="sourceLineNo">198</span> public DataSet setData(List<Row> data) {<a name="line.198"></a>
<span class="sourceLineNo">199</span> this.data = data;<a name="line.199"></a>
<span class="sourceLineNo">200</span> return this;<a name="line.200"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
index f79dcff..39b4b0b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElement.html
@@ -44,7 +44,7 @@
<span class="sourceLineNo">036</span> * @return The attributes of this element.<a name="line.36"></a>
<span class="sourceLineNo">037</span> */<a name="line.37"></a>
<span class="sourceLineNo">038</span> @Xml(format=ATTRS)<a name="line.38"></a>
-<span class="sourceLineNo">039</span> @BeanProperty(name="a")<a name="line.39"></a>
+<span class="sourceLineNo">039</span> @BeanProperty("a")<a name="line.39"></a>
<span class="sourceLineNo">040</span> public LinkedHashMap<String,Object> getAttrs() {<a name="line.40"></a>
<span class="sourceLineNo">041</span> return attrs;<a name="line.41"></a>
<span class="sourceLineNo">042</span> }<a name="line.42"></a>
@@ -54,7 +54,7 @@
<span class="sourceLineNo">046</span> * @param attrs The new attributes for this element.<a name="line.46"></a>
<span class="sourceLineNo">047</span> * @return This object (for method chaining).<a name="line.47"></a>
<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span> @BeanProperty(name="a")<a name="line.49"></a>
+<span class="sourceLineNo">049</span> @BeanProperty("a")<a name="line.49"></a>
<span class="sourceLineNo">050</span> public HtmlElement setAttrs(LinkedHashMap<String,Object> attrs) {<a name="line.50"></a>
<span class="sourceLineNo">051</span> this.attrs = attrs;<a name="line.51"></a>
<span class="sourceLineNo">052</span> return this;<a name="line.52"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
index a05d29a..302303b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementContainer.html
@@ -51,7 +51,7 @@
<span class="sourceLineNo">043</span> * @param children The new children for this container.<a name="line.43"></a>
<span class="sourceLineNo">044</span> * @return This object (for method chaining).<a name="line.44"></a>
<span class="sourceLineNo">045</span> */<a name="line.45"></a>
-<span class="sourceLineNo">046</span> @BeanProperty(name="c")<a name="line.46"></a>
+<span class="sourceLineNo">046</span> @BeanProperty("c")<a name="line.46"></a>
<span class="sourceLineNo">047</span> public HtmlElementContainer setChildren(LinkedList<Object> children) {<a name="line.47"></a>
<span class="sourceLineNo">048</span> this.children = children;<a name="line.48"></a>
<span class="sourceLineNo">049</span> return this;<a name="line.49"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
index ef15404..c7eac9d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementMixed.html
@@ -52,7 +52,7 @@
<span class="sourceLineNo">044</span> * @param children The new children of this element.<a name="line.44"></a>
<span class="sourceLineNo">045</span> * @return This object (for method chaining).<a name="line.45"></a>
<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span> @BeanProperty(name="c")<a name="line.47"></a>
+<span class="sourceLineNo">047</span> @BeanProperty("c")<a name="line.47"></a>
<span class="sourceLineNo">048</span> public HtmlElement setChildren(LinkedList<Object> children) {<a name="line.48"></a>
<span class="sourceLineNo">049</span> this.children = children;<a name="line.49"></a>
<span class="sourceLineNo">050</span> return this;<a name="line.50"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
index 4de9a58..46daab0 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementRawText.html
@@ -37,7 +37,7 @@
<span class="sourceLineNo">029</span> * @return The inner text of this element, or <jk>null</jk> if no text is set.<a name="line.29"></a>
<span class="sourceLineNo">030</span> */<a name="line.30"></a>
<span class="sourceLineNo">031</span> @Xml(format=XmlFormat.TEXT_PWS)<a name="line.31"></a>
-<span class="sourceLineNo">032</span> @BeanProperty(name="c")<a name="line.32"></a>
+<span class="sourceLineNo">032</span> @BeanProperty("c")<a name="line.32"></a>
<span class="sourceLineNo">033</span> public Object getText() {<a name="line.33"></a>
<span class="sourceLineNo">034</span> return text;<a name="line.34"></a>
<span class="sourceLineNo">035</span> }<a name="line.35"></a>
@@ -48,7 +48,7 @@
<span class="sourceLineNo">040</span> * @param text The inner text of this element, or <jk>null</jk> if no text is set.<a name="line.40"></a>
<span class="sourceLineNo">041</span> * @return This object (for method chaining).<a name="line.41"></a>
<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span> @BeanProperty(name="c")<a name="line.43"></a>
+<span class="sourceLineNo">043</span> @BeanProperty("c")<a name="line.43"></a>
<span class="sourceLineNo">044</span> public HtmlElement setText(Object text) {<a name="line.44"></a>
<span class="sourceLineNo">045</span> this.text = text;<a name="line.45"></a>
<span class="sourceLineNo">046</span> return this;<a name="line.46"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
index 7d157cf..2068f63 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/html5/HtmlElementText.html
@@ -37,7 +37,7 @@
<span class="sourceLineNo">029</span> * @return The inner text of this element, or <jk>null</jk> if no text is set.<a name="line.29"></a>
<span class="sourceLineNo">030</span> */<a name="line.30"></a>
<span class="sourceLineNo">031</span> @Xml(format=XmlFormat.TEXT)<a name="line.31"></a>
-<span class="sourceLineNo">032</span> @BeanProperty(name="c")<a name="line.32"></a>
+<span class="sourceLineNo">032</span> @BeanProperty("c")<a name="line.32"></a>
<span class="sourceLineNo">033</span> public Object getText() {<a name="line.33"></a>
<span class="sourceLineNo">034</span> return text;<a name="line.34"></a>
<span class="sourceLineNo">035</span> }<a name="line.35"></a>
@@ -48,7 +48,7 @@
<span class="sourceLineNo">040</span> * @param text The inner text of this element, or <jk>null</jk> if no text is set.<a name="line.40"></a>
<span class="sourceLineNo">041</span> * @return This object (for method chaining).<a name="line.41"></a>
<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span> @BeanProperty(name="c")<a name="line.43"></a>
+<span class="sourceLineNo">043</span> @BeanProperty("c")<a name="line.43"></a>
<span class="sourceLineNo">044</span> public HtmlElement setText(Object text) {<a name="line.44"></a>
<span class="sourceLineNo">045</span> this.text = text;<a name="line.45"></a>
<span class="sourceLineNo">046</span> return this;<a name="line.46"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
index 273e06f..beb7e17 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
@@ -151,7 +151,7 @@
<span class="sourceLineNo">143</span> *<a name="line.143"></a>
<span class="sourceLineNo">144</span> * @return The value of the <property>$schema</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.144"></a>
<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @BeanProperty(name="$schema")<a name="line.146"></a>
+<span class="sourceLineNo">146</span> @BeanProperty("$schema")<a name="line.146"></a>
<span class="sourceLineNo">147</span> public URI getSchemaVersionUri() {<a name="line.147"></a>
<span class="sourceLineNo">148</span> return schemaVersion;<a name="line.148"></a>
<span class="sourceLineNo">149</span> }<a name="line.149"></a>
@@ -162,7 +162,7 @@
<span class="sourceLineNo">154</span> * @param schemaVersion The new value for the <property>schemaVersion</property> property on this bean.<a name="line.154"></a>
<span class="sourceLineNo">155</span> * @return This object (for method chaining).<a name="line.155"></a>
<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> @BeanProperty(name="$schema")<a name="line.157"></a>
+<span class="sourceLineNo">157</span> @BeanProperty("$schema")<a name="line.157"></a>
<span class="sourceLineNo">158</span> public Schema setSchemaVersionUri(URI schemaVersion) {<a name="line.158"></a>
<span class="sourceLineNo">159</span> this.schemaVersion = schemaVersion;<a name="line.159"></a>
<span class="sourceLineNo">160</span> return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
<span class="sourceLineNo">1272</span> *<a name="line.1272"></a>
<span class="sourceLineNo">1273</span> * @return The value of the <property>$ref</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.1273"></a>
<span class="sourceLineNo">1274</span> */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span> @BeanProperty(name="$ref")<a name="line.1275"></a>
+<span class="sourceLineNo">1275</span> @BeanProperty("$ref")<a name="line.1275"></a>
<span class="sourceLineNo">1276</span> public URI getRef() {<a name="line.1276"></a>
<span class="sourceLineNo">1277</span> return ref;<a name="line.1277"></a>
<span class="sourceLineNo">1278</span> }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
<span class="sourceLineNo">1283</span> * @param ref The new value for the <property>$ref</property> property on this bean.<a name="line.1283"></a>
<span class="sourceLineNo">1284</span> * @return This object (for method chaining).<a name="line.1284"></a>
<span class="sourceLineNo">1285</span> */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span> @BeanProperty(name="$ref")<a name="line.1286"></a>
+<span class="sourceLineNo">1286</span> @BeanProperty("$ref")<a name="line.1286"></a>
<span class="sourceLineNo">1287</span> public Schema setRef(URI ref) {<a name="line.1287"></a>
<span class="sourceLineNo">1288</span> this.ref = ref;<a name="line.1288"></a>
<span class="sourceLineNo">1289</span> return this;<a name="line.1289"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
index 273e06f..beb7e17 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
@@ -151,7 +151,7 @@
<span class="sourceLineNo">143</span> *<a name="line.143"></a>
<span class="sourceLineNo">144</span> * @return The value of the <property>$schema</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.144"></a>
<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @BeanProperty(name="$schema")<a name="line.146"></a>
+<span class="sourceLineNo">146</span> @BeanProperty("$schema")<a name="line.146"></a>
<span class="sourceLineNo">147</span> public URI getSchemaVersionUri() {<a name="line.147"></a>
<span class="sourceLineNo">148</span> return schemaVersion;<a name="line.148"></a>
<span class="sourceLineNo">149</span> }<a name="line.149"></a>
@@ -162,7 +162,7 @@
<span class="sourceLineNo">154</span> * @param schemaVersion The new value for the <property>schemaVersion</property> property on this bean.<a name="line.154"></a>
<span class="sourceLineNo">155</span> * @return This object (for method chaining).<a name="line.155"></a>
<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> @BeanProperty(name="$schema")<a name="line.157"></a>
+<span class="sourceLineNo">157</span> @BeanProperty("$schema")<a name="line.157"></a>
<span class="sourceLineNo">158</span> public Schema setSchemaVersionUri(URI schemaVersion) {<a name="line.158"></a>
<span class="sourceLineNo">159</span> this.schemaVersion = schemaVersion;<a name="line.159"></a>
<span class="sourceLineNo">160</span> return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
<span class="sourceLineNo">1272</span> *<a name="line.1272"></a>
<span class="sourceLineNo">1273</span> * @return The value of the <property>$ref</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.1273"></a>
<span class="sourceLineNo">1274</span> */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span> @BeanProperty(name="$ref")<a name="line.1275"></a>
+<span class="sourceLineNo">1275</span> @BeanProperty("$ref")<a name="line.1275"></a>
<span class="sourceLineNo">1276</span> public URI getRef() {<a name="line.1276"></a>
<span class="sourceLineNo">1277</span> return ref;<a name="line.1277"></a>
<span class="sourceLineNo">1278</span> }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
<span class="sourceLineNo">1283</span> * @param ref The new value for the <property>$ref</property> property on this bean.<a name="line.1283"></a>
<span class="sourceLineNo">1284</span> * @return This object (for method chaining).<a name="line.1284"></a>
<span class="sourceLineNo">1285</span> */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span> @BeanProperty(name="$ref")<a name="line.1286"></a>
+<span class="sourceLineNo">1286</span> @BeanProperty("$ref")<a name="line.1286"></a>
<span class="sourceLineNo">1287</span> public Schema setRef(URI ref) {<a name="line.1287"></a>
<span class="sourceLineNo">1288</span> this.ref = ref;<a name="line.1288"></a>
<span class="sourceLineNo">1289</span> return this;<a name="line.1289"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
index 273e06f..beb7e17 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
@@ -151,7 +151,7 @@
<span class="sourceLineNo">143</span> *<a name="line.143"></a>
<span class="sourceLineNo">144</span> * @return The value of the <property>$schema</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.144"></a>
<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @BeanProperty(name="$schema")<a name="line.146"></a>
+<span class="sourceLineNo">146</span> @BeanProperty("$schema")<a name="line.146"></a>
<span class="sourceLineNo">147</span> public URI getSchemaVersionUri() {<a name="line.147"></a>
<span class="sourceLineNo">148</span> return schemaVersion;<a name="line.148"></a>
<span class="sourceLineNo">149</span> }<a name="line.149"></a>
@@ -162,7 +162,7 @@
<span class="sourceLineNo">154</span> * @param schemaVersion The new value for the <property>schemaVersion</property> property on this bean.<a name="line.154"></a>
<span class="sourceLineNo">155</span> * @return This object (for method chaining).<a name="line.155"></a>
<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> @BeanProperty(name="$schema")<a name="line.157"></a>
+<span class="sourceLineNo">157</span> @BeanProperty("$schema")<a name="line.157"></a>
<span class="sourceLineNo">158</span> public Schema setSchemaVersionUri(URI schemaVersion) {<a name="line.158"></a>
<span class="sourceLineNo">159</span> this.schemaVersion = schemaVersion;<a name="line.159"></a>
<span class="sourceLineNo">160</span> return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
<span class="sourceLineNo">1272</span> *<a name="line.1272"></a>
<span class="sourceLineNo">1273</span> * @return The value of the <property>$ref</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.1273"></a>
<span class="sourceLineNo">1274</span> */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span> @BeanProperty(name="$ref")<a name="line.1275"></a>
+<span class="sourceLineNo">1275</span> @BeanProperty("$ref")<a name="line.1275"></a>
<span class="sourceLineNo">1276</span> public URI getRef() {<a name="line.1276"></a>
<span class="sourceLineNo">1277</span> return ref;<a name="line.1277"></a>
<span class="sourceLineNo">1278</span> }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
<span class="sourceLineNo">1283</span> * @param ref The new value for the <property>$ref</property> property on this bean.<a name="line.1283"></a>
<span class="sourceLineNo">1284</span> * @return This object (for method chaining).<a name="line.1284"></a>
<span class="sourceLineNo">1285</span> */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span> @BeanProperty(name="$ref")<a name="line.1286"></a>
+<span class="sourceLineNo">1286</span> @BeanProperty("$ref")<a name="line.1286"></a>
<span class="sourceLineNo">1287</span> public Schema setRef(URI ref) {<a name="line.1287"></a>
<span class="sourceLineNo">1288</span> this.ref = ref;<a name="line.1288"></a>
<span class="sourceLineNo">1289</span> return this;<a name="line.1289"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
index 273e06f..beb7e17 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
@@ -151,7 +151,7 @@
<span class="sourceLineNo">143</span> *<a name="line.143"></a>
<span class="sourceLineNo">144</span> * @return The value of the <property>$schema</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.144"></a>
<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @BeanProperty(name="$schema")<a name="line.146"></a>
+<span class="sourceLineNo">146</span> @BeanProperty("$schema")<a name="line.146"></a>
<span class="sourceLineNo">147</span> public URI getSchemaVersionUri() {<a name="line.147"></a>
<span class="sourceLineNo">148</span> return schemaVersion;<a name="line.148"></a>
<span class="sourceLineNo">149</span> }<a name="line.149"></a>
@@ -162,7 +162,7 @@
<span class="sourceLineNo">154</span> * @param schemaVersion The new value for the <property>schemaVersion</property> property on this bean.<a name="line.154"></a>
<span class="sourceLineNo">155</span> * @return This object (for method chaining).<a name="line.155"></a>
<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> @BeanProperty(name="$schema")<a name="line.157"></a>
+<span class="sourceLineNo">157</span> @BeanProperty("$schema")<a name="line.157"></a>
<span class="sourceLineNo">158</span> public Schema setSchemaVersionUri(URI schemaVersion) {<a name="line.158"></a>
<span class="sourceLineNo">159</span> this.schemaVersion = schemaVersion;<a name="line.159"></a>
<span class="sourceLineNo">160</span> return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
<span class="sourceLineNo">1272</span> *<a name="line.1272"></a>
<span class="sourceLineNo">1273</span> * @return The value of the <property>$ref</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.1273"></a>
<span class="sourceLineNo">1274</span> */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span> @BeanProperty(name="$ref")<a name="line.1275"></a>
+<span class="sourceLineNo">1275</span> @BeanProperty("$ref")<a name="line.1275"></a>
<span class="sourceLineNo">1276</span> public URI getRef() {<a name="line.1276"></a>
<span class="sourceLineNo">1277</span> return ref;<a name="line.1277"></a>
<span class="sourceLineNo">1278</span> }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
<span class="sourceLineNo">1283</span> * @param ref The new value for the <property>$ref</property> property on this bean.<a name="line.1283"></a>
<span class="sourceLineNo">1284</span> * @return This object (for method chaining).<a name="line.1284"></a>
<span class="sourceLineNo">1285</span> */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span> @BeanProperty(name="$ref")<a name="line.1286"></a>
+<span class="sourceLineNo">1286</span> @BeanProperty("$ref")<a name="line.1286"></a>
<span class="sourceLineNo">1287</span> public Schema setRef(URI ref) {<a name="line.1287"></a>
<span class="sourceLineNo">1288</span> this.ref = ref;<a name="line.1288"></a>
<span class="sourceLineNo">1289</span> return this;<a name="line.1289"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
index 273e06f..beb7e17 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
@@ -151,7 +151,7 @@
<span class="sourceLineNo">143</span> *<a name="line.143"></a>
<span class="sourceLineNo">144</span> * @return The value of the <property>$schema</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.144"></a>
<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @BeanProperty(name="$schema")<a name="line.146"></a>
+<span class="sourceLineNo">146</span> @BeanProperty("$schema")<a name="line.146"></a>
<span class="sourceLineNo">147</span> public URI getSchemaVersionUri() {<a name="line.147"></a>
<span class="sourceLineNo">148</span> return schemaVersion;<a name="line.148"></a>
<span class="sourceLineNo">149</span> }<a name="line.149"></a>
@@ -162,7 +162,7 @@
<span class="sourceLineNo">154</span> * @param schemaVersion The new value for the <property>schemaVersion</property> property on this bean.<a name="line.154"></a>
<span class="sourceLineNo">155</span> * @return This object (for method chaining).<a name="line.155"></a>
<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> @BeanProperty(name="$schema")<a name="line.157"></a>
+<span class="sourceLineNo">157</span> @BeanProperty("$schema")<a name="line.157"></a>
<span class="sourceLineNo">158</span> public Schema setSchemaVersionUri(URI schemaVersion) {<a name="line.158"></a>
<span class="sourceLineNo">159</span> this.schemaVersion = schemaVersion;<a name="line.159"></a>
<span class="sourceLineNo">160</span> return this;<a name="line.160"></a>
@@ -1280,7 +1280,7 @@
<span class="sourceLineNo">1272</span> *<a name="line.1272"></a>
<span class="sourceLineNo">1273</span> * @return The value of the <property>$ref</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.1273"></a>
<span class="sourceLineNo">1274</span> */<a name="line.1274"></a>
-<span class="sourceLineNo">1275</span> @BeanProperty(name="$ref")<a name="line.1275"></a>
+<span class="sourceLineNo">1275</span> @BeanProperty("$ref")<a name="line.1275"></a>
<span class="sourceLineNo">1276</span> public URI getRef() {<a name="line.1276"></a>
<span class="sourceLineNo">1277</span> return ref;<a name="line.1277"></a>
<span class="sourceLineNo">1278</span> }<a name="line.1278"></a>
@@ -1291,7 +1291,7 @@
<span class="sourceLineNo">1283</span> * @param ref The new value for the <property>$ref</property> property on this bean.<a name="line.1283"></a>
<span class="sourceLineNo">1284</span> * @return This object (for method chaining).<a name="line.1284"></a>
<span class="sourceLineNo">1285</span> */<a name="line.1285"></a>
-<span class="sourceLineNo">1286</span> @BeanProperty(name="$ref")<a name="line.1286"></a>
+<span class="sourceLineNo">1286</span> @BeanProperty("$ref")<a name="line.1286"></a>
<span class="sourceLineNo">1287</span> public Schema setRef(URI ref) {<a name="line.1287"></a>
<span class="sourceLineNo">1288</span> this.ref = ref;<a name="line.1288"></a>
<span class="sourceLineNo">1289</span> return this;<a name="line.1289"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
index 4cc8339..5dc5d1e 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
@@ -213,125 +213,152 @@
<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> * Shortcut for calling <code>myList.toArray(new T[myList.size()]);</code><a name="line.208"></a>
-<span class="sourceLineNo">209</span> *<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @param c The collection being converted to an array.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @param componentType The component type of the array.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * @return The collection converted to an array.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> */<a name="line.213"></a>
-<span class="sourceLineNo">214</span> @SuppressWarnings("unchecked")<a name="line.214"></a>
-<span class="sourceLineNo">215</span> public static <T> T[] toObjectArray(Collection<?> c, Class<T> componentType) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> Object a = Array.newInstance(componentType, c.size());<a name="line.216"></a>
-<span class="sourceLineNo">217</span> Iterator<?> it = c.iterator();<a name="line.217"></a>
-<span class="sourceLineNo">218</span> int i = 0;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> while (it.hasNext())<a name="line.219"></a>
-<span class="sourceLineNo">220</span> Array.set(a, i++, it.next());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return (T[])a;<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> * Copies the specified array into the specified list.<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * Works on both object and primitive arrays.<a name="line.226"></a>
-<span class="sourceLineNo">227</span> *<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * @param array The array to copy into a list.<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * @param list The list to copy the values into.<a name="line.229"></a>
-<span class="sourceLineNo">230</span> */<a name="line.230"></a>
-<span class="sourceLineNo">231</span> @SuppressWarnings({"unchecked","rawtypes"})<a name="line.231"></a>
-<span class="sourceLineNo">232</span> public static void copyToList(Object array, List list) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> if (array != null) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> int length = Array.getLength(array);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> for (int i = 0; i < length; i++)<a name="line.235"></a>
-<span class="sourceLineNo">236</span> list.add(Array.get(array, i));<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span> }<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> /**<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * Returns <jk>true</jk> if the specified array contains the specified element<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * using the {@link Object#equals(Object)} method.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> *<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * @param element The element to check for.<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * @param array The array to check.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * @return <jk>true</jk> if the specified array contains the specified element,<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * <jk>false</jk> if the array or element is <jk>null</jk>.<a name="line.247"></a>
-<span class="sourceLineNo">248</span> */<a name="line.248"></a>
-<span class="sourceLineNo">249</span> public static <T> boolean contains(T element, T[] array) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> return indexOf(element, array) != -1;<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * Returns the index position of the element in the specified array<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * using the {@link Object#equals(Object)} method.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> *<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * @param element The element to check for.<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * @param array The array to check.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * @return The index position of the element in the specified array, or<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * <code>-1</code> if the array doesn't contain the element, or the array or element is <jk>null</jk>.<a name="line.260"></a>
-<span class="sourceLineNo">261</span> */<a name="line.261"></a>
-<span class="sourceLineNo">262</span> public static <T> int indexOf(T element, T[] array) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (element == null)<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return -1;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> if (array == null)<a name="line.265"></a>
-<span class="sourceLineNo">266</span> return -1;<a name="line.266"></a>
-<span class="sourceLineNo">267</span> for (int i = 0; i < array.length; i++)<a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (element.equals(array[i]))<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return i;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> return -1;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> /**<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * Returns <jk>true</jk> if the specified array contains the specified element<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * using the {@link String#equals(Object)} method.<a name="line.275"></a>
-<span class="sourceLineNo">276</span> *<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * @param element The element to check for.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * @param array The array to check.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * @return <jk>true</jk> if the specified array contains the specified element,<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * <jk>false</jk> if the array or element is <jk>null</jk>.<a name="line.280"></a>
-<span class="sourceLineNo">281</span> */<a name="line.281"></a>
-<span class="sourceLineNo">282</span> public static boolean contains(String element, String[] array) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return indexOf(element, array) != -1;<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> * Returns the index position of the element in the specified array<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * using the {@link String#equals(Object)} method.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> *<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * @param element The element to check for.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * @param array The array to check.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * @return The index position of the element in the specified array, or<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * <code>-1</code> if the array doesn't contain the element, or the array or element is <jk>null</jk>.<a name="line.293"></a>
-<span class="sourceLineNo">294</span> */<a name="line.294"></a>
-<span class="sourceLineNo">295</span> public static int indexOf(String element, String[] array) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> if (element == null)<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return -1;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (array == null)<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return -1;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> for (int i = 0; i < array.length; i++)<a name="line.300"></a>
-<span class="sourceLineNo">301</span> if (element.equals(array[i]))<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return i;<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return -1;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * Converts a primitive wrapper array (e.g. <code>Integer[]</code>) to a primitive array (e.g. <code><jk>int</jk>[]</code>).<a name="line.307"></a>
-<span class="sourceLineNo">308</span> *<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * @param o The array to convert. Must be a primitive wrapper array.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * @return A new array.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * @throws IllegalArgumentException If object is not a wrapper object array.<a name="line.311"></a>
-<span class="sourceLineNo">312</span> */<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public static Object toPrimitiveArray(Object o) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> Class<?> c = o.getClass();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (! c.isArray())<a name="line.315"></a>
-<span class="sourceLineNo">316</span> throw new IllegalArgumentException("Cannot pass non-array objects to toPrimitiveArray()");<a name="line.316"></a>
-<span class="sourceLineNo">317</span> int l = Array.getLength(o);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Class<?> tc = ClassUtils.getPrimitiveForWrapper(c.getComponentType());<a name="line.318"></a>
-<span class="sourceLineNo">319</span> if (tc == null)<a name="line.319"></a>
-<span class="sourceLineNo">320</span> throw new IllegalArgumentException("Array type is not a primitive wrapper array.");<a name="line.320"></a>
-<span class="sourceLineNo">321</span> Object a = Array.newInstance(tc, l);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> for (int i = 0; i < l; i++)<a name="line.322"></a>
-<span class="sourceLineNo">323</span> Array.set(a, i, Array.get(o, i));<a name="line.323"></a>
-<span class="sourceLineNo">324</span> return a;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>}<a name="line.326"></a>
+<span class="sourceLineNo">208</span> * Returns <jk>true</jk> if the specified object is an array.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @param array The array to test.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * @return <jk>true</jk> if the specified object is an array.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> */<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public static boolean isArray(Object array) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return array != null && array.getClass().isArray();<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> * Converts the specified array to an <code>ArrayList</code><a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <a name="line.218"></a>
+<span class="sourceLineNo">219</span> * @param array The array to convert.<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * @param componentType The type of objects in the array.<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * It must match the actual component type in the array.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * @return A new {@link ArrayList}<a name="line.222"></a>
+<span class="sourceLineNo">223</span> */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> @SuppressWarnings("unchecked")<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public static <T> List<T> toList(Object array, Class<T> componentType) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> List<T> l = new ArrayList<T>(Array.getLength(array));<a name="line.226"></a>
+<span class="sourceLineNo">227</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.227"></a>
+<span class="sourceLineNo">228</span> l.add((T)Array.get(array, i));<a name="line.228"></a>
+<span class="sourceLineNo">229</span> return l;<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> * Shortcut for calling <code>myList.toArray(new T[myList.size()]);</code><a name="line.233"></a>
+<span class="sourceLineNo">234</span> *<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @param c The collection being converted to an array.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * @param componentType The component type of the array.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @return The collection converted to an array.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> */<a name="line.238"></a>
+<span class="sourceLineNo">239</span> @SuppressWarnings("unchecked")<a name="line.239"></a>
+<span class="sourceLineNo">240</span> public static <T> T[] toObjectArray(Collection<?> c, Class<T> componentType) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> Object a = Array.newInstance(componentType, c.size());<a name="line.241"></a>
+<span class="sourceLineNo">242</span> Iterator<?> it = c.iterator();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> int i = 0;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> while (it.hasNext())<a name="line.244"></a>
+<span class="sourceLineNo">245</span> Array.set(a, i++, it.next());<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return (T[])a;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> /**<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * Copies the specified array into the specified list.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * Works on both object and primitive arrays.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> *<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * @param array The array to copy into a list.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * @param list The list to copy the values into.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @return The same list passed in.<a name="line.255"></a>
+<span class="sourceLineNo">256</span> */<a name="line.256"></a>
+<span class="sourceLineNo">257</span> @SuppressWarnings({"unchecked","rawtypes"})<a name="line.257"></a>
+<span class="sourceLineNo">258</span> public static List copyToList(Object array, List list) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (array != null) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> int length = Array.getLength(array);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> for (int i = 0; i < length; i++)<a name="line.261"></a>
+<span class="sourceLineNo">262</span> list.add(Array.get(array, i));<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return list;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> /**<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * Returns <jk>true</jk> if the specified array contains the specified element<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * using the {@link Object#equals(Object)} method.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> *<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * @param element The element to check for.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * @param array The array to check.<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * @return <jk>true</jk> if the specified array contains the specified element,<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * <jk>false</jk> if the array or element is <jk>null</jk>.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> */<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public static <T> boolean contains(T element, T[] array) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> return indexOf(element, array) != -1;<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> /**<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * Returns the index position of the element in the specified array<a name="line.281"></a>
+<span class="sourceLineNo">282</span> * using the {@link Object#equals(Object)} method.<a name="line.282"></a>
+<span class="sourceLineNo">283</span> *<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * @param element The element to check for.<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * @param array The array to check.<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * @return The index position of the element in the specified array, or<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * <code>-1</code> if the array doesn't contain the element, or the array or element is <jk>null</jk>.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> */<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public static <T> int indexOf(T element, T[] array) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> if (element == null)<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return -1;<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (array == null)<a name="line.292"></a>
+<span class="sourceLineNo">293</span> return -1;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> for (int i = 0; i < array.length; i++)<a name="line.294"></a>
+<span class="sourceLineNo">295</span> if (element.equals(array[i]))<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return i;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return -1;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> /**<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * Returns <jk>true</jk> if the specified array contains the specified element<a name="line.301"></a>
+<span class="sourceLineNo">302</span> * using the {@link String#equals(Object)} method.<a name="line.302"></a>
+<span class="sourceLineNo">303</span> *<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * @param element The element to check for.<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * @param array The array to check.<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * @return <jk>true</jk> if the specified array contains the specified element,<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * <jk>false</jk> if the array or element is <jk>null</jk>.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> */<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public static boolean contains(String element, String[] array) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> return indexOf(element, array) != -1;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span> /**<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * Returns the index position of the element in the specified array<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * using the {@link String#equals(Object)} method.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> *<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * @param element The element to check for.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * @param array The array to check.<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * @return The index position of the element in the specified array, or<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * <code>-1</code> if the array doesn't contain the element, or the array or element is <jk>null</jk>.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> */<a name="line.321"></a>
+<span class="sourceLineNo">322</span> public static int indexOf(String element, String[] array) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (element == null)<a name="line.323"></a>
+<span class="sourceLineNo">324</span> return -1;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> if (array == null)<a name="line.325"></a>
+<span class="sourceLineNo">326</span> return -1;<a name="line.326"></a>
+<span class="sourceLineNo">327</span> for (int i = 0; i < array.length; i++)<a name="line.327"></a>
+<span class="sourceLineNo">328</span> if (element.equals(array[i]))<a name="line.328"></a>
+<span class="sourceLineNo">329</span> return i;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> return -1;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> }<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> /**<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * Converts a primitive wrapper array (e.g. <code>Integer[]</code>) to a primitive array (e.g. <code><jk>int</jk>[]</code>).<a name="line.334"></a>
+<span class="sourceLineNo">335</span> *<a name="line.335"></a>
+<span class="sourceLineNo">336</span> * @param o The array to convert. Must be a primitive wrapper array.<a name="line.336"></a>
+<span class="sourceLineNo">337</span> * @return A new array.<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * @throws IllegalArgumentException If object is not a wrapper object array.<a name="line.338"></a>
+<span class="sourceLineNo">339</span> */<a name="line.339"></a>
+<span class="sourceLineNo">340</span> public static Object toPrimitiveArray(Object o) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> Class<?> c = o.getClass();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> if (! c.isArray())<a name="line.342"></a>
+<span class="sourceLineNo">343</span> throw new IllegalArgumentException("Cannot pass non-array objects to toPrimitiveArray()");<a name="line.343"></a>
+<span class="sourceLineNo">344</span> int l = Array.getLength(o);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> Class<?> tc = ClassUtils.getPrimitiveForWrapper(c.getComponentType());<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (tc == null)<a name="line.346"></a>
+<span class="sourceLineNo">347</span> throw new IllegalArgumentException("Array type is not a primitive wrapper array.");<a name="line.347"></a>
+<span class="sourceLineNo">348</span> Object a = Array.newInstance(tc, l);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> for (int i = 0; i < l; i++)<a name="line.349"></a>
+<span class="sourceLineNo">350</span> Array.set(a, i, Array.get(o, i));<a name="line.350"></a>
+<span class="sourceLineNo">351</span> return a;<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span>}<a name="line.353"></a>
[26/32] incubator-juneau-website git commit: Update javadocs
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/19e9b7df/content/site/apidocs/org/apache/juneau/rest/RequestQuery.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/RequestQuery.html b/content/site/apidocs/org/apache/juneau/rest/RequestQuery.html
index 3063752..50f8d4d 100644
--- a/content/site/apidocs/org/apache/juneau/rest/RequestQuery.html
+++ b/content/site/apidocs/org/apache/juneau/rest/RequestQuery.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.29">RequestQuery</a>
+<pre>public final class <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.30">RequestQuery</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMap.html?is-external=true" title="class or interface in java.util">LinkedHashMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></pre>
<div class="block">Represents the query parameters in an HTTP request.</div>
<dl>
@@ -265,6 +265,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<div class="block">Sets a request query parameter value.</div>
</td>
</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestQuery.html#toString--">toString</a></span>()</code> </td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/rest/RequestQuery.html#toString-boolean-">toString</a></span>(boolean sorted)</code>
+<div class="block">Converts the query parameters to a readable string.</div>
+</td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.util.LinkedHashMap">
@@ -285,7 +295,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<!-- -->
</a>
<h3>Methods inherited from class java.util.<a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true" title="class or interface in java.util">AbstractMap</a></h3>
-<code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.util">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#hashCode--" title="class or interface in java.util">hashCode</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#toString--" title="class or interface in java.util">toString</a></code></li>
+<code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.util">equals</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#hashCode--" title="class or interface in java.util">hashCode</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -321,7 +331,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockListLast">
<li class="blockList">
<h4>RequestQuery</h4>
-<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.29">RequestQuery</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.30">RequestQuery</a>()</pre>
</li>
</ul>
</li>
@@ -338,7 +348,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>addDefault</h4>
-<pre>public <a href="../../../../org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.53">addDefault</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> defaultEntries)</pre>
+<pre>public <a href="../../../../org/apache/juneau/rest/RequestQuery.html" title="class in org.apache.juneau.rest">RequestQuery</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.54">addDefault</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> defaultEntries)</pre>
<div class="block">Adds default entries to these query parameters.
<p>
This includes the default queries defined on the servlet and method levels.</div>
@@ -356,7 +366,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>put</h4>
-<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.71">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public void <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.72">put</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</pre>
<div class="block">Sets a request query parameter value.</div>
<dl>
@@ -372,7 +382,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>getFirst</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.85">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.86">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
<div class="block">Returns a query parameter value.
<p>
Same as <a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletRequest.html?is-external=true#getParameter-java.lang.String-" title="class or interface in javax.servlet"><code>ServletRequest.getParameter(String)</code></a> except only looks in the URL string, not parameters from URL-Encoded FORM posts.
@@ -392,7 +402,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>getFirst</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.106">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.107">getFirst</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> def)</pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RequestQuery.html#getFirst-java.lang.String-"><code>getFirst(String)</code></a> but returns the specified default value if the query parameter was not specified.</div>
<dl>
@@ -410,7 +420,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.140">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.141">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Returns the specified query parameter value converted to a POJO.
@@ -455,7 +465,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.154">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.155">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
T def,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> type)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -480,7 +490,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.190">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.191">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -527,7 +537,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>get</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.208">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.209">get</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> def,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
@@ -557,7 +567,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>getAll</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.224">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.225">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><T> c)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/juneau/rest/RequestQuery.html#get-java.lang.String-java.lang.Class-"><code>get(String, Class)</code></a> except for use on multi-part parameters
@@ -583,7 +593,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<ul class="blockList">
<li class="blockList">
<h4>getAll</h4>
-<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.244">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
+<pre>public <T> T <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.245">getAll</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a> type,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true" title="class or interface in java.lang.reflect">Type</a>... args)
throws <a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a></pre>
@@ -611,10 +621,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
<a name="containsAnyKeys-java.lang.String...-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>containsAnyKeys</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.254">containsAnyKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... params)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.255">containsAnyKeys</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... params)</pre>
<div class="block">Returns <jk>true</jk> if the request contains any of the specified query parameters.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -624,6 +634,35 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/util/LinkedHashMa
</dl>
</li>
</ul>
+<a name="toString-boolean-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.315">toString</a>(boolean sorted)</pre>
+<div class="block">Converts the query parameters to a readable string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sorted</code> - Sort the query parameters by name.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A JSON string containing the contents of the query parameters.</dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/rest/RequestQuery.html#line.325">toString</a>()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true#toString--" title="class or interface in java.util">toString</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/AbstractMap.html?is-external=true" title="class or interface in java.util">AbstractMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]></code></dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>