http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/7170135e/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
index d04d038..98dc250 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html
@@ -119,17 +119,17 @@
 <span class="sourceLineNo">111</span>      this.notABeanReason = 
b.init(this);<a name="line.111"></a>
 <span class="sourceLineNo">112</span><a name="line.112"></a>
 <span class="sourceLineNo">113</span>      this.beanFilter = beanFilter;<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      this.dictionaryName = (beanFilter 
== null ? null : beanFilter.getTypeName());<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      this.properties = b.properties;<a 
name="line.115"></a>
+<span class="sourceLineNo">114</span>      this.dictionaryName = beanFilter == 
null ? null : beanFilter.getTypeName();<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      this.properties = b.properties == 
null ? null : Collections.unmodifiableMap(b.properties);<a name="line.115"></a>
 <span class="sourceLineNo">116</span>      this.getterProps = 
Collections.unmodifiableMap(b.getterProps);<a name="line.116"></a>
 <span class="sourceLineNo">117</span>      this.setterProps = 
Collections.unmodifiableMap(b.setterProps);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      this.typeVarImpls = 
b.typeVarImpls;<a name="line.118"></a>
+<span class="sourceLineNo">118</span>      this.typeVarImpls = b.typeVarImpls 
== null ? null : Collections.unmodifiableMap(b.typeVarImpls);<a 
name="line.118"></a>
 <span class="sourceLineNo">119</span>      this.constructor = b.constructor;<a 
name="line.119"></a>
 <span class="sourceLineNo">120</span>      this.constructorArgs = 
b.constructorArgs;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>      this.extMeta = b.extMeta;<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>      this.subTypeProperty = 
b.subTypeIdProperty;<a name="line.122"></a>
+<span class="sourceLineNo">122</span>      this.subTypeProperty = 
b.subTypeIdProperty == null ? null : b.subTypeIdProperty.build();<a 
name="line.122"></a>
 <span class="sourceLineNo">123</span>      this.beanRegistry = 
b.beanRegistry;<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      this.typeProperty = new 
BeanPropertyMeta(this, ctx.getBeanTypePropertyName(), ctx.string(), 
beanRegistry);<a name="line.124"></a>
+<span class="sourceLineNo">124</span>      this.typeProperty = new 
BeanPropertyMeta.Builder(this, ctx.getBeanTypePropertyName(), ctx.string(), 
beanRegistry).build();<a name="line.124"></a>
 <span class="sourceLineNo">125</span>   }<a name="line.125"></a>
 <span class="sourceLineNo">126</span><a name="line.126"></a>
 <span class="sourceLineNo">127</span>   private static final class 
