http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/80ff9b74/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 e815156..79c2816 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
@@ -211,187 +211,188 @@
 <span class="sourceLineNo">203</span>    * @param eType The expected type of 
the object if this is a bean property.<a name="line.203"></a>
 <span class="sourceLineNo">204</span>    * @param attrName The bean property 
name if this is a bean property.  &lt;jk&gt;null&lt;/jk&gt; if this isn't a 
bean property being serialized.<a name="line.204"></a>
 <span class="sourceLineNo">205</span>    * @param pMeta The bean property 
metadata.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    *<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    * @return The same writer passed 
in.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * @throws Exception<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>    */<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   @SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   protected SerializerWriter 
serializeAnything(UonSerializerSession session, UonWriter out, Object o, 
ClassMeta&lt;?&gt; eType,<a name="line.211"></a>
-<span class="sourceLineNo">212</span>         String attrName, 
BeanPropertyMeta pMeta) throws Exception {<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>      if (o == null) {<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>         out.appendObject(null, false);<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>         return out;<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>      if (eType == null)<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>         eType = object();<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>      ClassMeta&lt;?&gt; aType;        // 
The actual type<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      ClassMeta&lt;?&gt; sType;        // 
The serialized type<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>      aType = session.push(attrName, o, 
eType);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      boolean isRecursion = aType == 
null;<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>      // Handle recursion<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>      if (aType == null) {<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>         o = null;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>         aType = object();<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>      sType = 
aType.getSerializedClassMeta();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      String typeName = 
session.getBeanTypeName(eType, aType, pMeta);<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>      // Swap if necessary<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>      PojoSwap swap = 
aType.getPojoSwap();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      if (swap != null) {<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>         o = swap.swap(session, o);<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>         // If the getSwapClass() method 
returns Object, we need to figure out<a name="line.242"></a>
-<span class="sourceLineNo">243</span>         // the actual type now.<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>         if (sType.isObject())<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>            sType = 
session.getClassMetaForObject(o);<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>      // '\0' characters are considered 
null.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      if (o == null || (sType.isChar() 
&amp;&amp; ((Character)o).charValue() == 0))<a name="line.249"></a>
-<span class="sourceLineNo">250</span>         out.appendObject(null, false);<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>      else if (sType.isBoolean())<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>         out.appendBoolean(o);<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>      else if (sType.isNumber())<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>         out.appendNumber(o);<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>      else if (sType.isBean())<a 
name="line.255"></a>
-<span class="sourceLineNo">256</span>         serializeBeanMap(session, out, 
session.toBeanMap(o), typeName);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      else if (sType.isUri() || (pMeta != 
null &amp;&amp; pMeta.isUri()))<a name="line.257"></a>
-<span class="sourceLineNo">258</span>         out.appendUri(o);<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>      else if (sType.isMap()) {<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>         if (o instanceof BeanMap)<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>            serializeBeanMap(session, 
out, (BeanMap)o, typeName);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>         else<a name="line.262"></a>
-<span class="sourceLineNo">263</span>            serializeMap(session, out, 
(Map)o, eType);<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      else if (sType.isCollection()) {<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>         serializeCollection(session, 
out, (Collection) o, eType);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      else if (sType.isArray()) {<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>         serializeCollection(session, 
out, toList(sType.getInnerClass(), o), eType);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      }<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      else {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>         out.appendObject(o, false);<a 
name="line.272"></a>
-<span class="sourceLineNo">273</span>      }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>      if (! isRecursion)<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>         session.pop();<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>      return out;<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>   @SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   private SerializerWriter 
serializeMap(UonSerializerSession session, UonWriter out, Map m, 
ClassMeta&lt;?&gt; type) throws Exception {<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span>      m = session.sort(m);<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>      ClassMeta&lt;?&gt; keyType = 
type.getKeyType(), valueType = type.getValueType();<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>      int depth = session.getIndent();<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>      out.append('(');<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>      Iterator mapEntries = 
m.entrySet().iterator();<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>      while (mapEntries.hasNext()) {<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>         Map.Entry e = (Map.Entry) 
mapEntries.next();<a name="line.293"></a>
-<span class="sourceLineNo">294</span>         Object value = e.getValue();<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>         Object key = 
session.generalize(e.getKey(), keyType);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>         out.cr(depth).appendObject(key, 
false).append('=');<a name="line.296"></a>
-<span class="sourceLineNo">297</span>         serializeAnything(session, out, 
value, valueType, (key == null ? null : session.toString(key)), null);<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>         if (mapEntries.hasNext())<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>            out.append(',');<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>      if (m.size() &gt; 0)<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>         out.cr(depth-1);<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>      out.append(')');<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>      return out;<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>   private SerializerWriter 
serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap&lt;?&gt; 
m, String typeName) throws Exception {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      int depth = session.getIndent();<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>      out.append('(');<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>      boolean addComma = false;<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>      for (BeanPropertyValue p : 
m.getValues(session.isTrimNulls(), typeName != null ? 
session.createBeanTypeNameProperty(m, typeName) : null)) {<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>         BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.317"></a>
-<span class="sourceLineNo">318</span>         ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>         String key = p.getName();<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span>         Object value = p.getValue();<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span>         Throwable t = p.getThrown();<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>         if (t != null)<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>            
session.addBeanGetterWarning(pMeta, t);<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>         if 
(session.canIgnoreValue(cMeta, key, value))<a name="line.326"></a>
-<span class="sourceLineNo">327</span>            continue;<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>         if (addComma)<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>            out.append(',');<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>         out.cr(depth).appendObject(key, 
false).append('=');<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>         serializeAnything(session, out, 
value, cMeta, key, pMeta);<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>         addComma = true;<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>      if (m.size() &gt; 0)<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>         out.cr(depth-1);<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>      out.append(')');<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>      return out;<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>   @SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   private SerializerWriter 
serializeCollection(UonSerializerSession session, UonWriter out, Collection c, 
ClassMeta&lt;?&gt; type) throws Exception {<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>      ClassMeta&lt;?&gt; elementType = 
type.getElementType();<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>      c = session.sort(c);<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>      out.append('@').append('(');<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span><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>      for (Iterator i = c.iterator(); 
i.hasNext();) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>         out.cr(depth);<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span>         serializeAnything(session, out, 
i.next(), elementType, "&lt;iterator&gt;", null);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>         if (i.hasNext())<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>            out.append(',');<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>      if (c.size() &gt; 0)<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>         out.cr(depth-1);<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>      out.append(')');<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span>      return out;<a name="line.368"></a>
-<span class="sourceLineNo">369</span>   }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">206</span>    * @param plainTextParams 
&lt;jk&gt;true&lt;/jk&gt; if this is a top level parameter key or value and 
paramFormat is PLAINTEXT.<a name="line.206"></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&lt;?&gt; eType,<a name="line.212"></a>
+<span class="sourceLineNo">213</span>         String attrName, 
BeanPropertyMeta pMeta, boolean plainTextParams) 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, 
plainTextParams);<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&lt;?&gt; aType;        // 
The actual type<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      ClassMeta&lt;?&gt; 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() 
&amp;&amp; ((Character)o).charValue() == 0))<a name="line.250"></a>
+<span class="sourceLineNo">251</span>         out.appendObject(null, false, 
plainTextParams);<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 &amp;&amp; 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, 
plainTextParams);<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&lt;?&gt; 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&lt;?&gt; 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>      out.append('(');<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span>      Iterator mapEntries = 
m.entrySet().iterator();<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>      while (mapEntries.hasNext()) {<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>         Map.Entry e = (Map.Entry) 
mapEntries.next();<a name="line.294"></a>
+<span class="sourceLineNo">295</span>         Object value = e.getValue();<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>         Object key = 
session.generalize(e.getKey(), keyType);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>         out.cr(depth).appendObject(key, 
false, false).append('=');<a name="line.297"></a>
+<span class="sourceLineNo">298</span>         serializeAnything(session, out, 
value, valueType, (key == null ? null : session.toString(key)), null, false);<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>         if (mapEntries.hasNext())<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>            out.append(',');<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>      if (m.size() &gt; 0)<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>         out.cr(depth-1);<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>      out.append(')');<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>      return out;<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>   private SerializerWriter 
serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap&lt;?&gt; 
m, String typeName) throws Exception {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      int depth = session.getIndent();<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>      out.append('(');<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>      boolean addComma = false;<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>      for (BeanPropertyValue p : 
m.getValues(session.isTrimNulls(), typeName != null ? 
session.createBeanTypeNameProperty(m, typeName) : null)) {<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>         BeanPropertyMeta pMeta = 
p.getMeta();<a name="line.318"></a>
+<span class="sourceLineNo">319</span>         ClassMeta&lt;?&gt; cMeta = 
p.getClassMeta();<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span>         String key = p.getName();<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>         Object value = p.getValue();<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>         Throwable t = p.getThrown();<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>         if (t != null)<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>            
session.addBeanGetterWarning(pMeta, t);<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>         if 
(session.canIgnoreValue(cMeta, key, value))<a name="line.327"></a>
+<span class="sourceLineNo">328</span>            continue;<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span>         if (addComma)<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>            out.append(',');<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>         out.cr(depth).appendObject(key, 
false, false).append('=');<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>         serializeAnything(session, out, 
value, cMeta, key, pMeta, false);<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>         addComma = true;<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>      if (m.size() &gt; 0)<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>         out.cr(depth-1);<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>      out.append(')');<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>      return out;<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>   @SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   private SerializerWriter 
serializeCollection(UonSerializerSession session, UonWriter out, Collection c, 
ClassMeta&lt;?&gt; type) throws Exception {<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>      ClassMeta&lt;?&gt; elementType = 
type.getElementType();<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>      c = session.sort(c);<a 
name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span>      out.append('@').append('(');<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>      int depth = session.getIndent();<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>      for (Iterator i = c.iterator(); 
i.hasNext();) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         out.cr(depth);<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>         serializeAnything(session, out, 
i.next(), elementType, "&lt;iterator&gt;", null, false);<a name="line.360"></a>
+<span class="sourceLineNo">361</span>         if (i.hasNext())<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>            out.append(',');<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>      if (c.size() &gt; 0)<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>         out.cr(depth-1);<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>      out.append(')');<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>      return out;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   }<a name="line.370"></a>
 <span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>   
//--------------------------------------------------------------------------------<a
 name="line.372"></a>
-<span class="sourceLineNo">373</span>   // Entry point methods<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>   @Override /* Serializer */<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>   public UonSerializerSession 
createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, 
TimeZone timeZone, MediaType mediaType) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      return new 
UonSerializerSession(ctx, op, output, javaMethod, locale, timeZone, 
mediaType);<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>   @Override /* Serializer */<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>   protected void 
doSerialize(SerializerSession session, Object o) throws Exception {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>      UonSerializerSession s = 
(UonSerializerSession)session;<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      serializeAnything(s, s.getWriter(), 
o, s.getExpectedRootType(o), "root", null);<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">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span>   
//--------------------------------------------------------------------------------<a
 name="line.373"></a>
+<span class="sourceLineNo">374</span>   // Entry point methods<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>   @Override /* Serializer */<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>   public UonSerializerSession 
createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, 
TimeZone timeZone, MediaType mediaType) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      return new 
UonSerializerSession(ctx, null, op, output, javaMethod, locale, timeZone, 
mediaType);<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>   @Override /* Serializer */<a 
name="line.382"></a>
+<span class="sourceLineNo">383</span>   protected void 
doSerialize(SerializerSession session, Object o) throws Exception {<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>      UonSerializerSession s = 
(UonSerializerSession)session;<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      serializeAnything(s, s.getWriter(), 
o, s.getExpectedRootType(o), "root", null, false);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/80ff9b74/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 f4ceb27..f8ccef9 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
@@ -46,54 +46,55 @@
 <span class="sourceLineNo">038</span>    *<a name="line.38"></a>
 <span class="sourceLineNo">039</span>    * @param ctx The context creating 
this session object.<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    * The context contains all the 
configuration settings for this object.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    * @param output The output object.  
See {@link JsonSerializerSession#getWriter()} for valid class types.<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>    * @param op The override 
properties.<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    * These override any context 
properties defined in the context.<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    * @param javaMethod The java method 
that called this serializer, usually the method in a REST servlet.<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>    * @param locale The session locale.<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then 
the locale defined on the context is used.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    * @param timeZone The session 
timezone.<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then 
the timezone defined on the context is used.<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    * @param mediaType The session media 
type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   protected 
UonSerializerSession(UonSerializerContext ctx, ObjectMap op, Object output, 
Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>      super(ctx, op, output, javaMethod, 
locale, timeZone, mediaType);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      if (op == null || op.isEmpty()) {<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>         encodeChars = ctx.encodeChars;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>         addBeanTypeProperties = 
ctx.addBeanTypeProperties;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>      } else {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>         encodeChars = 
op.getBoolean(UON_encodeChars, ctx.encodeChars);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>         addBeanTypeProperties = 
op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<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>   /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * Returns the {@link 
UonSerializerContext#UON_encodeChars} setting value for this session.<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    *<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * @return The {@link 
UonSerializerContext#UON_encodeChars} setting value for this session.<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   public final boolean isEncodeChars() 
{<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      return encodeChars;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>   }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>   /**<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    * Returns the {@link 
UonSerializerContext#UON_addBeanTypeProperties} 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>    * @return The {@link 
UonSerializerContext#UON_addBeanTypeProperties} setting value for this 
session.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   @Override /* SerializerSession */<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>   public final boolean 
isAddBeanTypeProperties() {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      return addBeanTypeProperties;<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>   }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>   @Override /* SerializerSession */<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>   public final UonWriter getWriter() 
throws Exception {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      Object output = getOutput();<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>      if (output instanceof UonWriter)<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>         return (UonWriter)output;<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>      return new UonWriter(this, 
super.getWriter(), isUseWhitespace(), isEncodeChars(), isTrimStrings(), 
getRelativeUriBase(), getAbsolutePathUriBase());<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">041</span>    * @param encode Override the {@link 
UonSerializerContext#UON_encodeChars} setting.<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    * @param output The output object.  
See {@link JsonSerializerSession#getWriter()} for valid class types.<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>    * @param op The override 
properties.<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    * These override any context 
properties defined in the context.<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    * @param javaMethod The java method 
that called this serializer, usually the method in a REST servlet.<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>    * @param locale The session locale.<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then 
the locale defined on the context is used.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    * @param timeZone The session 
timezone.<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    * If &lt;jk&gt;null&lt;/jk&gt;, then 
the timezone defined on the context is used.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    * @param mediaType The session media 
type (e.g. &lt;js&gt;"application/json"&lt;/js&gt;).<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    */<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   protected 
UonSerializerSession(UonSerializerContext ctx, Boolean encode, ObjectMap op, 
Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType 
mediaType) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      super(ctx, op, output, javaMethod, 
locale, timeZone, mediaType);<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      if (op == null || op.isEmpty()) {<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>         encodeChars = encode == null ? 
ctx.encodeChars : encode;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>         addBeanTypeProperties = 
ctx.addBeanTypeProperties;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>      } else {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>         encodeChars = encode == null ? 
op.getBoolean(UON_encodeChars, ctx.encodeChars) : encode;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>         addBeanTypeProperties = 
op.getBoolean(MSGPACK_addBeanTypeProperties, ctx.addBeanTypeProperties);<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><a name="line.62"></a>
+<span class="sourceLineNo">063</span>   /**<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    * Returns the {@link 
UonSerializerContext#UON_encodeChars} setting value for this session.<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>    *<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    * @return The {@link 
UonSerializerContext#UON_encodeChars} setting value for this session.<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>    */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   public final boolean isEncodeChars() 
{<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      return encodeChars;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>   }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>   /**<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    * Returns the {@link 
UonSerializerContext#UON_addBeanTypeProperties} setting value for this 
session.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    *<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    * @return The {@link 
UonSerializerContext#UON_addBeanTypeProperties} setting value for this 
session.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    */<a name="line.76"></a>
+<span class="sourceLineNo">077</span>   @Override /* SerializerSession */<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>   public final boolean 
isAddBeanTypeProperties() {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      return addBeanTypeProperties;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>   }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>   @Override /* SerializerSession */<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>   public final UonWriter getWriter() 
throws Exception {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      Object output = getOutput();<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>      if (output instanceof UonWriter)<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>         return (UonWriter)output;<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>      return new UonWriter(this, 
super.getWriter(), isUseWhitespace(), isEncodeChars(), isTrimStrings(), 
getRelativeUriBase(), getAbsolutePathUriBase());<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/80ff9b74/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html 
b/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html
new file mode 100644
index 0000000..604552b
--- /dev/null
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonUtils.html
@@ -0,0 +1,124 @@
+<!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.uon;<a 
name="line.13"></a>
+<span class="sourceLineNo">014</span><a name="line.14"></a>
+<span class="sourceLineNo">015</span>import org.apache.juneau.internal.*;<a 
name="line.15"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
+<span class="sourceLineNo">018</span> * Utility methods for the UON and 
UrlEncoding serializers and parsers.<a name="line.18"></a>
+<span class="sourceLineNo">019</span> */<a name="line.19"></a>
+<span class="sourceLineNo">020</span>public final class UonUtils {<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>   private static final AsciiSet 
needsQuoteChars = new AsciiSet("),=\n\t\r\b\f ");<a name="line.22"></a>
+<span class="sourceLineNo">023</span>   private static final AsciiSet 
maybeNeedsQuotesFirstChar = new AsciiSet("),=\n\t\r\b\f tfn+-.#0123456789");<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if the specified string needs to be quoted per UON notation.<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>    * &lt;p&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>    * For example, strings that start 
with '(' or '@' or look like boolean or numeric values<a name="line.28"></a>
+<span class="sourceLineNo">029</span>    * need to be quoted.<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>    *<a name="line.30"></a>
+<span class="sourceLineNo">031</span>    * @param s The string to test.<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if the specified string needs to be quoted per UON notation.<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>    */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>   public static final boolean 
needsQuotes(String s) {<a name="line.34"></a>
+<span class="sourceLineNo">035</span>      char c0 = s.isEmpty() ? 0 : 
s.charAt(0);<a name="line.35"></a>
+<span class="sourceLineNo">036</span>      return (<a name="line.36"></a>
+<span class="sourceLineNo">037</span>         s.isEmpty()<a name="line.37"></a>
+<span class="sourceLineNo">038</span>         || c0 == '@'<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>         || c0 == '('<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>         || needsQuoteChars.contains(s)<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>         || (<a name="line.41"></a>
+<span class="sourceLineNo">042</span>            
maybeNeedsQuotesFirstChar.contains(c0)<a name="line.42"></a>
+<span class="sourceLineNo">043</span>            &amp;&amp; (<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>               "true".equals(s)<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>               || "false".equals(s)<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>               || "null".equals(s)<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>               || 
StringUtils.isNumeric(s)<a name="line.47"></a>
+<span class="sourceLineNo">048</span>            )<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>
+<span class="sourceLineNo">052</span>}<a name="line.52"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

Reply via email to