You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/08/22 22:15:50 UTC
[10/25] incubator-juneau-website git commit: Update javadocs.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/fe5928f7/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html b/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
index 470feb9..42f96a2 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
@@ -72,10 +72,10 @@
<span class="sourceLineNo">064</span> this.debug = ctx.debug;<a name="line.64"></a>
<span class="sourceLineNo">065</span> this.mediaType = args.mediaType != null ? args.mediaType : ctx.mediaType;<a name="line.65"></a>
<span class="sourceLineNo">066</span> } else {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> _locale = (args.locale != null ? args.locale : getProperty(Locale.class, BEAN_locale, ctx.locale));<a name="line.67"></a>
-<span class="sourceLineNo">068</span> this.timeZone = (args.timeZone != null ? args.timeZone : getProperty(TimeZone.class, BEAN_timeZone, ctx.timeZone));<a name="line.68"></a>
-<span class="sourceLineNo">069</span> this.debug = getProperty(boolean.class, BEAN_debug, false);<a name="line.69"></a>
-<span class="sourceLineNo">070</span> this.mediaType = (args.mediaType != null ? args.mediaType : getProperty(MediaType.class, BEAN_mediaType, ctx.mediaType));<a name="line.70"></a>
+<span class="sourceLineNo">067</span> _locale = (args.locale != null ? args.locale : getPropertyWithDefault(BEAN_locale, ctx.locale, Locale.class));<a name="line.67"></a>
+<span class="sourceLineNo">068</span> this.timeZone = (args.timeZone != null ? args.timeZone : getPropertyWithDefault(BEAN_timeZone, ctx.timeZone, TimeZone.class));<a name="line.68"></a>
+<span class="sourceLineNo">069</span> this.debug = getPropertyWithDefault(BEAN_debug, false, boolean.class);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> this.mediaType = (args.mediaType != null ? args.mediaType : getPropertyWithDefault(BEAN_mediaType, ctx.mediaType, MediaType.class));<a name="line.70"></a>
<span class="sourceLineNo">071</span> }<a name="line.71"></a>
<span class="sourceLineNo">072</span> this.locale = _locale == null ? Locale.getDefault() : _locale;<a name="line.72"></a>
<span class="sourceLineNo">073</span> }<a name="line.73"></a>
@@ -152,7 +152,7 @@
<span class="sourceLineNo">144</span> // Shortcut for most common case.<a name="line.144"></a>
<span class="sourceLineNo">145</span> if (value != null && value.getClass() == type)<a name="line.145"></a>
<span class="sourceLineNo">146</span> return (T)value;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> return convertToType(null, value, ctx.getClassMeta(type));<a name="line.147"></a>
+<span class="sourceLineNo">147</span> return convertToMemberType(null, value, ctx.getClassMeta(type));<a name="line.147"></a>
<span class="sourceLineNo">148</span> }<a name="line.148"></a>
<span class="sourceLineNo">149</span><a name="line.149"></a>
<span class="sourceLineNo">150</span> /**<a name="line.150"></a>
@@ -168,8 +168,8 @@
<span class="sourceLineNo">160</span> * @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.<a name="line.160"></a>
<span class="sourceLineNo">161</span> * @return The converted value.<a name="line.161"></a>
<span class="sourceLineNo">162</span> */<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public final <T> T convertToType(Object outer, Object value, Class<T> type) throws InvalidDataConversionException {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return convertToType(outer, value, ctx.getClassMeta(type));<a name="line.164"></a>
+<span class="sourceLineNo">163</span> public final <T> T convertToMemberType(Object outer, Object value, Class<T> type) throws InvalidDataConversionException {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> return convertToMemberType(outer, value, ctx.getClassMeta(type));<a name="line.164"></a>
<span class="sourceLineNo">165</span> }<a name="line.165"></a>
<span class="sourceLineNo">166</span><a name="line.166"></a>
<span class="sourceLineNo">167</span> /**<a name="line.167"></a>
@@ -308,790 +308,804 @@
<span class="sourceLineNo">300</span> * @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.<a name="line.300"></a>
<span class="sourceLineNo">301</span> */<a name="line.301"></a>
<span class="sourceLineNo">302</span> public final <T> T convertToType(Object value, ClassMeta<T> type) throws InvalidDataConversionException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return convertToType(null, value, type);<a name="line.303"></a>
+<span class="sourceLineNo">303</span> return convertToMemberType(null, value, type);<a name="line.303"></a>
<span class="sourceLineNo">304</span> }<a name="line.304"></a>
<span class="sourceLineNo">305</span><a name="line.305"></a>
<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * Same as {@link #convertToType(Object, ClassMeta)}, except used for instantiating inner member classes that must<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * be instantiated within another class instance.<a name="line.308"></a>
-<span class="sourceLineNo">309</span> *<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * @param <T> The class type to convert the value to.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * @param outer<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * If class is a member class, this is the instance of the containing class.<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * Should be <jk>null</jk> if not a member class.<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @param value The value to convert.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * @param type The class type to convert the value to.<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @return The converted value.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> */<a name="line.318"></a>
-<span class="sourceLineNo">319</span> public final <T> T convertToType(Object outer, Object value, ClassMeta<T> type) throws InvalidDataConversionException {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> if (type == null)<a name="line.320"></a>
-<span class="sourceLineNo">321</span> type = (ClassMeta<T>)ctx.object();<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> try {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> // Handle the case of a null value.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> if (value == null) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> // If it's a primitive, then use the converters to get the default value for the primitive type.<a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (type.isPrimitive())<a name="line.328"></a>
-<span class="sourceLineNo">329</span> return type.getPrimitiveDefault();<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> // Otherwise, just return null.<a name="line.331"></a>
-<span class="sourceLineNo">332</span> return null;<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> Class<T> tc = type.getInnerClass();<a name="line.335"></a>
+<span class="sourceLineNo">307</span> * Same as {@link #convertToType(Object, Class)}, but allows for complex data types consisting of collections or maps.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> *<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @param <T> The class type to convert the value to.<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * @param value The value to be converted.<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * @param type The target object type.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * @param args The target object parameter types.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @return The converted type.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.<a name="line.314"></a>
+<span class="sourceLineNo">315</span> */<a name="line.315"></a>
+<span class="sourceLineNo">316</span> public final <T> T convertToType(Object value, Type type, Type...args) throws InvalidDataConversionException {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> return (T)convertToMemberType(null, value, getClassMeta(type, args));<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> /**<a name="line.320"></a>
+<span class="sourceLineNo">321</span> * Same as {@link #convertToType(Object, ClassMeta)}, except used for instantiating inner member classes that must<a name="line.321"></a>
+<span class="sourceLineNo">322</span> * be instantiated within another class instance.<a name="line.322"></a>
+<span class="sourceLineNo">323</span> *<a name="line.323"></a>
+<span class="sourceLineNo">324</span> * @param <T> The class type to convert the value to.<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * @param outer<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * If class is a member class, this is the instance of the containing class.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> * Should be <jk>null</jk> if not a member class.<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * @param value The value to convert.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param type The class type to convert the value to.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @throws InvalidDataConversionException If the specified value cannot be converted to the specified type.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> * @return The converted value.<a name="line.331"></a>
+<span class="sourceLineNo">332</span> */<a name="line.332"></a>
+<span class="sourceLineNo">333</span> public final <T> T convertToMemberType(Object outer, Object value, ClassMeta<T> type) throws InvalidDataConversionException {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> if (type == null)<a name="line.334"></a>
+<span class="sourceLineNo">335</span> type = (ClassMeta<T>)ctx.object();<a name="line.335"></a>
<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> // If no conversion needed, then just return the value.<a name="line.337"></a>
-<span class="sourceLineNo">338</span> // Don't include maps or collections, because child elements may need conversion.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> if (tc.isInstance(value))<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (! ((type.isMap() && type.getValueType().isNotObject()) || (type.isCollection() && type.getElementType().isNotObject())))<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return (T)value;<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (tc == Class.class)<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return (T)(ctx.classLoader.loadClass(value.toString()));<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (type.getPojoSwap() != null) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> PojoSwap f = type.getPojoSwap();<a name="line.347"></a>
-<span class="sourceLineNo">348</span> Class<?> nc = f.getNormalClass(), fc = f.getSwapClass();<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (isParentClass(nc, tc) && isParentClass(fc, value.getClass()))<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return (T)f.unswap(this, value, type);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> ClassMeta<?> vt = ctx.getClassMetaForObject(value);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (vt.getPojoSwap() != null) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> PojoSwap f = vt.getPojoSwap();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> Class<?> nc = f.getNormalClass(), fc = f.getSwapClass();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (isParentClass(nc, vt.getInnerClass()) && isParentClass(fc, tc))<a name="line.357"></a>
-<span class="sourceLineNo">358</span> return (T)f.swap(this, value);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (type.isPrimitive()) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (value.toString().isEmpty())<a name="line.362"></a>
-<span class="sourceLineNo">363</span> return type.getPrimitiveDefault();<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> if (type.isNumber()) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (value instanceof Number) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> Number n = (Number)value;<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (tc == Integer.TYPE)<a name="line.368"></a>
-<span class="sourceLineNo">369</span> return (T)Integer.valueOf(n.intValue());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> if (tc == Short.TYPE)<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return (T)Short.valueOf(n.shortValue());<a name="line.371"></a>
-<span class="sourceLineNo">372</span> if (tc == Long.TYPE)<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return (T)Long.valueOf(n.longValue());<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (tc == Float.TYPE)<a name="line.374"></a>
-<span class="sourceLineNo">375</span> return (T)Float.valueOf(n.floatValue());<a name="line.375"></a>
-<span class="sourceLineNo">376</span> if (tc == Double.TYPE)<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return (T)Double.valueOf(n.doubleValue());<a name="line.377"></a>
-<span class="sourceLineNo">378</span> if (tc == Byte.TYPE)<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return (T)Byte.valueOf(n.byteValue());<a name="line.379"></a>
-<span class="sourceLineNo">380</span> } else {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> String n = null;<a name="line.381"></a>
-<span class="sourceLineNo">382</span> if (value instanceof Boolean)<a name="line.382"></a>
-<span class="sourceLineNo">383</span> n = ((Boolean)value).booleanValue() ? "1" : "0";<a name="line.383"></a>
-<span class="sourceLineNo">384</span> else<a name="line.384"></a>
-<span class="sourceLineNo">385</span> n = value.toString();<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> int multiplier = (tc == Integer.TYPE || tc == Short.TYPE || tc == Long.TYPE) ? getMultiplier(n) : 1;<a name="line.387"></a>
-<span class="sourceLineNo">388</span> if (multiplier != 1) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> n = n.substring(0, n.length()-1).trim();<a name="line.389"></a>
-<span class="sourceLineNo">390</span> Long l = Long.valueOf(n) * multiplier;<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (tc == Integer.TYPE)<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return (T)Integer.valueOf(l.intValue());<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (tc == Short.TYPE)<a name="line.393"></a>
-<span class="sourceLineNo">394</span> return (T)Short.valueOf(l.shortValue());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (tc == Long.TYPE)<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return (T)Long.valueOf(l.longValue());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> } else {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (tc == Integer.TYPE)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> return (T)Integer.valueOf(n);<a name="line.399"></a>
-<span class="sourceLineNo">400</span> if (tc == Short.TYPE)<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return (T)Short.valueOf(n);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> if (tc == Long.TYPE)<a name="line.402"></a>
-<span class="sourceLineNo">403</span> return (T)Long.valueOf(n);<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (tc == Float.TYPE)<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return (T)new Float(n);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (tc == Double.TYPE)<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return (T)new Double(n);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> if (tc == Byte.TYPE)<a name="line.408"></a>
-<span class="sourceLineNo">409</span> return (T)Byte.valueOf(n);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> } else if (type.isChar()) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> String s = value.toString();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> return (T)Character.valueOf(s.length() == 0 ? 0 : s.charAt(0));<a name="line.414"></a>
-<span class="sourceLineNo">415</span> } else if (type.isBoolean()) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> if (value instanceof Number) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> int i = ((Number)value).intValue();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return (T)(i == 0 ? Boolean.FALSE : Boolean.TRUE);<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> return (T)Boolean.valueOf(value.toString());<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> }<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span> if (type.isNumber()) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> if (value instanceof Number) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Number n = (Number)value;<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (tc == Integer.class)<a name="line.427"></a>
-<span class="sourceLineNo">428</span> return (T)Integer.valueOf(n.intValue());<a name="line.428"></a>
-<span class="sourceLineNo">429</span> if (tc == Short.class)<a name="line.429"></a>
-<span class="sourceLineNo">430</span> return (T)Short.valueOf(n.shortValue());<a name="line.430"></a>
-<span class="sourceLineNo">431</span> if (tc == Long.class)<a name="line.431"></a>
-<span class="sourceLineNo">432</span> return (T)Long.valueOf(n.longValue());<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (tc == Float.class)<a name="line.433"></a>
-<span class="sourceLineNo">434</span> return (T)Float.valueOf(n.floatValue());<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (tc == Double.class)<a name="line.435"></a>
-<span class="sourceLineNo">436</span> return (T)Double.valueOf(n.doubleValue());<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (tc == Byte.class)<a name="line.437"></a>
-<span class="sourceLineNo">438</span> return (T)Byte.valueOf(n.byteValue());<a name="line.438"></a>
-<span class="sourceLineNo">439</span> if (tc == Byte.class)<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return (T)Byte.valueOf(n.byteValue());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (tc == AtomicInteger.class)<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return (T)new AtomicInteger(n.intValue());<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if (tc == AtomicLong.class)<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return (T)new AtomicLong(n.intValue());<a name="line.444"></a>
-<span class="sourceLineNo">445</span> } else {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> if (value.toString().isEmpty())<a name="line.446"></a>
-<span class="sourceLineNo">447</span> return null;<a name="line.447"></a>
-<span class="sourceLineNo">448</span> String n = null;<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (value instanceof Boolean)<a name="line.449"></a>
-<span class="sourceLineNo">450</span> n = ((Boolean)value).booleanValue() ? "1" : "0";<a name="line.450"></a>
-<span class="sourceLineNo">451</span> else<a name="line.451"></a>
-<span class="sourceLineNo">452</span> n = value.toString();<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> int multiplier = (tc == Integer.class || tc == Short.class || tc == Long.class) ? getMultiplier(n) : 1;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> if (multiplier != 1) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> n = n.substring(0, n.length()-1).trim();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> Long l = Long.valueOf(n) * multiplier;<a name="line.457"></a>
-<span class="sourceLineNo">458</span> if (tc == Integer.TYPE)<a name="line.458"></a>
-<span class="sourceLineNo">459</span> return (T)Integer.valueOf(l.intValue());<a name="line.459"></a>
-<span class="sourceLineNo">460</span> if (tc == Short.TYPE)<a name="line.460"></a>
-<span class="sourceLineNo">461</span> return (T)Short.valueOf(l.shortValue());<a name="line.461"></a>
-<span class="sourceLineNo">462</span> if (tc == Long.TYPE)<a name="line.462"></a>
-<span class="sourceLineNo">463</span> return (T)Long.valueOf(l.longValue());<a name="line.463"></a>
-<span class="sourceLineNo">464</span> } else {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> if (tc == Integer.class)<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return (T)Integer.valueOf(n);<a name="line.466"></a>
-<span class="sourceLineNo">467</span> if (tc == Short.class)<a name="line.467"></a>
-<span class="sourceLineNo">468</span> return (T)Short.valueOf(n);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (tc == Long.class)<a name="line.469"></a>
-<span class="sourceLineNo">470</span> return (T)Long.valueOf(n);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (tc == Float.class)<a name="line.471"></a>
-<span class="sourceLineNo">472</span> return (T)new Float(n);<a name="line.472"></a>
-<span class="sourceLineNo">473</span> if (tc == Double.class)<a name="line.473"></a>
-<span class="sourceLineNo">474</span> return (T)new Double(n);<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (tc == Byte.class)<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return (T)Byte.valueOf(n);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> if (tc == AtomicInteger.class)<a name="line.477"></a>
-<span class="sourceLineNo">478</span> return (T)new AtomicInteger(Integer.valueOf(n));<a name="line.478"></a>
-<span class="sourceLineNo">479</span> if (tc == AtomicLong.class)<a name="line.479"></a>
-<span class="sourceLineNo">480</span> return (T)new AtomicLong(Long.valueOf(n));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span> }<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span> if (type.isChar()) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> String s = value.toString();<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return (T)Character.valueOf(s.length() == 0 ? 0 : s.charAt(0));<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> // Handle setting of array properties<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if (type.isArray()) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> if (vt.isCollection())<a name="line.492"></a>
-<span class="sourceLineNo">493</span> return (T)toArray(type, (Collection)value);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> else if (vt.isArray())<a name="line.494"></a>
-<span class="sourceLineNo">495</span> return (T)toArray(type, Arrays.asList((Object[])value));<a name="line.495"></a>
-<span class="sourceLineNo">496</span> else if (startsWith(value.toString(), '['))<a name="line.496"></a>
-<span class="sourceLineNo">497</span> return (T)toArray(type, new ObjectList(value.toString()).setBeanSession(this));<a name="line.497"></a>
-<span class="sourceLineNo">498</span> else<a name="line.498"></a>
-<span class="sourceLineNo">499</span> return (T)toArray(type, new ObjectList((Object[])StringUtils.split(value.toString())).setBeanSession(this));<a name="line.499"></a>
-<span class="sourceLineNo">500</span> }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span> // Target type is some sort of Map that needs to be converted.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> if (type.isMap()) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span> try {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> if (value instanceof Map) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> Map m = type.canCreateNewInstance(outer) ? (Map)type.newInstance(outer) : new ObjectMap(this);<a name="line.506"></a>
-<span class="sourceLineNo">507</span> ClassMeta keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (Map.Entry e : (Set<Map.Entry>)((Map)value).entrySet()) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> Object k = e.getKey();<a name="line.509"></a>
-<span class="sourceLineNo">510</span> if (keyType.isNotObject()) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> if (keyType.isString() && k.getClass() != Class.class)<a name="line.511"></a>
-<span class="sourceLineNo">512</span> k = k.toString();<a name="line.512"></a>
-<span class="sourceLineNo">513</span> else<a name="line.513"></a>
-<span class="sourceLineNo">514</span> k = convertToType(m, k, keyType);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span> Object v = e.getValue();<a name="line.516"></a>
-<span class="sourceLineNo">517</span> if (valueType.isNotObject())<a name="line.517"></a>
-<span class="sourceLineNo">518</span> v = convertToType(m, v, valueType);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> m.put(k, v);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return (T)m;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> } else if (!type.canCreateNewInstanceFromString(outer)) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> ObjectMap m = new ObjectMap(value.toString(), ctx.defaultParser);<a name="line.523"></a>
-<span class="sourceLineNo">524</span> return convertToType(outer, m, type);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> } catch (Exception e) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> throw new InvalidDataConversionException(value.getClass(), type, e);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> // Target type is some sort of Collection<a name="line.531"></a>
-<span class="sourceLineNo">532</span> if (type.isCollection()) {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> try {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> Collection l = type.canCreateNewInstance(outer) ? (Collection)type.newInstance(outer) : new ObjectList(this);<a name="line.534"></a>
-<span class="sourceLineNo">535</span> ClassMeta elementType = type.getElementType();<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (value.getClass().isArray())<a name="line.537"></a>
-<span class="sourceLineNo">538</span> for (Object o : (Object[])value)<a name="line.538"></a>
-<span class="sourceLineNo">539</span> l.add(elementType.isObject() ? o : convertToType(l, o, elementType));<a name="line.539"></a>
-<span class="sourceLineNo">540</span> else if (value instanceof Collection)<a name="line.540"></a>
-<span class="sourceLineNo">541</span> for (Object o : (Collection)value)<a name="line.541"></a>
-<span class="sourceLineNo">542</span> l.add(elementType.isObject() ? o : convertToType(l, o, elementType));<a name="line.542"></a>
-<span class="sourceLineNo">543</span> else if (value instanceof Map)<a name="line.543"></a>
-<span class="sourceLineNo">544</span> l.add(elementType.isObject() ? value : convertToType(l, value, elementType));<a name="line.544"></a>
-<span class="sourceLineNo">545</span> else if (! value.toString().isEmpty())<a name="line.545"></a>
-<span class="sourceLineNo">546</span> throw new InvalidDataConversionException(value.getClass(), type, null);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> return (T)l;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> } catch (InvalidDataConversionException e) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span> throw e;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> } catch (Exception e) {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> throw new InvalidDataConversionException(value.getClass(), type, e);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span> if (type.isEnum()) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> if (type.canCreateNewInstanceFromString(outer))<a name="line.556"></a>
-<span class="sourceLineNo">557</span> return type.newInstanceFromString(outer, value.toString());<a name="line.557"></a>
-<span class="sourceLineNo">558</span> return (T)Enum.valueOf((Class<? extends Enum>)tc, value.toString());<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> if (type.isString()) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> if (vt.isMapOrBean() || vt.isCollectionOrArray()) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> if (JsonSerializer.DEFAULT_LAX != null)<a name="line.563"></a>
-<span class="sourceLineNo">564</span> return (T)JsonSerializer.DEFAULT_LAX.serialize(value);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> } else if (vt.isClass()) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> return (T)getReadableClassName((Class<?>)value);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> }<a name="line.567"></a>
-<span class="sourceLineNo">568</span> return (T)value.toString();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span> if (type.isCharSequence()) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span> Class<?> c = value.getClass();<a name="line.572"></a>
-<span class="sourceLineNo">573</span> if (c.isArray()) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (c.getComponentType().isPrimitive()) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> ObjectList l = new ObjectList(this);<a name="line.575"></a>
-<span class="sourceLineNo">576</span> int size = Array.getLength(value);<a name="line.576"></a>
-<span class="sourceLineNo">577</span> for (int i = 0; i < size; i++)<a name="line.577"></a>
-<span class="sourceLineNo">578</span> l.add(Array.get(value, i));<a name="line.578"></a>
-<span class="sourceLineNo">579</span> value = l;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> value = new ObjectList((Object[])value).setBeanSession(this);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span><a name="line.583"></a>
-<span class="sourceLineNo">584</span> return type.newInstanceFromString(outer, value.toString());<a name="line.584"></a>
-<span class="sourceLineNo">585</span> }<a name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span> if (type.isBoolean()) {<a name="line.587"></a>
-<span class="sourceLineNo">588</span> if (value instanceof Number)<a name="line.588"></a>
-<span class="sourceLineNo">589</span> return (T)(Boolean.valueOf(((Number)value).intValue() != 0));<a name="line.589"></a>
-<span class="sourceLineNo">590</span> return (T)Boolean.valueOf(value.toString());<a name="line.590"></a>
-<span class="sourceLineNo">591</span> }<a name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span> // It's a bean being initialized with a Map<a name="line.593"></a>
-<span class="sourceLineNo">594</span> if (type.isBean() && value instanceof Map) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> if (value instanceof ObjectMap) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span> ObjectMap m2 = (ObjectMap)value;<a name="line.596"></a>
-<span class="sourceLineNo">597</span> String typeName = m2.getString(getBeanTypePropertyName(type));<a name="line.597"></a>
-<span class="sourceLineNo">598</span> if (typeName != null) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> ClassMeta cm = type.getBeanRegistry().getClassMeta(typeName);<a name="line.599"></a>
-<span class="sourceLineNo">600</span> if (cm != null && isParentClass(type.innerClass, cm.innerClass))<a name="line.600"></a>
-<span class="sourceLineNo">601</span> return (T)m2.cast(cm);<a name="line.601"></a>
-<span class="sourceLineNo">602</span> }<a name="line.602"></a>
-<span class="sourceLineNo">603</span> }<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return newBeanMap(tc).load((Map<?,?>) value).getBean();<a name="line.604"></a>
+<span class="sourceLineNo">337</span> try {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> // Handle the case of a null value.<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if (value == null) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> // If it's a primitive, then use the converters to get the default value for the primitive type.<a name="line.341"></a>
+<span class="sourceLineNo">342</span> if (type.isPrimitive())<a name="line.342"></a>
+<span class="sourceLineNo">343</span> return type.getPrimitiveDefault();<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> // Otherwise, just return null.<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return null;<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> Class<T> tc = type.getInnerClass();<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> // If no conversion needed, then just return the value.<a name="line.351"></a>
+<span class="sourceLineNo">352</span> // Don't include maps or collections, because child elements may need conversion.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> if (tc.isInstance(value))<a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (! ((type.isMap() && type.getValueType().isNotObject()) || (type.isCollection() && type.getElementType().isNotObject())))<a name="line.354"></a>
+<span class="sourceLineNo">355</span> return (T)value;<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> if (tc == Class.class)<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return (T)(ctx.classLoader.loadClass(value.toString()));<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (type.getPojoSwap() != null) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> PojoSwap f = type.getPojoSwap();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> Class<?> nc = f.getNormalClass(), fc = f.getSwapClass();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (isParentClass(nc, tc) && isParentClass(fc, value.getClass()))<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return (T)f.unswap(this, value, type);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span> ClassMeta<?> vt = ctx.getClassMetaForObject(value);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> if (vt.getPojoSwap() != null) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> PojoSwap f = vt.getPojoSwap();<a name="line.369"></a>
+<span class="sourceLineNo">370</span> Class<?> nc = f.getNormalClass(), fc = f.getSwapClass();<a name="line.370"></a>
+<span class="sourceLineNo">371</span> if (isParentClass(nc, vt.getInnerClass()) && isParentClass(fc, tc))<a name="line.371"></a>
+<span class="sourceLineNo">372</span> return (T)f.swap(this, value);<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> if (type.isPrimitive()) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> if (value.toString().isEmpty())<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return type.getPrimitiveDefault();<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> if (type.isNumber()) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> if (value instanceof Number) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> Number n = (Number)value;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> if (tc == Integer.TYPE)<a name="line.382"></a>
+<span class="sourceLineNo">383</span> return (T)Integer.valueOf(n.intValue());<a name="line.383"></a>
+<span class="sourceLineNo">384</span> if (tc == Short.TYPE)<a name="line.384"></a>
+<span class="sourceLineNo">385</span> return (T)Short.valueOf(n.shortValue());<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (tc == Long.TYPE)<a name="line.386"></a>
+<span class="sourceLineNo">387</span> return (T)Long.valueOf(n.longValue());<a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (tc == Float.TYPE)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> return (T)Float.valueOf(n.floatValue());<a name="line.389"></a>
+<span class="sourceLineNo">390</span> if (tc == Double.TYPE)<a name="line.390"></a>
+<span class="sourceLineNo">391</span> return (T)Double.valueOf(n.doubleValue());<a name="line.391"></a>
+<span class="sourceLineNo">392</span> if (tc == Byte.TYPE)<a name="line.392"></a>
+<span class="sourceLineNo">393</span> return (T)Byte.valueOf(n.byteValue());<a name="line.393"></a>
+<span class="sourceLineNo">394</span> } else {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> String n = null;<a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (value instanceof Boolean)<a name="line.396"></a>
+<span class="sourceLineNo">397</span> n = ((Boolean)value).booleanValue() ? "1" : "0";<a name="line.397"></a>
+<span class="sourceLineNo">398</span> else<a name="line.398"></a>
+<span class="sourceLineNo">399</span> n = value.toString();<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> int multiplier = (tc == Integer.TYPE || tc == Short.TYPE || tc == Long.TYPE) ? getMultiplier(n) : 1;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> if (multiplier != 1) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> n = n.substring(0, n.length()-1).trim();<a name="line.403"></a>
+<span class="sourceLineNo">404</span> Long l = Long.valueOf(n) * multiplier;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> if (tc == Integer.TYPE)<a name="line.405"></a>
+<span class="sourceLineNo">406</span> return (T)Integer.valueOf(l.intValue());<a name="line.406"></a>
+<span class="sourceLineNo">407</span> if (tc == Short.TYPE)<a name="line.407"></a>
+<span class="sourceLineNo">408</span> return (T)Short.valueOf(l.shortValue());<a name="line.408"></a>
+<span class="sourceLineNo">409</span> if (tc == Long.TYPE)<a name="line.409"></a>
+<span class="sourceLineNo">410</span> return (T)Long.valueOf(l.longValue());<a name="line.410"></a>
+<span class="sourceLineNo">411</span> } else {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> if (tc == Integer.TYPE)<a name="line.412"></a>
+<span class="sourceLineNo">413</span> return (T)Integer.valueOf(n);<a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (tc == Short.TYPE)<a name="line.414"></a>
+<span class="sourceLineNo">415</span> return (T)Short.valueOf(n);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (tc == Long.TYPE)<a name="line.416"></a>
+<span class="sourceLineNo">417</span> return (T)Long.valueOf(n);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> if (tc == Float.TYPE)<a name="line.418"></a>
+<span class="sourceLineNo">419</span> return (T)new Float(n);<a name="line.419"></a>
+<span class="sourceLineNo">420</span> if (tc == Double.TYPE)<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return (T)new Double(n);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (tc == Byte.TYPE)<a name="line.422"></a>
+<span class="sourceLineNo">423</span> return (T)Byte.valueOf(n);<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span> }<a name="line.425"></a>
+<span class="sourceLineNo">426</span> } else if (type.isChar()) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> String s = value.toString();<a name="line.427"></a>
+<span class="sourceLineNo">428</span> return (T)Character.valueOf(s.length() == 0 ? 0 : s.charAt(0));<a name="line.428"></a>
+<span class="sourceLineNo">429</span> } else if (type.isBoolean()) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> if (value instanceof Number) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> int i = ((Number)value).intValue();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> return (T)(i == 0 ? Boolean.FALSE : Boolean.TRUE);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> return (T)Boolean.valueOf(value.toString());<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (type.isNumber()) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> if (value instanceof Number) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> Number n = (Number)value;<a name="line.440"></a>
+<span class="sourceLineNo">441</span> if (tc == Integer.class)<a name="line.441"></a>
+<span class="sourceLineNo">442</span> return (T)Integer.valueOf(n.intValue());<a name="line.442"></a>
+<span class="sourceLineNo">443</span> if (tc == Short.class)<a name="line.443"></a>
+<span class="sourceLineNo">444</span> return (T)Short.valueOf(n.shortValue());<a name="line.444"></a>
+<span class="sourceLineNo">445</span> if (tc == Long.class)<a name="line.445"></a>
+<span class="sourceLineNo">446</span> return (T)Long.valueOf(n.longValue());<a name="line.446"></a>
+<span class="sourceLineNo">447</span> if (tc == Float.class)<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return (T)Float.valueOf(n.floatValue());<a name="line.448"></a>
+<span class="sourceLineNo">449</span> if (tc == Double.class)<a name="line.449"></a>
+<span class="sourceLineNo">450</span> return (T)Double.valueOf(n.doubleValue());<a name="line.450"></a>
+<span class="sourceLineNo">451</span> if (tc == Byte.class)<a name="line.451"></a>
+<span class="sourceLineNo">452</span> return (T)Byte.valueOf(n.byteValue());<a name="line.452"></a>
+<span class="sourceLineNo">453</span> if (tc == Byte.class)<a name="line.453"></a>
+<span class="sourceLineNo">454</span> return (T)Byte.valueOf(n.byteValue());<a name="line.454"></a>
+<span class="sourceLineNo">455</span> if (tc == AtomicInteger.class)<a name="line.455"></a>
+<span class="sourceLineNo">456</span> return (T)new AtomicInteger(n.intValue());<a name="line.456"></a>
+<span class="sourceLineNo">457</span> if (tc == AtomicLong.class)<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return (T)new AtomicLong(n.intValue());<a name="line.458"></a>
+<span class="sourceLineNo">459</span> } else {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> if (value.toString().isEmpty())<a name="line.460"></a>
+<span class="sourceLineNo">461</span> return null;<a name="line.461"></a>
+<span class="sourceLineNo">462</span> String n = null;<a name="line.462"></a>
+<span class="sourceLineNo">463</span> if (value instanceof Boolean)<a name="line.463"></a>
+<span class="sourceLineNo">464</span> n = ((Boolean)value).booleanValue() ? "1" : "0";<a name="line.464"></a>
+<span class="sourceLineNo">465</span> else<a name="line.465"></a>
+<span class="sourceLineNo">466</span> n = value.toString();<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> int multiplier = (tc == Integer.class || tc == Short.class || tc == Long.class) ? getMultiplier(n) : 1;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> if (multiplier != 1) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> n = n.substring(0, n.length()-1).trim();<a name="line.470"></a>
+<span class="sourceLineNo">471</span> Long l = Long.valueOf(n) * multiplier;<a name="line.471"></a>
+<span class="sourceLineNo">472</span> if (tc == Integer.TYPE)<a name="line.472"></a>
+<span class="sourceLineNo">473</span> return (T)Integer.valueOf(l.intValue());<a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (tc == Short.TYPE)<a name="line.474"></a>
+<span class="sourceLineNo">475</span> return (T)Short.valueOf(l.shortValue());<a name="line.475"></a>
+<span class="sourceLineNo">476</span> if (tc == Long.TYPE)<a name="line.476"></a>
+<span class="sourceLineNo">477</span> return (T)Long.valueOf(l.longValue());<a name="line.477"></a>
+<span class="sourceLineNo">478</span> } else {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> if (tc == Integer.class)<a name="line.479"></a>
+<span class="sourceLineNo">480</span> return (T)Integer.valueOf(n);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (tc == Short.class)<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return (T)Short.valueOf(n);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> if (tc == Long.class)<a name="line.483"></a>
+<span class="sourceLineNo">484</span> return (T)Long.valueOf(n);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> if (tc == Float.class)<a name="line.485"></a>
+<span class="sourceLineNo">486</span> return (T)new Float(n);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> if (tc == Double.class)<a name="line.487"></a>
+<span class="sourceLineNo">488</span> return (T)new Double(n);<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (tc == Byte.class)<a name="line.489"></a>
+<span class="sourceLineNo">490</span> return (T)Byte.valueOf(n);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> if (tc == AtomicInteger.class)<a name="line.491"></a>
+<span class="sourceLineNo">492</span> return (T)new AtomicInteger(Integer.valueOf(n));<a name="line.492"></a>
+<span class="sourceLineNo">493</span> if (tc == AtomicLong.class)<a name="line.493"></a>
+<span class="sourceLineNo">494</span> return (T)new AtomicLong(Long.valueOf(n));<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span> }<a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (type.isChar()) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> String s = value.toString();<a name="line.500"></a>
+<span class="sourceLineNo">501</span> return (T)Character.valueOf(s.length() == 0 ? 0 : s.charAt(0));<a name="line.501"></a>
+<span class="sourceLineNo">502</span> }<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span> // Handle setting of array properties<a name="line.504"></a>
+<span class="sourceLineNo">505</span> if (type.isArray()) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (vt.isCollection())<a name="line.506"></a>
+<span class="sourceLineNo">507</span> return (T)toArray(type, (Collection)value);<a name="line.507"></a>
+<span class="sourceLineNo">508</span> else if (vt.isArray())<a name="line.508"></a>
+<span class="sourceLineNo">509</span> return (T)toArray(type, Arrays.asList((Object[])value));<a name="line.509"></a>
+<span class="sourceLineNo">510</span> else if (startsWith(value.toString(), '['))<a name="line.510"></a>
+<span class="sourceLineNo">511</span> return (T)toArray(type, new ObjectList(value.toString()).setBeanSession(this));<a name="line.511"></a>
+<span class="sourceLineNo">512</span> else<a name="line.512"></a>
+<span class="sourceLineNo">513</span> return (T)toArray(type, new ObjectList((Object[])StringUtils.split(value.toString())).setBeanSession(this));<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span> // Target type is some sort of Map that needs to be converted.<a name="line.516"></a>
+<span class="sourceLineNo">517</span> if (type.isMap()) {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> try {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (value instanceof Map) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> Map m = type.canCreateNewInstance(outer) ? (Map)type.newInstance(outer) : new ObjectMap(this);<a name="line.520"></a>
+<span class="sourceLineNo">521</span> ClassMeta keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.521"></a>
+<span class="sourceLineNo">522</span> for (Map.Entry e : (Set<Map.Entry>)((Map)value).entrySet()) {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> Object k = e.getKey();<a name="line.523"></a>
+<span class="sourceLineNo">524</span> if (keyType.isNotObject()) {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> if (keyType.isString() && k.getClass() != Class.class)<a name="line.525"></a>
+<span class="sourceLineNo">526</span> k = k.toString();<a name="line.526"></a>
+<span class="sourceLineNo">527</span> else<a name="line.527"></a>
+<span class="sourceLineNo">528</span> k = convertToMemberType(m, k, keyType);<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span> Object v = e.getValue();<a name="line.530"></a>
+<span class="sourceLineNo">531</span> if (valueType.isNotObject())<a name="line.531"></a>
+<span class="sourceLineNo">532</span> v = convertToMemberType(m, v, valueType);<a name="line.532"></a>
+<span class="sourceLineNo">533</span> m.put(k, v);<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
+<span class="sourceLineNo">535</span> return (T)m;<a name="line.535"></a>
+<span class="sourceLineNo">536</span> } else if (!type.canCreateNewInstanceFromString(outer)) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> ObjectMap m = new ObjectMap(value.toString(), ctx.defaultParser);<a name="line.537"></a>
+<span class="sourceLineNo">538</span> return convertToMemberType(outer, m, type);<a name="line.538"></a>
+<span class="sourceLineNo">539</span> }<a name="line.539"></a>
+<span class="sourceLineNo">540</span> } catch (Exception e) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span> throw new InvalidDataConversionException(value.getClass(), type, e);<a name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span> }<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span> // Target type is some sort of Collection<a name="line.545"></a>
+<span class="sourceLineNo">546</span> if (type.isCollection()) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span> try {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> Collection l = type.canCreateNewInstance(outer) ? (Collection)type.newInstance(outer) : new ObjectList(this);<a name="line.548"></a>
+<span class="sourceLineNo">549</span> ClassMeta elementType = type.getElementType();<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span> if (value.getClass().isArray())<a name="line.551"></a>
+<span class="sourceLineNo">552</span> for (Object o : (Object[])value)<a name="line.552"></a>
+<span class="sourceLineNo">553</span> l.add(elementType.isObject() ? o : convertToMemberType(l, o, elementType));<a name="line.553"></a>
+<span class="sourceLineNo">554</span> else if (value instanceof Collection)<a name="line.554"></a>
+<span class="sourceLineNo">555</span> for (Object o : (Collection)value)<a name="line.555"></a>
+<span class="sourceLineNo">556</span> l.add(elementType.isObject() ? o : convertToMemberType(l, o, elementType));<a name="line.556"></a>
+<span class="sourceLineNo">557</span> else if (value instanceof Map)<a name="line.557"></a>
+<span class="sourceLineNo">558</span> l.add(elementType.isObject() ? value : convertToMemberType(l, value, elementType));<a name="line.558"></a>
+<span class="sourceLineNo">559</span> else if (! value.toString().isEmpty())<a name="line.559"></a>
+<span class="sourceLineNo">560</span> throw new InvalidDataConversionException(value.getClass(), type, null);<a name="line.560"></a>
+<span class="sourceLineNo">561</span> return (T)l;<a name="line.561"></a>
+<span class="sourceLineNo">562</span> } catch (InvalidDataConversionException e) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> throw e;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> } catch (Exception e) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> throw new InvalidDataConversionException(value.getClass(), type, e);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> }<a name="line.566"></a>
+<span class="sourceLineNo">567</span> }<a name="line.567"></a>
+<span class="sourceLineNo">568</span><a name="line.568"></a>
+<span class="sourceLineNo">569</span> if (type.isEnum()) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span> if (type.canCreateNewInstanceFromString(outer))<a name="line.570"></a>
+<span class="sourceLineNo">571</span> return type.newInstanceFromString(outer, value.toString());<a name="line.571"></a>
+<span class="sourceLineNo">572</span> return (T)Enum.valueOf((Class<? extends Enum>)tc, value.toString());<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span><a name="line.574"></a>
+<span class="sourceLineNo">575</span> if (type.isString()) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span> if (vt.isMapOrBean() || vt.isCollectionOrArray()) {<a name="line.576"></a>
+<span class="sourceLineNo">577</span> if (JsonSerializer.DEFAULT_LAX != null)<a name="line.577"></a>
+<span class="sourceLineNo">578</span> return (T)JsonSerializer.DEFAULT_LAX.serialize(value);<a name="line.578"></a>
+<span class="sourceLineNo">579</span> } else if (vt.isClass()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> return (T)getReadableClassName((Class<?>)value);<a name="line.580"></a>
+<span class="sourceLineNo">581</span> }<a name="line.581"></a>
+<span class="sourceLineNo">582</span> return (T)value.toString();<a name="line.582"></a>
+<span class="sourceLineNo">583</span> }<a name="line.583"></a>
+<span class="sourceLineNo">584</span><a name="line.584"></a>
+<span class="sourceLineNo">585</span> if (type.isCharSequence()) {<a name="line.585"></a>
+<span class="sourceLineNo">586</span> Class<?> c = value.getClass();<a name="line.586"></a>
+<span class="sourceLineNo">587</span> if (c.isArray()) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span> if (c.getComponentType().isPrimitive()) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span> ObjectList l = new ObjectList(this);<a name="line.589"></a>
+<span class="sourceLineNo">590</span> int size = Array.getLength(value);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> for (int i = 0; i < size; i++)<a name="line.591"></a>
+<span class="sourceLineNo">592</span> l.add(Array.get(value, i));<a name="line.592"></a>
+<span class="sourceLineNo">593</span> value = l;<a name="line.593"></a>
+<span class="sourceLineNo">594</span> }<a name="line.594"></a>
+<span class="sourceLineNo">595</span> value = new ObjectList((Object[])value).setBeanSession(this);<a name="line.595"></a>
+<span class="sourceLineNo">596</span> }<a name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span> return type.newInstanceFromString(outer, value.toString());<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span> if (type.isBoolean()) {<a name="line.601"></a>
+<span class="sourceLineNo">602</span> if (value instanceof Number)<a name="line.602"></a>
+<span class="sourceLineNo">603</span> return (T)(Boolean.valueOf(((Number)value).intValue() != 0));<a name="line.603"></a>
+<span class="sourceLineNo">604</span> return (T)Boolean.valueOf(value.toString());<a name="line.604"></a>
<span class="sourceLineNo">605</span> }<a name="line.605"></a>
<span class="sourceLineNo">606</span><a name="line.606"></a>
-<span class="sourceLineNo">607</span> if (type.canCreateNewInstanceFromNumber(outer) && value instanceof Number)<a name="line.607"></a>
-<span class="sourceLineNo">608</span> return type.newInstanceFromNumber(this, outer, (Number)value);<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> if (type.canCreateNewInstanceFromString(outer))<a name="line.610"></a>
-<span class="sourceLineNo">611</span> return type.newInstanceFromString(outer, value.toString());<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span> if (type.isBean())<a name="line.613"></a>
-<span class="sourceLineNo">614</span> return newBeanMap(type.getInnerClass()).load(value.toString()).getBean();<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span> } catch (Exception e) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> throw new InvalidDataConversionException(value, type, e);<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span> throw new InvalidDataConversionException(value, type, null);<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span><a name="line.622"></a>
-<span class="sourceLineNo">623</span> private static int getMultiplier(String s) {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> if (s.endsWith("G"))<a name="line.624"></a>
-<span class="sourceLineNo">625</span> return 1024*1024*1024;<a name="line.625"></a>
-<span class="sourceLineNo">626</span> if (s.endsWith("M"))<a name="line.626"></a>
-<span class="sourceLineNo">627</span> return 1024*1024;<a name="line.627"></a>
-<span class="sourceLineNo">628</span> if (s.endsWith("K"))<a name="line.628"></a>
-<span class="sourceLineNo">629</span> return 1024;<a name="line.629"></a>
-<span class="sourceLineNo">630</span> return 1;<a name="line.630"></a>
-<span class="sourceLineNo">631</span> }<a name="line.631"></a>
-<span class="sourceLineNo">632</span><a name="line.632"></a>
-<span class="sourceLineNo">633</span> /**<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * Converts the contents of the specified list into an array.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> *<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * <p><a name="line.636"></a>
-<span class="sourceLineNo">637</span> * Works on both object and primitive arrays.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> *<a name="line.638"></a>
-<span class="sourceLineNo">639</span> * <p><a name="line.639"></a>
-<span class="sourceLineNo">640</span> * In the case of multi-dimensional arrays, the incoming list must contain elements of type n-1 dimension.<a name="line.640"></a>
-<span class="sourceLineNo">641</span> * i.e. if {@code type} is <code><jk>int</jk>[][]</code> then {@code list} must have entries of type<a name="line.641"></a>
-<span class="sourceLineNo">642</span> * <code><jk>int</jk>[]</code>.<a name="line.642"></a>
-<span class="sourceLineNo">643</span> *<a name="line.643"></a>
-<span class="sourceLineNo">644</span> * @param type The type to convert to. Must be an array type.<a name="line.644"></a>
-<span class="sourceLineNo">645</span> * @param list The contents to populate the array with.<a name="line.645"></a>
-<span class="sourceLineNo">646</span> * @return A new object or primitive array.<a name="line.646"></a>
-<span class="sourceLineNo">647</span> */<a name="line.647"></a>
-<span class="sourceLineNo">648</span> public final Object toArray(ClassMeta<?> type, Collection<?> list) {<a name="line.648"></a>
-<span class="sourceLineNo">649</span> if (list == null)<a name="line.649"></a>
-<span class="sourceLineNo">650</span> return null;<a name="line.650"></a>
-<span class="sourceLineNo">651</span> ClassMeta<?> componentType = type.isArgs() ? object() : type.getElementType();<a name="line.651"></a>
-<span class="sourceLineNo">652</span> Object array = Array.newInstance(componentType.getInnerClass(), list.size());<a name="line.652"></a>
-<span class="sourceLineNo">653</span> int i = 0;<a name="line.653"></a>
-<span class="sourceLineNo">654</span> for (Object o : list) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> if (! type.getInnerClass().isInstance(o)) {<a name="line.655"></a>
-<span class="sourceLineNo">656</span> if (componentType.isArray() && o instanceof Collection)<a name="line.656"></a>
-<span class="sourceLineNo">657</span> o = toArray(componentType, (Collection<?>)o);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> else if (o == null && componentType.isPrimitive())<a name="line.658"></a>
-<span class="sourceLineNo">659</span> o = componentType.getPrimitiveDefault();<a name="line.659"></a>
-<span class="sourceLineNo">660</span> else<a name="line.660"></a>
-<span class="sourceLineNo">661</span> o = convertToType(null, o, componentType);<a name="line.661"></a>
-<span class="sourceLineNo">662</span> }<a name="line.662"></a>
-<span class="sourceLineNo">663</span> try {<a name="line.663"></a>
-<span class="sourceLineNo">664</span> Array.set(array, i++, o);<a name="line.664"></a>
-<span class="sourceLineNo">665</span> } catch (IllegalArgumentException e) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span> e.printStackTrace();<a name="line.666"></a>
-<span class="sourceLineNo">667</span> throw e;<a name="line.667"></a>
-<span class="sourceLineNo">668</span> }<a name="line.668"></a>
-<span class="sourceLineNo">669</span> }<a name="line.669"></a>
-<span class="sourceLineNo">670</span> return array;<a name="line.670"></a>
-<span class="sourceLineNo">671</span> }<a name="line.671"></a>
-<span class="sourceLineNo">672</span><a name="line.672"></a>
-<span class="sourceLineNo">673</span> /**<a name="line.673"></a>
-<span class="sourceLineNo">674</span> * Wraps an object inside a {@link BeanMap} object (i.e. a modifiable {@link Map}).<a name="line.674"></a>
-<span class="sourceLineNo">675</span> *<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * <p><a name="line.676"></a>
-<span class="sourceLineNo">677</span> * If object is not a true bean, then throws a {@link BeanRuntimeException} with an explanation of why it's not a<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * bean.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> *<a name="line.679"></a>
-<span class="sourceLineNo">680</span> * <h5 class='section'>Example:</h5><a name="line.680"></a>
-<span class="sourceLineNo">681</span> * <p class='bcode'><a name="line.681"></a>
-<span class="sourceLineNo">682</span> * <jc>// Construct a bean map around a bean instance</jc><a name="line.682"></a>
-<span class="sourceLineNo">683</span> * BeanMap&lt;Person&gt; bm = BeanContext.<jsf>DEFAULT</jsf>.forBean(<jk>new</jk> Person());<a name="line.683"></a>
-<span class="sourceLineNo">684</span> * </p><a name="line.684"></a>
-<span class="sourceLineNo">685</span> *<a name="line.685"></a>
-<span class="sourceLineNo">686</span> * @param <T> The class of the object being wrapped.<a name="line.686"></a>
-<span class="sourceLineNo">687</span> * @param o The object to wrap in a map interface. Must not be null.<a name="line.687"></a>
-<span class="sourceLineNo">688</span> * @return The wrapped object.<a name="line.688"></a>
-<span class="sourceLineNo">689</span> */<a name="line.689"></a>
-<span class="sourceLineNo">690</span> public final <T> BeanMap<T> toBeanMap(T o) {<a name="line.690"></a>
-<span class="sourceLineNo">691</span> return this.toBeanMap(o, (Class<T>)o.getClass());<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> /**<a name="line.694"></a>
-<span class="sourceLineNo">695</span> * Determines whether the specified object matches the requirements on this context of being a bean.<a name="line.695"></a>
-<span class="sourceLineNo">696</span> *<a name="line.696"></a>
-<span class="sourceLineNo">697</span> * @param o The object being tested.<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * @return <jk>true</jk> if the specified object is considered a bean.<a name="line.698"></a>
-<span class="sourceLineNo">699</span> */<a name="line.699"></a>
-<span class="sourceLineNo">700</span> public final boolean isBean(Object o) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> if (o == null)<a name="line.701"></a>
-<span class="sourceLineNo">702</span> return false;<a name="line.702"></a>
-<span class="sourceLineNo">703</span> return isBean(o.getClass());<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span> /**<a name="line.706"></a>
-<span class="sourceLineNo">707</span> * Determines whether the specified class matches the requirements on this context of being a bean.<a name="line.707"></a>
-<span class="sourceLineNo">708</span> *<a name="line.708"></a>
-<span class="sourceLineNo">709</span> * @param c The class being tested.<a name="line.709"></a>
-<span class="sourceLineNo">710</span> * @return <jk>true</jk> if the specified class is considered a bean.<a name="line.710"></a>
-<span class="sourceLineNo">711</span> */<a name="line.711"></a>
-<span class="sourceLineNo">712</span> public final boolean isBean(Class<?> c) {<a name="line.712"></a>
-<span class="sourceLineNo">713</span> return getBeanMeta(c) != null;<a name="line.713"></a>
-<span class="sourceLineNo">714</span> }<a name="line.714"></a>
-<span class="sourceLineNo">715</span><a name="line.715"></a>
-<span class="sourceLineNo">716</span> /**<a name="line.716"></a>
-<span class="sourceLineNo">717</span> * Wraps an object inside a {@link BeanMap} object (i.e.: a modifiable {@link Map}) defined as a bean for one of its<a name="line.717"></a>
-<span class="sourceLineNo">718</span> * class, a super class, or an implemented interface.<a name="line.718"></a>
-<span class="sourceLineNo">719</span> *<a name="line.719"></a>
-<span class="sourceLineNo">720</span> * <p><a name="line.720"></a>
-<span class="sourceLineNo">721</span> * If object is not a true bean, throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.<a name="line.721"></a>
+<span class="sourceLineNo">607</span> // It's a bean being initialized with a Map<a name="line.607"></a>
+<span class="sourceLineNo">608</span> if (type.isBean() && value instanceof Map) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> if (value instanceof ObjectMap) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span> ObjectMap m2 = (ObjectMap)value;<a name="line.610"></a>
+<span class="sourceLineNo">611</span> String typeName = m2.getString(getBeanTypePropertyName(type));<a name="line.611"></a>
+<span class="sourceLineNo">612</span> if (typeName != null) {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> ClassMeta cm = type.getBeanRegistry().getClassMeta(typeName);<a name="line.613"></a>
+<span class="sourceLineNo">614</span> if (cm != null && isParentClass(type.innerClass, cm.innerClass))<a name="line.614"></a>
+<span class="sourceLineNo">615</span> return (T)m2.cast(cm);<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> return newBeanMap(tc).load((Map<?,?>) value).getBean();<a name="line.618"></a>
+<span class="sourceLineNo">619</span> }<a name="line.619"></a>
+<span class="sourceLineNo">620</span><a name="line.620"></a>
+<span class="sourceLineNo">621</span> if (type.canCreateNewInstanceFromNumber(outer) && value instanceof Number)<a name="line.621"></a>
+<span class="sourceLineNo">622</span> return type.newInstanceFromNumber(this, outer, (Number)value);<a name="line.622"></a>
+<span class="sourceLineNo">623</span><a name="line.623"></a>
+<span class="sourceLineNo">624</span> if (type.canCreateNewInstanceFromString(outer))<a name="line.624"></a>
+<span class="sourceLineNo">625</span> return type.newInstanceFromString(outer, value.toString());<a name="line.625"></a>
+<span class="sourceLineNo">626</span><a name="line.626"></a>
+<span class="sourceLineNo">627</span> if (type.isBean())<a name="line.627"></a>
+<span class="sourceLineNo">628</span> return newBeanMap(type.getInnerClass()).load(value.toString()).getBean();<a name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span> } catch (Exception e) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span> throw new InvalidDataConversionException(value, type, e);<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> throw new InvalidDataConversionException(value, type, null);<a name="line.634"></a>
+<span class="sourceLineNo">635</span> }<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span> private static int getMultiplier(String s) {<a name="line.637"></a>
+<span class="sourceLineNo">638</span> if (s.endsWith("G"))<a name="line.638"></a>
+<span class="sourceLineNo">639</span> return 1024*1024*1024;<a name="line.639"></a>
+<span class="sourceLineNo">640</span> if (s.endsWith("M"))<a name="line.640"></a>
+<span class="sourceLineNo">641</span> return 1024*1024;<a name="line.641"></a>
+<span class="sourceLineNo">642</span> if (s.endsWith("K"))<a name="line.642"></a>
+<span class="sourceLineNo">643</span> return 1024;<a name="line.643"></a>
+<span class="sourceLineNo">644</span> return 1;<a name="line.644"></a>
+<span class="sourceLineNo">645</span> }<a name="line.645"></a>
+<span class="sourceLineNo">646</span><a name="line.646"></a>
+<span class="sourceLineNo">647</span> /**<a name="line.647"></a>
+<span class="sourceLineNo">648</span> * Converts the contents of the specified list into an array.<a name="line.648"></a>
+<span class="sourceLineNo">649</span> *<a name="line.649"></a>
+<span class="sourceLineNo">650</span> * <p><a name="line.650"></a>
+<span class="sourceLineNo">651</span> * Works on both object and primitive arrays.<a name="line.651"></a>
+<span class="sourceLineNo">652</span> *<a name="line.652"></a>
+<span class="sourceLineNo">653</span> * <p><a name="line.653"></a>
+<span class="sourceLineNo">654</span> * In the case of multi-dimensional arrays, the incoming list must contain elements of type n-1 dimension.<a name="line.654"></a>
+<span class="sourceLineNo">655</span> * i.e. if {@code type} is <code><jk>int</jk>[][]</code> then {@code list} must have entries of type<a name="line.655"></a>
+<span class="sourceLineNo">656</span> * <code><jk>int</jk>[]</code>.<a name="line.656"></a>
+<span class="sourceLineNo">657</span> *<a name="line.657"></a>
+<span class="sourceLineNo">658</span> * @param type The type to convert to. Must be an array type.<a name="line.658"></a>
+<span class="sourceLineNo">659</span> * @param list The contents to populate the array with.<a name="line.659"></a>
+<span class="sourceLineNo">660</span> * @return A new object or primitive array.<a name="line.660"></a>
+<span class="sourceLineNo">661</span> */<a name="line.661"></a>
+<span class="sourceLineNo">662</span> public final Object toArray(ClassMeta<?> type, Collection<?> list) {<a name="line.662"></a>
+<span class="sourceLineNo">663</span> if (list == null)<a name="line.663"></a>
+<span class="sourceLineNo">664</span> return null;<a name="line.664"></a>
+<span class="sourceLineNo">665</span> ClassMeta<?> componentType = type.isArgs() ? object() : type.getElementType();<a name="line.665"></a>
+<span class="sourceLineNo">666</span> Object array = Array.newInstance(componentType.getInnerClass(), list.size());<a name="line.666"></a>
+<span class="sourceLineNo">667</span> int i = 0;<a name="line.667"></a>
+<span class="sourceLineNo">668</span> for (Object o : list) {<a name="line.668"></a>
+<span class="sourceLineNo">669</span> if (! type.getInnerClass().isInstance(o)) {<a name="line.669"></a>
+<span class="sourceLineNo">670</span> if (componentType.isArray() && o instanceof Collection)<a name="line.670"></a>
+<span class="sourceLineNo">671</span> o = toArray(componentType, (Collection<?>)o);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> else if (o == null && componentType.isPrimitive())<a name="line.672"></a>
+<span class="sourceLineNo">673</span> o = componentType.getPrimitiveDefault();<a name="line.673"></a>
+<span class="sourceLineNo">674</span> else<a name="line.674"></a>
+<span class="sourceLineNo">675</span> o = convertToType(o, componentType);<a name="line.675"></a>
+<span class="sourceLineNo">676</span> }<a name="line.676"></a>
+<span class="sourceLineNo">677</span> try {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> Array.set(array, i++, o);<a name="line.678"></a>
+<span class="sourceLineNo">679</span> } catch (IllegalArgumentException e) {<a name="line.679"></a>
+<span class="sourceLineNo">680</span> e.printStackTrace();<a name="line.680"></a>
+<span class="sourceLineNo">681</span> throw e;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
+<span class="sourceLineNo">683</span> }<a name="line.683"></a>
+<span class="sourceLineNo">684</span> return array;<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span><a name="line.686"></a>
+<span class="sourceLineNo">687</span> /**<a name="line.687"></a>
+<span class="sourceLineNo">688</span> * Wraps an object inside a {@link BeanMap} object (i.e. a modifiable {@link Map}).<a name="line.688"></a>
+<span class="sourceLineNo">689</span> *<a name="line.689"></a>
+<span class="sourceLineNo">690</span> * <p><a name="line.690"></a>
+<span class="sourceLineNo">691</span> * If object is not a true bean, then throws a {@link BeanRuntimeException} with an explanation of why it's not a<a name="line.691"></a>
+<span class="sourceLineNo">692</span> * bean.<a name="line.692"></a>
+<span class="sourceLineNo">693</span> *<a name="line.693"></a>
+<span class="sourceLineNo">694</span> * <h5 class='section'>Example:</h5><a name="line.694"></a>
+<span class="sourceLineNo">695</span> * <p class='bcode'><a name="line.695"></a>
+<span class="sourceLineNo">696</span> * <jc>// Construct a bean map around a bean instance</jc><a name="line.696"></a>
+<span class="sourceLineNo">697</span> * BeanMap&lt;Person&gt; bm = BeanContext.<jsf>DEFAULT</jsf>.forBean(<jk>new</jk> Person());<a name="line.697"></a>
+<span class="sourceLineNo">698</span> * </p><a name="line.698"></a>
+<span class="sourceLin
<TRUNCATED>