http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/436334e6/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 229d099..befee42 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html +++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMeta.html @@ -242,559 +242,568 @@ <span class="sourceLineNo">234</span><a name="line.234"></a> <span class="sourceLineNo">235</span> // Explicitly defined property names in @Bean annotation.<a name="line.235"></a> <span class="sourceLineNo">236</span> Set<String> fixedBeanProps = new LinkedHashSet<String>();<a name="line.236"></a> -<span class="sourceLineNo">237</span><a name="line.237"></a> -<span class="sourceLineNo">238</span> if (beanFilter != null) {<a name="line.238"></a> +<span class="sourceLineNo">237</span> String[] includeProperties = ctx.getIncludeProperties(c);<a name="line.237"></a> +<span class="sourceLineNo">238</span> String[] excludeProperties = ctx.getExcludeProperties(c);<a name="line.238"></a> <span class="sourceLineNo">239</span><a name="line.239"></a> -<span class="sourceLineNo">240</span> // Get the 'properties' attribute if specified.<a name="line.240"></a> -<span class="sourceLineNo">241</span> if (beanFilter.getProperties() != null)<a name="line.241"></a> -<span class="sourceLineNo">242</span> for (String p : beanFilter.getProperties())<a name="line.242"></a> -<span class="sourceLineNo">243</span> fixedBeanProps.add(p);<a name="line.243"></a> -<span class="sourceLineNo">244</span><a name="line.244"></a> -<span class="sourceLineNo">245</span> if (beanFilter.getPropertyNamer() != null)<a name="line.245"></a> -<span class="sourceLineNo">246</span> propertyNamer = beanFilter.getPropertyNamer();<a name="line.246"></a> -<span class="sourceLineNo">247</span> }<a name="line.247"></a> -<span class="sourceLineNo">248</span><a name="line.248"></a> -<span class="sourceLineNo">249</span> if (propertyNamer == null)<a name="line.249"></a> -<span class="sourceLineNo">250</span> propertyNamer = new PropertyNamerDefault();<a name="line.250"></a> -<span class="sourceLineNo">251</span><a name="line.251"></a> -<span class="sourceLineNo">252</span> // First populate the properties with those specified in the bean annotation to<a name="line.252"></a> -<span class="sourceLineNo">253</span> // ensure that ordering first.<a name="line.253"></a> -<span class="sourceLineNo">254</span> for (String name : fixedBeanProps)<a name="line.254"></a> -<span class="sourceLineNo">255</span> normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a name="line.255"></a> +<span class="sourceLineNo">240</span> if (beanFilter != null) {<a name="line.240"></a> +<span class="sourceLineNo">241</span><a name="line.241"></a> +<span class="sourceLineNo">242</span> // Get the 'properties' attribute if specified.<a name="line.242"></a> +<span class="sourceLineNo">243</span> if (beanFilter.getProperties() != null && includeProperties == null)<a name="line.243"></a> +<span class="sourceLineNo">244</span> for (String p : beanFilter.getProperties())<a name="line.244"></a> +<span class="sourceLineNo">245</span> fixedBeanProps.add(p);<a name="line.245"></a> +<span class="sourceLineNo">246</span><a name="line.246"></a> +<span class="sourceLineNo">247</span> if (beanFilter.getPropertyNamer() != null)<a name="line.247"></a> +<span class="sourceLineNo">248</span> propertyNamer = beanFilter.getPropertyNamer();<a name="line.248"></a> +<span class="sourceLineNo">249</span> }<a name="line.249"></a> +<span class="sourceLineNo">250</span><a name="line.250"></a> +<span class="sourceLineNo">251</span> if (includeProperties != null)<a name="line.251"></a> +<span class="sourceLineNo">252</span> fixedBeanProps.addAll(Arrays.asList(includeProperties));<a name="line.252"></a> +<span class="sourceLineNo">253</span><a name="line.253"></a> +<span class="sourceLineNo">254</span> if (propertyNamer == null)<a name="line.254"></a> +<span class="sourceLineNo">255</span> propertyNamer = new PropertyNamerDefault();<a name="line.255"></a> <span class="sourceLineNo">256</span><a name="line.256"></a> -<span class="sourceLineNo">257</span> if (ctx.useJavaBeanIntrospector) {<a name="line.257"></a> -<span class="sourceLineNo">258</span> BeanInfo bi = null;<a name="line.258"></a> -<span class="sourceLineNo">259</span> if (! c2.isInterface())<a name="line.259"></a> -<span class="sourceLineNo">260</span> bi = Introspector.getBeanInfo(c2, stopClass);<a name="line.260"></a> -<span class="sourceLineNo">261</span> else<a name="line.261"></a> -<span class="sourceLineNo">262</span> bi = Introspector.getBeanInfo(c2, null);<a name="line.262"></a> -<span class="sourceLineNo">263</span> if (bi != null) {<a name="line.263"></a> -<span class="sourceLineNo">264</span> for (PropertyDescriptor pd : bi.getPropertyDescriptors()) {<a name="line.264"></a> -<span class="sourceLineNo">265</span> String name = pd.getName();<a name="line.265"></a> -<span class="sourceLineNo">266</span> if (! normalProps.containsKey(name))<a name="line.266"></a> -<span class="sourceLineNo">267</span> normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a name="line.267"></a> -<span class="sourceLineNo">268</span> normalProps.get(name).setGetter(pd.getReadMethod()).setSetter(pd.getWriteMethod());<a name="line.268"></a> -<span class="sourceLineNo">269</span> }<a name="line.269"></a> -<span class="sourceLineNo">270</span> }<a name="line.270"></a> -<span class="sourceLineNo">271</span><a name="line.271"></a> -<span class="sourceLineNo">272</span> } else /* Use 'better' introspection */ {<a name="line.272"></a> -<span class="sourceLineNo">273</span><a name="line.273"></a> -<span class="sourceLineNo">274</span> for (Field f : findBeanFields(c2, stopClass, fVis)) {<a name="line.274"></a> -<span class="sourceLineNo">275</span> String name = findPropertyName(f, fixedBeanProps);<a name="line.275"></a> -<span class="sourceLineNo">276</span> if (name != null) {<a name="line.276"></a> -<span class="sourceLineNo">277</span> if (! normalProps.containsKey(name))<a name="line.277"></a> -<span class="sourceLineNo">278</span> normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a name="line.278"></a> -<span class="sourceLineNo">279</span> normalProps.get(name).setField(f);<a name="line.279"></a> -<span class="sourceLineNo">280</span> }<a name="line.280"></a> -<span class="sourceLineNo">281</span> }<a name="line.281"></a> -<span class="sourceLineNo">282</span><a name="line.282"></a> -<span class="sourceLineNo">283</span> List<BeanMethod> bms = findBeanMethods(c2, stopClass, mVis, fixedBeanProps, propertyNamer);<a name="line.283"></a> -<span class="sourceLineNo">284</span><a name="line.284"></a> -<span class="sourceLineNo">285</span> // Iterate through all the getters.<a name="line.285"></a> -<span class="sourceLineNo">286</span> for (BeanMethod bm : bms) {<a name="line.286"></a> -<span class="sourceLineNo">287</span> String pn = bm.propertyName;<a name="line.287"></a> -<span class="sourceLineNo">288</span> Method m = bm.method;<a name="line.288"></a> -<span class="sourceLineNo">289</span> if (! normalProps.containsKey(pn))<a name="line.289"></a> -<span class="sourceLineNo">290</span> normalProps.put(pn, new BeanPropertyMeta.Builder(beanMeta, pn));<a name="line.290"></a> -<span class="sourceLineNo">291</span> BeanPropertyMeta.Builder bpm = normalProps.get(pn);<a name="line.291"></a> -<span class="sourceLineNo">292</span> if (! bm.isSetter)<a name="line.292"></a> -<span class="sourceLineNo">293</span> bpm.setGetter(m);<a name="line.293"></a> -<span class="sourceLineNo">294</span> }<a name="line.294"></a> -<span class="sourceLineNo">295</span><a name="line.295"></a> -<span class="sourceLineNo">296</span> // Now iterate through all the setters.<a name="line.296"></a> -<span class="sourceLineNo">297</span> for (BeanMethod bm : bms) {<a name="line.297"></a> -<span class="sourceLineNo">298</span> if (bm.isSetter) {<a name="line.298"></a> -<span class="sourceLineNo">299</span> BeanPropertyMeta.Builder bpm = normalProps.get(bm.propertyName);<a name="line.299"></a> -<span class="sourceLineNo">300</span> if (bm.matchesPropertyType(bpm))<a name="line.300"></a> -<span class="sourceLineNo">301</span> bpm.setSetter(bm.method);<a name="line.301"></a> -<span class="sourceLineNo">302</span> }<a name="line.302"></a> -<span class="sourceLineNo">303</span> }<a name="line.303"></a> -<span class="sourceLineNo">304</span> }<a name="line.304"></a> -<span class="sourceLineNo">305</span><a name="line.305"></a> -<span class="sourceLineNo">306</span> typeVarImpls = new HashMap<Class<?>,Class<?>[]>();<a name="line.306"></a> -<span class="sourceLineNo">307</span> findTypeVarImpls(c, typeVarImpls);<a name="line.307"></a> -<span class="sourceLineNo">308</span> if (typeVarImpls.isEmpty())<a name="line.308"></a> -<span class="sourceLineNo">309</span> typeVarImpls = null;<a name="line.309"></a> +<span class="sourceLineNo">257</span> // First populate the properties with those specified in the bean annotation to<a name="line.257"></a> +<span class="sourceLineNo">258</span> // ensure that ordering first.<a name="line.258"></a> +<span class="sourceLineNo">259</span> for (String name : fixedBeanProps)<a name="line.259"></a> +<span class="sourceLineNo">260</span> normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a name="line.260"></a> +<span class="sourceLineNo">261</span><a name="line.261"></a> +<span class="sourceLineNo">262</span> if (ctx.useJavaBeanIntrospector) {<a name="line.262"></a> +<span class="sourceLineNo">263</span> BeanInfo bi = null;<a name="line.263"></a> +<span class="sourceLineNo">264</span> if (! c2.isInterface())<a name="line.264"></a> +<span class="sourceLineNo">265</span> bi = Introspector.getBeanInfo(c2, stopClass);<a name="line.265"></a> +<span class="sourceLineNo">266</span> else<a name="line.266"></a> +<span class="sourceLineNo">267</span> bi = Introspector.getBeanInfo(c2, null);<a name="line.267"></a> +<span class="sourceLineNo">268</span> if (bi != null) {<a name="line.268"></a> +<span class="sourceLineNo">269</span> for (PropertyDescriptor pd : bi.getPropertyDescriptors()) {<a name="line.269"></a> +<span class="sourceLineNo">270</span> String name = pd.getName();<a name="line.270"></a> +<span class="sourceLineNo">271</span> if (! normalProps.containsKey(name))<a name="line.271"></a> +<span class="sourceLineNo">272</span> normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a name="line.272"></a> +<span class="sourceLineNo">273</span> normalProps.get(name).setGetter(pd.getReadMethod()).setSetter(pd.getWriteMethod());<a name="line.273"></a> +<span class="sourceLineNo">274</span> }<a name="line.274"></a> +<span class="sourceLineNo">275</span> }<a name="line.275"></a> +<span class="sourceLineNo">276</span><a name="line.276"></a> +<span class="sourceLineNo">277</span> } else /* Use 'better' introspection */ {<a name="line.277"></a> +<span class="sourceLineNo">278</span><a name="line.278"></a> +<span class="sourceLineNo">279</span> for (Field f : findBeanFields(c2, stopClass, fVis)) {<a name="line.279"></a> +<span class="sourceLineNo">280</span> String name = findPropertyName(f, fixedBeanProps);<a name="line.280"></a> +<span class="sourceLineNo">281</span> if (name != null) {<a name="line.281"></a> +<span class="sourceLineNo">282</span> if (! normalProps.containsKey(name))<a name="line.282"></a> +<span class="sourceLineNo">283</span> normalProps.put(name, new BeanPropertyMeta.Builder(beanMeta, name));<a name="line.283"></a> +<span class="sourceLineNo">284</span> normalProps.get(name).setField(f);<a name="line.284"></a> +<span class="sourceLineNo">285</span> }<a name="line.285"></a> +<span class="sourceLineNo">286</span> }<a name="line.286"></a> +<span class="sourceLineNo">287</span><a name="line.287"></a> +<span class="sourceLineNo">288</span> List<BeanMethod> bms = findBeanMethods(c2, stopClass, mVis, fixedBeanProps, propertyNamer);<a name="line.288"></a> +<span class="sourceLineNo">289</span><a name="line.289"></a> +<span class="sourceLineNo">290</span> // Iterate through all the getters.<a name="line.290"></a> +<span class="sourceLineNo">291</span> for (BeanMethod bm : bms) {<a name="line.291"></a> +<span class="sourceLineNo">292</span> String pn = bm.propertyName;<a name="line.292"></a> +<span class="sourceLineNo">293</span> Method m = bm.method;<a name="line.293"></a> +<span class="sourceLineNo">294</span> if (! normalProps.containsKey(pn))<a name="line.294"></a> +<span class="sourceLineNo">295</span> normalProps.put(pn, new BeanPropertyMeta.Builder(beanMeta, pn));<a name="line.295"></a> +<span class="sourceLineNo">296</span> BeanPropertyMeta.Builder bpm = normalProps.get(pn);<a name="line.296"></a> +<span class="sourceLineNo">297</span> if (! bm.isSetter)<a name="line.297"></a> +<span class="sourceLineNo">298</span> bpm.setGetter(m);<a name="line.298"></a> +<span class="sourceLineNo">299</span> }<a name="line.299"></a> +<span class="sourceLineNo">300</span><a name="line.300"></a> +<span class="sourceLineNo">301</span> // Now iterate through all the setters.<a name="line.301"></a> +<span class="sourceLineNo">302</span> for (BeanMethod bm : bms) {<a name="line.302"></a> +<span class="sourceLineNo">303</span> if (bm.isSetter) {<a name="line.303"></a> +<span class="sourceLineNo">304</span> BeanPropertyMeta.Builder bpm = normalProps.get(bm.propertyName);<a name="line.304"></a> +<span class="sourceLineNo">305</span> if (bm.matchesPropertyType(bpm))<a name="line.305"></a> +<span class="sourceLineNo">306</span> bpm.setSetter(bm.method);<a name="line.306"></a> +<span class="sourceLineNo">307</span> }<a name="line.307"></a> +<span class="sourceLineNo">308</span> }<a name="line.308"></a> +<span class="sourceLineNo">309</span> }<a name="line.309"></a> <span class="sourceLineNo">310</span><a name="line.310"></a> -<span class="sourceLineNo">311</span> // Eliminate invalid properties, and set the contents of getterProps and setterProps.<a name="line.311"></a> -<span class="sourceLineNo">312</span> for (Iterator<BeanPropertyMeta.Builder> i = normalProps.values().iterator(); i.hasNext();) {<a name="line.312"></a> -<span class="sourceLineNo">313</span> BeanPropertyMeta.Builder p = i.next();<a name="line.313"></a> -<span class="sourceLineNo">314</span> try {<a name="line.314"></a> -<span class="sourceLineNo">315</span> if (p.validate(ctx, beanRegistry, typeVarImpls)) {<a name="line.315"></a> -<span class="sourceLineNo">316</span><a name="line.316"></a> -<span class="sourceLineNo">317</span> if (p.getter != null)<a name="line.317"></a> -<span class="sourceLineNo">318</span> getterProps.put(p.getter, p.name);<a name="line.318"></a> -<span class="sourceLineNo">319</span><a name="line.319"></a> -<span class="sourceLineNo">320</span> if (p.setter != null)<a name="line.320"></a> -<span class="sourceLineNo">321</span> setterProps.put(p.setter, p.name);<a name="line.321"></a> -<span class="sourceLineNo">322</span><a name="line.322"></a> -<span class="sourceLineNo">323</span> } else {<a name="line.323"></a> -<span class="sourceLineNo">324</span> i.remove();<a name="line.324"></a> -<span class="sourceLineNo">325</span> }<a name="line.325"></a> -<span class="sourceLineNo">326</span> } catch (ClassNotFoundException e) {<a name="line.326"></a> -<span class="sourceLineNo">327</span> throw new BeanRuntimeException(c, e.getLocalizedMessage());<a name="line.327"></a> -<span class="sourceLineNo">328</span> }<a name="line.328"></a> -<span class="sourceLineNo">329</span> }<a name="line.329"></a> -<span class="sourceLineNo">330</span><a name="line.330"></a> -<span class="sourceLineNo">331</span> // Check for missing properties.<a name="line.331"></a> -<span class="sourceLineNo">332</span> for (String fp : fixedBeanProps)<a name="line.332"></a> -<span class="sourceLineNo">333</span> if (! normalProps.containsKey(fp))<a name="line.333"></a> -<span class="sourceLineNo">334</span> throw new BeanRuntimeException(c, "The property ''{0}'' was defined on the @Bean(properties=X) annotation but was not found on the class definition.", fp);<a name="line.334"></a> +<span class="sourceLineNo">311</span> typeVarImpls = new HashMap<Class<?>,Class<?>[]>();<a name="line.311"></a> +<span class="sourceLineNo">312</span> findTypeVarImpls(c, typeVarImpls);<a name="line.312"></a> +<span class="sourceLineNo">313</span> if (typeVarImpls.isEmpty())<a name="line.313"></a> +<span class="sourceLineNo">314</span> typeVarImpls = null;<a name="line.314"></a> +<span class="sourceLineNo">315</span><a name="line.315"></a> +<span class="sourceLineNo">316</span> // Eliminate invalid properties, and set the contents of getterProps and setterProps.<a name="line.316"></a> +<span class="sourceLineNo">317</span> for (Iterator<BeanPropertyMeta.Builder> i = normalProps.values().iterator(); i.hasNext();) {<a name="line.317"></a> +<span class="sourceLineNo">318</span> BeanPropertyMeta.Builder p = i.next();<a name="line.318"></a> +<span class="sourceLineNo">319</span> try {<a name="line.319"></a> +<span class="sourceLineNo">320</span> if (p.validate(ctx, beanRegistry, typeVarImpls)) {<a name="line.320"></a> +<span class="sourceLineNo">321</span><a name="line.321"></a> +<span class="sourceLineNo">322</span> if (p.getter != null)<a name="line.322"></a> +<span class="sourceLineNo">323</span> getterProps.put(p.getter, p.name);<a name="line.323"></a> +<span class="sourceLineNo">324</span><a name="line.324"></a> +<span class="sourceLineNo">325</span> if (p.setter != null)<a name="line.325"></a> +<span class="sourceLineNo">326</span> setterProps.put(p.setter, p.name);<a name="line.326"></a> +<span class="sourceLineNo">327</span><a name="line.327"></a> +<span class="sourceLineNo">328</span> } else {<a name="line.328"></a> +<span class="sourceLineNo">329</span> i.remove();<a name="line.329"></a> +<span class="sourceLineNo">330</span> }<a name="line.330"></a> +<span class="sourceLineNo">331</span> } catch (ClassNotFoundException e) {<a name="line.331"></a> +<span class="sourceLineNo">332</span> throw new BeanRuntimeException(c, e.getLocalizedMessage());<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><a name="line.335"></a> -<span class="sourceLineNo">336</span> // Mark constructor arg properties.<a name="line.336"></a> -<span class="sourceLineNo">337</span> for (String fp : constructorArgs) {<a name="line.337"></a> -<span class="sourceLineNo">338</span> BeanPropertyMeta.Builder m = normalProps.get(fp);<a name="line.338"></a> -<span class="sourceLineNo">339</span> if (m == null)<a name="line.339"></a> -<span class="sourceLineNo">340</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.340"></a> -<span class="sourceLineNo">341</span> m.setAsConstructorArg();<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> // Make sure at least one property was found.<a name="line.344"></a> -<span class="sourceLineNo">345</span> if (beanFilter == null && ctx.beansRequireSomeProperties && normalProps.size() == 0)<a name="line.345"></a> -<span class="sourceLineNo">346</span> return "No properties detected on bean class";<a name="line.346"></a> -<span class="sourceLineNo">347</span><a name="line.347"></a> -<span class="sourceLineNo">348</span> sortProperties = (ctx.sortProperties || (beanFilter != null && beanFilter.isSortProperties())) && fixedBeanProps.isEmpty();<a name="line.348"></a> -<span class="sourceLineNo">349</span><a name="line.349"></a> -<span class="sourceLineNo">350</span> properties = sortProperties ? new TreeMap<String,BeanPropertyMeta>() : new LinkedHashMap<String,BeanPropertyMeta>();<a name="line.350"></a> -<span class="sourceLineNo">351</span><a name="line.351"></a> -<span class="sourceLineNo">352</span> if (beanFilter != null && beanFilter.getTypeName() != null)<a name="line.352"></a> -<span class="sourceLineNo">353</span> dictionaryName = beanFilter.getTypeName();<a name="line.353"></a> -<span class="sourceLineNo">354</span> if (dictionaryName == null)<a name="line.354"></a> -<span class="sourceLineNo">355</span> dictionaryName = findDictionaryName(this.classMeta);<a name="line.355"></a> +<span class="sourceLineNo">336</span> // Check for missing properties.<a name="line.336"></a> +<span class="sourceLineNo">337</span> for (String fp : fixedBeanProps)<a name="line.337"></a> +<span class="sourceLineNo">338</span> if (! normalProps.containsKey(fp))<a name="line.338"></a> +<span class="sourceLineNo">339</span> throw new BeanRuntimeException(c, "The property ''{0}'' was defined on the @Bean(properties=X) annotation but was not found on the class definition.", fp);<a name="line.339"></a> +<span class="sourceLineNo">340</span><a name="line.340"></a> +<span class="sourceLineNo">341</span> // Mark constructor arg properties.<a name="line.341"></a> +<span class="sourceLineNo">342</span> for (String fp : constructorArgs) {<a name="line.342"></a> +<span class="sourceLineNo">343</span> BeanPropertyMeta.Builder m = normalProps.get(fp);<a name="line.343"></a> +<span class="sourceLineNo">344</span> if (m == null)<a name="line.344"></a> +<span class="sourceLineNo">345</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.345"></a> +<span class="sourceLineNo">346</span> m.setAsConstructorArg();<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> // Make sure at least one property was found.<a name="line.349"></a> +<span class="sourceLineNo">350</span> if (beanFilter == null && ctx.beansRequireSomeProperties && normalProps.size() == 0)<a name="line.350"></a> +<span class="sourceLineNo">351</span> return "No properties detected on bean class";<a name="line.351"></a> +<span class="sourceLineNo">352</span><a name="line.352"></a> +<span class="sourceLineNo">353</span> sortProperties = (ctx.sortProperties || (beanFilter != null && beanFilter.isSortProperties())) && fixedBeanProps.isEmpty();<a name="line.353"></a> +<span class="sourceLineNo">354</span><a name="line.354"></a> +<span class="sourceLineNo">355</span> properties = sortProperties ? new TreeMap<String,BeanPropertyMeta>() : new LinkedHashMap<String,BeanPropertyMeta>();<a name="line.355"></a> <span class="sourceLineNo">356</span><a name="line.356"></a> -<span class="sourceLineNo">357</span> for (Map.Entry<String,BeanPropertyMeta.Builder> e : normalProps.entrySet()) {<a name="line.357"></a> -<span class="sourceLineNo">358</span> BeanPropertyMeta pMeta = e.getValue().build();<a name="line.358"></a> -<span class="sourceLineNo">359</span> if (pMeta.isDyna())<a name="line.359"></a> -<span class="sourceLineNo">360</span> dynaProperty = pMeta;<a name="line.360"></a> -<span class="sourceLineNo">361</span> properties.put(e.getKey(), pMeta);<a name="line.361"></a> -<span class="sourceLineNo">362</span> }<a name="line.362"></a> -<span class="sourceLineNo">363</span><a name="line.363"></a> -<span class="sourceLineNo">364</span> // If a beanFilter is defined, look for inclusion and exclusion lists.<a name="line.364"></a> -<span class="sourceLineNo">365</span> if (beanFilter != null) {<a name="line.365"></a> -<span class="sourceLineNo">366</span><a name="line.366"></a> -<span class="sourceLineNo">367</span> // Eliminated excluded properties if BeanFilter.excludeKeys is specified.<a name="line.367"></a> -<span class="sourceLineNo">368</span> String[] includeKeys = beanFilter.getProperties();<a name="line.368"></a> -<span class="sourceLineNo">369</span> String[] excludeKeys = beanFilter.getExcludeProperties();<a name="line.369"></a> -<span class="sourceLineNo">370</span> if (excludeKeys != null) {<a name="line.370"></a> -<span class="sourceLineNo">371</span> for (String k : excludeKeys)<a name="line.371"></a> -<span class="sourceLineNo">372</span> properties.remove(k);<a name="line.372"></a> -<span class="sourceLineNo">373</span><a name="line.373"></a> -<span class="sourceLineNo">374</span> // Only include specified properties if BeanFilter.includeKeys is specified.<a name="line.374"></a> -<span class="sourceLineNo">375</span> // Note that the order must match includeKeys.<a name="line.375"></a> -<span class="sourceLineNo">376</span> } else if (includeKeys != null) {<a name="line.376"></a> -<span class="sourceLineNo">377</span> Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<String,BeanPropertyMeta>();<a name="line.377"></a> -<span class="sourceLineNo">378</span> for (String k : includeKeys) {<a name="line.378"></a> -<span class="sourceLineNo">379</span> if (properties.containsKey(k))<a name="line.379"></a> -<span class="sourceLineNo">380</span> properties2.put(k, properties.get(k));<a name="line.380"></a> -<span class="sourceLineNo">381</span> }<a name="line.381"></a> -<span class="sourceLineNo">382</span> properties = properties2;<a name="line.382"></a> -<span class="sourceLineNo">383</span> }<a name="line.383"></a> -<span class="sourceLineNo">384</span> }<a name="line.384"></a> -<span class="sourceLineNo">385</span><a name="line.385"></a> -<span class="sourceLineNo">386</span> if (pNames != null) {<a name="line.386"></a> -<span class="sourceLineNo">387</span> Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<String,BeanPropertyMeta>();<a name="line.387"></a> -<span class="sourceLineNo">388</span> for (String k : pNames) {<a name="line.388"></a> -<span class="sourceLineNo">389</span> if (properties.containsKey(k))<a name="line.389"></a> -<span class="sourceLineNo">390</span> properties2.put(k, properties.get(k));<a name="line.390"></a> -<span class="sourceLineNo">391</span> }<a name="line.391"></a> -<span class="sourceLineNo">392</span> properties = properties2;<a name="line.392"></a> -<span class="sourceLineNo">393</span> }<a name="line.393"></a> +<span class="sourceLineNo">357</span> if (beanFilter != null && beanFilter.getTypeName() != null)<a name="line.357"></a> +<span class="sourceLineNo">358</span> dictionaryName = beanFilter.getTypeName();<a name="line.358"></a> +<span class="sourceLineNo">359</span> if (dictionaryName == null)<a name="line.359"></a> +<span class="sourceLineNo">360</span> dictionaryName = findDictionaryName(this.classMeta);<a name="line.360"></a> +<span class="sourceLineNo">361</span><a name="line.361"></a> +<span class="sourceLineNo">362</span> for (Map.Entry<String,BeanPropertyMeta.Builder> e : normalProps.entrySet()) {<a name="line.362"></a> +<span class="sourceLineNo">363</span> BeanPropertyMeta pMeta = e.getValue().build();<a name="line.363"></a> +<span class="sourceLineNo">364</span> if (pMeta.isDyna())<a name="line.364"></a> +<span class="sourceLineNo">365</span> dynaProperty = pMeta;<a name="line.365"></a> +<span class="sourceLineNo">366</span> properties.put(e.getKey(), pMeta);<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> // If a beanFilter is defined, look for inclusion and exclusion lists.<a name="line.369"></a> +<span class="sourceLineNo">370</span> if (beanFilter != null) {<a name="line.370"></a> +<span class="sourceLineNo">371</span><a name="line.371"></a> +<span class="sourceLineNo">372</span> // Eliminated excluded properties if BeanFilter.excludeKeys is specified.<a name="line.372"></a> +<span class="sourceLineNo">373</span> String[] includeKeys = beanFilter.getProperties();<a name="line.373"></a> +<span class="sourceLineNo">374</span> String[] excludeKeys = beanFilter.getExcludeProperties();<a name="line.374"></a> +<span class="sourceLineNo">375</span> if (excludeKeys != null && excludeProperties == null) {<a name="line.375"></a> +<span class="sourceLineNo">376</span> for (String k : excludeKeys)<a name="line.376"></a> +<span class="sourceLineNo">377</span> properties.remove(k);<a name="line.377"></a> +<span class="sourceLineNo">378</span><a name="line.378"></a> +<span class="sourceLineNo">379</span> // Only include specified properties if BeanFilter.includeKeys is specified.<a name="line.379"></a> +<span class="sourceLineNo">380</span> // Note that the order must match includeKeys.<a name="line.380"></a> +<span class="sourceLineNo">381</span> } else if (includeKeys != null) {<a name="line.381"></a> +<span class="sourceLineNo">382</span> Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<String,BeanPropertyMeta>();<a name="line.382"></a> +<span class="sourceLineNo">383</span> for (String k : includeKeys) {<a name="line.383"></a> +<span class="sourceLineNo">384</span> if (properties.containsKey(k))<a name="line.384"></a> +<span class="sourceLineNo">385</span> properties2.put(k, properties.get(k));<a name="line.385"></a> +<span class="sourceLineNo">386</span> }<a name="line.386"></a> +<span class="sourceLineNo">387</span> properties = properties2;<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><a name="line.390"></a> +<span class="sourceLineNo">391</span> if (excludeProperties != null)<a name="line.391"></a> +<span class="sourceLineNo">392</span> for (String ep : excludeProperties)<a name="line.392"></a> +<span class="sourceLineNo">393</span> properties.remove(ep);<a name="line.393"></a> <span class="sourceLineNo">394</span><a name="line.394"></a> -<span class="sourceLineNo">395</span> } catch (BeanRuntimeException e) {<a name="line.395"></a> -<span class="sourceLineNo">396</span> throw e;<a name="line.396"></a> -<span class="sourceLineNo">397</span> } catch (Exception e) {<a name="line.397"></a> -<span class="sourceLineNo">398</span> return "Exception: " + getStackTrace(e);<a name="line.398"></a> -<span class="sourceLineNo">399</span> }<a name="line.399"></a> -<span class="sourceLineNo">400</span><a name="line.400"></a> -<span class="sourceLineNo">401</span> return null;<a name="line.401"></a> -<span class="sourceLineNo">402</span> }<a name="line.402"></a> +<span class="sourceLineNo">395</span> if (pNames != null) {<a name="line.395"></a> +<span class="sourceLineNo">396</span> Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<String,BeanPropertyMeta>();<a name="line.396"></a> +<span class="sourceLineNo">397</span> for (String k : pNames) {<a name="line.397"></a> +<span class="sourceLineNo">398</span> if (properties.containsKey(k))<a name="line.398"></a> +<span class="sourceLineNo">399</span> properties2.put(k, properties.get(k));<a name="line.399"></a> +<span class="sourceLineNo">400</span> }<a name="line.400"></a> +<span class="sourceLineNo">401</span> properties = properties2;<a name="line.401"></a> +<span class="sourceLineNo">402</span> }<a name="line.402"></a> <span class="sourceLineNo">403</span><a name="line.403"></a> -<span class="sourceLineNo">404</span> private String findDictionaryName(ClassMeta<?> cm) {<a name="line.404"></a> -<span class="sourceLineNo">405</span> BeanRegistry br = cm.getBeanRegistry();<a name="line.405"></a> -<span class="sourceLineNo">406</span> if (br != null) {<a name="line.406"></a> -<span class="sourceLineNo">407</span> String s = br.getTypeName(this.classMeta);<a name="line.407"></a> -<span class="sourceLineNo">408</span> if (s != null)<a name="line.408"></a> -<span class="sourceLineNo">409</span> return s;<a name="line.409"></a> -<span class="sourceLineNo">410</span> }<a name="line.410"></a> -<span class="sourceLineNo">411</span> Class<?> pcm = cm.innerClass.getSuperclass();<a name="line.411"></a> -<span class="sourceLineNo">412</span> if (pcm != null) {<a name="line.412"></a> -<span class="sourceLineNo">413</span> String s = findDictionaryName(ctx.getClassMeta(pcm));<a name="line.413"></a> -<span class="sourceLineNo">414</span> if (s != null)<a name="line.414"></a> -<span class="sourceLineNo">415</span> return s;<a name="line.415"></a> -<span class="sourceLineNo">416</span> }<a name="line.416"></a> -<span class="sourceLineNo">417</span> for (Class<?> icm : cm.innerClass.getInterfaces()) {<a name="line.417"></a> -<span class="sourceLineNo">418</span> String s = findDictionaryName(ctx.getClassMeta(icm));<a name="line.418"></a> -<span class="sourceLineNo">419</span> if (s != null)<a name="line.419"></a> -<span class="sourceLineNo">420</span> return s;<a name="line.420"></a> -<span class="sourceLineNo">421</span> }<a name="line.421"></a> -<span class="sourceLineNo">422</span> return null;<a name="line.422"></a> -<span class="sourceLineNo">423</span> }<a name="line.423"></a> -<span class="sourceLineNo">424</span><a name="line.424"></a> -<span class="sourceLineNo">425</span> /*<a name="line.425"></a> -<span class="sourceLineNo">426</span> * Returns the property name of the specified field if it's a valid property.<a name="line.426"></a> -<span class="sourceLineNo">427</span> * Returns null if the field isn't a valid property.<a name="line.427"></a> -<span class="sourceLineNo">428</span> */<a name="line.428"></a> -<span class="sourceLineNo">429</span> private String findPropertyName(Field f, Set<String> fixedBeanProps) {<a name="line.429"></a> -<span class="sourceLineNo">430</span> BeanProperty bp = f.getAnnotation(BeanProperty.class);<a name="line.430"></a> -<span class="sourceLineNo">431</span> String name = bpName(bp);<a name="line.431"></a> -<span class="sourceLineNo">432</span> if (! name.isEmpty()) {<a name="line.432"></a> -<span class="sourceLineNo">433</span> if (fixedBeanProps.isEmpty() || fixedBeanProps.contains(name))<a name="line.433"></a> -<span class="sourceLineNo">434</span> return name;<a name="line.434"></a> -<span class="sourceLineNo">435</span> throw new BeanRuntimeException(classMeta.getInnerClass(), "Method property ''{0}'' identified in @BeanProperty, but missing from @Bean", name);<a name="line.435"></a> -<span class="sourceLineNo">436</span> }<a name="line.436"></a> -<span class="sourceLineNo">437</span> name = propertyNamer.getPropertyName(f.getName());<a name="line.437"></a> -<span class="sourceLineNo">438</span> if (fixedBeanProps.isEmpty() || fixedBeanProps.contains(name))<a name="line.438"></a> -<span class="sourceLineNo">439</span> return name;<a name="line.439"></a> -<span class="sourceLineNo">440</span> return null;<a name="line.440"></a> -<span class="sourceLineNo">441</span> }<a name="line.441"></a> -<span class="sourceLineNo">442</span> }<a name="line.442"></a> -<span class="sourceLineNo">443</span><a name="line.443"></a> -<span class="sourceLineNo">444</span> /**<a name="line.444"></a> -<span class="sourceLineNo">445</span> * Returns the {@link ClassMeta} of this bean.<a name="line.445"></a> -<span class="sourceLineNo">446</span> *<a name="line.446"></a> -<span class="sourceLineNo">447</span> * @return The {@link ClassMeta} of this bean.<a name="line.447"></a> -<span class="sourceLineNo">448</span> */<a name="line.448"></a> -<span class="sourceLineNo">449</span> @BeanIgnore<a name="line.449"></a> -<span class="sourceLineNo">450</span> public ClassMeta<T> getClassMeta() {<a name="line.450"></a> -<span class="sourceLineNo">451</span> return classMeta;<a name="line.451"></a> -<span class="sourceLineNo">452</span> }<a name="line.452"></a> -<span class="sourceLineNo">453</span><a name="line.453"></a> -<span class="sourceLineNo">454</span> /**<a name="line.454"></a> -<span class="sourceLineNo">455</span> * Returns the dictionary name for this bean as defined through the {@link Bean#typeName()} annotation.<a name="line.455"></a> -<span class="sourceLineNo">456</span> *<a name="line.456"></a> -<span class="sourceLineNo">457</span> * @return The dictioanry name for this bean, or <jk>null</jk> if it has no dictionary name defined.<a name="line.457"></a> -<span class="sourceLineNo">458</span> */<a name="line.458"></a> -<span class="sourceLineNo">459</span> public String getDictionaryName() {<a name="line.459"></a> -<span class="sourceLineNo">460</span> return dictionaryName;<a name="line.460"></a> +<span class="sourceLineNo">404</span> } catch (BeanRuntimeException e) {<a name="line.404"></a> +<span class="sourceLineNo">405</span> throw e;<a name="line.405"></a> +<span class="sourceLineNo">406</span> } catch (Exception e) {<a name="line.406"></a> +<span class="sourceLineNo">407</span> return "Exception: " + getStackTrace(e);<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> return null;<a name="line.410"></a> +<span class="sourceLineNo">411</span> }<a name="line.411"></a> +<span class="sourceLineNo">412</span><a name="line.412"></a> +<span class="sourceLineNo">413</span> private String findDictionaryName(ClassMeta<?> cm) {<a name="line.413"></a> +<span class="sourceLineNo">414</span> BeanRegistry br = cm.getBeanRegistry();<a name="line.414"></a> +<span class="sourceLineNo">415</span> if (br != null) {<a name="line.415"></a> +<span class="sourceLineNo">416</span> String s = br.getTypeName(this.classMeta);<a name="line.416"></a> +<span class="sourceLineNo">417</span> if (s != null)<a name="line.417"></a> +<span class="sourceLineNo">418</span> return s;<a name="line.418"></a> +<span class="sourceLineNo">419</span> }<a name="line.419"></a> +<span class="sourceLineNo">420</span> Class<?> pcm = cm.innerClass.getSuperclass();<a name="line.420"></a> +<span class="sourceLineNo">421</span> if (pcm != null) {<a name="line.421"></a> +<span class="sourceLineNo">422</span> String s = findDictionaryName(ctx.getClassMeta(pcm));<a name="line.422"></a> +<span class="sourceLineNo">423</span> if (s != null)<a name="line.423"></a> +<span class="sourceLineNo">424</span> return s;<a name="line.424"></a> +<span class="sourceLineNo">425</span> }<a name="line.425"></a> +<span class="sourceLineNo">426</span> for (Class<?> icm : cm.innerClass.getInterfaces()) {<a name="line.426"></a> +<span class="sourceLineNo">427</span> String s = findDictionaryName(ctx.getClassMeta(icm));<a name="line.427"></a> +<span class="sourceLineNo">428</span> if (s != null)<a name="line.428"></a> +<span class="sourceLineNo">429</span> return s;<a name="line.429"></a> +<span class="sourceLineNo">430</span> }<a name="line.430"></a> +<span class="sourceLineNo">431</span> return null;<a name="line.431"></a> +<span class="sourceLineNo">432</span> }<a name="line.432"></a> +<span class="sourceLineNo">433</span><a name="line.433"></a> +<span class="sourceLineNo">434</span> /*<a name="line.434"></a> +<span class="sourceLineNo">435</span> * Returns the property name of the specified field if it's a valid property.<a name="line.435"></a> +<span class="sourceLineNo">436</span> * Returns null if the field isn't a valid property.<a name="line.436"></a> +<span class="sourceLineNo">437</span> */<a name="line.437"></a> +<span class="sourceLineNo">438</span> private String findPropertyName(Field f, Set<String> fixedBeanProps) {<a name="line.438"></a> +<span class="sourceLineNo">439</span> BeanProperty bp = f.getAnnotation(BeanProperty.class);<a name="line.439"></a> +<span class="sourceLineNo">440</span> String name = bpName(bp);<a name="line.440"></a> +<span class="sourceLineNo">441</span> if (! name.isEmpty()) {<a name="line.441"></a> +<span class="sourceLineNo">442</span> if (fixedBeanProps.isEmpty() || fixedBeanProps.contains(name))<a name="line.442"></a> +<span class="sourceLineNo">443</span> return name;<a name="line.443"></a> +<span class="sourceLineNo">444</span> throw new BeanRuntimeException(classMeta.getInnerClass(), "Method property ''{0}'' identified in @BeanProperty, but missing from @Bean", name);<a name="line.444"></a> +<span class="sourceLineNo">445</span> }<a name="line.445"></a> +<span class="sourceLineNo">446</span> name = propertyNamer.getPropertyName(f.getName());<a name="line.446"></a> +<span class="sourceLineNo">447</span> if (fixedBeanProps.isEmpty() || fixedBeanProps.contains(name))<a name="line.447"></a> +<span class="sourceLineNo">448</span> return name;<a name="line.448"></a> +<span class="sourceLineNo">449</span> return null;<a name="line.449"></a> +<span class="sourceLineNo">450</span> }<a name="line.450"></a> +<span class="sourceLineNo">451</span> }<a name="line.451"></a> +<span class="sourceLineNo">452</span><a name="line.452"></a> +<span class="sourceLineNo">453</span> /**<a name="line.453"></a> +<span class="sourceLineNo">454</span> * Returns the {@link ClassMeta} of this bean.<a name="line.454"></a> +<span class="sourceLineNo">455</span> *<a name="line.455"></a> +<span class="sourceLineNo">456</span> * @return The {@link ClassMeta} of this bean.<a name="line.456"></a> +<span class="sourceLineNo">457</span> */<a name="line.457"></a> +<span class="sourceLineNo">458</span> @BeanIgnore<a name="line.458"></a> +<span class="sourceLineNo">459</span> public ClassMeta<T> getClassMeta() {<a name="line.459"></a> +<span class="sourceLineNo">460</span> return classMeta;<a name="line.460"></a> <span class="sourceLineNo">461</span> }<a name="line.461"></a> <span class="sourceLineNo">462</span><a name="line.462"></a> <span class="sourceLineNo">463</span> /**<a name="line.463"></a> -<span class="sourceLineNo">464</span> * Returns a mock bean property that resolves to the name <js>"_type"</js> and whose value always resolves<a name="line.464"></a> -<span class="sourceLineNo">465</span> * to the dictionary name of the bean.<a name="line.465"></a> -<span class="sourceLineNo">466</span> *<a name="line.466"></a> -<span class="sourceLineNo">467</span> * @return The type name property.<a name="line.467"></a> -<span class="sourceLineNo">468</span> */<a name="line.468"></a> -<span class="sourceLineNo">469</span> public BeanPropertyMeta getTypeProperty() {<a name="line.469"></a> -<span class="sourceLineNo">470</span> return typeProperty;<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span><a name="line.472"></a> -<span class="sourceLineNo">473</span> /*<a name="line.473"></a> -<span class="sourceLineNo">474</span> * Temporary getter/setter method struct.<a name="line.474"></a> -<span class="sourceLineNo">475</span> */<a name="line.475"></a> -<span class="sourceLineNo">476</span> private static class BeanMethod {<a name="line.476"></a> -<span class="sourceLineNo">477</span> String propertyName;<a name="line.477"></a> -<span class="sourceLineNo">478</span> boolean isSetter;<a name="line.478"></a> -<span class="sourceLineNo">479</span> Method method;<a name="line.479"></a> -<span class="sourceLineNo">480</span> Class<?> type;<a name="line.480"></a> +<span class="sourceLineNo">464</span> * Returns the dictionary name for this bean as defined through the {@link Bean#typeName()} annotation.<a name="line.464"></a> +<span class="sourceLineNo">465</span> *<a name="line.465"></a> +<span class="sourceLineNo">466</span> * @return The dictioanry name for this bean, or <jk>null</jk> if it has no dictionary name defined.<a name="line.466"></a> +<span class="sourceLineNo">467</span> */<a name="line.467"></a> +<span class="sourceLineNo">468</span> public String getDictionaryName() {<a name="line.468"></a> +<span class="sourceLineNo">469</span> return dictionaryName;<a name="line.469"></a> +<span class="sourceLineNo">470</span> }<a name="line.470"></a> +<span class="sourceLineNo">471</span><a name="line.471"></a> +<span class="sourceLineNo">472</span> /**<a name="line.472"></a> +<span class="sourceLineNo">473</span> * Returns a mock bean property that resolves to the name <js>"_type"</js> and whose value always resolves<a name="line.473"></a> +<span class="sourceLineNo">474</span> * to the dictionary name of the bean.<a name="line.474"></a> +<span class="sourceLineNo">475</span> *<a name="line.475"></a> +<span class="sourceLineNo">476</span> * @return The type name property.<a name="line.476"></a> +<span class="sourceLineNo">477</span> */<a name="line.477"></a> +<span class="sourceLineNo">478</span> public BeanPropertyMeta getTypeProperty() {<a name="line.478"></a> +<span class="sourceLineNo">479</span> return typeProperty;<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> <span class="sourceLineNo">481</span><a name="line.481"></a> -<span class="sourceLineNo">482</span> BeanMethod(String propertyName, boolean isSetter, Method method) {<a name="line.482"></a> -<span class="sourceLineNo">483</span> this.propertyName = propertyName;<a name="line.483"></a> -<span class="sourceLineNo">484</span> this.isSetter = isSetter;<a name="line.484"></a> -<span class="sourceLineNo">485</span> this.method = method;<a name="line.485"></a> -<span class="sourceLineNo">486</span> if (isSetter)<a name="line.486"></a> -<span class="sourceLineNo">487</span> this.type = method.getParameterTypes()[0];<a name="line.487"></a> -<span class="sourceLineNo">488</span> else<a name="line.488"></a> -<span class="sourceLineNo">489</span> this.type = method.getReturnType();<a name="line.489"></a> -<span class="sourceLineNo">490</span> }<a name="line.490"></a> -<span class="sourceLineNo">491</span><a name="line.491"></a> -<span class="sourceLineNo">492</span> /*<a name="line.492"></a> -<span class="sourceLineNo">493</span> * Returns true if this method matches the class type of the specified property.<a name="line.493"></a> -<span class="sourceLineNo">494</span> * Only meant to be used for setters.<a name="line.494"></a> -<span class="sourceLineNo">495</span> */<a name="line.495"></a> -<span class="sourceLineNo">496</span> boolean matchesPropertyType(BeanPropertyMeta.Builder b) {<a name="line.496"></a> -<span class="sourceLineNo">497</span> if (b == null)<a name="line.497"></a> -<span class="sourceLineNo">498</span> return false;<a name="line.498"></a> -<span class="sourceLineNo">499</span><a name="line.499"></a> -<span class="sourceLineNo">500</span> // Don't do further validation if this is the "*" bean property.<a name="line.500"></a> -<span class="sourceLineNo">501</span> if ("*".equals(b.name))<a name="line.501"></a> -<span class="sourceLineNo">502</span> return true;<a name="line.502"></a> -<span class="sourceLineNo">503</span><a name="line.503"></a> -<span class="sourceLineNo">504</span> // Get the bean property type from the getter/field.<a name="line.504"></a> -<span class="sourceLineNo">505</span> Class<?> pt = null;<a name="line.505"></a> -<span class="sourceLineNo">506</span> if (b.getter != null)<a name="line.506"></a> -<span class="sourceLineNo">507</span> pt = b.getter.getReturnType();<a name="line.507"></a> -<span class="sourceLineNo">508</span> else if (b.field != null)<a name="line.508"></a> -<span class="sourceLineNo">509</span> pt = b.field.getType();<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> // Doesn't match if no getter/field defined.<a name="line.511"></a> -<span class="sourceLineNo">512</span> if (pt == null)<a name="line.512"></a> -<span class="sourceLineNo">513</span> return false;<a name="line.513"></a> -<span class="sourceLineNo">514</span><a name="line.514"></a> -<span class="sourceLineNo">515</span> // Doesn't match if not same type or super type as getter/field.<a name="line.515"></a> -<span class="sourceLineNo">516</span> if (! isParentClass(type, pt))<a name="line.516"></a> -<span class="sourceLineNo">517</span> return false;<a name="line.517"></a> -<span class="sourceLineNo">518</span><a name="line.518"></a> -<span class="sourceLineNo">519</span> // If a setter was previously set, only use this setter if it's a closer<a name="line.519"></a> -<span class="sourceLineNo">520</span> // match (e.g. prev type is a superclass of this type).<a name="line.520"></a> -<span class="sourceLineNo">521</span> if (b.setter == null)<a name="line.521"></a> -<span class="sourceLineNo">522</span> return true;<a name="line.522"></a> +<span class="sourceLineNo">482</span> /*<a name="line.482"></a> +<span class="sourceLineNo">483</span> * Temporary getter/setter method struct.<a name="line.483"></a> +<span class="sourceLineNo">484</span> */<a name="line.484"></a> +<span class="sourceLineNo">485</span> private static class BeanMethod {<a name="line.485"></a> +<span class="sourceLineNo">486</span> String propertyName;<a name="line.486"></a> +<span class="sourceLineNo">487</span> boolean isSetter;<a name="line.487"></a> +<span class="sourceLineNo">488</span> Method method;<a name="line.488"></a> +<span class="sourceLineNo">489</span> Class<?> type;<a name="line.489"></a> +<span class="sourceLineNo">490</span><a name="line.490"></a> +<span class="sourceLineNo">491</span> BeanMethod(String propertyName, boolean isSetter, Method method) {<a name="line.491"></a> +<span class="sourceLineNo">492</span> this.propertyName = propertyName;<a name="line.492"></a> +<span class="sourceLineNo">493</span> this.isSetter = isSetter;<a name="line.493"></a> +<span class="sourceLineNo">494</span> this.method = method;<a name="line.494"></a> +<span class="sourceLineNo">495</span> if (isSetter)<a name="line.495"></a> +<span class="sourceLineNo">496</span> this.type = method.getParameterTypes()[0];<a name="line.496"></a> +<span class="sourceLineNo">497</span> else<a name="line.497"></a> +<span class="sourceLineNo">498</span> this.type = method.getReturnType();<a name="line.498"></a> +<span class="sourceLineNo">499</span> }<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> * Returns true if this method matches the class type of the specified property.<a name="line.502"></a> +<span class="sourceLineNo">503</span> * Only meant to be used for setters.<a name="line.503"></a> +<span class="sourceLineNo">504</span> */<a name="line.504"></a> +<span class="sourceLineNo">505</span> boolean matchesPropertyType(BeanPropertyMeta.Builder b) {<a name="line.505"></a> +<span class="sourceLineNo">506</span> if (b == null)<a name="line.506"></a> +<span class="sourceLineNo">507</span> return false;<a name="line.507"></a> +<span class="sourceLineNo">508</span><a name="line.508"></a> +<span class="sourceLineNo">509</span> // Don't do further validation if this is the "*" bean property.<a name="line.509"></a> +<span class="sourceLineNo">510</span> if ("*".equals(b.name))<a name="line.510"></a> +<span class="sourceLineNo">511</span> return true;<a name="line.511"></a> +<span class="sourceLineNo">512</span><a name="line.512"></a> +<span class="sourceLineNo">513</span> // Get the bean property type from the getter/field.<a name="line.513"></a> +<span class="sourceLineNo">514</span> Class<?> pt = null;<a name="line.514"></a> +<span class="sourceLineNo">515</span> if (b.getter != null)<a name="line.515"></a> +<span class="sourceLineNo">516</span> pt = b.getter.getReturnType();<a name="line.516"></a> +<span class="sourceLineNo">517</span> else if (b.field != null)<a name="line.517"></a> +<span class="sourceLineNo">518</span> pt = b.field.getType();<a name="line.518"></a> +<span class="sourceLineNo">519</span><a name="line.519"></a> +<span class="sourceLineNo">520</span> // Doesn't match if no getter/field defined.<a name="line.520"></a> +<span class="sourceLineNo">521</span> if (pt == null)<a name="line.521"></a> +<span class="sourceLineNo">522</span> return false;<a name="line.522"></a> <span class="sourceLineNo">523</span><a name="line.523"></a> -<span class="sourceLineNo">524</span> Class<?> prevType = b.setter.getParameterTypes()[0];<a name="line.524"></a> -<span class="sourceLineNo">525</span> return isParentClass(prevType, type, true);<a name="line.525"></a> -<span class="sourceLineNo">526</span> }<a name="line.526"></a> +<span class="sourceLineNo">524</span> // Doesn't match if not same type or super type as getter/field.<a name="line.524"></a> +<span class="sourceLineNo">525</span> if (! isParentClass(type, pt))<a name="line.525"></a> +<span class="sourceLineNo">526</span> return false;<a name="line.526"></a> <span class="sourceLineNo">527</span><a name="line.527"></a> -<span class="sourceLineNo">528</span> @Override /* Object */<a name="line.528"></a> -<span class="sourceLineNo">529</span> public String toString() {<a name="line.529"></a> -<span class="sourceLineNo">530</span> return method.toString();<a name="line.530"></a> -<span class="sourceLineNo">531</span> }<a name="line.531"></a> -<span class="sourceLineNo">532</span> }<a name="line.532"></a> -<span class="sourceLineNo">533</span><a name="line.533"></a> -<span class="sourceLineNo">534</span> /*<a name="line.534"></a> -<span class="sourceLineNo">535</span> * Find all the bean methods on this class.<a name="line.535"></a> -<span class="sourceLineNo">536</span> *<a name="line.536"></a> -<span class="sourceLineNo">537</span> * @param c The transformed class.<a name="line.537"></a> -<span class="sourceLineNo">538</span> * @param stopClass Don't look above this class in the hierarchy.<a name="line.538"></a> -<span class="sourceLineNo">539</span> * @param v The minimum method visibility.<a name="line.539"></a> -<span class="sourceLineNo">540</span> * @param fixedBeanProps Only include methods whose properties are in this list.<a name="line.540"></a> -<span class="sourceLineNo">541</span> * @param pn Use this property namer to determine property names from the method names.<a name="line.541"></a> -<span class="sourceLineNo">542</span> */<a name="line.542"></a> -<span class="sourceLineNo">543</span> private static List<BeanMethod> findBeanMethods(Class<?> c, Class<?> stopClass, Visibility v, Set<String> fixedBeanProps, PropertyNamer pn) {<a name="line.543"></a> -<span class="sourceLineNo">544</span> List<BeanMethod> l = new LinkedList<BeanMethod>();<a name="line.544"></a> -<span class="sourceLineNo">545</span><a name="line.545"></a> -<span class="sourceLineNo">546</span> for (Class<?> c2 : findClasses(c, stopClass)) {<a name="line.546"></a> -<span class="sourceLineNo">547</span> for (Method m : c2.getDeclaredMethods()) {<a name="line.547"></a> -<span class="sourceLineNo">548</span> int mod = m.getModifiers();<a name="line.548"></a> -<span class="sourceLineNo">549</span> if (Modifier.isStatic(mod))<a name="line.549"></a> -<span class="sourceLineNo">550</span> continue;<a name="line.550"></a> -<span class="sourceLineNo">551</span> if (m.isBridge()) // This eliminates methods with covariant return types from parent classes on child classes.<a name="line.551"></a> -<span class="sourceLineNo">552</span> continue;<a name="line.552"></a> -<span class="sourceLineNo">553</span><a name="line.553"></a> -<span class="sourceLineNo">554</span> BeanIgnore bi = getMethodAnnotation(BeanIgnore.class, c, m);<a name="line.554"></a> -<span class="sourceLineNo">555</span> if (bi != null)<a name="line.555"></a> -<span class="sourceLineNo">556</span> continue;<a name="line.556"></a> -<span class="sourceLineNo">557</span><a name="line.557"></a> -<span class="sourceLineNo">558</span> BeanProperty bp = getMethodAnnotation(BeanProperty.class, c, m);<a name="line.558"></a> -<span class="sourceLineNo">559</span> if (! (v.isVisible(m) || bp != null))<a name="line.559"></a> -<span class="sourceLineNo">560</span> continue;<a name="line.560"></a> -<span class="sourceLineNo">561</span><a name="line.561"></a> -<span class="sourceLineNo">562</span> String n = m.getName();<a name="line.562"></a> -<span class="sourceLineNo">563</span> Class<?>[] pt = m.getParameterTypes();<a name="line.563"></a> -<span class="sourceLineNo">564</span> Class<?> rt = m.getReturnType();<a name="line.564"></a> -<span class="sourceLineNo">565</span> boolean isGetter = false, isSetter = false;<a name="line.565"></a> -<span class="sourceLineNo">566</span> String bpName = bpName(bp);<a name="line.566"></a> -<span class="sourceLineNo">567</span> if (pt.length == 0) {<a name="line.567"></a> -<span class="sourceLineNo">568</span> if (n.startsWith("get") && (! rt.equals(Void.TYPE))) {<a name="line.568"></a> -<span class="sourceLineNo">569</span> isGetter = true;<a name="line.569"></a> -<span class="sourceLineNo">570</span> n = n.substring(3);<a name="line.570"></a> -<span class="sourceLineNo">571</span> } else if (n.startsWith("is") && (rt.equals(Boolean.TYPE) || rt.equals(Boolean.class))) {<a name="line.571"></a> -<span class="sourceLineNo">572</span> isGetter = true;<a name="line.572"></a> -<span class="sourceLineNo">573</span> n = n.substring(2);<a name="line.573"></a> -<span class="sourceLineNo">574</span> } else if (! bpName.isEmpty()) {<a name="line.574"></a> -<span class="sourceLineNo">575</span> isGetter = true;<a name="line.575"></a> -<span class="sourceLineNo">576</span> n = bpName;<a name="line.576"></a> -<span class="sourceLineNo">577</span> }<a name="line.577"></a> -<span class="sourceLineNo">578</span> } else if (pt.length == 1) {<a name="line.578"></a> -<span class="sourceLineNo">579</span> if (n.startsWith("set") && (isParentClass(rt, c) || rt.equals(Void.TYPE))) {<a name="line.579"></a> -<span class="sourceLineNo">580</span> isSetter = true;<a name="line.580"></a> -<span class="sourceLineNo">581</span> n = n.substring(3);<a name="line.581"></a> -<span class="sourceLineNo">582</span> } else if (! bpName.isEmpty()) {<a name="line.582"></a> -<span class="sourceLineNo">583</span> isSetter = true;<a name="line.583"></a> -<span class="sourceLineNo">584</span> n = bpName;<a name="line.584"></a> -<span class="sourceLineNo">585</span> }<a name="line.585"></a> -<span class="sourceLineNo">586</span> } else if (pt.length == 2) {<a name="line.586"></a> -<span class="sourceLineNo">587</span> if ("*".equals(bpName)) {<a name="line.587"></a> -<span class="sourceLineNo">588</span> isSetter = true;<a name="line.588"></a> -<span class="sourceLineNo">589</span> n = bpName;<a name="line.589"></a> -<span class="sourceLineNo">590</span> }<a name="line.590"></a> -<span class="sourceLineNo">591</span> }<a name="line.591"></a> -<span class="sourceLineNo">592</span> n = pn.getPropertyName(n);<a name="line.592"></a> -<span class="sourceLineNo">593</span> if (isGetter || isSetter) {<a name="line.593"></a> -<span class="sourceLineNo">594</span> if (! bpName.isEmpty()) {<a name="line.594"></a> -<span class="sourceLineNo">595</span> n = bpName;<a name="line.595"></a> -<span class="sourceLineNo">596</span> if (! fixedBeanProps.isEmpty())<a name="line.596"></a> -<span class="sourceLineNo">597</span> if (! fixedBeanProps.contains(n))<a name="line.597"></a> -<span class="sourceLineNo">598</span> throw new BeanRuntimeException(c, "Method property ''{0}'' identified in @BeanProperty, but missing from @Bean", n);<a name="line.598"></a> +<span class="sourceLineNo">528</span> // If a setter was previously set, only use this setter if it's a closer<a name="line.528"></a> +<span class="sourceLineNo">529</span> // match (e.g. prev type is a superclass of this type).<a name="line.529"></a> +<span class="sourceLineNo">530</span> if (b.setter == null)<a name="line.530"></a> +<span class="sourceLineNo">531</span> return true;<a name="line.531"></a> +<span class="sourceLineNo">532</span><a name="line.532"></a> +<span class="sourceLineNo">533</span> Class<?> prevType = b.setter.getParameterTypes()[0];<a name="line.533"></a> +<span class="sourceLineNo">534</span> return isParentClass(prevType, type, true);<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span><a name="line.536"></a> +<span class="sourceLineNo">537</span> @Override /* Object */<a name="line.537"></a> +<span class="sourceLineNo">538</span> public String toString() {<a name="line.538"></a> +<span class="sourceLineNo">539</span> return method.toString();<a name="line.539"></a> +<span class="sourceLineNo">540</span> }<a name="line.540"></a> +<span class="sourceLineNo">541</span> }<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> * Find all the bean methods on this class.<a name="line.544"></a> +<span class="sourceLineNo">545</span> *<a name="line.545"></a> +<span class="sourceLineNo">546</span> * @param c The transformed class.<a name="line.546"></a> +<span class="sourceLineNo">547</span> * @param stopClass Don't look above this class in the hierarchy.<a name="line.547"></a> +<span class="sourceLineNo">548</span> * @param v The minimum method visibility.<a name="line.548"></a> +<span class="sourceLineNo">549</span> * @param fixedBeanProps Only include methods whose properties are in this list.<a name="line.549"></a> +<span class="sourceLineNo">550</span> * @param pn Use this property namer to determine property names from the method names.<a name="line.550"></a> +<span class="sourceLineNo">551</span> */<a name="line.551"></a> +<span class="sourceLineNo">552</span> private static List<BeanMethod> findBeanMethods(Class<?> c, Class<?> stopClass, Visibility v, Set<String> fixedBeanProps, PropertyNamer pn) {<a name="line.552"></a> +<span class="sourceLineNo">553</span> List<BeanMethod> l = new LinkedList<BeanMethod>();<a name="line.553"></a> +<span class="sourceLineNo">554</span><a name="line.554"></a> +<span class="sourceLineNo">555</span> for (Class<?> c2 : findClasses(c, stopClass)) {<a name="line.555"></a> +<span class="sourceLineNo">556</span> for (Method m : c2.getDeclaredMethods()) {<a name="line.556"></a> +<span class="sourceLineNo">557</span> int mod = m.getModifiers();<a name="line.557"></a> +<span class="sourceLineNo">558</span> if (Modifier.isStatic(mod))<a name="line.558"></a> +<span class="sourceLineNo">559</span> continue;<a name="line.559"></a> +<span class="sourceLineNo">560</span> if (m.isBridge()) // This eliminates methods with covariant return types from parent classes on child classes.<a name="line.560"></a> +<span class="sourceLineNo">561</span> continue;<a name="line.561"></a> +<span class="sourceLineNo">562</span><a name="line.562"></a> +<span class="sourceLineNo">563</span> BeanIgnore bi = getMethodAnnotation(BeanIgnore.class, c, m);<a name="line.563"></a> +<span class="sourceLineNo">564</span> if (bi != null)<a name="line.564"></a> +<span class="sourceLineNo">565</span> continue;<a name="line.565"></a> +<span class="sourceLineNo">566</span><a name="line.566"></a> +<span class="sourceLineNo">567</span> BeanProperty bp = getMethodAnnotation(BeanProperty.class, c, m);<a name="line.567"></a> +<span class="sourceLineNo">568</span> if (! (v.isVisible(m) || bp != null))<a name="line.568"></a> +<span class="sourceLineNo">569</span> continue;<a name="line.569"></a> +<span class="sourceLineNo">570</span><a name="line.570"></a> +<span class="sourceLineNo">571</span> String n = m.getName();<a name="line.571"></a> +<span class="sourceLineNo">572</span> Class<?>[] pt = m.getParameterTypes();<a name="line.572"></a> +<span class="sourceLineNo">573</span> Class<?> rt = m.getReturnType();<a name="line.573"></a> +<span class="sourceLineNo">574</span> boolean isGetter = false, isSetter = false;<a name="line.574"></a> +<span class="sourceLineNo">575</span> String bpName = bpName(bp);<a name="line.575"></a> +<span class="sourceLineNo">576</span> if (pt.length == 0) {<a name="line.576"></a> +<span class="sourceLineNo">577</span> if (n.startsWith("get") && (! rt.equals(Void.TYPE))) {<a name="line.577"></a> +<span class="sourceLineNo">578</span> isGetter = true;<a name="line.578"></a> +<span class="sourceLineNo">579</span> n = n.substring(3);<a name="line.579"></a> +<span class="sourceLineNo">580</span> } else if (n.startsWith("is") && (rt.equals(Boolean.TYPE) || rt.equals(Boolean.class))) {<a name="line.580"></a> +<span class="sourceLineNo">581</span> isGetter = true;<a name="line.581"></a> +<span class="sourceLineNo">582</span> n = n.substring(2);<a name="line.582"></a> +<span class="sourceLineNo">583</span> } else if (! bpName.isEmpty()) {<a name="line.583"></a> +<span class="sourceLineNo">584</span> isGetter = true;<a name="line.584"></a> +<span class="sourceLineNo">585</span> n = bpName;<a name="line.585"></a> +<span class="sourceLineNo">586</span> }<a name="line.586"></a> +<span class="sourceLineNo">587</span> } else if (pt.length == 1) {<a name="line.587"></a> +<span class="sourceLineNo">588</span> if (n.startsWith("set") && (isParentClass(rt, c) || rt.equals(Void.TYPE))) {<a name="line.588"></a> +<span class="sourceLineNo">589</span> isSetter = true;<a name="line.589"></a> +<span class="sourceLineNo">590</span> n = n.substring(3);<a name="line.590"></a> +<span class="sourceLineNo">591</span> } else if (! bpName.isEmpty()) {<a name="line.591"></a> +<span class="sourceLineNo">592</span> isSetter = true;<a name="line.592"></a> +<span class="sourceLineNo">593</span> n = bpName;<a name="line.593"></a> +<span class="sourceLineNo">594</span> }<a name="line.594"></a> +<span class="sourceLineNo">595</span> } else if (pt.length == 2) {<a name="line.595"></a> +<span class="sourceLineNo">596</span> if ("*".equals(bpName)) {<a name="line.596"></a> +<span class="sourceLineNo">597</span> isSetter = true;<a name="line.597"></a> +<span class="sourceLineNo">598</span> n = bpName;<a name="line.598"></a> <span class="sourceLineNo">599</span> }<a name="line.599"></a> -<span class="sourceLineNo">600</span> l.add(new BeanMethod(n, isSetter, m));<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> }<a name="line.603"></a> -<span class="sourceLineNo">604</span> return l;<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> private static Collection<Field> findBeanFields(Class<?> c, Class<?> stopClass, Visibility v) {<a name="line.607"></a> -<span class="sourceLineNo">608</span> List<Field> l = new LinkedList<Field>();<a name="line.608"></a> -<span class="sourceLineNo">609</span> for (Class<?> c2 : findClasses(c, stopClass)) {<a name="line.609"></a> -<span class="sourceLineNo">610</span> for (Field f : c2.getDeclaredFields()) {<a name="line.610"></a> -<span class="sourceLineNo">611</span> int m = f.getModifiers();<a name="line.611"></a> -<span class="sourceLineNo">612</span> if (Modifier.isStatic(m) || Modifier.isTransient(m))<a name="line.612"></a> -<span class="sourceLineNo">613</span> continue;<a name="line.613"></a> -<span class="sourceLineNo">614</span> if (f.isAnnotationPresent(BeanIgnore.class))<a name="line.614"></a> -<span class="sourceLineNo">615</span> continue;<a name="line.615"></a> -<span class="sourceLineNo">616</span> if (! (v.isVisible(f) || f.isAnnotationPresent(BeanProperty.class)))<a name="line.616"></a> -<span class="sourceLineNo">617</span> continue;<a name="line.617"></a> -<span class="sourceLineNo">618</span> l.add(f);<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> return l;<a name="line.621"></a> -<span class="sourceLineNo">622</span> }<a name="line.622"></a> -<span class="sourceLineNo">623</span><a name="line.623"></a> -<span class="sourceLineNo">624</span> private static List<Class<?>> findClasses(Class<?> c, Class<?> stopClass) {<a name="line.624"></a> -<span class="sourceLineNo">625</span> LinkedList<Class<?>> l = new LinkedList<Class<?>>();<a name="line.625"></a> -<span class="sourceLineNo">626</span> findClasses(c, l, stopClass);<a name="line.626"></a> -<span class="sourceLineNo">627</span> return l;<a name="line.627"></a> -<span class="sourceLineNo">628</span> }<a name="line.628"></a> -<span class="sourceLineNo">629</span><a name="line.629"></a> -<span class="sourceLineNo">630</span> private static void findClasses(Class<?> c, LinkedList<Class<?>> l, Class<?> stopClass) {<a name="line.630"></a> -<span class="sourceLineNo">631</span> while (c != null && stopClass != c) {<a name="line.631"></a> -<span class="sourceLineNo">632</span> l.addFirst(c);<a name="line.632"></a> -<span class="sourceLineNo">633</span> for (Class<?> ci : c.getInterfaces())<a name="line.633"></a> -<span class="sourceLineNo">634</span> findClasses(ci, l, stopClass);<a name="line.634"></a> -<span class="sourceLineNo">635</span> c = c.getSuperclass();<a name="line.635"></a> -<span class="sourceLineNo">636</span> }<a name="line.636"></a> +<span class="sourceLineNo">600</span> }<a name="line.600"></a> +<span class="sourceLineNo">601</span> n = pn.getPropertyName(n);<a name="line.601"></a> +<span class="sourceLineNo">602</span> if (isGetter || isSetter) {<a name="line.602"></a> +<span class="sourceLineNo">603</span> if (! bpName.isEmpty()) {<a name="line.603"></a> +<span class="sourceLineNo">604</span> n = bpName;<a name="line.604"></a> +<span class="sourceLineNo">605</span> if (! fixedBeanProps.isEmpty())<a name="line.605"></a> +<span class="sourceLineNo">606</span> if (! fixedBeanProps.contains(n))<a name="line.606"></a> +<span class="sourceLineNo">607</span> throw new BeanRuntimeException(c, "Method property ''{0}'' identified in @BeanProperty, but missing from @Bean", n);<a name="line.607"></a> +<span class="sourceLineNo">608</span> }<a name="line.608"></a> +<span class="sourceLineNo">609</span> l.add(new BeanMethod(n, isSetter, m));<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> return l;<a name="line.613"></a> +<span class="sourceLineNo">614</span> }<a name="line.614"></a> +<span class="sourceLineNo">615</span><a name="line.615"></a> +<span class="sourceLineNo">616</span> private static Collection<Field> findBeanFields(Class<?> c, Class<?> stopClass, Visibility v) {<a name="line.616"></a> +<span class="sourceLineNo">617</span> List<Field> l = new LinkedList<Field>();<a name="line.617"></a> +<span class="sourceLineNo">618</span> for (Class<?> c2 : findClasses(c, stopClass)) {<a name="line.618"></a> +<span class="sourceLineNo">619</span> for (Field f : c2.getDeclaredFields()) {<a name="line.619"></a> +<span class="sourceLineNo">620</span> int m = f.getModifiers();<a name="line.620"></a> +<span class="sourceLineNo">621</span> if (Modifier.isStatic(m) || Modifier.isTransient(m))<a name="line.621"></a> +<span class="sourceLineNo">622</span> continue;<a name="line.622"></a> +<span class="sourceLineNo">623</span> if (f.isAnnotationPresent(BeanIgnore.class))<a name="line.623"></a> +<span class="sourceLineNo">624</span> continue;<a name="line.624"></a> +<span class="sourceLineNo">625</span> if (! (v.isVisible(f) || f.isAnnotationPresent(BeanProperty.class)))<a name="line.625"></a> +<span class="sourceLineNo">626</span> continue;<a name="line.626"></a> +<span class="sourceLineNo">627</span> l.add(f);<a name="line.627"></a> +<span class="sourceLineNo">628</span> }<a name="line.628"></a> +<span class="sourceLineNo">629</span> }<a name="line.629"></a> +<span class="sourceLineNo">630</span> return l;<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> private static List<Class<?>> findClasses(Class<?> c, Class<?> stopClass) {<a name="line.633"></a> +<span class="sourceLineNo">634</span> LinkedList<Class<?>> l = new LinkedList<Class<?>>();<a name="line.634"></a> +<span class="sourceLineNo">635</span> findClasses(c, l, stopClass);<a name="line.635"></a> +<span class="sourceLineNo">636</span> return l;<a name="line.636"></a> <span class="sourceLineNo">637</span> }<a name="line.637"></a> <span class="sourceLineNo">638</span><a name="line.638"></a> -<span class="sourceLineNo">639</span> /**<a name="line.639"></a> -<span class="sourceLineNo">640</span> * Returns the metadata on all properties associated with this bean.<a name="line.640"></a> -<span class="sourceLineNo">641</span> *<a name="line.641"></a> -<span class="sourceLineNo">642</span> * @return Metadata on all properties associated with this bean.<a name="line.642"></a> -<span class="sourceLineNo">643</span> */<a name="line.643"></a> -<span class="sourceLineNo">644</span> public Collection<BeanPropertyMeta> getPropertyMetas() {<a name="line.644"></a> -<span class="sourceLineNo">645</span> return this.properties.values();<a name="line.645"></a> +<span class="sourceLineNo">639</span> private static void findClasses(Class<?> c, LinkedList<Class<?>> l, Class<?> stopClass) {<a name="line.639"></a> +<span class="sourceLineNo">640</span> while (c != null && stopClass != c) {<a name="line.640"></a> +<span class="sourceLineNo">641</span> l.addFirst(c);<a name="line.641"></a> +<span class="sourceLineNo">642</span> for (Class<?> ci : c.getInterfaces())<a name="line.642"></a> +<span class="sourceLineNo">643</span> findClasses(ci, l, stopClass);<a name="line.643"></a> +<span class="sourceLineNo">644</span> c = c.getSuperclass();<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> /**<a name="line.648"></a> -<span class="sourceLineNo">649</span> * Returns the metadata on the specified list of properties.<a name="line.649"></a> +<span class="sourceLineNo">649</span> * Returns the metadata on all properties associated with this bean.<a name="line.649"></a> <span class="sourceLineNo">650</span> *<a name="line.650"></a> -<span class="sourceLineNo">651</span> * @param pNames The list of properties to retrieve. If <jk>null</jk>, returns all properties.<a name="line.651"></a> -<span class="sourceLineNo">652</span> * @return The metadata on the specified list of properties.<a name="line.652"></a> -<span class="sourceLineNo">653</span> */<a name="line.653"></a> -<span class="sourceLineNo">654</span> public Collection<BeanPropertyMeta> getPropertyMetas(final String...pNames) {<a name="line.654"></a> -<span class="sourceLineNo">655</span> if (pNames == null)<a name="line.655"></a> -<span class="sourceLineNo">656</span> return getPropertyMetas();<a name="line.656"></a> -<span class="sourceLineNo">657</span> List<BeanPropertyMeta> l = new ArrayList<BeanPropertyMeta>(pNames.length);<a name="line.657"></a> -<span class="sourceLineNo">658</span> for (int i = 0; i < pNames.length; i++)<a name="line.658"></a> -<span class="sourceLineNo">659</span> l.add(getPropertyMeta(pNames[i]));<a name="line.659"></a> -<span class="sourceLineNo">660</span> return l;<a name="line.660"></a> -<span class="sourceLineNo">661</span> }<a name="line.661"></a> -<span class="sourceLineNo">662</span><a name="line.662"></a> -<span class="sourceLineNo">663</span> /**<a name="line.663"></a> -<span class="sourceLineNo">664</span> * Returns the language-specified extended metadata on this bean class.<a name="line.664"></a> -<span class="sourceLineNo">665</span> *<a name="line.665"></a> -<span class="sourceLineNo">666</span> * @param metaDataClass The name of the metadata class to create.<a name="line.666"></a> -<span class="sourceLineNo">667</span> * @return Extended metadata on this bean class. Never <jk>null</jk>.<a name="line.667"></a> -<span class="sourceLineNo">668</span> */<a name="line.668"></a> -<span class="sourceLineNo">669</span> public <M extends BeanMetaExtended> M getExtendedMeta(Class<M> metaDataClass) {<a name="line.669"></a> -<span class="sourceLineNo">670</span> return extMeta.get(metaDataClass, this);<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> * Returns metadata about the specified property.<a name="line.674"></a> -<span class="sourceLineNo">675</span> *<a name="line.675"></a> -<span class="sourceLineNo">676</span> * @param name The name of the property on this bean.<a name="line.676"></a> -<span class="sourceLineNo">677</span> * @return The metadata about the property, or <jk>null</jk> if no such property exists<a name="line.677"></a> -<span class="sourceLineNo">678</span> * on this bean.<a name="line.678"></a> -<span class="sourceLineNo">679</span> */<a name="line.679"></a> -<span class="sourceLineNo">680</span> public BeanPropertyMeta getPropertyMeta(String name) {<a name="line.680"></a> -<span class="sourceLineNo">681</span> BeanPropertyMeta bpm = properties.get(name);<a name="line.681"></a> -<span class="sourceLineNo">682</span> if (bpm == null)<a name="line.682"></a> -<span class="sourceLineNo">683</span> bpm = dynaProperty;<a name="line.683"></a> -<span class="sourceLineNo">684</span> return bpm;<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> * Creates a new instance of this bean.<a name="line.688"></a> -<span class="sourceLineNo">689</span> *<a name="line.689"></a> -<span class="sourceLineNo">690</span> * @param outer The outer object if bean class is a non-static inner member class.<a name="line.690"></a> -<span class="sourceLineNo">691</span> * @return A new instance of this bean if possible, or <jk>null</jk> if not.<a name="line.691"></a> -<span class="sourceLineNo">692</span> * @throws IllegalArgumentException Thrown by constructor.<a name="line.692"></a> -<span class="sourceLineNo">693</span> * @throws InstantiationException Thrown by constructor.<a name="line.693"></a> -<span class="sourceLineNo">694</span> * @throws IllegalAccessException Thrown by constructor.<a name="line.694"></a> -<span class="sourceLineNo">695</span> * @throws InvocationTargetException Thrown by constructor.<a name="line.695"></a> -<span class="sourceLineNo">696</span> */<a name="line.696"></a> -<span class="sourceLineNo">697</span> @SuppressWarnings("unchecked")<a name="line.697"></a> -<span class="sourceLineNo">698</span> protected T newBean(Object outer) throws IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException {<a name="line.698"></a> -<span class="sourceLineNo">699</span> if (classMeta.isMemberClass()) {<a name="line.699"></a> -<span class="sourceLineNo">700</span> if (constructor != null)<a name="line.700"></a> -<span class="sourceLineNo">701</span> return constructor.newInstance(outer);<a name="line.701"></a> -<span class="sourceLineNo">702</span> } else {<a name="line.702"></a> -<span class="sourceLineNo">703</span> if (constructor != null)<a name="line.703"></a> -<span class="sourceLineNo">704</span> return constructor.newInstance((Object[])null);<a name="line.704"></a> -<span class="sourceLineNo">705</span> InvocationHandler h = classMeta.getProxyInvocationHandler();<a name="line.705"></a> -<span class="sourceLineNo">706</span> if (h != null) {<a name="line.706"></a> -<span class="sourceLineNo">707</span> ClassLoader cl = classMeta.getBeanContext().classLoader;<a name="line.707"></a> -<span class="sourceLineNo">708</span> if (cl == null)<a name="line.708"></a> -<span class="sourceLineNo">709</span> cl = this.getClass().getClassLoader();<a name="line.709"></a> -<span class="sourceLineNo">710</span> return (T)Proxy.newProxyInstance(cl, new Class[] { classMeta.innerClass, java.io.Serializable.class }, h);<a name="line.710"></a> -<span class="sourceLineNo">711</span> }<a name="line.711"></a> -<span class="sourceLineNo">712</span> }<a name="line.712"></a> -<span class="sourceLineNo">713</span> return null;<a name="line.713"></a> -<span class="sourceLineNo">714</span> }<a name="line.714"></a> -<span cla
<TRUNCATED>