Builder&lt;T&gt; {<a name="line.127"></a>
@@ -144,7 +144,7 @@
 <span class="sourceLineNo">136</span>      Constructor&lt;T&gt; constructor;<a 
name="line.136"></a>
 <span class="sourceLineNo">137</span>      String[] constructorArgs = new 
String[0];<a name="line.137"></a>
 <span class="sourceLineNo">138</span>      MetadataMap extMeta = new 
MetadataMap();<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      BeanPropertyMeta 
subTypeIdProperty;<a name="line.139"></a>
+<span class="sourceLineNo">139</span>      BeanPropertyMeta.Builder 
subTypeIdProperty;<a name="line.139"></a>
 <span class="sourceLineNo">140</span>      PropertyNamer propertyNamer;<a 
name="line.140"></a>
 <span class="sourceLineNo">141</span>      BeanRegistry beanRegistry;<a 
name="line.141"></a>
 <span class="sourceLineNo">142</span><a name="line.142"></a>
@@ -183,7 +183,7 @@
 <span class="sourceLineNo">175</span>            if (stopClass == null)<a 
name="line.175"></a>
 <span class="sourceLineNo">176</span>               stopClass = 
Object.class;<a name="line.176"></a>
 <span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>            
Map&lt;String,BeanPropertyMeta&gt; normalProps = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a name="line.178"></a>
+<span class="sourceLineNo">178</span>            
Map&lt;String,BeanPropertyMeta.Builder&gt; normalProps = new 
LinkedHashMap&lt;String,BeanPropertyMeta.Builder&gt;();<a name="line.178"></a>
 <span class="sourceLineNo">179</span><a name="line.179"></a>
 <span class="sourceLineNo">180</span>            /// See if this class matches 
one the patterns in the exclude-class list.<a name="line.180"></a>
 <span class="sourceLineNo">181</span>            if (ctx.isNotABean(c))<a 
name="line.181"></a>
@@ -246,7 +246,7 @@
 <span class="sourceLineNo">238</span>            // First populate the 
properties with those specified in the bean annotation to<a name="line.238"></a>
 <span class="sourceLineNo">239</span>            // ensure that ordering 
first.<a name="line.239"></a>
 <span class="sourceLineNo">240</span>            for (String name : 
fixedBeanProps)<a name="line.240"></a>
-<span class="sourceLineNo">241</span>               normalProps.put(name, new 
BeanPropertyMeta(beanMeta, name));<a name="line.241"></a>
+<span class="sourceLineNo">241</span>               normalProps.put(name, new 
BeanPropertyMeta.Builder(beanMeta, name));<a name="line.241"></a>
 <span class="sourceLineNo">242</span><a name="line.242"></a>
 <span class="sourceLineNo">243</span>            if 
(ctx.useJavaBeanIntrospector) {<a name="line.243"></a>
 <span class="sourceLineNo">244</span>               BeanInfo bi = null;<a 
name="line.244"></a>
@@ -258,7 +258,7 @@
 <span class="sourceLineNo">250</span>                  for (PropertyDescriptor 
pd : bi.getPropertyDescriptors()) {<a name="line.250"></a>
 <span class="sourceLineNo">251</span>                     String name = 
pd.getName();<a name="line.251"></a>
 <span class="sourceLineNo">252</span>                     if (! 
normalProps.containsKey(name))<a name="line.252"></a>
-<span class="sourceLineNo">253</span>                        
normalProps.put(name, new BeanPropertyMeta(beanMeta, name));<a 
name="line.253"></a>
+<span class="sourceLineNo">253</span>                        
normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a 
name="line.253"></a>
 <span class="sourceLineNo">254</span>                     
normalProps.get(name).setGetter(pd.getReadMethod()).setSetter(pd.getWriteMethod());<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>
@@ -269,7 +269,7 @@
 <span class="sourceLineNo">261</span>                  String name = 
findPropertyName(f, fixedBeanProps);<a name="line.261"></a>
 <span class="sourceLineNo">262</span>                  if (name != null) {<a 
name="line.262"></a>
 <span class="sourceLineNo">263</span>                     if (! 
normalProps.containsKey(name))<a name="line.263"></a>
-<span class="sourceLineNo">264</span>                        
normalProps.put(name, new BeanPropertyMeta(beanMeta, name));<a 
name="line.264"></a>
+<span class="sourceLineNo">264</span>                        
normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a 
name="line.264"></a>
 <span class="sourceLineNo">265</span>                     
normalProps.get(name).setField(f);<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>
@@ -281,8 +281,8 @@
 <span class="sourceLineNo">273</span>                  String pn = 
bm.propertyName;<a name="line.273"></a>
 <span class="sourceLineNo">274</span>                  Method m = bm.method;<a 
name="line.274"></a>
 <span class="sourceLineNo">275</span>                  if (! 
normalProps.containsKey(pn))<a name="line.275"></a>
-<span class="sourceLineNo">276</span>                     normalProps.put(pn, 
new BeanPropertyMeta(beanMeta, pn));<a name="line.276"></a>
-<span class="sourceLineNo">277</span>                  BeanPropertyMeta bpm = 
normalProps.get(pn);<a name="line.277"></a>
+<span class="sourceLineNo">276</span>                     normalProps.put(pn, 
new BeanPropertyMeta.Builder(beanMeta, pn));<a name="line.276"></a>
+<span class="sourceLineNo">277</span>                  
BeanPropertyMeta.Builder bpm = normalProps.get(pn);<a name="line.277"></a>
 <span class="sourceLineNo">278</span>                  if (! bm.isSetter)<a 
name="line.278"></a>
 <span class="sourceLineNo">279</span>                     bpm.setGetter(m);<a 
name="line.279"></a>
 <span class="sourceLineNo">280</span>               }<a name="line.280"></a>
@@ -290,7 +290,7 @@
 <span class="sourceLineNo">282</span>               // Now iterate through all 
the setters.<a name="line.282"></a>
 <span class="sourceLineNo">283</span>               for (BeanMethod bm : bms) 
{<a name="line.283"></a>
 <span class="sourceLineNo">284</span>                  if (bm.isSetter) {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>                     BeanPropertyMeta bpm 
= normalProps.get(bm.propertyName);<a name="line.285"></a>
+<span class="sourceLineNo">285</span>                     
BeanPropertyMeta.Builder bpm = normalProps.get(bm.propertyName);<a 
name="line.285"></a>
 <span class="sourceLineNo">286</span>                     if 
(bm.matchesPropertyType(bpm))<a name="line.286"></a>
 <span class="sourceLineNo">287</span>                        
bpm.setSetter(bm.method);<a name="line.287"></a>
 <span class="sourceLineNo">288</span>                  }<a name="line.288"></a>
@@ -303,16 +303,16 @@
 <span class="sourceLineNo">295</span>               typeVarImpls = null;<a 
name="line.295"></a>
 <span class="sourceLineNo">296</span><a name="line.296"></a>
 <span class="sourceLineNo">297</span>            // Eliminate invalid 
properties, and set the contents of getterProps and setterProps.<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>            for 
(Iterator&lt;BeanPropertyMeta&gt; i = normalProps.values().iterator(); 
i.hasNext();) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>               BeanPropertyMeta p = 
i.next();<a name="line.299"></a>
+<span class="sourceLineNo">298</span>            for 
(Iterator&lt;BeanPropertyMeta.Builder&gt; i = normalProps.values().iterator(); 
i.hasNext();) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>               BeanPropertyMeta.Builder p 
= i.next();<a name="line.299"></a>
 <span class="sourceLineNo">300</span>               try {<a 
name="line.300"></a>
 <span class="sourceLineNo">301</span>                  if (p.validate(ctx, 
beanRegistry, typeVarImpls)) {<a name="line.301"></a>
 <span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>                     if (p.getGetter() != 
null)<a name="line.303"></a>
-<span class="sourceLineNo">304</span>                        
getterProps.put(p.getGetter(), p.getName());<a name="line.304"></a>
+<span class="sourceLineNo">303</span>                     if (p.getter != 
null)<a name="line.303"></a>
+<span class="sourceLineNo">304</span>                        
getterProps.put(p.getter, p.name);<a name="line.304"></a>
 <span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>                     if (p.getSetter() != 
null)<a name="line.306"></a>
-<span class="sourceLineNo">307</span>                        
setterProps.put(p.getSetter(), p.getName());<a name="line.307"></a>
+<span class="sourceLineNo">306</span>                     if (p.setter != 
null)<a name="line.306"></a>
+<span class="sourceLineNo">307</span>                        
setterProps.put(p.setter, p.name);<a name="line.307"></a>
 <span class="sourceLineNo">308</span><a name="line.308"></a>
 <span class="sourceLineNo">309</span>                  } else {<a 
name="line.309"></a>
 <span class="sourceLineNo">310</span>                     i.remove();<a 
name="line.310"></a>
@@ -329,7 +329,7 @@
 <span class="sourceLineNo">321</span><a name="line.321"></a>
 <span class="sourceLineNo">322</span>            // Mark constructor arg 
properties.<a name="line.322"></a>
 <span class="sourceLineNo">323</span>            for (String fp : 
constructorArgs) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>               BeanPropertyMeta m = 
normalProps.get(fp);<a name="line.324"></a>
+<span class="sourceLineNo">324</span>               BeanPropertyMeta.Builder m 
= normalProps.get(fp);<a name="line.324"></a>
 <span class="sourceLineNo">325</span>               if (m == null)<a 
name="line.325"></a>
 <span class="sourceLineNo">326</span>                  throw new 
BeanRuntimeException(c, "The property ''{0}'' was defined on the 
@BeanConstructor(properties=X) annotation but was not found on the class 
definition.", fp);<a name="line.326"></a>
 <span class="sourceLineNo">327</span>               m.setAsConstructorArg();<a 
name="line.327"></a>
@@ -345,473 +345,486 @@
 <span class="sourceLineNo">337</span><a name="line.337"></a>
 <span class="sourceLineNo">338</span>            if (beanFilter != null 
&amp;&amp; beanFilter.getSubTypeProperty() != null) {<a name="line.338"></a>
 <span class="sourceLineNo">339</span>               String subTypeProperty = 
beanFilter.getSubTypeProperty();<a name="line.339"></a>
-<span class="sourceLineNo">340</span>               this.subTypeIdProperty = 
new SubTypePropertyMeta(beanMeta, subTypeProperty, beanFilter.getSubTypes(), 
normalProps.remove(subTypeProperty), beanRegistry);<a name="line.340"></a>
-<span class="sourceLineNo">341</span>               
properties.put(subTypeProperty, this.subTypeIdProperty);<a name="line.341"></a>
-<span class="sourceLineNo">342</span>            }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>            
properties.putAll(normalProps);<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>            // If a beanFilter is 
defined, look for inclusion and exclusion lists.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>            if (beanFilter != null) {<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>               // Eliminated excluded 
properties if BeanFilter.excludeKeys is specified.<a name="line.349"></a>
-<span class="sourceLineNo">350</span>               String[] includeKeys = 
beanFilter.getProperties();<a name="line.350"></a>
-<span class="sourceLineNo">351</span>               String[] excludeKeys = 
beanFilter.getExcludeProperties();<a name="line.351"></a>
-<span class="sourceLineNo">352</span>               if (excludeKeys != null) 
{<a name="line.352"></a>
-<span class="sourceLineNo">353</span>                  for (String k : 
excludeKeys)<a name="line.353"></a>
-<span class="sourceLineNo">354</span>                     
properties.remove(k);<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span>               // Only include specified 
properties if BeanFilter.includeKeys is specified.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>               // Note that the order 
must match includeKeys.<a name="line.357"></a>
-<span class="sourceLineNo">358</span>               } else if (includeKeys != 
null) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>                  
Map&lt;String,BeanPropertyMeta&gt; properties2 = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>                  for (String k : 
includeKeys) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>                     if 
(properties.containsKey(k))<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                        
properties2.put(k, properties.get(k));<a name="line.362"></a>
-<span class="sourceLineNo">363</span>                  }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>                  properties = 
properties2;<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><a name="line.367"></a>
-<span class="sourceLineNo">368</span>            if (pNames != null) {<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>               
Map&lt;String,BeanPropertyMeta&gt; properties2 = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a name="line.369"></a>
-<span class="sourceLineNo">370</span>               for (String k : pNames) 
{<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                  if 
(properties.containsKey(k))<a name="line.371"></a>
-<span class="sourceLineNo">372</span>                     properties2.put(k, 
properties.get(k));<a name="line.372"></a>
-<span class="sourceLineNo">373</span>               }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>               properties = 
properties2;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>            }<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>            // We return this through the 
Bean.keySet() interface, so make sure it's not modifiable.<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>            properties = 
Collections.unmodifiableMap(properties);<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>         } catch (BeanRuntimeException e) 
{<a name="line.380"></a>
-<span class="sourceLineNo">381</span>            throw e;<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>         } catch (Exception e) {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>            return "Exception:  " + 
StringUtils.getStackTrace(e);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>         }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span>         return null;<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>      }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>      /*<a name="line.389"></a>
-<span class="sourceLineNo">390</span>       * Returns the property name of the 
specified field if it's a valid property.<a name="line.390"></a>
-<span class="sourceLineNo">391</span>       * Returns null if the field isn't 
a valid property.<a name="line.391"></a>
-<span class="sourceLineNo">392</span>       */<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      private String 
findPropertyName(Field f, Set&lt;String&gt; fixedBeanProps) {<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>         BeanProperty bp = 
f.getAnnotation(BeanProperty.class);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>         if (bp != null &amp;&amp; ! 
bp.name().equals("")) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>            String name = bp.name();<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span>            if (fixedBeanProps.isEmpty() 
|| fixedBeanProps.contains(name))<a name="line.397"></a>
-<span class="sourceLineNo">398</span>               return name;<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>            throw new 
BeanRuntimeException(classMeta.getInnerClass(), "Method property ''{0}'' 
identified in @BeanProperty, but missing from @Bean", name);<a 
name="line.399"></a>
-<span class="sourceLineNo">400</span>         }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>         String name = 
propertyNamer.getPropertyName(f.getName());<a name="line.401"></a>
-<span class="sourceLineNo">402</span>         if (fixedBeanProps.isEmpty() || 
fixedBeanProps.contains(name))<a name="line.402"></a>
-<span class="sourceLineNo">403</span>            return name;<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>         return null;<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>      }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>   }<a name="line.407"></a>
+<span class="sourceLineNo">340</span>               BeanPropertyMeta.Builder 
stp = normalProps.remove(subTypeProperty);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>               this.subTypeIdProperty = 
new SubTypePropertyMeta.Builder(beanMeta, subTypeProperty, 
beanFilter.getSubTypes(), stp == null ? null : stp.build(), beanRegistry);<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>               
properties.put(subTypeProperty, this.subTypeIdProperty.build());<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>            }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span>            for 
(Map.Entry&lt;String,BeanPropertyMeta.Builder&gt; e : normalProps.entrySet())<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>               properties.put(e.getKey(), 
e.getValue().build());<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>            // If a beanFilter is 
defined, look for inclusion and exclusion lists.<a name="line.348"></a>
+<span class="sourceLineNo">349</span>            if (beanFilter != null) {<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>               // Eliminated excluded 
properties if BeanFilter.excludeKeys is specified.<a name="line.351"></a>
+<span class="sourceLineNo">352</span>               String[] includeKeys = 
beanFilter.getProperties();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>               String[] excludeKeys = 
beanFilter.getExcludeProperties();<a name="line.353"></a>
+<span class="sourceLineNo">354</span>               if (excludeKeys != null) 
{<a name="line.354"></a>
+<span class="sourceLineNo">355</span>                  for (String k : 
excludeKeys)<a name="line.355"></a>
+<span class="sourceLineNo">356</span>                     
properties.remove(k);<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>               // Only include specified 
properties if BeanFilter.includeKeys is specified.<a name="line.358"></a>
+<span class="sourceLineNo">359</span>               // Note that the order 
must match includeKeys.<a name="line.359"></a>
+<span class="sourceLineNo">360</span>               } else if (includeKeys != 
null) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>                  
Map&lt;String,BeanPropertyMeta&gt; properties2 = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a name="line.361"></a>
+<span class="sourceLineNo">362</span>                  for (String k : 
includeKeys) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>                     if 
(properties.containsKey(k))<a name="line.363"></a>
+<span class="sourceLineNo">364</span>                        
properties2.put(k, properties.get(k));<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                  }<a name="line.365"></a>
+<span class="sourceLineNo">366</span>                  properties = 
properties2;<a name="line.366"></a>
+<span class="sourceLineNo">367</span>               }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>            }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span>            if (pNames != null) {<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>               
Map&lt;String,BeanPropertyMeta&gt; properties2 = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a name="line.371"></a>
+<span class="sourceLineNo">372</span>               for (String k : pNames) 
{<a name="line.372"></a>
+<span class="sourceLineNo">373</span>                  if 
(properties.containsKey(k))<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                     properties2.put(k, 
properties.get(k));<a name="line.374"></a>
+<span class="sourceLineNo">375</span>               }<a name="line.375"></a>
+<span class="sourceLineNo">376</span>               properties = 
properties2;<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>         } catch (BeanRuntimeException e) 
{<a name="line.379"></a>
+<span class="sourceLineNo">380</span>            throw e;<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>         } catch (Exception e) {<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>            return "Exception:  " + 
StringUtils.getStackTrace(e);<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>         return null;<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span>      /*<a name="line.388"></a>
+<span class="sourceLineNo">389</span>       * Returns the property name of the 
specified field if it's a valid property.<a name="line.389"></a>
+<span class="sourceLineNo">390</span>       * Returns null if the field isn't 
a valid property.<a name="line.390"></a>
+<span class="sourceLineNo">391</span>       */<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      private String 
findPropertyName(Field f, Set&lt;String&gt; fixedBeanProps) {<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>         BeanProperty bp = 
f.getAnnotation(BeanProperty.class);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>         if (bp != null &amp;&amp; ! 
bp.name().equals("")) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            String name = bp.name();<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>            if (fixedBeanProps.isEmpty() 
|| fixedBeanProps.contains(name))<a name="line.396"></a>
+<span class="sourceLineNo">397</span>               return name;<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>            throw new 
BeanRuntimeException(classMeta.getInnerClass(), "Method property ''{0}'' 
identified in @BeanProperty, but missing from @Bean", name);<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>         }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>         String name = 
propertyNamer.getPropertyName(f.getName());<a name="line.400"></a>
+<span class="sourceLineNo">401</span>         if (fixedBeanProps.isEmpty() || 
fixedBeanProps.contains(name))<a name="line.401"></a>
+<span class="sourceLineNo">402</span>            return name;<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>         return null;<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>      }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>   }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><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>    * Returns the {@link ClassMeta} of 
this bean.<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    *<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    * @return The {@link ClassMeta} of 
this bean.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    */<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   @BeanIgnore<a name="line.415"></a>
-<span class="sourceLineNo">416</span>   public ClassMeta&lt;T&gt; 
getClassMeta() {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>      return classMeta;<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>   }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>   /**<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    * Returns the dictionary name for 
this bean as defined through the {@link Bean#typeName()} annotation.<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>    *<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    * @return The dictioanry name for 
this bean, or &lt;jk&gt;null&lt;/jk&gt; if it has no dictionary name defined.<a 
name="line.423"></a>
-<span class="sourceLineNo">424</span>    */<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   public String getDictionaryName() {<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>      return dictionaryName;<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>   }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span>   /**<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    * Returns the subtype property of 
this bean if it has one.<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    * &lt;p&gt;<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    * The subtype is specified using the 
{@link Bean#subTypeProperty()} annotation.<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    *<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    * @return The meta property for the 
sub type property, or &lt;jk&gt;null&lt;/jk&gt; if no subtype is defined for 
this bean.<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    */<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   public BeanPropertyMeta 
getSubTypeProperty() {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      return subTypeProperty;<a 
name="line.437"></a>
-<span class="sourceLineNo">438</span>   }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>   /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if this bean has subtypes associated with it.<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    * Subtypes are defined using the 
{@link Bean#subTypes()} annotation.<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    *<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if this bean has subtypes associated with it.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    */<a name="line.445"></a>
-<span class="sourceLineNo">446</span>   public boolean isSubTyped() {<a 
name="line.446"></a>
-<span class="sourceLineNo">447</span>      return subTypeProperty != null;<a 
name="line.447"></a>
-<span class="sourceLineNo">448</span>   }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span>   /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    * Returns a mock bean property that 
resolves to the name &lt;js&gt;"_type"&lt;/js&gt; and whose value always 
resolves<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    *    to the dictionary name of the 
bean.<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    *<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    * @return The type name property.<a 
name="line.454"></a>
-<span class="sourceLineNo">455</span>    */<a name="line.455"></a>
-<span class="sourceLineNo">456</span>   public BeanPropertyMeta 
getTypeProperty() {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      return typeProperty;<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>   }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>   /*<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    * Temporary getter/setter method 
struct.<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    */<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   private static class BeanMethod {<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span>      String propertyName;<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>      boolean isSetter;<a 
name="line.465"></a>
-<span class="sourceLineNo">466</span>      Method method;<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span>      Class&lt;?&gt; type;<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span>      BeanMethod(String propertyName, 
boolean isSetter, Method method) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>         this.propertyName = 
propertyName;<a name="line.470"></a>
-<span class="sourceLineNo">471</span>         this.isSetter = isSetter;<a 
name="line.471"></a>
-<span class="sourceLineNo">472</span>         this.method = method;<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>         if (isSetter)<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>            this.type = 
method.getParameterTypes()[0];<a name="line.474"></a>
-<span class="sourceLineNo">475</span>         else<a name="line.475"></a>
-<span class="sourceLineNo">476</span>            this.type = 
method.getReturnType();<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span>      /*<a name="line.479"></a>
-<span class="sourceLineNo">480</span>       * Returns true if this method 
matches the class type of the specified property.<a name="line.480"></a>
-<span class="sourceLineNo">481</span>       * Only meant to be used for 
setters.<a name="line.481"></a>
-<span class="sourceLineNo">482</span>       */<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      boolean 
matchesPropertyType(BeanPropertyMeta b) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span>         if (b == null)<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>            return false;<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>         // Get the bean property type 
from the getter/field.<a name="line.487"></a>
-<span class="sourceLineNo">488</span>         Class&lt;?&gt; pt = null;<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>         if (b.getGetter() != null)<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>            pt = 
b.getGetter().getReturnType();<a name="line.490"></a>
-<span class="sourceLineNo">491</span>         else if (b.getField() != null)<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>            pt = 
b.getField().getType();<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span>         // Doesn't match if no 
getter/field defined.<a name="line.494"></a>
-<span class="sourceLineNo">495</span>         if (pt == null)<a 
name="line.495"></a>
-<span class="sourceLineNo">496</span>            return false;<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span><a name="line.497"></a>
-<span class="sourceLineNo">498</span>         // Doesn't match if not same 
type or super type as getter/field.<a name="line.498"></a>
-<span class="sourceLineNo">499</span>         if (! isParentClass(type, pt))<a 
name="line.499"></a>
-<span class="sourceLineNo">500</span>            return false;<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>         // If a setter was previously 
set, only use this setter if it's a closer<a name="line.502"></a>
-<span class="sourceLineNo">503</span>         // match (e.g. prev type is a 
superclass of this type).<a name="line.503"></a>
-<span class="sourceLineNo">504</span>         if (b.getSetter() == null)<a 
name="line.504"></a>
-<span class="sourceLineNo">505</span>            return true;<a 
name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>         Class&lt;?&gt; prevType = 
b.getSetter().getParameterTypes()[0];<a name="line.507"></a>
-<span class="sourceLineNo">508</span>         return isParentClass(prevType, 
type, true);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>      @Override /* Object */<a 
name="line.511"></a>
-<span class="sourceLineNo">512</span>      public String toString() {<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>         return method.toString();<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><a name="line.516"></a>
-<span class="sourceLineNo">517</span>   /*<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    * Find all the bean methods on this 
class.<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    *<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    * @param c The transformed class.<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>    * @param stopClass Don't look above 
this class in the hierarchy.<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    * @param v The minimum method 
visibility.<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    * @param fixedBeanProps Only include 
methods whose properties are in this list.<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    * @param pn Use this property namer 
to determine property names from the method names.<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    */<a name="line.525"></a>
-<span class="sourceLineNo">526</span>   private static List&lt;BeanMethod&gt; 
findBeanMethods(Class&lt;?&gt; c, Class&lt;?&gt; stopClass, Visibility v, 
Set&lt;String&gt; fixedBeanProps, PropertyNamer pn) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      List&lt;BeanMethod&gt; l = new 
LinkedList&lt;BeanMethod&gt;();<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>      for (Class&lt;?&gt; c2 : 
findClasses(c, stopClass)) {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>         for (Method m : 
c2.getDeclaredMethods()) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span>            int mod = m.getModifiers();<a 
name="line.531"></a>
-<span class="sourceLineNo">532</span>            if (Modifier.isStatic(mod))<a 
name="line.532"></a>
-<span class="sourceLineNo">533</span>               continue;<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>            if 
(m.isAnnotationPresent(BeanIgnore.class))<a name="line.534"></a>
-<span class="sourceLineNo">535</span>               continue;<a 
name="line.535"></a>
-<span class="sourceLineNo">536</span>            if (m.isBridge())   // This 
eliminates methods with covariant return types from parent classes on child 
classes.<a name="line.536"></a>
-<span class="sourceLineNo">537</span>               continue;<a 
name="line.537"></a>
-<span class="sourceLineNo">538</span>            if (! (v.isVisible(m) || 
m.isAnnotationPresent(BeanProperty.class)))<a name="line.538"></a>
-<span class="sourceLineNo">539</span>               continue;<a 
name="line.539"></a>
-<span class="sourceLineNo">540</span>            String n = m.getName();<a 
name="line.540"></a>
-<span class="sourceLineNo">541</span>            Class&lt;?&gt;[] pt = 
m.getParameterTypes();<a name="line.541"></a>
-<span class="sourceLineNo">542</span>            Class&lt;?&gt; rt = 
m.getReturnType();<a name="line.542"></a>
-<span class="sourceLineNo">543</span>            boolean isGetter = false, 
isSetter = false;<a name="line.543"></a>
-<span class="sourceLineNo">544</span>            BeanProperty bp = 
m.getAnnotation(BeanProperty.class);<a name="line.544"></a>
-<span class="sourceLineNo">545</span>            if (pt.length == 0) {<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>               if (n.startsWith("get") 
&amp;&amp; (! rt.equals(Void.TYPE))) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span>                  isGetter = true;<a 
name="line.547"></a>
-<span class="sourceLineNo">548</span>                  n = n.substring(3);<a 
name="line.548"></a>
-<span class="sourceLineNo">549</span>               } else if 
(n.startsWith("is") &amp;&amp; (rt.equals(Boolean.TYPE) || 
rt.equals(Boolean.class))) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>                  isGetter = true;<a 
name="line.550"></a>
-<span class="sourceLineNo">551</span>                  n = n.substring(2);<a 
name="line.551"></a>
-<span class="sourceLineNo">552</span>               } else if (bp != null 
&amp;&amp; ! bp.name().isEmpty()) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>                  isGetter = true;<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span>                  n = bp.name();<a 
name="line.554"></a>
-<span class="sourceLineNo">555</span>               }<a name="line.555"></a>
-<span class="sourceLineNo">556</span>            } else if (pt.length == 1) 
{<a name="line.556"></a>
-<span class="sourceLineNo">557</span>               if (n.startsWith("set") 
&amp;&amp; (isParentClass(rt, c) || rt.equals(Void.TYPE))) {<a 
name="line.557"></a>
-<span class="sourceLineNo">558</span>                  isSetter = true;<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>                  n = n.substring(3);<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>               } else if (bp != null 
&amp;&amp; ! bp.name().isEmpty()) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>                  isSetter = true;<a 
name="line.561"></a>
-<span class="sourceLineNo">562</span>                  n = bp.name();<a 
name="line.562"></a>
-<span class="sourceLineNo">563</span>               }<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            }<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            n = pn.getPropertyName(n);<a 
name="line.565"></a>
-<span class="sourceLineNo">566</span>            if (isGetter || isSetter) {<a 
name="line.566"></a>
-<span class="sourceLineNo">567</span>               if (bp != null &amp;&amp; 
! bp.name().equals("")) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>                  n = bp.name();<a 
name="line.568"></a>
-<span class="sourceLineNo">569</span>                  if (! 
fixedBeanProps.isEmpty())<a name="line.569"></a>
-<span class="sourceLineNo">570</span>                     if (! 
fixedBeanProps.contains(n))<a name="line.570"></a>
-<span class="sourceLineNo">571</span>                        throw new 
BeanRuntimeException(c, "Method property ''{0}'' identified in @BeanProperty, 
but missing from @Bean", n);<a name="line.571"></a>
-<span class="sourceLineNo">572</span>               }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>               l.add(new BeanMethod(n, 
isSetter, m));<a name="line.573"></a>
-<span class="sourceLineNo">574</span>            }<a name="line.574"></a>
-<span class="sourceLineNo">575</span>         }<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      }<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      return l;<a name="line.577"></a>
-<span class="sourceLineNo">578</span>   }<a name="line.578"></a>
-<span class="sourceLineNo">579</span><a name="line.579"></a>
-<span class="sourceLineNo">580</span>   private static Collection&lt;Field&gt; 
findBeanFields(Class&lt;?&gt; c, Class&lt;?&gt; stopClass, Visibility v) {<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>      List&lt;Field&gt; l = new 
LinkedList&lt;Field&gt;();<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      for (Class&lt;?&gt; c2 : 
findClasses(c, stopClass)) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span>         for (Field f : 
c2.getDeclaredFields()) {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            int m = f.getModifiers();<a 
name="line.584"></a>
-<span class="sourceLineNo">585</span>            if (Modifier.isStatic(m) || 
Modifier.isTransient(m))<a name="line.585"></a>
-<span class="sourceLineNo">586</span>               continue;<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span>            if 
(f.isAnnotationPresent(BeanIgnore.class))<a name="line.587"></a>
-<span class="sourceLineNo">588</span>               continue;<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>            if (! (v.isVisible(f) || 
f.isAnnotationPresent(BeanProperty.class)))<a name="line.589"></a>
-<span class="sourceLineNo">590</span>               continue;<a 
name="line.590"></a>
-<span class="sourceLineNo">591</span>            l.add(f);<a 
name="line.591"></a>
-<span class="sourceLineNo">592</span>         }<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      }<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      return l;<a name="line.594"></a>
-<span class="sourceLineNo">595</span>   }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>   private static 
List&lt;Class&lt;?&gt;&gt; findClasses(Class&lt;?&gt; c, Class&lt;?&gt; 
stopClass) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      LinkedList&lt;Class&lt;?&gt;&gt; l 
= new LinkedList&lt;Class&lt;?&gt;&gt;();<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      findClasses(c, l, stopClass);<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span>      return l;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>   private static void 
findClasses(Class&lt;?&gt; c, LinkedList&lt;Class&lt;?&gt;&gt; l, 
Class&lt;?&gt; stopClass) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>      while (c != null &amp;&amp; 
stopClass != c) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>         l.addFirst(c);<a 
name="line.605"></a>
-<span class="sourceLineNo">606</span>         for (Class&lt;?&gt; ci : 
c.getInterfaces())<a name="line.606"></a>
-<span class="sourceLineNo">607</span>            findClasses(ci, l, 
stopClass);<a name="line.607"></a>
-<span class="sourceLineNo">608</span>         c = c.getSuperclass();<a 
name="line.608"></a>
-<span class="sourceLineNo">609</span>      }<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   }<a name="line.610"></a>
-<span class="sourceLineNo">611</span><a name="line.611"></a>
-<span class="sourceLineNo">612</span>   /**<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    * Returns the metadata on all 
properties associated with this bean.<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    *<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    * @return Metadata on all properties 
associated with this bean.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    */<a name="line.616"></a>
-<span class="sourceLineNo">617</span>   public 
Collection&lt;BeanPropertyMeta&gt; getPropertyMetas() {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      return this.properties.values();<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>   /**<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    * Returns the metadata on the 
specified list of properties.<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    *<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    * @param pNames The list of 
properties to retrieve.  If &lt;jk&gt;null&lt;/jk&gt;, returns all 
properties.<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    * @return The metadata on the 
specified list of properties.<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    */<a name="line.626"></a>
-<span class="sourceLineNo">627</span>   public 
Collection&lt;BeanPropertyMeta&gt; getPropertyMetas(final String...pNames) {<a 
name="line.627"></a>
-<span class="sourceLineNo">628</span>      if (pNames == null)<a 
name="line.628"></a>
-<span class="sourceLineNo">629</span>         return getPropertyMetas();<a 
name="line.629"></a>
-<span class="sourceLineNo">630</span>      List&lt;BeanPropertyMeta&gt; l = 
new ArrayList&lt;BeanPropertyMeta&gt;(pNames.length);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      for (int i = 0; i &lt; 
pNames.length; i++)<a name="line.631"></a>
-<span class="sourceLineNo">632</span>         
l.add(getPropertyMeta(pNames[i]));<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      return l;<a name="line.633"></a>
-<span class="sourceLineNo">634</span>   }<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>    * Returns the language-specified 
extended metadata on this bean class.<a name="line.637"></a>
-<span class="sourceLineNo">638</span>    *<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    * @param metaDataClass The name of 
the metadata class to create.<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    * @return Extended metadata on this 
bean class.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    */<a name="line.641"></a>
-<span class="sourceLineNo">642</span>   public &lt;M extends 
BeanMetaExtended&gt; M getExtendedMeta(Class&lt;M&gt; metaDataClass) {<a 
name="line.642"></a>
-<span class="sourceLineNo">643</span>      return extMeta.get(metaDataClass, 
this);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span>   /**<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    * Returns metadata about the 
specified property.<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    *<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    * @param name The name of the 
property on this bean.<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    * @return The metadata about the 
property, or &lt;jk&gt;null&lt;/jk&gt; if no such property exists<a 
name="line.650"></a>
-<span class="sourceLineNo">651</span>    *    on this bean.<a 
name="line.651"></a>
-<span class="sourceLineNo">652</span>    */<a name="line.652"></a>
-<span class="sourceLineNo">653</span>   public BeanPropertyMeta 
getPropertyMeta(String name) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      return this.properties.get(name);<a 
name="line.654"></a>
-<span class="sourceLineNo">655</span>   }<a name="line.655"></a>
-<span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>   /**<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    * Creates a new instance of this 
bean.<a name="line.658"></a>
-<span class="sourceLineNo">659</span>    *<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    * @param outer The outer object if 
bean class is a non-static inner member class.<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    * @return A new instance of this bean 
if possible, or &lt;jk&gt;null&lt;/jk&gt; if not.<a name="line.661"></a>
-<span class="sourceLineNo">662</span>    * @throws IllegalArgumentException 
Thrown by constructor.<a name="line.662"></a>
-<span class="sourceLineNo">663</span>    * @throws InstantiationException 
Thrown by constructor.<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    * @throws IllegalAccessException 
Thrown by constructor.<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    * @throws InvocationTargetException 
Thrown by constructor.<a name="line.665"></a>
-<span class="sourceLineNo">666</span>    */<a name="line.666"></a>
-<span class="sourceLineNo">667</span>   @SuppressWarnings("unchecked")<a 
name="line.667"></a>
-<span class="sourceLineNo">668</span>   protected T newBean(Object outer) 
throws IllegalArgumentException, InstantiationException, 
IllegalAccessException, InvocationTargetException {<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      if (classMeta.isMemberClass()) {<a 
name="line.669"></a>
-<span class="sourceLineNo">670</span>         if (constructor != null)<a 
name="line.670"></a>
-<span class="sourceLineNo">671</span>            return 
constructor.newInstance(outer);<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      } else {<a name="line.672"></a>
-<span class="sourceLineNo">673</span>         if (constructor != null)<a 
name="line.673"></a>
-<span class="sourceLineNo">674</span>            return 
constructor.newInstance((Object[])null);<a name="line.674"></a>
-<span class="sourceLineNo">675</span>         InvocationHandler h = 
classMeta.getProxyInvocationHandler();<a name="line.675"></a>
-<span class="sourceLineNo">676</span>         if (h != null) {<a 
name="line.676"></a>
-<span class="sourceLineNo">677</span>            ClassLoader cl = 
classMeta.getBeanContext().classLoader;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>            if (cl == null)<a 
name="line.678"></a>
-<span class="sourceLineNo">679</span>               cl = 
this.getClass().getClassLoader();<a name="line.679"></a>
-<span class="sourceLineNo">680</span>            return 
(T)Proxy.newProxyInstance(cl, new Class[] { classMeta.innerClass, 
java.io.Serializable.class }, h);<a name="line.680"></a>
-<span class="sourceLineNo">681</span>         }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>      }<a name="line.682"></a>
-<span class="sourceLineNo">683</span>      return null;<a name="line.683"></a>
-<span class="sourceLineNo">684</span>   }<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>   /**<a name="line.686"></a>
-<span class="sourceLineNo">687</span>    * Recursively determines the classes 
represented by parameterized types in the class hierarchy of<a 
name="line.687"></a>
-<span class="sourceLineNo">688</span>    * the specified type, and puts the 
results in the specified map.&lt;br&gt;<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    * &lt;p&gt;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>    *    For example, given the following 
classes...<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    * &lt;p class='bcode'&gt;<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>    *    public static class 
BeanA&amp;lt;T&gt; {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    *       public T x;<a 
name="line.693"></a>
-<span class="sourceLineNo">694</span>    *    }<a name="line.694"></a>
-<span class="sourceLineNo">695</span>    *    public static class BeanB 
extends BeanA&amp;lt;Integer&gt;} {...}<a name="line.695"></a>
-<span class="sourceLineNo">696</span>    * &lt;p&gt;<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    *    ...calling this method on {@code 
BeanB.class} will load the following data into {@code m} indicating<a 
name="line.697"></a>
-<span class="sourceLineNo">698</span>    *    that the {@code T} parameter on 
the BeanA class is implemented with an {@code Integer}:<a name="line.698"></a>
-<span class="sourceLineNo">699</span>    * &lt;p class='bcode'&gt;<a 
name="line.699"></a>
-<span class="sourceLineNo">700</span>    *    {BeanA.class:[Integer.class]}<a 
name="line.700"></a>
-<span class="sourceLineNo">701</span>    * &lt;p&gt;<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    *    TODO:  This code doesn't 
currently properly handle the following situation:<a name="line.702"></a>
-<span class="sourceLineNo">703</span>    * &lt;p class='bcode'&gt;<a 
name="line.703"></a>
-<span class="sourceLineNo">704</span>    *    public static class 
BeanB&amp;ltT extends Number&gt; extends BeanA&amp;ltT&gt;;<a 
name="line.704"></a>
-<span class="sourceLineNo">705</span>    *    public static class BeanC 
extends BeanB&amp;ltInteger&gt;;<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    * &lt;p&gt;<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    *    When called on {@code BeanC}, 
the variable will be detected as a {@code Number}, not an {@code 
Integer}.&lt;br&gt;<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    *    If anyone can figure out a 
better way of doing this, please do so!<a name="line.708"></a>
-<span class="sourceLineNo">709</span>    *<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    * @param t The type we're 
recursing.<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    * @param m Where the results are 
loaded.<a name="line.711"></a>
-<span class="sourceLineNo">712</span>    */<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   private static void 
findTypeVarImpls(Type t, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; m) {<a 
name="line.713"></a>
-<span class="sourceLineNo">714</span>      if (t instanceof Class) {<a 
name="line.714"></a>
-<span class="sourceLineNo">715</span>         Class&lt;?&gt; c = 
(Class&lt;?&gt;)t;<a name="line.715"></a>
-<span class="sourceLineNo">716</span>         
findTypeVarImpls(c.getGenericSuperclass(), m);<a name="line.716"></a>
-<span class="sourceLineNo">717</span>         for (Type ci : 
c.getGenericInterfaces())<a name="line.717"></a>
-<span class="sourceLineNo">718</span>            findTypeVarImpls(ci, m);<a 
name="line.718"></a>
-<span class="sourceLineNo">719</span>      } else if (t instanceof 
ParameterizedType) {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>         ParameterizedType pt = 
(ParameterizedType)t;<a name="line.720"></a>
-<span class="sourceLineNo">721</span>         Type rt = pt.getRawType();<a 
name="line.721"></a>
-<span class="sourceLineNo">722</span>         if (rt instanceof Class) {<a 
name="line.722"></a>
-<span class="sourceLineNo">723</span>            Type[] gImpls = 
pt.getActualTypeArguments();<a name="line.723"></a>
-<span class="sourceLineNo">724</span>            Class&lt;?&gt;[] gTypes = new 
Class[gImpls.length];<a name="line.724"></a>
-<span class="sourceLineNo">725</span>            for (int i = 0; i &lt; 
gImpls.length; i++) {<a name="line.725"></a>
-<span class="sourceLineNo">726</span>               Type gt = gImpls[i];<a 
name="line.726"></a>
-<span class="sourceLineNo">727</span>               if (gt instanceof Class)<a 
name="line.727"></a>
-<span class="sourceLineNo">728</span>                  gTypes[i] = 
(Class&lt;?&gt;)gt;<a name="line.728"></a>
-<span class="sourceLineNo">729</span>               else if (gt instanceof 
TypeVariable) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span>                  TypeVariable&lt;?&gt; 
tv = (TypeVariable&lt;?&gt;)gt;<a name="line.730"></a>
-<span class="sourceLineNo">731</span>                  for (Type upperBound : 
tv.getBounds())<a name="line.731"></a>
-<span class="sourceLineNo">732</span>                     if (upperBound 
instanceof Class)<a name="line.732"></a>
-<span class="sourceLineNo">733</span>                        gTypes[i] = 
(Class&lt;?&gt;)upperBound;<a name="line.733"></a>
-<span class="sourceLineNo">734</span>               }<a name="line.734"></a>
-<span class="sourceLineNo">735</span>            }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>            m.put((Class&lt;?&gt;)rt, 
gTypes);<a name="line.736"></a>
-<span class="sourceLineNo">737</span>            
findTypeVarImpls(pt.getRawType(), m);<a name="line.737"></a>
-<span class="sourceLineNo">738</span>         }<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      }<a name="line.739"></a>
-<span class="sourceLineNo">740</span>   }<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>   /*<a name="line.742"></a>
-<span class="sourceLineNo">743</span>    * Bean property for getting and 
setting bean subtype.<a name="line.743"></a>
-<span class="sourceLineNo">744</span>    */<a name="line.744"></a>
-<span class="sourceLineNo">745</span>   
@SuppressWarnings({"rawtypes","unchecked"})<a name="line.745"></a>
-<span class="sourceLineNo">746</span>   private static class 
SubTypePropertyMeta extends BeanPropertyMeta {<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span>      private 
Map&lt;Class&lt;?&gt;,String&gt; subTypes;<a name="line.748"></a>
-<span class="sourceLineNo">749</span>      private BeanPropertyMeta 
realProperty;  // Bean property if bean actually has a real subtype field.<a 
name="line.749"></a>
-<span class="sourceLineNo">750</span>      private BeanMeta&lt;?&gt; 
beanMeta;<a name="line.750"></a>
-<span class="sourceLineNo">751</span><a name="line.751"></a>
-<span class="sourceLineNo">752</span>      SubTypePropertyMeta(BeanMeta 
beanMeta, String subTypeAttr, Map&lt;Class&lt;?&gt;,String&gt; subTypes, 
BeanPropertyMeta realProperty, BeanRegistry beanRegistry) {<a 
name="line.752"></a>
-<span class="sourceLineNo">753</span>         super(beanMeta, subTypeAttr, 
beanMeta.ctx.string(), beanRegistry);<a name="line.753"></a>
-<span class="sourceLineNo">754</span>         this.subTypes = subTypes;<a 
name="line.754"></a>
-<span class="sourceLineNo">755</span>         this.realProperty = 
realProperty;<a name="line.755"></a>
-<span class="sourceLineNo">756</span>         this.beanMeta = beanMeta;<a 
name="line.756"></a>
-<span class="sourceLineNo">757</span>      }<a name="line.757"></a>
-<span class="sourceLineNo">758</span><a name="line.758"></a>
-<span class="sourceLineNo">759</span>      /*<a name="line.759"></a>
-<span class="sourceLineNo">760</span>       * Setting this bean property 
causes the inner bean to be set to the subtype implementation.<a 
name="line.760"></a>
-<span class="sourceLineNo">761</span>       */<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      @Override /* BeanPropertyMeta */<a 
name="line.762"></a>
-<span class="sourceLineNo">763</span>      public Object set(BeanMap&lt;?&gt; 
m, Object value) throws BeanRuntimeException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>         if (value == null)<a 
name="line.764"></a>
-<span class="sourceLineNo">765</span>            throw new 
BeanRuntimeException("Attempting to set bean subtype property to null.");<a 
name="line.765"></a>
-<span class="sourceLineNo">766</span>         String subTypeId = 
value.toString();<a name="line.766"></a>
-<span class="sourceLineNo">767</span>         for 
(Entry&lt;Class&lt;?&gt;,String&gt; e : subTypes.entrySet()) {<a 
name="line.767"></a>
-<span class="sourceLineNo">768</span>            if 
(e.getValue().equals(subTypeId)) {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>               Class subTypeClass = 
e.getKey();<a name="line.769"></a>
-<span class="sourceLineNo">770</span>               m.meta = 
beanMeta.ctx.getBeanMeta(subTypeClass);<a name="line.770"></a>
-<span class="sourceLineNo">771</span>               try {<a 
name="line.771"></a>
-<span class="sourceLineNo">772</span>                  
m.setBean(subTypeClass.newInstance());<a name="line.772"></a>
-<span class="sourceLineNo">773</span>                  if (realProperty != 
null)<a name="line.773"></a>
-<span class="sourceLineNo">774</span>                     realProperty.set(m, 
value);<a name="line.774"></a>
-<span class="sourceLineNo">775</span>                  // If subtype attribute 
wasn't specified first, set them again from the temporary cache.<a 
name="line.775"></a>
-<span class="sourceLineNo">776</span>                  if (m.propertyCache != 
null)<a name="line.776"></a>
-<span class="sourceLineNo">777</span>                     for 
(Map.Entry&lt;String,Object&gt; me : m.propertyCache.entrySet())<a 
name="line.777"></a>
-<span class="sourceLineNo">778</span>                        
m.put(me.getKey(), me.getValue());<a name="line.778"></a>
-<span class="sourceLineNo">779</span>               } catch (Exception e1) {<a 
name="line.779"></a>
-<span class="sourceLineNo">780</span>                  throw new 
BeanRuntimeException(e1);<a name="line.780"></a>
-<span class="sourceLineNo">781</span>               }<a name="line.781"></a>
-<span class="sourceLineNo">782</span>               return null;<a 
name="line.782"></a>
-<span class="sourceLineNo">783</span>            }<a name="line.783"></a>
-<span class="sourceLineNo">784</span>         }<a name="line.784"></a>
-<span class="sourceLineNo">785</span>         throw new 
BeanRuntimeException(beanMeta.c, "Unknown subtype ID ''{0}''", subTypeId);<a 
name="line.785"></a>
-<span class="sourceLineNo">786</span>      }<a name="line.786"></a>
-<span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span>      @Override /* BeanPropertyMeta */<a 
name="line.788"></a>
-<span class="sourceLineNo">789</span>      public Object get(BeanMap&lt;?&gt; 
m) throws BeanRuntimeException {<a name="line.789"></a>
-<span class="sourceLineNo">790</span>         String subTypeId = 
beanMeta.beanFilter.getSubTypes().get(beanMeta.c);<a name="line.790"></a>
-<span class="sourceLineNo">791</span>         if (subTypeId == null)<a 
name="line.791"></a>
-<span class="sourceLineNo">792</span>            throw new 
BeanRuntimeException(beanMeta.c, "Unmapped sub type class");<a 
name="line.792"></a>
-<span class="sourceLineNo">793</span>         return subTypeId;<a 
name="line.793"></a>
-<span class="sourceLineNo">794</span>      }<a name="line.794"></a>
-<span class="sourceLineNo">795</span>   }<a name="line.795"></a>
-<span class="sourceLineNo">796</span><a name="line.796"></a>
-<span class="sourceLineNo">797</span>   @Override /* Object */<a 
name="line.797"></a>
-<span class="sourceLineNo">798</span>   public String toString() {<a 
name="line.798"></a>
-<span class="sourceLineNo">799</span>      StringBuilder sb = new 
StringBuilder(c.getName());<a name="line.799"></a>
-<span class="sourceLineNo">800</span>      sb.append(" {\n");<a 
name="line.800"></a>
-<span class="sourceLineNo">801</span>      for (BeanPropertyMeta pm : 
this.properties.values())<a name="line.801"></a>
-<span class="sourceLineNo">802</span>         
sb.append('\t').append(pm.toString()).append(",\n");<a name="line.802"></a>
-<span class="sourceLineNo">803</span>      sb.append('}');<a 
name="line.803"></a>
-<span class="sourceLineNo">804</span>      return sb.toString();<a 
name="line.804"></a>
-<span class="sourceLineNo">805</span>   }<a name="line.805"></a>
-<span class="sourceLineNo">806</span>}<a name="line.806"></a>
+<span class="sourceLineNo">409</span>   /**<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    * Returns the {@link ClassMeta} of 
this bean.<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    *<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    * @return The {@link ClassMeta} of 
this bean.<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    */<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   @BeanIgnore<a name="line.414"></a>
+<span class="sourceLineNo">415</span>   public ClassMeta&lt;T&gt; 
getClassMeta() {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      return classMeta;<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>   }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span>   /**<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    * Returns the dictionary name for 
this bean as defined through the {@link Bean#typeName()} annotation.<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>    *<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    * @return The dictioanry name for 
this bean, or &lt;jk&gt;null&lt;/jk&gt; if it has no dictionary name defined.<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span>    */<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   public String getDictionaryName() {<a 
name="line.424"></a>
+<span class="sourceLineNo">425</span>      return dictionaryName;<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>   }<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>   /**<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    * Returns the subtype property of 
this bean if it has one.<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    * &lt;p&gt;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    * The subtype is specified using the 
{@link Bean#subTypeProperty()} annotation.<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    *<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    * @return The meta property for the 
sub type property, or &lt;jk&gt;null&lt;/jk&gt; if no subtype is defined for 
this bean.<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    */<a name="line.434"></a>
+<span class="sourceLineNo">435</span>   public BeanPropertyMeta 
getSubTypeProperty() {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      return subTypeProperty;<a 
name="line.436"></a>
+<span class="sourceLineNo">437</span>   }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>   /**<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if this bean has subtypes associated with it.<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    * Subtypes are defined using the 
{@link Bean#subTypes()} annotation.<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    *<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if this bean has subtypes associated with it.<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>   public boolean isSubTyped() {<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>      return subTypeProperty != null;<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span>   }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>   /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    * Returns a mock bean property that 
resolves to the name &lt;js&gt;"_type"&lt;/js&gt; and whose value always 
resolves<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    *    to the dictionary name of the 
bean.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    *<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    * @return The type name property.<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>    */<a name="line.454"></a>
+<span class="sourceLineNo">455</span>   public BeanPropertyMeta 
getTypeProperty() {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      return typeProperty;<a 
name="line.456"></a>
+<span class="sourceLineNo">457</span>   }<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span>   /*<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    * Temporary getter/setter method 
struct.<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    */<a name="line.461"></a>
+<span class="sourceLineNo">462</span>   private static class BeanMethod {<a 
name="line.462"></a>
+<span class="sourceLineNo">463</span>      String propertyName;<a 
name="line.463"></a>
+<span class="sourceLineNo">464</span>      boolean isSetter;<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>      Method method;<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>      Class&lt;?&gt; type;<a 
name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>      BeanMethod(String propertyName, 
boolean isSetter, Method method) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span>         this.propertyName = 
propertyName;<a name="line.469"></a>
+<span class="sourceLineNo">470</span>         this.isSetter = isSetter;<a 
name="line.470"></a>
+<span class="sourceLineNo">471</span>         this.method = method;<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>         if (isSetter)<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span>            this.type = 
method.getParameterTypes()[0];<a name="line.473"></a>
+<span class="sourceLineNo">474</span>         else<a name="line.474"></a>
+<span class="sourceLineNo">475</span>            this.type = 
method.getReturnType();<a name="line.475"></a>
+<span class="sourceLineNo">476</span>      }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>      /*<a name="line.478"></a>
+<span class="sourceLineNo">479</span>       * Returns true if this method 
matches the class type of the specified property.<a name="line.479"></a>
+<span class="sourceLineNo">480</span>       * Only meant to be used for 
setters.<a name="line.480"></a>
+<span class="sourceLineNo">481</span>       */<a name="line.481"></a>
+<span class="sourceLineNo">482</span>      boolean 
matchesPropertyType(BeanPropertyMeta.Builder b) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span>         if (b == null)<a 
name="line.483"></a>
+<span class="sourceLineNo">484</span>            return false;<a 
name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>         // Get the bean property type 
from the getter/field.<a name="line.486"></a>
+<span class="sourceLineNo">487</span>         Class&lt;?&gt; pt = null;<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>         if (b.getter != null)<a 
name="line.488"></a>
+<span class="sourceLineNo">489</span>            pt = 
b.getter.getReturnType();<a name="line.489"></a>
+<span class="sourceLineNo">490</span>         else if (b.field != null)<a 
name="line.490"></a>
+<span class="sourceLineNo">491</span>            pt = b.field.getType();<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>         // Doesn't match if no 
getter/field defined.<a name="line.493"></a>
+<span class="sourceLineNo">494</span>         if (pt == null)<a 
name="line.494"></a>
+<span class="sourceLineNo">495</span>            return false;<a 
name="line.495"></a>
+<span class="sourceLineNo">496</span><a name="line.496"></a>
+<span class="sourceLineNo">497</span>         // Doesn't match if not same 
type or super type as getter/field.<a name="line.497"></a>
+<span class="sourceLineNo">498</span>         if (! isParentClass(type, pt))<a 
name="line.498"></a>
+<span class="sourceLineNo">499</span>            return false;<a 
name="line.499"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span>         // If a setter was previously 
set, only use this setter if it's a closer<a name="line.501"></a>
+<span class="sourceLineNo">502</span>         // match (e.g. prev type is a 
superclass of this type).<a name="line.502"></a>
+<span class="sourceLineNo">503</span>         if (b.setter == null)<a 
name="line.503"></a>
+<span class="sourceLineNo">504</span>            return true;<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span>         Class&lt;?&gt; prevType = 
b.setter.getParameterTypes()[0];<a name="line.506"></a>
+<span class="sourceLineNo">507</span>         return isParentClass(prevType, 
type, true);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      }<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span>      @Override /* Object */<a 
name="line.510"></a>
+<span class="sourceLineNo">511</span>      public String toString() {<a 
name="line.511"></a>
+<span class="sourceLineNo">512</span>         return method.toString();<a 
name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   }<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span>   /*<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    * Find all the bean methods on this 
class.<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    *<a name="line.518"></a>
+<span class="sourceLineNo">519</span>    * @param c The transformed class.<a 
name="line.519"></a>
+<span class="sourceLineNo">520</span>    * @param stopClass Don't look above 
this class in the hierarchy.<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    * @param v The minimum method 
visibility.<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    * @param fixedBeanProps Only include 
methods whose properties are in this list.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    * @param pn Use this property namer 
to determine property names from the method names.<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    */<a name="line.524"></a>
+<span class="sourceLineNo">525</span>   private static List&lt;BeanMethod&gt; 
findBeanMethods(Class&lt;?&gt; c, Class&lt;?&gt; stopClass, Visibility v, 
Set&lt;String&gt; fixedBeanProps, PropertyNamer pn) {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      List&lt;BeanMethod&gt; l = new 
LinkedList&lt;BeanMethod&gt;();<a name="line.526"></a>
+<span class="sourceLineNo">527</span><a name="line.527"></a>
+<span class="sourceLineNo">528</span>      for (Class&lt;?&gt; c2 : 
findClasses(c, stopClass)) {<a name="line.528"></a>
+<span class="sourceLineNo">529</span>         for (Method m : 
c2.getDeclaredMethods()) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>            int mod = m.getModifiers();<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span>            if (Modifier.isStatic(mod))<a 
name="line.531"></a>
+<span class="sourceLineNo">532</span>               continue;<a 
name="line.532"></a>
+<span class="sourceLineNo">533</span>            if 
(m.isAnnotationPresent(BeanIgnore.class))<a name="line.533"></a>
+<span class="sourceLineNo">534</span>               continue;<a 
name="line.534"></a>
+<span class="sourceLineNo">535</span>            if (m.isBridge())   // This 
eliminates methods with covariant return types from parent classes on child 
classes.<a name="line.535"></a>
+<span class="sourceLineNo">536</span>               continue;<a 
name="line.536"></a>
+<span class="sourceLineNo">537</span>            if (! (v.isVisible(m) || 
m.isAnnotationPresent(BeanProperty.class)))<a name="line.537"></a>
+<span class="sourceLineNo">538</span>               continue;<a 
name="line.538"></a>
+<span class="sourceLineNo">539</span>            String n = m.getName();<a 
name="line.539"></a>
+<span class="sourceLineNo">540</span>            Class&lt;?&gt;[] pt = 
m.getParameterTypes();<a name="line.540"></a>
+<span class="sourceLineNo">541</span>            Class&lt;?&gt; rt = 
m.getReturnType();<a name="line.541"></a>
+<span class="sourceLineNo">542</span>            boolean isGetter = false, 
isSetter = false;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>            BeanProperty bp = 
m.getAnnotation(BeanProperty.class);<a name="line.543"></a>
+<span class="sourceLineNo">544</span>            if (pt.length == 0) {<a 
name="line.544"></a>
+<span class="sourceLineNo">545</span>               if (n.startsWith("get") 
&amp;&amp; (! rt.equals(Void.TYPE))) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>                  isGetter = true;<a 
name="line.546"></a>
+<span class="sourceLineNo">547</span>                  n = n.substring(3);<a 
name="line.547"></a>
+<span class="sourceLineNo">548</span>               } else if 
(n.startsWith("is") &amp;&amp; (rt.equals(Boolean.TYPE) || 
rt.equals(Boolean.class))) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>                  isGetter = true;<a 
name="line.549"></a>
+<span class="sourceLineNo">550</span>                  n = n.substring(2);<a 
name="line.550"></a>
+<span class="sourceLineNo">551</span>               } else if (bp != null 
&amp;&amp; ! bp.name().isEmpty()) {<a name="line.551"></a>
+<span class="sourceLineNo">552</span>                  isGetter = true;<a 
name="line.552"></a>
+<span class="sourceLineNo">553</span>                  n = bp.name();<a 
name="line.553"></a>
+<span class="sourceLineNo">554</span>               }<a name="line.554"></a>
+<span class="sourceLineNo">555</span>            } else if (pt.length == 1) 
{<a name="line.555"></a>
+<span class="sourceLineNo">556</span>               if (n.startsWith("set") 
&amp;&amp; (isParentClass(rt, c) || rt.equals(Void.TYPE))) {<a 
name="line.556"></a>
+<span class="sourceLineNo">557</span>                  isSetter = true;<a 
name="line.557"></a>
+<span class="sourceLineNo">558</span>                  n = n.substring(3);<a 
name="line.558"></a>
+<span class="sourceLineNo">559</span>               } else if (bp != null 
&amp;&amp; ! bp.name().isEmpty()) {<a name="line.559"></a>
+<span class="sourceLineNo">560</span>                  isSetter = true;<a 
name="line.560"></a>
+<span class="sourceLineNo">561</span>                  n = bp.name();<a 
name="line.561"></a>
+<span class="sourceLineNo">562</span>               }<a name="line.562"></a>
+<span class="sourceLineNo">563</span>            }<a name="line.563"></a>
+<span class="sourceLineNo">564</span>            n = pn.getPropertyName(n);<a 
name="line.564"></a>
+<span class="sourceLineNo">565</span>            if (isGetter || isSetter) {<a 
name="line.565"></a>
+<span class="sourceLineNo">566</span>               if (bp != null &amp;&amp; 
! bp.name().equals("")) {<a name="line.566"></a>
+<span class="sourceLineNo">567</span>                  n = bp.name();<a 
name="line.567"></a>
+<span class="sourceLineNo">568</span>                  if (! 
fixedBeanProps.isEmpty())<a name="line.568"></a>
+<span class="sourceLineNo">569</span>                     if (! 
fixedBeanProps.contains(n))<a name="line.569"></a>
+<span class="sourceLineNo">570</span>                        throw new 
BeanRuntimeException(c, "Method property ''{0}'' identified in @BeanProperty, 
but missing from @Bean", n);<a name="line.570"></a>
+<span class="sourceLineNo">571</span>               }<a name="line.571"></a>
+<span class="sourceLineNo">572</span>               l.add(new BeanMethod(n, 
isSetter, m));<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>      }<a name="line.575"></a>
+<span class="sourceLineNo">576</span>      return l;<a name="line.576"></a>
+<span class="sourceLineNo">577</span>   }<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span>   private static Collection&lt;Field&gt; 
findBeanFields(Class&lt;?&gt; c, Class&lt;?&gt; stopClass, Visibility v) {<a 
name="line.579"></a>
+<span class="sourceLineNo">580</span>      List&lt;Field&gt; l = new 
LinkedList&lt;Field&gt;();<a name="line.580"></a>
+<span class="sourceLineNo">581</span>      for (Class&lt;?&gt; c2 : 
findClasses(c, stopClass)) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>         for (Field f : 
c2.getDeclaredFields()) {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>            int m = f.getModifiers();<a 
name="line.583"></a>
+<span class="sourceLineNo">584</span>            if (Modifier.isStatic(m) || 
Modifier.isTransient(m))<a name="line.584"></a>
+<span class="sourceLineNo">585</span>               continue;<a 
name="line.585"></a>
+<span class="sourceLineNo">586</span>            if 
(f.isAnnotationPresent(BeanIgnore.class))<a name="line.586"></a>
+<span class="sourceLineNo">587</span>               continue;<a 
name="line.587"></a>
+<span class="sourceLineNo">588</span>            if (! (v.isVisible(f) || 
f.isAnnotationPresent(BeanProperty.class)))<a name="line.588"></a>
+<span class="sourceLineNo">589</span>               continue;<a 
name="line.589"></a>
+<span class="sourceLineNo">590</span>            l.add(f);<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>      return l;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   }<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>   private static 
List&lt;Class&lt;?&gt;&gt; findClasses(Class&lt;?&gt; c, Class&lt;?&gt; 
stopClass) {<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      LinkedList&lt;Class&lt;?&gt;&gt; l 
= new LinkedList&lt;Class&lt;?&gt;&gt;();<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      findClasses(c, l, stopClass);<a 
name="line.598"></a>
+<span class="sourceLineNo">599</span>      return l;<a name="line.599"></a>
+<span class="sourceLineNo">600</span>   }<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span>   private static void 
findClasses(Class&lt;?&gt; c, LinkedList&lt;Class&lt;?&gt;&gt; l, 
Class&lt;?&gt; stopClass) {<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      while (c != null &amp;&amp; 
stopClass != c) {<a name="line.603"></a>
+<span class="sourceLineNo">604</span>         l.addFirst(c);<a 
name="line.604"></a>
+<span class="sourceLineNo">605</span>         for (Class&lt;?&gt; ci : 
c.getInterfaces())<a name="line.605"></a>
+<span class="sourceLineNo">606</span>            findClasses(ci, l, 
stopClass);<a name="line.606"></a>
+<span class="sourceLineNo">607</span>         c = c.getSuperclass();<a 
name="line.607"></a>
+<span class="sourceLineNo">608</span>      }<a name="line.608"></a>
+<span class="sourceLineNo">609</span>   }<a name="line.609"></a>
+<span class="sourceLineNo">610</span><a name="line.610"></a>
+<span class="sourceLineNo">611</span>   /**<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    * Returns the metadata on all 
properties associated with this bean.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    *<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    * @return Metadata on all properties 
associated with this bean.<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    */<a name="line.615"></a>
+<span class="sourceLineNo">616</span>   public 
Collection&lt;BeanPropertyMeta&gt; getPropertyMetas() {<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      return this.properties.values();<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>   /**<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    * Returns the metadata on the 
specified list of properties.<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    *<a name="line.622"></a>
+<span class="sourceLineNo">623</span>    * @param pNames The list of 
properties to retrieve.  If &lt;jk&gt;null&lt;/jk&gt;, returns all 
properties.<a name="line.623"></a>
+<span class="sourceLineNo">624</span>    * @return The metadata on the 
specified list of properties.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    */<a name="line.625"></a>
+<span class="sourceLineNo">626</span>   public 
Collection&lt;BeanPropertyMeta&gt; getPropertyMetas(final

<TRUNCATED>

Reply via email to