Repository: incubator-juneau-website Updated Branches: refs/heads/asf-site 776c3c280 -> 236aea453
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/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 1ee1931..122c8c0 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 @@ -247,160 +247,189 @@ <span class="sourceLineNo">239</span> serializeMap(session, out, (Map)o, sType);<a name="line.239"></a> <span class="sourceLineNo">240</span> } else if (sType.isBean()) {<a name="line.240"></a> <span class="sourceLineNo">241</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.241"></a> -<span class="sourceLineNo">242</span> } else if (sType.isCollection()) {<a name="line.242"></a> -<span class="sourceLineNo">243</span> serializeMap(session, out, getCollectionMap((Collection)o), session.getClassMeta(Map.class, Integer.class, sType.getElementType()));<a name="line.243"></a> -<span class="sourceLineNo">244</span> } else {<a name="line.244"></a> -<span class="sourceLineNo">245</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.245"></a> -<span class="sourceLineNo">246</span> // mock key/value pair with a "_value" key.<a name="line.246"></a> -<span class="sourceLineNo">247</span> out.append("_value=");<a name="line.247"></a> -<span class="sourceLineNo">248</span> super.serializeAnything(session, out, o, null, null, null);<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> session.pop();<a name="line.251"></a> -<span class="sourceLineNo">252</span> return out;<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> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.255"></a> -<span class="sourceLineNo">256</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.256"></a> -<span class="sourceLineNo">257</span> int i = 0;<a name="line.257"></a> -<span class="sourceLineNo">258</span> for (Object o : c)<a name="line.258"></a> -<span class="sourceLineNo">259</span> m.put(i++, o);<a name="line.259"></a> -<span class="sourceLineNo">260</span> return m;<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> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.263"></a> -<span class="sourceLineNo">264</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.264"></a> -<span class="sourceLineNo">265</span><a name="line.265"></a> -<span class="sourceLineNo">266</span> m = session.sort(m);<a name="line.266"></a> -<span class="sourceLineNo">267</span><a name="line.267"></a> -<span class="sourceLineNo">268</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.268"></a> -<span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> int depth = session.getIndent();<a name="line.270"></a> -<span class="sourceLineNo">271</span> boolean addAmp = false;<a name="line.271"></a> -<span class="sourceLineNo">272</span><a name="line.272"></a> -<span class="sourceLineNo">273</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.273"></a> -<span class="sourceLineNo">274</span><a name="line.274"></a> -<span class="sourceLineNo">275</span> while (mapEntries.hasNext()) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.276"></a> -<span class="sourceLineNo">277</span> Object value = e.getValue();<a name="line.277"></a> -<span class="sourceLineNo">278</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.278"></a> +<span class="sourceLineNo">242</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.242"></a> +<span class="sourceLineNo">243</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.243"></a> +<span class="sourceLineNo">244</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.244"></a> +<span class="sourceLineNo">245</span> } else {<a name="line.245"></a> +<span class="sourceLineNo">246</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.246"></a> +<span class="sourceLineNo">247</span> // mock key/value pair with a "_value" key.<a name="line.247"></a> +<span class="sourceLineNo">248</span> out.append("_value=");<a name="line.248"></a> +<span class="sourceLineNo">249</span> super.serializeAnything(session, out, o, null, null, null);<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> session.pop();<a name="line.252"></a> +<span class="sourceLineNo">253</span> return out;<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> /**<a name="line.256"></a> +<span class="sourceLineNo">257</span> * Converts a Collection into an integer-indexed map.<a name="line.257"></a> +<span class="sourceLineNo">258</span> */<a name="line.258"></a> +<span class="sourceLineNo">259</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.259"></a> +<span class="sourceLineNo">260</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.260"></a> +<span class="sourceLineNo">261</span> int i = 0;<a name="line.261"></a> +<span class="sourceLineNo">262</span> for (Object o : c)<a name="line.262"></a> +<span class="sourceLineNo">263</span> m.put(i++, o);<a name="line.263"></a> +<span class="sourceLineNo">264</span> return m;<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> * Converts an array into an integer-indexed map.<a name="line.268"></a> +<span class="sourceLineNo">269</span> */<a name="line.269"></a> +<span class="sourceLineNo">270</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.270"></a> +<span class="sourceLineNo">271</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.271"></a> +<span class="sourceLineNo">272</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.272"></a> +<span class="sourceLineNo">273</span> m.put(i, Array.get(array, i));<a name="line.273"></a> +<span class="sourceLineNo">274</span> return m;<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> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.277"></a> +<span class="sourceLineNo">278</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<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> if (session.shouldUseExpandedParams(value)) {<a name="line.281"></a> -<span class="sourceLineNo">282</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.282"></a> -<span class="sourceLineNo">283</span> while (i.hasNext()) {<a name="line.283"></a> -<span class="sourceLineNo">284</span> if (addAmp)<a name="line.284"></a> -<span class="sourceLineNo">285</span> out.cr(depth).append('&');<a name="line.285"></a> -<span class="sourceLineNo">286</span> out.appendObject(key, true).append('=');<a name="line.286"></a> -<span class="sourceLineNo">287</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.287"></a> -<span class="sourceLineNo">288</span> addAmp = true;<a name="line.288"></a> -<span class="sourceLineNo">289</span> }<a name="line.289"></a> -<span class="sourceLineNo">290</span> } else {<a name="line.290"></a> -<span class="sourceLineNo">291</span> if (addAmp)<a name="line.291"></a> -<span class="sourceLineNo">292</span> out.cr(depth).append('&');<a name="line.292"></a> -<span class="sourceLineNo">293</span> out.appendObject(key, true).append('=');<a name="line.293"></a> -<span class="sourceLineNo">294</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.294"></a> -<span class="sourceLineNo">295</span> addAmp = true;<a name="line.295"></a> -<span class="sourceLineNo">296</span> }<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> return out;<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> @SuppressWarnings({ "rawtypes" })<a name="line.302"></a> -<span class="sourceLineNo">303</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.303"></a> -<span class="sourceLineNo">304</span> int depth = session.getIndent();<a name="line.304"></a> -<span class="sourceLineNo">305</span><a name="line.305"></a> -<span class="sourceLineNo">306</span> boolean addAmp = false;<a name="line.306"></a> -<span class="sourceLineNo">307</span><a name="line.307"></a> -<span class="sourceLineNo">308</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.308"></a> -<span class="sourceLineNo">309</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.309"></a> -<span class="sourceLineNo">310</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.310"></a> +<span class="sourceLineNo">280</span> m = session.sort(m);<a name="line.280"></a> +<span class="sourceLineNo">281</span><a name="line.281"></a> +<span class="sourceLineNo">282</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.282"></a> +<span class="sourceLineNo">283</span><a name="line.283"></a> +<span class="sourceLineNo">284</span> int depth = session.getIndent();<a name="line.284"></a> +<span class="sourceLineNo">285</span> boolean addAmp = false;<a name="line.285"></a> +<span class="sourceLineNo">286</span><a name="line.286"></a> +<span class="sourceLineNo">287</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.287"></a> +<span class="sourceLineNo">288</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.288"></a> +<span class="sourceLineNo">289</span> Object value = e.getValue();<a name="line.289"></a> +<span class="sourceLineNo">290</span><a name="line.290"></a> +<span class="sourceLineNo">291</span> if (session.shouldUseExpandedParams(value)) {<a name="line.291"></a> +<span class="sourceLineNo">292</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.292"></a> +<span class="sourceLineNo">293</span> while (i.hasNext()) {<a name="line.293"></a> +<span class="sourceLineNo">294</span> if (addAmp)<a name="line.294"></a> +<span class="sourceLineNo">295</span> out.cr(depth).append('&');<a name="line.295"></a> +<span class="sourceLineNo">296</span> out.appendObject(key, true).append('=');<a name="line.296"></a> +<span class="sourceLineNo">297</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.297"></a> +<span class="sourceLineNo">298</span> addAmp = true;<a name="line.298"></a> +<span class="sourceLineNo">299</span> }<a name="line.299"></a> +<span class="sourceLineNo">300</span> } else {<a name="line.300"></a> +<span class="sourceLineNo">301</span> if (addAmp)<a name="line.301"></a> +<span class="sourceLineNo">302</span> out.cr(depth).append('&');<a name="line.302"></a> +<span class="sourceLineNo">303</span> out.appendObject(key, true).append('=');<a name="line.303"></a> +<span class="sourceLineNo">304</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.304"></a> +<span class="sourceLineNo">305</span> addAmp = true;<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> return out;<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> String key = p.getName();<a name="line.312"></a> -<span class="sourceLineNo">313</span> Object value = p.getValue();<a name="line.313"></a> -<span class="sourceLineNo">314</span> Throwable t = p.getThrown();<a name="line.314"></a> -<span class="sourceLineNo">315</span> if (t != null)<a name="line.315"></a> -<span class="sourceLineNo">316</span> session.addBeanGetterWarning(pMeta, t);<a name="line.316"></a> -<span class="sourceLineNo">317</span><a name="line.317"></a> -<span class="sourceLineNo">318</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.318"></a> -<span class="sourceLineNo">319</span> continue;<a name="line.319"></a> -<span class="sourceLineNo">320</span><a name="line.320"></a> -<span class="sourceLineNo">321</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.321"></a> -<span class="sourceLineNo">322</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.322"></a> -<span class="sourceLineNo">323</span> // so we need to check type if we think it's an array.<a name="line.323"></a> -<span class="sourceLineNo">324</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.324"></a> -<span class="sourceLineNo">325</span> while (i.hasNext()) {<a name="line.325"></a> -<span class="sourceLineNo">326</span> if (addAmp)<a name="line.326"></a> -<span class="sourceLineNo">327</span> out.cr(depth).append('&');<a name="line.327"></a> -<span class="sourceLineNo">328</span><a name="line.328"></a> -<span class="sourceLineNo">329</span> out.appendObject(key, true).append('=');<a name="line.329"></a> +<span class="sourceLineNo">312</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.312"></a> +<span class="sourceLineNo">313</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.313"></a> +<span class="sourceLineNo">314</span><a name="line.314"></a> +<span class="sourceLineNo">315</span> ClassMeta<?> valueType = type.getValueType();<a name="line.315"></a> +<span class="sourceLineNo">316</span><a name="line.316"></a> +<span class="sourceLineNo">317</span> int depth = session.getIndent();<a name="line.317"></a> +<span class="sourceLineNo">318</span> boolean addAmp = false;<a name="line.318"></a> +<span class="sourceLineNo">319</span><a name="line.319"></a> +<span class="sourceLineNo">320</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.320"></a> +<span class="sourceLineNo">321</span> if (addAmp)<a name="line.321"></a> +<span class="sourceLineNo">322</span> out.cr(depth).append('&');<a name="line.322"></a> +<span class="sourceLineNo">323</span> out.append(e.getKey()).append('=');<a name="line.323"></a> +<span class="sourceLineNo">324</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null);<a name="line.324"></a> +<span class="sourceLineNo">325</span> addAmp = true;<a name="line.325"></a> +<span class="sourceLineNo">326</span> }<a name="line.326"></a> +<span class="sourceLineNo">327</span><a name="line.327"></a> +<span class="sourceLineNo">328</span> return out;<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> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.331"></a> -<span class="sourceLineNo">332</span><a name="line.332"></a> -<span class="sourceLineNo">333</span> addAmp = true;<a name="line.333"></a> -<span class="sourceLineNo">334</span> }<a name="line.334"></a> -<span class="sourceLineNo">335</span> } else {<a name="line.335"></a> -<span class="sourceLineNo">336</span> if (addAmp)<a name="line.336"></a> -<span class="sourceLineNo">337</span> out.cr(depth).append('&');<a name="line.337"></a> -<span class="sourceLineNo">338</span><a name="line.338"></a> -<span class="sourceLineNo">339</span> out.appendObject(key, true).append('=');<a name="line.339"></a> +<span class="sourceLineNo">331</span> @SuppressWarnings({ "rawtypes" })<a name="line.331"></a> +<span class="sourceLineNo">332</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.332"></a> +<span class="sourceLineNo">333</span> int depth = session.getIndent();<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span> boolean addAmp = false;<a name="line.335"></a> +<span class="sourceLineNo">336</span><a name="line.336"></a> +<span class="sourceLineNo">337</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.337"></a> +<span class="sourceLineNo">338</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.338"></a> +<span class="sourceLineNo">339</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.339"></a> <span class="sourceLineNo">340</span><a name="line.340"></a> -<span class="sourceLineNo">341</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.341"></a> -<span class="sourceLineNo">342</span><a name="line.342"></a> -<span class="sourceLineNo">343</span> addAmp = true;<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> }<a name="line.346"></a> -<span class="sourceLineNo">347</span> return out;<a name="line.347"></a> -<span class="sourceLineNo">348</span> }<a name="line.348"></a> +<span class="sourceLineNo">341</span> String key = p.getName();<a name="line.341"></a> +<span class="sourceLineNo">342</span> Object value = p.getValue();<a name="line.342"></a> +<span class="sourceLineNo">343</span> Throwable t = p.getThrown();<a name="line.343"></a> +<span class="sourceLineNo">344</span> if (t != null)<a name="line.344"></a> +<span class="sourceLineNo">345</span> session.addBeanGetterWarning(pMeta, t);<a name="line.345"></a> +<span class="sourceLineNo">346</span><a name="line.346"></a> +<span class="sourceLineNo">347</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.347"></a> +<span class="sourceLineNo">348</span> continue;<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> // Methods for constructing individual parameter values.<a name="line.352"></a> -<span class="sourceLineNo">353</span> //--------------------------------------------------------------------------------<a name="line.353"></a> -<span class="sourceLineNo">354</span><a name="line.354"></a> -<span class="sourceLineNo">355</span> /**<a name="line.355"></a> -<span class="sourceLineNo">356</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.356"></a> -<span class="sourceLineNo">357</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.357"></a> -<span class="sourceLineNo">358</span> * Useful for constructing URL parts.<a name="line.358"></a> -<span class="sourceLineNo">359</span> *<a name="line.359"></a> -<span class="sourceLineNo">360</span> * @param o The object to serialize.<a name="line.360"></a> -<span class="sourceLineNo">361</span> * @return The serialized object.<a name="line.361"></a> -<span class="sourceLineNo">362</span> */<a name="line.362"></a> -<span class="sourceLineNo">363</span> public String serializeUrlPart(Object o) {<a name="line.363"></a> -<span class="sourceLineNo">364</span> try {<a name="line.364"></a> -<span class="sourceLineNo">365</span> // Shortcut for simple types.<a name="line.365"></a> -<span class="sourceLineNo">366</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.366"></a> -<span class="sourceLineNo">367</span> if (cm != null)<a name="line.367"></a> -<span class="sourceLineNo">368</span> if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.368"></a> -<span class="sourceLineNo">369</span> return o.toString();<a name="line.369"></a> -<span class="sourceLineNo">370</span><a name="line.370"></a> -<span class="sourceLineNo">371</span> StringWriter w = new StringWriter();<a name="line.371"></a> -<span class="sourceLineNo">372</span> UonSerializerSession s = createSession(w, null, null, null, null, MediaType.UON);<a name="line.372"></a> -<span class="sourceLineNo">373</span> super.doSerialize(s, o);<a name="line.373"></a> -<span class="sourceLineNo">374</span> return w.toString();<a name="line.374"></a> -<span class="sourceLineNo">375</span> } catch (Exception e) {<a name="line.375"></a> -<span class="sourceLineNo">376</span> throw new RuntimeException(e);<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">350</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.350"></a> +<span class="sourceLineNo">351</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.351"></a> +<span class="sourceLineNo">352</span> // so we need to check type if we think it's an array.<a name="line.352"></a> +<span class="sourceLineNo">353</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.353"></a> +<span class="sourceLineNo">354</span> while (i.hasNext()) {<a name="line.354"></a> +<span class="sourceLineNo">355</span> if (addAmp)<a name="line.355"></a> +<span class="sourceLineNo">356</span> out.cr(depth).append('&');<a name="line.356"></a> +<span class="sourceLineNo">357</span><a name="line.357"></a> +<span class="sourceLineNo">358</span> out.appendObject(key, true).append('=');<a name="line.358"></a> +<span class="sourceLineNo">359</span><a name="line.359"></a> +<span class="sourceLineNo">360</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.360"></a> +<span class="sourceLineNo">361</span><a name="line.361"></a> +<span class="sourceLineNo">362</span> addAmp = true;<a name="line.362"></a> +<span class="sourceLineNo">363</span> }<a name="line.363"></a> +<span class="sourceLineNo">364</span> } else {<a name="line.364"></a> +<span class="sourceLineNo">365</span> if (addAmp)<a name="line.365"></a> +<span class="sourceLineNo">366</span> out.cr(depth).append('&');<a name="line.366"></a> +<span class="sourceLineNo">367</span><a name="line.367"></a> +<span class="sourceLineNo">368</span> out.appendObject(key, true).append('=');<a name="line.368"></a> +<span class="sourceLineNo">369</span><a name="line.369"></a> +<span class="sourceLineNo">370</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.370"></a> +<span class="sourceLineNo">371</span><a name="line.371"></a> +<span class="sourceLineNo">372</span> addAmp = true;<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> return out;<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><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 UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.386"></a> -<span class="sourceLineNo">387</span> return new UrlEncodingSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.392"></a> -<span class="sourceLineNo">393</span> serializeAnything(s, s.getWriter(), o);<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">380</span> //--------------------------------------------------------------------------------<a name="line.380"></a> +<span class="sourceLineNo">381</span> // Methods for constructing individual parameter values.<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> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.385"></a> +<span class="sourceLineNo">386</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.386"></a> +<span class="sourceLineNo">387</span> * Useful for constructing URL parts.<a name="line.387"></a> +<span class="sourceLineNo">388</span> *<a name="line.388"></a> +<span class="sourceLineNo">389</span> * @param o The object to serialize.<a name="line.389"></a> +<span class="sourceLineNo">390</span> * @return The serialized object.<a name="line.390"></a> +<span class="sourceLineNo">391</span> */<a name="line.391"></a> +<span class="sourceLineNo">392</span> public String serializeUrlPart(Object o) {<a name="line.392"></a> +<span class="sourceLineNo">393</span> try {<a name="line.393"></a> +<span class="sourceLineNo">394</span> // Shortcut for simple types.<a name="line.394"></a> +<span class="sourceLineNo">395</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.395"></a> +<span class="sourceLineNo">396</span> if (cm != null)<a name="line.396"></a> +<span class="sourceLineNo">397</span> if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.397"></a> +<span class="sourceLineNo">398</span> return o.toString();<a name="line.398"></a> +<span class="sourceLineNo">399</span><a name="line.399"></a> +<span class="sourceLineNo">400</span> StringWriter w = new StringWriter();<a name="line.400"></a> +<span class="sourceLineNo">401</span> UonSerializerSession s = createSession(w, null, null, null, null, MediaType.UON);<a name="line.401"></a> +<span class="sourceLineNo">402</span> super.doSerialize(s, o);<a name="line.402"></a> +<span class="sourceLineNo">403</span> return w.toString();<a name="line.403"></a> +<span class="sourceLineNo">404</span> } catch (Exception e) {<a name="line.404"></a> +<span class="sourceLineNo">405</span> throw new RuntimeException(e);<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><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> // Entry point methods<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> @Override /* Serializer */<a name="line.414"></a> +<span class="sourceLineNo">415</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.415"></a> +<span class="sourceLineNo">416</span> return new UrlEncodingSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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> @Override /* Serializer */<a name="line.419"></a> +<span class="sourceLineNo">420</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.420"></a> +<span class="sourceLineNo">421</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.421"></a> +<span class="sourceLineNo">422</span> serializeAnything(s, s.getWriter(), o);<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> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/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 1ee1931..122c8c0 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 @@ -247,160 +247,189 @@ <span class="sourceLineNo">239</span> serializeMap(session, out, (Map)o, sType);<a name="line.239"></a> <span class="sourceLineNo">240</span> } else if (sType.isBean()) {<a name="line.240"></a> <span class="sourceLineNo">241</span> serializeBeanMap(session, out, session.toBeanMap(o), typeName);<a name="line.241"></a> -<span class="sourceLineNo">242</span> } else if (sType.isCollection()) {<a name="line.242"></a> -<span class="sourceLineNo">243</span> serializeMap(session, out, getCollectionMap((Collection)o), session.getClassMeta(Map.class, Integer.class, sType.getElementType()));<a name="line.243"></a> -<span class="sourceLineNo">244</span> } else {<a name="line.244"></a> -<span class="sourceLineNo">245</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.245"></a> -<span class="sourceLineNo">246</span> // mock key/value pair with a "_value" key.<a name="line.246"></a> -<span class="sourceLineNo">247</span> out.append("_value=");<a name="line.247"></a> -<span class="sourceLineNo">248</span> super.serializeAnything(session, out, o, null, null, null);<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> session.pop();<a name="line.251"></a> -<span class="sourceLineNo">252</span> return out;<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> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.255"></a> -<span class="sourceLineNo">256</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.256"></a> -<span class="sourceLineNo">257</span> int i = 0;<a name="line.257"></a> -<span class="sourceLineNo">258</span> for (Object o : c)<a name="line.258"></a> -<span class="sourceLineNo">259</span> m.put(i++, o);<a name="line.259"></a> -<span class="sourceLineNo">260</span> return m;<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> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.263"></a> -<span class="sourceLineNo">264</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.264"></a> -<span class="sourceLineNo">265</span><a name="line.265"></a> -<span class="sourceLineNo">266</span> m = session.sort(m);<a name="line.266"></a> -<span class="sourceLineNo">267</span><a name="line.267"></a> -<span class="sourceLineNo">268</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.268"></a> -<span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> int depth = session.getIndent();<a name="line.270"></a> -<span class="sourceLineNo">271</span> boolean addAmp = false;<a name="line.271"></a> -<span class="sourceLineNo">272</span><a name="line.272"></a> -<span class="sourceLineNo">273</span> Iterator mapEntries = m.entrySet().iterator();<a name="line.273"></a> -<span class="sourceLineNo">274</span><a name="line.274"></a> -<span class="sourceLineNo">275</span> while (mapEntries.hasNext()) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.276"></a> -<span class="sourceLineNo">277</span> Object value = e.getValue();<a name="line.277"></a> -<span class="sourceLineNo">278</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.278"></a> +<span class="sourceLineNo">242</span> } else if (sType.isCollection() || sType.isArray()) {<a name="line.242"></a> +<span class="sourceLineNo">243</span> Map m = sType.isCollection() ? getCollectionMap((Collection)o) : getCollectionMap(o);<a name="line.243"></a> +<span class="sourceLineNo">244</span> serializeCollectionMap(session, out, m, session.getClassMeta(Map.class, Integer.class, Object.class));<a name="line.244"></a> +<span class="sourceLineNo">245</span> } else {<a name="line.245"></a> +<span class="sourceLineNo">246</span> // All other types can't be serialized as key/value pairs, so we create a<a name="line.246"></a> +<span class="sourceLineNo">247</span> // mock key/value pair with a "_value" key.<a name="line.247"></a> +<span class="sourceLineNo">248</span> out.append("_value=");<a name="line.248"></a> +<span class="sourceLineNo">249</span> super.serializeAnything(session, out, o, null, null, null);<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> session.pop();<a name="line.252"></a> +<span class="sourceLineNo">253</span> return out;<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> /**<a name="line.256"></a> +<span class="sourceLineNo">257</span> * Converts a Collection into an integer-indexed map.<a name="line.257"></a> +<span class="sourceLineNo">258</span> */<a name="line.258"></a> +<span class="sourceLineNo">259</span> private static Map<Integer,Object> getCollectionMap(Collection<?> c) {<a name="line.259"></a> +<span class="sourceLineNo">260</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.260"></a> +<span class="sourceLineNo">261</span> int i = 0;<a name="line.261"></a> +<span class="sourceLineNo">262</span> for (Object o : c)<a name="line.262"></a> +<span class="sourceLineNo">263</span> m.put(i++, o);<a name="line.263"></a> +<span class="sourceLineNo">264</span> return m;<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> * Converts an array into an integer-indexed map.<a name="line.268"></a> +<span class="sourceLineNo">269</span> */<a name="line.269"></a> +<span class="sourceLineNo">270</span> private static Map<Integer,Object> getCollectionMap(Object array) {<a name="line.270"></a> +<span class="sourceLineNo">271</span> Map<Integer,Object> m = new TreeMap<Integer,Object>();<a name="line.271"></a> +<span class="sourceLineNo">272</span> for (int i = 0; i < Array.getLength(array); i++)<a name="line.272"></a> +<span class="sourceLineNo">273</span> m.put(i, Array.get(array, i));<a name="line.273"></a> +<span class="sourceLineNo">274</span> return m;<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> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.277"></a> +<span class="sourceLineNo">278</span> private SerializerWriter serializeMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<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> if (session.shouldUseExpandedParams(value)) {<a name="line.281"></a> -<span class="sourceLineNo">282</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.282"></a> -<span class="sourceLineNo">283</span> while (i.hasNext()) {<a name="line.283"></a> -<span class="sourceLineNo">284</span> if (addAmp)<a name="line.284"></a> -<span class="sourceLineNo">285</span> out.cr(depth).append('&');<a name="line.285"></a> -<span class="sourceLineNo">286</span> out.appendObject(key, true).append('=');<a name="line.286"></a> -<span class="sourceLineNo">287</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.287"></a> -<span class="sourceLineNo">288</span> addAmp = true;<a name="line.288"></a> -<span class="sourceLineNo">289</span> }<a name="line.289"></a> -<span class="sourceLineNo">290</span> } else {<a name="line.290"></a> -<span class="sourceLineNo">291</span> if (addAmp)<a name="line.291"></a> -<span class="sourceLineNo">292</span> out.cr(depth).append('&');<a name="line.292"></a> -<span class="sourceLineNo">293</span> out.appendObject(key, true).append('=');<a name="line.293"></a> -<span class="sourceLineNo">294</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.294"></a> -<span class="sourceLineNo">295</span> addAmp = true;<a name="line.295"></a> -<span class="sourceLineNo">296</span> }<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> return out;<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> @SuppressWarnings({ "rawtypes" })<a name="line.302"></a> -<span class="sourceLineNo">303</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.303"></a> -<span class="sourceLineNo">304</span> int depth = session.getIndent();<a name="line.304"></a> -<span class="sourceLineNo">305</span><a name="line.305"></a> -<span class="sourceLineNo">306</span> boolean addAmp = false;<a name="line.306"></a> -<span class="sourceLineNo">307</span><a name="line.307"></a> -<span class="sourceLineNo">308</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.308"></a> -<span class="sourceLineNo">309</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.309"></a> -<span class="sourceLineNo">310</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.310"></a> +<span class="sourceLineNo">280</span> m = session.sort(m);<a name="line.280"></a> +<span class="sourceLineNo">281</span><a name="line.281"></a> +<span class="sourceLineNo">282</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.282"></a> +<span class="sourceLineNo">283</span><a name="line.283"></a> +<span class="sourceLineNo">284</span> int depth = session.getIndent();<a name="line.284"></a> +<span class="sourceLineNo">285</span> boolean addAmp = false;<a name="line.285"></a> +<span class="sourceLineNo">286</span><a name="line.286"></a> +<span class="sourceLineNo">287</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.287"></a> +<span class="sourceLineNo">288</span> Object key = session.generalize(e.getKey(), keyType);<a name="line.288"></a> +<span class="sourceLineNo">289</span> Object value = e.getValue();<a name="line.289"></a> +<span class="sourceLineNo">290</span><a name="line.290"></a> +<span class="sourceLineNo">291</span> if (session.shouldUseExpandedParams(value)) {<a name="line.291"></a> +<span class="sourceLineNo">292</span> Iterator i = value instanceof Collection ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.292"></a> +<span class="sourceLineNo">293</span> while (i.hasNext()) {<a name="line.293"></a> +<span class="sourceLineNo">294</span> if (addAmp)<a name="line.294"></a> +<span class="sourceLineNo">295</span> out.cr(depth).append('&');<a name="line.295"></a> +<span class="sourceLineNo">296</span> out.appendObject(key, true).append('=');<a name="line.296"></a> +<span class="sourceLineNo">297</span> super.serializeAnything(session, out, i.next(), null, (key == null ? null : key.toString()), null);<a name="line.297"></a> +<span class="sourceLineNo">298</span> addAmp = true;<a name="line.298"></a> +<span class="sourceLineNo">299</span> }<a name="line.299"></a> +<span class="sourceLineNo">300</span> } else {<a name="line.300"></a> +<span class="sourceLineNo">301</span> if (addAmp)<a name="line.301"></a> +<span class="sourceLineNo">302</span> out.cr(depth).append('&');<a name="line.302"></a> +<span class="sourceLineNo">303</span> out.appendObject(key, true).append('=');<a name="line.303"></a> +<span class="sourceLineNo">304</span> super.serializeAnything(session, out, value, valueType, (key == null ? null : key.toString()), null);<a name="line.304"></a> +<span class="sourceLineNo">305</span> addAmp = true;<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> return out;<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> String key = p.getName();<a name="line.312"></a> -<span class="sourceLineNo">313</span> Object value = p.getValue();<a name="line.313"></a> -<span class="sourceLineNo">314</span> Throwable t = p.getThrown();<a name="line.314"></a> -<span class="sourceLineNo">315</span> if (t != null)<a name="line.315"></a> -<span class="sourceLineNo">316</span> session.addBeanGetterWarning(pMeta, t);<a name="line.316"></a> -<span class="sourceLineNo">317</span><a name="line.317"></a> -<span class="sourceLineNo">318</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.318"></a> -<span class="sourceLineNo">319</span> continue;<a name="line.319"></a> -<span class="sourceLineNo">320</span><a name="line.320"></a> -<span class="sourceLineNo">321</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.321"></a> -<span class="sourceLineNo">322</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.322"></a> -<span class="sourceLineNo">323</span> // so we need to check type if we think it's an array.<a name="line.323"></a> -<span class="sourceLineNo">324</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.324"></a> -<span class="sourceLineNo">325</span> while (i.hasNext()) {<a name="line.325"></a> -<span class="sourceLineNo">326</span> if (addAmp)<a name="line.326"></a> -<span class="sourceLineNo">327</span> out.cr(depth).append('&');<a name="line.327"></a> -<span class="sourceLineNo">328</span><a name="line.328"></a> -<span class="sourceLineNo">329</span> out.appendObject(key, true).append('=');<a name="line.329"></a> +<span class="sourceLineNo">312</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.312"></a> +<span class="sourceLineNo">313</span> private SerializerWriter serializeCollectionMap(UrlEncodingSerializerSession session, UonWriter out, Map m, ClassMeta<?> type) throws Exception {<a name="line.313"></a> +<span class="sourceLineNo">314</span><a name="line.314"></a> +<span class="sourceLineNo">315</span> ClassMeta<?> valueType = type.getValueType();<a name="line.315"></a> +<span class="sourceLineNo">316</span><a name="line.316"></a> +<span class="sourceLineNo">317</span> int depth = session.getIndent();<a name="line.317"></a> +<span class="sourceLineNo">318</span> boolean addAmp = false;<a name="line.318"></a> +<span class="sourceLineNo">319</span><a name="line.319"></a> +<span class="sourceLineNo">320</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.320"></a> +<span class="sourceLineNo">321</span> if (addAmp)<a name="line.321"></a> +<span class="sourceLineNo">322</span> out.cr(depth).append('&');<a name="line.322"></a> +<span class="sourceLineNo">323</span> out.append(e.getKey()).append('=');<a name="line.323"></a> +<span class="sourceLineNo">324</span> super.serializeAnything(session, out, e.getValue(), valueType, null, null);<a name="line.324"></a> +<span class="sourceLineNo">325</span> addAmp = true;<a name="line.325"></a> +<span class="sourceLineNo">326</span> }<a name="line.326"></a> +<span class="sourceLineNo">327</span><a name="line.327"></a> +<span class="sourceLineNo">328</span> return out;<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> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.331"></a> -<span class="sourceLineNo">332</span><a name="line.332"></a> -<span class="sourceLineNo">333</span> addAmp = true;<a name="line.333"></a> -<span class="sourceLineNo">334</span> }<a name="line.334"></a> -<span class="sourceLineNo">335</span> } else {<a name="line.335"></a> -<span class="sourceLineNo">336</span> if (addAmp)<a name="line.336"></a> -<span class="sourceLineNo">337</span> out.cr(depth).append('&');<a name="line.337"></a> -<span class="sourceLineNo">338</span><a name="line.338"></a> -<span class="sourceLineNo">339</span> out.appendObject(key, true).append('=');<a name="line.339"></a> +<span class="sourceLineNo">331</span> @SuppressWarnings({ "rawtypes" })<a name="line.331"></a> +<span class="sourceLineNo">332</span> private SerializerWriter serializeBeanMap(UrlEncodingSerializerSession session, UonWriter out, BeanMap<?> m, String typeName) throws Exception {<a name="line.332"></a> +<span class="sourceLineNo">333</span> int depth = session.getIndent();<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span> boolean addAmp = false;<a name="line.335"></a> +<span class="sourceLineNo">336</span><a name="line.336"></a> +<span class="sourceLineNo">337</span> for (BeanPropertyValue p : m.getValues(session.isTrimNulls(), typeName != null ? session.createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.337"></a> +<span class="sourceLineNo">338</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.338"></a> +<span class="sourceLineNo">339</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.339"></a> <span class="sourceLineNo">340</span><a name="line.340"></a> -<span class="sourceLineNo">341</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.341"></a> -<span class="sourceLineNo">342</span><a name="line.342"></a> -<span class="sourceLineNo">343</span> addAmp = true;<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> }<a name="line.346"></a> -<span class="sourceLineNo">347</span> return out;<a name="line.347"></a> -<span class="sourceLineNo">348</span> }<a name="line.348"></a> +<span class="sourceLineNo">341</span> String key = p.getName();<a name="line.341"></a> +<span class="sourceLineNo">342</span> Object value = p.getValue();<a name="line.342"></a> +<span class="sourceLineNo">343</span> Throwable t = p.getThrown();<a name="line.343"></a> +<span class="sourceLineNo">344</span> if (t != null)<a name="line.344"></a> +<span class="sourceLineNo">345</span> session.addBeanGetterWarning(pMeta, t);<a name="line.345"></a> +<span class="sourceLineNo">346</span><a name="line.346"></a> +<span class="sourceLineNo">347</span> if (session.canIgnoreValue(cMeta, key, value))<a name="line.347"></a> +<span class="sourceLineNo">348</span> continue;<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> // Methods for constructing individual parameter values.<a name="line.352"></a> -<span class="sourceLineNo">353</span> //--------------------------------------------------------------------------------<a name="line.353"></a> -<span class="sourceLineNo">354</span><a name="line.354"></a> -<span class="sourceLineNo">355</span> /**<a name="line.355"></a> -<span class="sourceLineNo">356</span> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.356"></a> -<span class="sourceLineNo">357</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.357"></a> -<span class="sourceLineNo">358</span> * Useful for constructing URL parts.<a name="line.358"></a> -<span class="sourceLineNo">359</span> *<a name="line.359"></a> -<span class="sourceLineNo">360</span> * @param o The object to serialize.<a name="line.360"></a> -<span class="sourceLineNo">361</span> * @return The serialized object.<a name="line.361"></a> -<span class="sourceLineNo">362</span> */<a name="line.362"></a> -<span class="sourceLineNo">363</span> public String serializeUrlPart(Object o) {<a name="line.363"></a> -<span class="sourceLineNo">364</span> try {<a name="line.364"></a> -<span class="sourceLineNo">365</span> // Shortcut for simple types.<a name="line.365"></a> -<span class="sourceLineNo">366</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.366"></a> -<span class="sourceLineNo">367</span> if (cm != null)<a name="line.367"></a> -<span class="sourceLineNo">368</span> if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.368"></a> -<span class="sourceLineNo">369</span> return o.toString();<a name="line.369"></a> -<span class="sourceLineNo">370</span><a name="line.370"></a> -<span class="sourceLineNo">371</span> StringWriter w = new StringWriter();<a name="line.371"></a> -<span class="sourceLineNo">372</span> UonSerializerSession s = createSession(w, null, null, null, null, MediaType.UON);<a name="line.372"></a> -<span class="sourceLineNo">373</span> super.doSerialize(s, o);<a name="line.373"></a> -<span class="sourceLineNo">374</span> return w.toString();<a name="line.374"></a> -<span class="sourceLineNo">375</span> } catch (Exception e) {<a name="line.375"></a> -<span class="sourceLineNo">376</span> throw new RuntimeException(e);<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">350</span> if (value != null && session.shouldUseExpandedParams(pMeta)) {<a name="line.350"></a> +<span class="sourceLineNo">351</span> // Transformed object array bean properties may be transformed resulting in ArrayLists,<a name="line.351"></a> +<span class="sourceLineNo">352</span> // so we need to check type if we think it's an array.<a name="line.352"></a> +<span class="sourceLineNo">353</span> Iterator i = (cMeta.isCollection() || value instanceof Collection) ? ((Collection)value).iterator() : ArrayUtils.iterator(value);<a name="line.353"></a> +<span class="sourceLineNo">354</span> while (i.hasNext()) {<a name="line.354"></a> +<span class="sourceLineNo">355</span> if (addAmp)<a name="line.355"></a> +<span class="sourceLineNo">356</span> out.cr(depth).append('&');<a name="line.356"></a> +<span class="sourceLineNo">357</span><a name="line.357"></a> +<span class="sourceLineNo">358</span> out.appendObject(key, true).append('=');<a name="line.358"></a> +<span class="sourceLineNo">359</span><a name="line.359"></a> +<span class="sourceLineNo">360</span> super.serializeAnything(session, out, i.next(), cMeta.getElementType(), key, pMeta);<a name="line.360"></a> +<span class="sourceLineNo">361</span><a name="line.361"></a> +<span class="sourceLineNo">362</span> addAmp = true;<a name="line.362"></a> +<span class="sourceLineNo">363</span> }<a name="line.363"></a> +<span class="sourceLineNo">364</span> } else {<a name="line.364"></a> +<span class="sourceLineNo">365</span> if (addAmp)<a name="line.365"></a> +<span class="sourceLineNo">366</span> out.cr(depth).append('&');<a name="line.366"></a> +<span class="sourceLineNo">367</span><a name="line.367"></a> +<span class="sourceLineNo">368</span> out.appendObject(key, true).append('=');<a name="line.368"></a> +<span class="sourceLineNo">369</span><a name="line.369"></a> +<span class="sourceLineNo">370</span> super.serializeAnything(session, out, value, cMeta, key, pMeta);<a name="line.370"></a> +<span class="sourceLineNo">371</span><a name="line.371"></a> +<span class="sourceLineNo">372</span> addAmp = true;<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> return out;<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><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 UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.386"></a> -<span class="sourceLineNo">387</span> return new UrlEncodingSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.392"></a> -<span class="sourceLineNo">393</span> serializeAnything(s, s.getWriter(), o);<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">380</span> //--------------------------------------------------------------------------------<a name="line.380"></a> +<span class="sourceLineNo">381</span> // Methods for constructing individual parameter values.<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> * Converts the specified object to a string using this serializers {@link BeanSession#convertToType(Object, Class)} method<a name="line.385"></a> +<span class="sourceLineNo">386</span> * and runs {@link URLEncoder#encode(String,String)} against the results.<a name="line.386"></a> +<span class="sourceLineNo">387</span> * Useful for constructing URL parts.<a name="line.387"></a> +<span class="sourceLineNo">388</span> *<a name="line.388"></a> +<span class="sourceLineNo">389</span> * @param o The object to serialize.<a name="line.389"></a> +<span class="sourceLineNo">390</span> * @return The serialized object.<a name="line.390"></a> +<span class="sourceLineNo">391</span> */<a name="line.391"></a> +<span class="sourceLineNo">392</span> public String serializeUrlPart(Object o) {<a name="line.392"></a> +<span class="sourceLineNo">393</span> try {<a name="line.393"></a> +<span class="sourceLineNo">394</span> // Shortcut for simple types.<a name="line.394"></a> +<span class="sourceLineNo">395</span> ClassMeta<?> cm = getBeanContext().getClassMetaForObject(o);<a name="line.395"></a> +<span class="sourceLineNo">396</span> if (cm != null)<a name="line.396"></a> +<span class="sourceLineNo">397</span> if (cm.isCharSequence() || cm.isNumber() || cm.isBoolean())<a name="line.397"></a> +<span class="sourceLineNo">398</span> return o.toString();<a name="line.398"></a> +<span class="sourceLineNo">399</span><a name="line.399"></a> +<span class="sourceLineNo">400</span> StringWriter w = new StringWriter();<a name="line.400"></a> +<span class="sourceLineNo">401</span> UonSerializerSession s = createSession(w, null, null, null, null, MediaType.UON);<a name="line.401"></a> +<span class="sourceLineNo">402</span> super.doSerialize(s, o);<a name="line.402"></a> +<span class="sourceLineNo">403</span> return w.toString();<a name="line.403"></a> +<span class="sourceLineNo">404</span> } catch (Exception e) {<a name="line.404"></a> +<span class="sourceLineNo">405</span> throw new RuntimeException(e);<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><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> // Entry point methods<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> @Override /* Serializer */<a name="line.414"></a> +<span class="sourceLineNo">415</span> public UrlEncodingSerializerSession createSession(Object output, ObjectMap op, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.415"></a> +<span class="sourceLineNo">416</span> return new UrlEncodingSerializerSession(ctx, op, output, javaMethod, locale, timeZone, mediaType);<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> @Override /* Serializer */<a name="line.419"></a> +<span class="sourceLineNo">420</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.420"></a> +<span class="sourceLineNo">421</span> UrlEncodingSerializerSession s = (UrlEncodingSerializerSession)session;<a name="line.421"></a> +<span class="sourceLineNo">422</span> serializeAnything(s, s.getWriter(), o);<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>
