http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
index e15a096..6012d78 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
@@ -137,915 +137,938 @@
 <span class="sourceLineNo">129</span>            rawTypeMeta = 
f.resolveClassMeta(p, field.getGenericType(), typeVarImpls);<a 
name="line.129"></a>
 <span class="sourceLineNo">130</span>            isUri |= (rawTypeMeta.isUri() 
|| field.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.130"></a>
 <span class="sourceLineNo">131</span>            if (p != null) {<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>               swap = 
getPropertyPojoSwap(p);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>               if (! 
p.properties().isEmpty())<a name="line.133"></a>
-<span class="sourceLineNo">134</span>                  properties = 
split(p.properties());<a name="line.134"></a>
-<span class="sourceLineNo">135</span>               
bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.135"></a>
-<span class="sourceLineNo">136</span>            }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>         }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>         if (getter != null) {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            if (rawTypeMeta == null)<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>               rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>            isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>            if (p != null) {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>               if (swap == null)<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>                  swap = 
getPropertyPojoSwap(p);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>               if (properties != null 
&amp;&amp; ! p.properties().isEmpty())<a name="line.147"></a>
-<span class="sourceLineNo">148</span>                  properties = 
split(p.properties());<a name="line.148"></a>
-<span class="sourceLineNo">149</span>               
bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.149"></a>
-<span class="sourceLineNo">150</span>            }<a name="line.150"></a>
-<span class="sourceLineNo">151</span>         }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>         if (setter != null) {<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>            if (rawTypeMeta == null)<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>               rawTypeMeta = 
f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>            isUri |= (rawTypeMeta.isUri() 
|| setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>            if (p != null) {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>               if (swap == null)<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>                  swap = 
getPropertyPojoSwap(p);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>               if (properties != null 
&amp;&amp; ! p.properties().isEmpty())<a name="line.161"></a>
-<span class="sourceLineNo">162</span>                  properties = 
split(p.properties());<a name="line.162"></a>
-<span class="sourceLineNo">163</span>               
bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.163"></a>
-<span class="sourceLineNo">164</span>            }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>         }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>         if (rawTypeMeta == null)<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>            return false;<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>         this.beanRegistry = new 
BeanRegistry(beanContext, parentBeanRegistry, bdClasses.toArray(new 
Class&lt;?&gt;[0]));<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>         isDyna = "*".equals(name);<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>         // Do some annotation 
validation.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>         Class&lt;?&gt; c = 
rawTypeMeta.getInnerClass();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>         if (getter != null) {<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>            if (isDyna) {<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>               if (! 
isParentClass(Map.class, c))<a name="line.178"></a>
-<span class="sourceLineNo">179</span>                  return false;<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>            } else {<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>               if (! 
isParentClass(getter.getReturnType(), c))<a name="line.181"></a>
-<span class="sourceLineNo">182</span>                  return false;<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>            }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>         }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>         if (setter != null) {<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>            Class&lt;?&gt;[] pt = 
setter.getParameterTypes();<a name="line.186"></a>
-<span class="sourceLineNo">187</span>            if (pt.length != (isDyna ? 2 
: 1))<a name="line.187"></a>
-<span class="sourceLineNo">188</span>               return false;<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>            if (isDyna) {<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>               if (! 
pt[0].equals(String.class))<a name="line.190"></a>
+<span class="sourceLineNo">132</span>               if (! 
p.properties().isEmpty())<a name="line.132"></a>
+<span class="sourceLineNo">133</span>                  properties = 
split(p.properties());<a name="line.133"></a>
+<span class="sourceLineNo">134</span>               
bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>            Swap s = 
field.getAnnotation(Swap.class);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>            if (s != null) {<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>               swap = 
getPropertyPojoSwap(s);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>         }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>         if (getter != null) {<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>            if (rawTypeMeta == null)<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>               rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>            isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>            if (p != null) {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>               if (properties != null 
&amp;&amp; ! p.properties().isEmpty())<a name="line.148"></a>
+<span class="sourceLineNo">149</span>                  properties = 
split(p.properties());<a name="line.149"></a>
+<span class="sourceLineNo">150</span>               
bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            Swap s = 
getter.getAnnotation(Swap.class);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>            if (s != null &amp;&amp; swap 
== null) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>               swap = 
getPropertyPojoSwap(s);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>            }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>         if (setter != null) {<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>            BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            if (rawTypeMeta == null)<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>               rawTypeMeta = 
f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>            isUri |= (rawTypeMeta.isUri() 
|| setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>            if (p != null) {<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>               if (swap == null)<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>                  swap = 
getPropertyPojoSwap(p);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>               if (properties != null 
&amp;&amp; ! p.properties().isEmpty())<a name="line.166"></a>
+<span class="sourceLineNo">167</span>                  properties = 
split(p.properties());<a name="line.167"></a>
+<span class="sourceLineNo">168</span>               
bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.168"></a>
+<span class="sourceLineNo">169</span>            }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            Swap s = 
setter.getAnnotation(Swap.class);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>            if (s != null &amp;&amp; swap 
== null) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>               swap = 
getPropertyPojoSwap(s);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>            }<a name="line.173"></a>
+<span class="sourceLineNo">174</span>         }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>         if (rawTypeMeta == null)<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>            return false;<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span>         this.beanRegistry = new 
BeanRegistry(beanContext, parentBeanRegistry, bdClasses.toArray(new 
Class&lt;?&gt;[0]));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>         isDyna = "*".equals(name);<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>         // Do some annotation 
validation.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>         Class&lt;?&gt; c = 
rawTypeMeta.getInnerClass();<a name="line.184"></a>
+<span class="sourceLineNo">185</span>         if (getter != null) {<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>            if (isDyna) {<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>               if (! 
isParentClass(Map.class, c))<a name="line.187"></a>
+<span class="sourceLineNo">188</span>                  return false;<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>            } else {<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>               if (! 
isParentClass(getter.getReturnType(), c))<a name="line.190"></a>
 <span class="sourceLineNo">191</span>                  return false;<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>            } else {<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>               if (! isParentClass(pt[0], 
c))<a name="line.193"></a>
-<span class="sourceLineNo">194</span>                  return false;<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>            }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>         }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>         if (field != null) {<a 
name="line.197"></a>
+<span class="sourceLineNo">192</span>            }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>         }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>         if (setter != null) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>            Class&lt;?&gt;[] pt = 
setter.getParameterTypes();<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            if (pt.length != (isDyna ? 2 
: 1))<a name="line.196"></a>
+<span class="sourceLineNo">197</span>               return false;<a 
name="line.197"></a>
 <span class="sourceLineNo">198</span>            if (isDyna) {<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>               if (! 
isParentClass(Map.class, field.getType()))<a name="line.199"></a>
+<span class="sourceLineNo">199</span>               if (! 
pt[0].equals(String.class))<a name="line.199"></a>
 <span class="sourceLineNo">200</span>                  return false;<a 
name="line.200"></a>
 <span class="sourceLineNo">201</span>            } else {<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>               if (! 
isParentClass(field.getType(), c))<a name="line.202"></a>
+<span class="sourceLineNo">202</span>               if (! isParentClass(pt[0], 
c))<a name="line.202"></a>
 <span class="sourceLineNo">203</span>                  return false;<a 
name="line.203"></a>
 <span class="sourceLineNo">204</span>            }<a name="line.204"></a>
 <span class="sourceLineNo">205</span>         }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>         if (isDyna)<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>            rawTypeMeta = 
rawTypeMeta.getValueType();<a name="line.208"></a>
-<span class="sourceLineNo">209</span>         if (rawTypeMeta == null)<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>            return false;<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>         if (typeMeta == null)<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>            typeMeta = (swap != null ? 
swap.getSwapClassMeta(beanContext) : rawTypeMeta == null ? beanContext.object() 
: rawTypeMeta.getSerializedClassMeta());<a name="line.213"></a>
-<span class="sourceLineNo">214</span>         if (typeMeta == null)<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>            typeMeta = rawTypeMeta;<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>         return true;<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>      }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>      /**<a name="line.220"></a>
-<span class="sourceLineNo">221</span>       * @return A new BeanPropertyMeta 
object using this builder.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>       */<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      public BeanPropertyMeta build() {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>         return new 
BeanPropertyMeta(this);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>      private static PojoSwap 
getPropertyPojoSwap(BeanProperty p) throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>         if (! p.format().isEmpty())<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>            return 
newInstance(PojoSwap.class, StringFormatSwap.class, p.format());<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>         Class&lt;?&gt; c = p.swap();<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>         if (c == Null.class)<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>            return null;<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>         if 
(isParentClass(PojoSwap.class, c))<a name="line.233"></a>
-<span class="sourceLineNo">234</span>            return 
newInstance(PojoSwap.class, c);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>         throw new RuntimeException("TODO 
- Surrogate swaps not yet supported.");<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span>      BeanPropertyMeta.Builder 
setGetter(Method getter) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>         setAccessible(getter);<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>         this.getter = getter;<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>         return this;<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>      }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>      BeanPropertyMeta.Builder 
setSetter(Method setter) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>         setAccessible(setter);<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>         this.setter = setter;<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span>         return this;<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>      }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>      BeanPropertyMeta.Builder 
setField(Field field) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>         setAccessible(field);<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>         this.field = field;<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>         return this;<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>      }<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>      BeanPropertyMeta.Builder 
setAsConstructorArg() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>         this.isConstructorArg = true;<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>         return this;<a 
name="line.258"></a>
+<span class="sourceLineNo">206</span>         if (field != null) {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>            if (isDyna) {<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>               if (! 
isParentClass(Map.class, field.getType()))<a name="line.208"></a>
+<span class="sourceLineNo">209</span>                  return false;<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>            } else {<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>               if (! 
isParentClass(field.getType(), c))<a name="line.211"></a>
+<span class="sourceLineNo">212</span>                  return false;<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>            }<a name="line.213"></a>
+<span class="sourceLineNo">214</span>         }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>         if (isDyna)<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>            rawTypeMeta = 
rawTypeMeta.getValueType();<a name="line.217"></a>
+<span class="sourceLineNo">218</span>         if (rawTypeMeta == null)<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>            return false;<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>         if (typeMeta == null)<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>            typeMeta = (swap != null ? 
beanContext.getClassMeta(swap.getSwapClass()) : rawTypeMeta == null ? 
beanContext.object() : rawTypeMeta);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>         if (typeMeta == null)<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>            typeMeta = rawTypeMeta;<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>         return true;<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>      /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>       * @return A new BeanPropertyMeta 
object using this builder.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>       */<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      public BeanPropertyMeta build() {<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>         return new 
BeanPropertyMeta(this);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span>      private static PojoSwap 
getPropertyPojoSwap(BeanProperty p) throws Exception {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>         if (! p.format().isEmpty())<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>            return 
newInstance(PojoSwap.class, StringFormatSwap.class, p.format());<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>         return null;<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>      }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>      private static PojoSwap 
getPropertyPojoSwap(Swap s) throws Exception {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>         Class&lt;?&gt; c = s.value();<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>         if (c == Null.class)<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>            c = s.impl();<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>         if (c == Null.class)<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>            return null;<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>         if 
(isParentClass(PojoSwap.class, c)) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>            PojoSwap ps = 
newInstance(PojoSwap.class, c);<a name="line.249"></a>
+<span class="sourceLineNo">250</span>            if (ps.forMediaTypes() != 
null)<a name="line.250"></a>
+<span class="sourceLineNo">251</span>               throw new 
RuntimeException("TODO - Media types on swaps not yet supported on bean 
properties.");<a name="line.251"></a>
+<span class="sourceLineNo">252</span>            if (ps.withTemplate() != 
null)<a name="line.252"></a>
+<span class="sourceLineNo">253</span>               throw new 
RuntimeException("TODO - Templates on swaps not yet supported on bean 
properties.");<a name="line.253"></a>
+<span class="sourceLineNo">254</span>            return ps;<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>         }<a name="line.255"></a>
+<span class="sourceLineNo">256</span>         if 
(isParentClass(Surrogate.class, c))<a name="line.256"></a>
+<span class="sourceLineNo">257</span>            throw new 
RuntimeException("TODO - Surrogate swaps not yet supported on bean 
properties.");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>         throw new 
FormattedRuntimeException("Invalid class used in @Swap annotation.  Must be a 
subclass of PojoSwap or Surrogate.", c);<a name="line.258"></a>
 <span class="sourceLineNo">259</span>      }<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>   }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>   /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    * Creates a new BeanPropertyMeta 
using the contents of the specified builder.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    *<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    * @param b The builder to copy fields 
from.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    */<a name="line.267"></a>
-<span class="sourceLineNo">268</span>   protected 
BeanPropertyMeta(BeanPropertyMeta.Builder b) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      this.field = b.field;<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>      this.getter = b.getter;<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>      this.setter = b.setter;<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>      this.isUri = b.isUri;<a 
name="line.272"></a>
-<span class="sourceLineNo">273</span>      this.beanMeta = b.beanMeta;<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>      this.beanContext = b.beanContext;<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>      this.name = b.name;<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      this.rawTypeMeta = b.rawTypeMeta;<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>      this.typeMeta = b.typeMeta;<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>      this.properties = b.properties;<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>      this.swap = b.swap;<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>      this.beanRegistry = 
b.beanRegistry;<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      this.overrideValue = 
b.overrideValue;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      this.delegateFor = b.delegateFor;<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>      this.extMeta = b.extMeta;<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>      this.isDyna = b.isDyna;<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>    * Returns the name of this bean 
property.<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    *<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    * @return The name of the bean 
property.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>   public String getName() {<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>      return name;<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>   /**<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    * Returns the bean meta that this 
property belongs to.<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    *<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    * @return The bean meta that this 
property belongs to.<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    */<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   @BeanIgnore<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   public BeanMeta&lt;?&gt; getBeanMeta() 
{<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      return beanMeta;<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>   }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>   /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    * Returns the getter method for this 
property.<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    *<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    * @return The getter method for this 
bean property, or &lt;jk&gt;null&lt;/jk&gt; if there is no getter method.<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>    */<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   public Method getGetter() {<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>      return getter;<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>   }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>   /**<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    * Returns the setter method for this 
property.<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    *<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    * @return The setter method for this 
bean property, or &lt;jk&gt;null&lt;/jk&gt; if there is no setter method.<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>    */<a name="line.319"></a>
-<span class="sourceLineNo">320</span>   public Method getSetter() {<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span>      return setter;<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span>   }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>   /**<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    * Returns the field for this 
property.<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    *<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    * @return The field for this bean 
property, or &lt;jk&gt;null&lt;/jk&gt; if there is no field associated with 
this bean property.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    */<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   public Field getField() {<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>      return field;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>   /**<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    * Returns the {@link ClassMeta} of 
the class of this property.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    *<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    * &lt;p&gt;<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    * If this property or the property 
type class has a {@link PojoSwap} associated with it, this method returns the<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>    * transformed class meta.<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>    * This matches the class type that is 
used by the {@link #get(BeanMap,String)} and<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    * {@link #set(BeanMap,String,Object)} 
methods.<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    *<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    * @return The {@link ClassMeta} of 
the class of this property.<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    */<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   public ClassMeta&lt;?&gt; 
getClassMeta() {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      return typeMeta;<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>   }<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>    * Returns the bean dictionary in use 
for this bean property.<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    *<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    * &lt;p&gt;<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    * The order of lookup for the 
dictionary is as follows:<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    * &lt;ol&gt;<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    *    &lt;li&gt;Dictionary defined via 
{@link BeanProperty#beanDictionary()}.<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    *    &lt;li&gt;Dictionary defined via 
{@link BeanContext#BEAN_beanDictionary} context property.<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    * &lt;/ol&gt;<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    *<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    * @return The bean dictionary in use 
for this bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    */<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   public BeanRegistry getBeanRegistry() 
{<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      return beanRegistry;<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>   /**<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is a URI.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    *<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    * &lt;p&gt;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    * A bean property can be considered a 
URI if any of the following are true:<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    * &lt;ul&gt;<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    *    &lt;li&gt;Property class type is 
{@link URL} or {@link URI}.<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    *    &lt;li&gt;Property class type is 
annotated with {@link org.apache.juneau.annotation.URI}.<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    *    &lt;li&gt;Property getter, 
setter, or field is annotated with {@link org.apache.juneau.annotation.URI}.<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>    * &lt;/ul&gt;<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    *<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is a URI.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>   public boolean isUri() {<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>      return isUri;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   }<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>   /**<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is named &lt;js&gt;"*"&lt;/js&gt;.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    *<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is named &lt;js&gt;"*"&lt;/js&gt;.<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    */<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   public boolean isDyna() {<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>      return isDyna;<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>    * Returns the override list of 
properties defined through a {@link BeanProperty#properties()} annotation<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>    * on this property.<a 
name="line.392"></a>
-<span class="sourceLineNo">393</span>    *<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    * @return The list of override 
properties, or &lt;jk&gt;null&lt;/jk&gt; if annotation not specified.<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>    */<a name="line.395"></a>
-<span class="sourceLineNo">396</span>   public String[] getProperties() {<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span>      return properties;<a 
name="line.397"></a>
-<span class="sourceLineNo">398</span>   }<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>    * Returns the language-specified 
extended metadata on this bean property.<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    *<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    * @param c The name of the metadata 
class to create.<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    * @return Extended metadata on this 
bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    */<a name="line.405"></a>
-<span class="sourceLineNo">406</span>   public &lt;M extends 
BeanPropertyMetaExtended&gt; M getExtendedMeta(Class&lt;M&gt; c) {<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>      if (delegateFor != null)<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>         return 
delegateFor.getExtendedMeta(c);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      return extMeta.get(c, this);<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>   }<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>   /**<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    * Equivalent to calling {@link 
BeanMap#get(Object)}, but is faster since it avoids looking up the property 
meta.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    *<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    * @param m The bean map to get the 
transformed value from.<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    * @param pName The property name.<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>    * @return The property value.<a 
name="line.417"></a>
+<span class="sourceLineNo">261</span>      BeanPropertyMeta.Builder 
setGetter(Method getter) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>         setAccessible(getter);<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>         this.getter = getter;<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>         return this;<a 
name="line.264"></a>
+<span class="sourceLineNo">265</span>      }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span>      BeanPropertyMeta.Builder 
setSetter(Method setter) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>         setAccessible(setter);<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>         this.setter = setter;<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>         return this;<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>      }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span>      BeanPropertyMeta.Builder 
setField(Field field) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>         setAccessible(field);<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>         this.field = field;<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>         return this;<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span>      BeanPropertyMeta.Builder 
setAsConstructorArg() {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>         this.isConstructorArg = true;<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>         return this;<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span>   }<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>    * Creates a new BeanPropertyMeta 
using the contents of the specified builder.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    *<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    * @param b The builder to copy fields 
from.<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    */<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   protected 
BeanPropertyMeta(BeanPropertyMeta.Builder b) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      this.field = b.field;<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>      this.getter = b.getter;<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>      this.setter = b.setter;<a 
name="line.294"></a>
+<span class="sourceLineNo">295</span>      this.isUri = b.isUri;<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>      this.beanMeta = b.beanMeta;<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      this.beanContext = b.beanContext;<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>      this.name = b.name;<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>      this.rawTypeMeta = b.rawTypeMeta;<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>      this.typeMeta = b.typeMeta;<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>      this.properties = b.properties;<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>      this.swap = b.swap;<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>      this.beanRegistry = 
b.beanRegistry;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      this.overrideValue = 
b.overrideValue;<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      this.delegateFor = b.delegateFor;<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>      this.extMeta = b.extMeta;<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>      this.isDyna = b.isDyna;<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>    * Returns the name of this bean 
property.<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    *<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    * @return The name of the bean 
property.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    */<a name="line.314"></a>
+<span class="sourceLineNo">315</span>   public String getName() {<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>      return name;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>   }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>   /**<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    * Returns the bean meta that this 
property belongs to.<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    *<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    * @return The bean meta that this 
property belongs to.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    */<a name="line.323"></a>
+<span class="sourceLineNo">324</span>   @BeanIgnore<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   public BeanMeta&lt;?&gt; getBeanMeta() 
{<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      return beanMeta;<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>   }<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>    * Returns the getter method for this 
property.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    *<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    * @return The getter method for this 
bean property, or &lt;jk&gt;null&lt;/jk&gt; if there is no getter method.<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>    */<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   public Method getGetter() {<a 
name="line.334"></a>
+<span class="sourceLineNo">335</span>      return getter;<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>   }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>   /**<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    * Returns the setter method for this 
property.<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    *<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    * @return The setter method for this 
bean property, or &lt;jk&gt;null&lt;/jk&gt; if there is no setter method.<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>    */<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   public Method getSetter() {<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>      return setter;<a 
name="line.344"></a>
+<span class="sourceLineNo">345</span>   }<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>   /**<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    * Returns the field for this 
property.<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    *<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    * @return The field for this bean 
property, or &lt;jk&gt;null&lt;/jk&gt; if there is no field associated with 
this bean property.<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    */<a name="line.351"></a>
+<span class="sourceLineNo">352</span>   public Field getField() {<a 
name="line.352"></a>
+<span class="sourceLineNo">353</span>      return field;<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>   /**<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    * Returns the {@link ClassMeta} of 
the class of this property.<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    *<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    * &lt;p&gt;<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    * If this property or the property 
type class has a {@link PojoSwap} associated with it, this method returns the<a 
name="line.360"></a>
+<span class="sourceLineNo">361</span>    * transformed class meta.<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>    * This matches the class type that is 
used by the {@link #get(BeanMap,String)} and<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    * {@link #set(BeanMap,String,Object)} 
methods.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    *<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    * @return The {@link ClassMeta} of 
the class of this property.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    */<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   public ClassMeta&lt;?&gt; 
getClassMeta() {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      return typeMeta;<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>   }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span>   /**<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    * Returns the bean dictionary in use 
for this bean property.<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    *<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    * &lt;p&gt;<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    * The order of lookup for the 
dictionary is as follows:<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    * &lt;ol&gt;<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    *    &lt;li&gt;Dictionary defined via 
{@link BeanProperty#beanDictionary()}.<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    *    &lt;li&gt;Dictionary defined via 
{@link BeanContext#BEAN_beanDictionary} context property.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    * &lt;/ol&gt;<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    *<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    * @return The bean dictionary in use 
for this bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    */<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   public BeanRegistry getBeanRegistry() 
{<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      return beanRegistry;<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>   }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>   /**<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is a URI.<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    *<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    * &lt;p&gt;<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    * A bean property can be considered a 
URI if any of the following are true:<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    * &lt;ul&gt;<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    *    &lt;li&gt;Property class type is 
{@link URL} or {@link URI}.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    *    &lt;li&gt;Property class type is 
annotated with {@link org.apache.juneau.annotation.URI}.<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    *    &lt;li&gt;Property getter, 
setter, or field is annotated with {@link org.apache.juneau.annotation.URI}.<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>    * &lt;/ul&gt;<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    *<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is a URI.<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    */<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   public boolean isUri() {<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>      return isUri;<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>   /**<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    * Returns &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is named &lt;js&gt;"*"&lt;/js&gt;.<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    *<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    * @return &lt;jk&gt;true&lt;/jk&gt; 
if this bean property is named &lt;js&gt;"*"&lt;/js&gt;.<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    */<a name="line.408"></a>
+<span class="sourceLineNo">409</span>   public boolean isDyna() {<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>      return isDyna;<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>   /**<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    * Returns the override list of 
properties defined through a {@link BeanProperty#properties()} annotation<a 
name="line.414"></a>
+<span class="sourceLineNo">415</span>    * on this property.<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>    *<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    * @return The list of override 
properties, or &lt;jk&gt;null&lt;/jk&gt; if annotation not specified.<a 
name="line.417"></a>
 <span class="sourceLineNo">418</span>    */<a name="line.418"></a>
-<span class="sourceLineNo">419</span>   public Object get(BeanMap&lt;?&gt; m, 
String pName) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>      try {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>         if (overrideValue != null)<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>            return overrideValue;<a 
name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>         // Read-only beans have their 
properties stored in a cache until getBean() is called.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>         Object bean = m.bean;<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>         if (bean == null)<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>            return 
m.propertyCache.get(name);<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span>         return 
toSerializedForm(m.getBeanSession(), getRaw(m, pName));<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span>      } catch (Throwable e) {<a 
name="line.431"></a>
-<span class="sourceLineNo">432</span>         if 
(beanContext.ignoreInvocationExceptionsOnGetters) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>            if 
(rawTypeMeta.isPrimitive())<a name="line.433"></a>
-<span class="sourceLineNo">434</span>               return 
rawTypeMeta.getPrimitiveDefault();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>            return null;<a 
name="line.435"></a>
-<span class="sourceLineNo">436</span>         }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>         throw new 
BeanRuntimeException(beanMeta.c, "Exception occurred while getting property 
''{0}''", name).initCause(e);<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>   /**<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    * Equivalent to calling {@link 
BeanMap#getRaw(Object)}, but is faster since it avoids looking up the property 
meta.<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    *<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    * @param m The bean map to get the 
transformed value from.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    * @param pName The property name.<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span>    * @return The raw property value.<a 
name="line.446"></a>
-<span class="sourceLineNo">447</span>    */<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   public Object getRaw(BeanMap&lt;?&gt; 
m, String pName) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      try {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>         // Read-only beans have their 
properties stored in a cache until getBean() is called.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>         Object bean = m.bean;<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>         if (bean == null)<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>            return 
m.propertyCache.get(name);<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span>         return invokeGetter(bean, 
pName);<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>      } catch (Throwable e) {<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>         if 
(beanContext.ignoreInvocationExceptionsOnGetters) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            if 
(rawTypeMeta.isPrimitive())<a name="line.459"></a>
-<span class="sourceLineNo">460</span>               return 
rawTypeMeta.getPrimitiveDefault();<a name="line.460"></a>
-<span class="sourceLineNo">461</span>            return null;<a 
name="line.461"></a>
-<span class="sourceLineNo">462</span>         }<a name="line.462"></a>
-<span class="sourceLineNo">463</span>         throw new 
BeanRuntimeException(beanMeta.c, "Exception occurred while getting property 
''{0}''", name).initCause(e);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      }<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>   /**<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    * Converts a raw bean property value 
to serialized form.<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    * Applies transforms and child 
property filters.<a name="line.469"></a>
+<span class="sourceLineNo">419</span>   public String[] getProperties() {<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>      return properties;<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>   }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span>   /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    * Returns the language-specified 
extended metadata on this bean property.<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    *<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    * @param c The name of the metadata 
class to create.<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    * @return Extended metadata on this 
bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    */<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   public &lt;M extends 
BeanPropertyMetaExtended&gt; M getExtendedMeta(Class&lt;M&gt; c) {<a 
name="line.429"></a>
+<span class="sourceLineNo">430</span>      if (delegateFor != null)<a 
name="line.430"></a>
+<span class="sourceLineNo">431</span>         return 
delegateFor.getExtendedMeta(c);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      return extMeta.get(c, this);<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>   /**<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    * Equivalent to calling {@link 
BeanMap#get(Object)}, but is faster since it avoids looking up the property 
meta.<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    *<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    * @param m The bean map to get the 
transformed value from.<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    * @param pName The property name.<a 
name="line.439"></a>
+<span class="sourceLineNo">440</span>    * @return The property value.<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span>    */<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   public Object get(BeanMap&lt;?&gt; m, 
String pName) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      try {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>         if (overrideValue != null)<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span>            return overrideValue;<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span>         // Read-only beans have their 
properties stored in a cache until getBean() is called.<a name="line.447"></a>
+<span class="sourceLineNo">448</span>         Object bean = m.bean;<a 
name="line.448"></a>
+<span class="sourceLineNo">449</span>         if (bean == null)<a 
name="line.449"></a>
+<span class="sourceLineNo">450</span>            return 
m.propertyCache.get(name);<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>         return 
toSerializedForm(m.getBeanSession(), getRaw(m, pName));<a name="line.452"></a>
+<span class="sourceLineNo">453</span><a name="line.453"></a>
+<span class="sourceLineNo">454</span>      } catch (Throwable e) {<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>         if 
(beanContext.ignoreInvocationExceptionsOnGetters) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>            if 
(rawTypeMeta.isPrimitive())<a name="line.456"></a>
+<span class="sourceLineNo">457</span>               return 
rawTypeMeta.getPrimitiveDefault();<a name="line.457"></a>
+<span class="sourceLineNo">458</span>            return null;<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>         }<a name="line.459"></a>
+<span class="sourceLineNo">460</span>         throw new 
BeanRuntimeException(beanMeta.c, "Exception occurred while getting property 
''{0}''", name).initCause(e);<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>   /**<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    * Equivalent to calling {@link 
BeanMap#getRaw(Object)}, but is faster since it avoids looking up the property 
meta.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    *<a name="line.466"></a>
+<span class="sourceLineNo">467</span>    * @param m The bean map to get the 
transformed value from.<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    * @param pName The property name.<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span>    * @return The raw property value.<a 
name="line.469"></a>
 <span class="sourceLineNo">470</span>    */<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   final Object 
toSerializedForm(BeanSession session, Object o) {<a name="line.471"></a>
+<span class="sourceLineNo">471</span>   public Object getRaw(BeanMap&lt;?&gt; 
m, String pName) {<a name="line.471"></a>
 <span class="sourceLineNo">472</span>      try {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>         o = transform(session, o);<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>         if (o == null)<a 
name="line.474"></a>
-<span class="sourceLineNo">475</span>            return null;<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>         if (properties != null) {<a 
name="line.476"></a>
-<span class="sourceLineNo">477</span>            if (rawTypeMeta.isArray()) 
{<a name="line.477"></a>
-<span class="sourceLineNo">478</span>               Object[] a = 
(Object[])o;<a name="line.478"></a>
-<span class="sourceLineNo">479</span>               List l = new 
DelegateList(rawTypeMeta);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>               ClassMeta childType = 
rawTypeMeta.getElementType();<a name="line.480"></a>
-<span class="sourceLineNo">481</span>               for (Object c : a)<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>                  
l.add(applyChildPropertiesFilter(session, childType, c));<a name="line.482"></a>
-<span class="sourceLineNo">483</span>               return l;<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>            } else if 
(rawTypeMeta.isCollection()) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>               Collection c = 
(Collection)o;<a name="line.485"></a>
-<span class="sourceLineNo">486</span>               List l = new 
ArrayList(c.size());<a name="line.486"></a>
-<span class="sourceLineNo">487</span>               ClassMeta childType = 
rawTypeMeta.getElementType();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>               for (Object cc : c)<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>                  
l.add(applyChildPropertiesFilter(session, childType, cc));<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>               return l;<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>            } else {<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>               return 
applyChildPropertiesFilter(session, rawTypeMeta, o);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>            }<a name="line.493"></a>
-<span class="sourceLineNo">494</span>         }<a name="line.494"></a>
-<span class="sourceLineNo">495</span>         return o;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      } catch (SerializeException e) {<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>         throw new 
BeanRuntimeException(e);<a name="line.497"></a>
-<span class="sourceLineNo">498</span>      }<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>    * Equivalent to calling {@link 
BeanMap#put(String, Object)}, but is faster since it avoids looking up the 
property<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    * meta.<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    *<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    * @param m The bean map to set the 
property value on.<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    * @param pName The property name.<a 
name="line.506"></a>
-<span class="sourceLineNo">507</span>    * @param value The value to set.<a 
name="line.507"></a>
-<span class="sourceLineNo">508</span>    * @return The previous property 
value.<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    * @throws BeanRuntimeException If 
property could not be set.<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    */<a name="line.510"></a>
-<span class="sourceLineNo">511</span>   public Object set(BeanMap&lt;?&gt; m, 
String pName, Object value) throws BeanRuntimeException {<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      try {<a name="line.512"></a>
-<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span>         BeanSession session = 
m.getBeanSession();<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>         // Convert to raw form.<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>         value = unswap(session, 
value);<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>         if (m.bean == null) {<a 
name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>            // Read-only beans get their 
properties stored in a cache.<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            if (m.propertyCache != 
null)<a name="line.522"></a>
-<span class="sourceLineNo">523</span>               return 
m.propertyCache.put(name, value);<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>            throw new 
BeanRuntimeException("Non-existent bean instance on bean.");<a 
name="line.525"></a>
-<span class="sourceLineNo">526</span>         }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span>         boolean isMap = 
rawTypeMeta.isMap();<a name="line.528"></a>
-<span class="sourceLineNo">529</span>         boolean isCollection = 
rawTypeMeta.isCollection();<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span>         if ((! isDyna) &amp;&amp; field 
== null &amp;&amp; setter == null &amp;&amp; ! (isMap || isCollection)) {<a 
name="line.531"></a>
-<span class="sourceLineNo">532</span>            if ((value == null &amp;&amp; 
beanContext.ignoreUnknownNullBeanProperties) || 
beanContext.ignorePropertiesWithoutSetters)<a name="line.532"></a>
-<span class="sourceLineNo">533</span>               return null;<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>            throw new 
BeanRuntimeException(beanMeta.c, "Setter or public field not defined on 
property ''{0}''", name);<a name="line.534"></a>
-<span class="sourceLineNo">535</span>         }<a name="line.535"></a>
+<span class="sourceLineNo">473</span>         // Read-only beans have their 
properties stored in a cache until getBean() is called.<a name="line.473"></a>
+<span class="sourceLineNo">474</span>         Object bean = m.bean;<a 
name="line.474"></a>
+<span class="sourceLineNo">475</span>         if (bean == null)<a 
name="line.475"></a>
+<span class="sourceLineNo">476</span>            return 
m.propertyCache.get(name);<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>         return invokeGetter(bean, 
pName);<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span>      } catch (Throwable e) {<a 
name="line.480"></a>
+<span class="sourceLineNo">481</span>         if 
(beanContext.ignoreInvocationExceptionsOnGetters) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span>            if 
(rawTypeMeta.isPrimitive())<a name="line.482"></a>
+<span class="sourceLineNo">483</span>               return 
rawTypeMeta.getPrimitiveDefault();<a name="line.483"></a>
+<span class="sourceLineNo">484</span>            return null;<a 
name="line.484"></a>
+<span class="sourceLineNo">485</span>         }<a name="line.485"></a>
+<span class="sourceLineNo">486</span>         throw new 
BeanRuntimeException(beanMeta.c, "Exception occurred while getting property 
''{0}''", name).initCause(e);<a name="line.486"></a>
+<span class="sourceLineNo">487</span>      }<a name="line.487"></a>
+<span class="sourceLineNo">488</span>   }<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>   /**<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    * Converts a raw bean property value 
to serialized form.<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    * Applies transforms and child 
property filters.<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    */<a name="line.493"></a>
+<span class="sourceLineNo">494</span>   final Object 
toSerializedForm(BeanSession session, Object o) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      try {<a name="line.495"></a>
+<span class="sourceLineNo">496</span>         o = transform(session, o);<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>         if (o == null)<a 
name="line.497"></a>
+<span class="sourceLineNo">498</span>            return null;<a 
name="line.498"></a>
+<span class="sourceLineNo">499</span>         if (properties != null) {<a 
name="line.499"></a>
+<span class="sourceLineNo">500</span>            if (rawTypeMeta.isArray()) 
{<a name="line.500"></a>
+<span class="sourceLineNo">501</span>               Object[] a = 
(Object[])o;<a name="line.501"></a>
+<span class="sourceLineNo">502</span>               List l = new 
DelegateList(rawTypeMeta);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>               ClassMeta childType = 
rawTypeMeta.getElementType();<a name="line.503"></a>
+<span class="sourceLineNo">504</span>               for (Object c : a)<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>                  
l.add(applyChildPropertiesFilter(session, childType, c));<a name="line.505"></a>
+<span class="sourceLineNo">506</span>               return l;<a 
name="line.506"></a>
+<span class="sourceLineNo">507</span>            } else if 
(rawTypeMeta.isCollection()) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>               Collection c = 
(Collection)o;<a name="line.508"></a>
+<span class="sourceLineNo">509</span>               List l = new 
ArrayList(c.size());<a name="line.509"></a>
+<span class="sourceLineNo">510</span>               ClassMeta childType = 
rawTypeMeta.getElementType();<a name="line.510"></a>
+<span class="sourceLineNo">511</span>               for (Object cc : c)<a 
name="line.511"></a>
+<span class="sourceLineNo">512</span>                  
l.add(applyChildPropertiesFilter(session, childType, cc));<a 
name="line.512"></a>
+<span class="sourceLineNo">513</span>               return l;<a 
name="line.513"></a>
+<span class="sourceLineNo">514</span>            } else {<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>               return 
applyChildPropertiesFilter(session, rawTypeMeta, o);<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>         return o;<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      } catch (SerializeException e) {<a 
name="line.519"></a>
+<span class="sourceLineNo">520</span>         throw new 
BeanRuntimeException(e);<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      }<a name="line.521"></a>
+<span class="sourceLineNo">522</span>   }<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span>   /**<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    * Equivalent to calling {@link 
BeanMap#put(String, Object)}, but is faster since it avoids looking up the 
property<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    * meta.<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    *<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    * @param m The bean map to set the 
property value on.<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    * @param pName The property name.<a 
name="line.529"></a>
+<span class="sourceLineNo">530</span>    * @param value The value to set.<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span>    * @return The previous property 
value.<a name="line.531"></a>
+<span class="sourceLineNo">532</span>    * @throws BeanRuntimeException If 
property could not be set.<a name="line.532"></a>
+<span class="sourceLineNo">533</span>    */<a name="line.533"></a>
+<span class="sourceLineNo">534</span>   public Object set(BeanMap&lt;?&gt; m, 
String pName, Object value) throws BeanRuntimeException {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      try {<a name="line.535"></a>
 <span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>         Object bean = m.getBean(true);  
// Don't use getBean() because it triggers array creation!<a 
name="line.537"></a>
+<span class="sourceLineNo">537</span>         BeanSession session = 
m.getBeanSession();<a name="line.537"></a>
 <span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span>         try {<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>            Object r = 
beanContext.beanMapPutReturnsOldValue || isMap || isCollection ? get(m, pName) 
: null;<a name="line.541"></a>
-<span class="sourceLineNo">542</span>            Class&lt;?&gt; propertyClass 
= rawTypeMeta.getInnerClass();<a name="line.542"></a>
+<span class="sourceLineNo">539</span>         // Convert to raw form.<a 
name="line.539"></a>
+<span class="sourceLineNo">540</span>         value = unswap(session, 
value);<a name="line.540"></a>
+<span class="sourceLineNo">541</span><a name="line.541"></a>
+<span class="sourceLineNo">542</span>         if (m.bean == null) {<a 
name="line.542"></a>
 <span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span>            if (value == null &amp;&amp; 
(isMap || isCollection)) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>               invokeSetter(bean, pName, 
null);<a name="line.545"></a>
-<span class="sourceLineNo">546</span>               return r;<a 
name="line.546"></a>
-<span class="sourceLineNo">547</span>            }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span>            if (isMap) {<a 
name="line.549"></a>
+<span class="sourceLineNo">544</span>            // Read-only beans get their 
properties stored in a cache.<a name="line.544"></a>
+<span class="sourceLineNo">545</span>            if (m.propertyCache != 
null)<a name="line.545"></a>
+<span class="sourceLineNo">546</span>               return 
m.propertyCache.put(name, value);<a name="line.546"></a>
+<span class="sourceLineNo">547</span><a name="line.547"></a>
+<span class="sourceLineNo">548</span>            throw new 
BeanRuntimeException("Non-existent bean instance on bean.");<a 
name="line.548"></a>
+<span class="sourceLineNo">549</span>         }<a name="line.549"></a>
 <span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span>               if (! (value instanceof 
Map)) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span>                  if (value instanceof 
CharSequence)<a name="line.552"></a>
-<span class="sourceLineNo">553</span>                     value = new 
ObjectMap((CharSequence)value).setBeanSession(session);<a name="line.553"></a>
-<span class="sourceLineNo">554</span>                  else<a 
name="line.554"></a>
-<span class="sourceLineNo">555</span>                     throw new 
BeanRuntimeException(beanMeta.c, "Cannot set property ''{0}'' of type ''{1}'' 
to object of type ''{2}''", name, propertyClass.getName(), 
findClassName(value));<a name="line.555"></a>
-<span class="sourceLineNo">556</span>               }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>               Map valueMap = 
(Map)value;<a name="line.558"></a>
-<span class="sourceLineNo">559</span>               Map propMap = (Map)r;<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>               ClassMeta&lt;?&gt; 
valueType = rawTypeMeta.getValueType();<a name="line.560"></a>
+<span class="sourceLineNo">551</span>         boolean isMap = 
rawTypeMeta.isMap();<a name="line.551"></a>
+<span class="sourceLineNo">552</span>         boolean isCollection = 
rawTypeMeta.isCollection();<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span>         if ((! isDyna) &amp;&amp; field 
== null &amp;&amp; setter == null &amp;&amp; ! (isMap || isCollection)) {<a 
name="line.554"></a>
+<span class="sourceLineNo">555</span>            if ((value == null &amp;&amp; 
beanContext.ignoreUnknownNullBeanProperties) || 
beanContext.ignorePropertiesWithoutSetters)<a name="line.555"></a>
+<span class="sourceLineNo">556</span>               return null;<a 
name="line.556"></a>
+<span class="sourceLineNo">557</span>            throw new 
BeanRuntimeException(beanMeta.c, "Setter or public field not defined on 
property ''{0}''", name);<a name="line.557"></a>
+<span class="sourceLineNo">558</span>         }<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span>         Object bean = m.getBean(true);  
// Don't use getBean() because it triggers array creation!<a 
name="line.560"></a>
 <span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span>               // If the property type is 
abstract, then we either need to reuse the existing<a name="line.562"></a>
-<span class="sourceLineNo">563</span>               // map (if it's not null), 
or try to assign the value directly.<a name="line.563"></a>
-<span class="sourceLineNo">564</span>               if (! 
rawTypeMeta.canCreateNewInstance()) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>                  if (propMap == null) 
{<a name="line.565"></a>
-<span class="sourceLineNo">566</span>                     if (setter == null 
&amp;&amp; field == null)<a name="line.566"></a>
-<span class="sourceLineNo">567</span>                        throw new 
BeanRuntimeException(beanMeta.c, "Cannot set property ''{0}'' of type ''{1}'' 
to object of type ''{2}'' because no setter or public field is defined, and the 
current value is null", name, propertyClass.getName(), findClassName(value));<a 
name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span>                     if 
(propertyClass.isInstance(valueMap)) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>                        if (! 
valueType.isObject()) {<a name="line.570"></a>
-<span class="sourceLineNo">571</span>                           for (Map.Entry 
e : (Set&lt;Map.Entry&gt;)valueMap.entrySet()) {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>                              Object v = 
e.getValue();<a name="line.572"></a>
-<span class="sourceLineNo">573</span>                              if (v != 
null &amp;&amp; ! valueType.getInnerClass().isInstance(v))<a 
name="line.573"></a>
-<span class="sourceLineNo">574</span>                                 throw 
new BeanRuntimeException(beanMeta.c, "Cannot set property ''{0}'' of type 
''{1}'' to object of type ''{2}'' because the value types in the assigned map 
do not match the specified ''elementClass'' attribute on the property, and the 
property value is currently null", name, propertyClass.getName(), 
findClassName(value));<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>                        
invokeSetter(bean, pName, valueMap);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>                        return r;<a 
name="line.578"></a>
-<span class="sourceLineNo">579</span>                     }<a 
name="line.579"></a>
-<span class="sourceLineNo">580</span>                     throw new 
BeanRuntimeException(beanMeta.c, "Cannot set property ''{0}'' of type ''{2}'' 
to object of type ''{2}'' because the assigned map cannot be converted to the 
specified type because the property type is abstract, and the property value is 
currently null", name, propertyClass.getName(), findClassName(value));<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>                  }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>               } else {<a 
name="line.582"></a>
-<span class="sourceLineNo">583</span>                  if (propMap == null) 
{<a name="line.583"></a>
-<span class="sourceLineNo">584</span>                     propMap = 
newInstance(Map.class, propertyClass);<a name="line.584"></a>
-<span class="sourceLineNo">585</span>                  } else {<a 
name="line.585"></a>
-<span class="sourceLineNo">586</span>                     propMap.clear();<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span>                  }<a name="line.587"></a>
-<span class="sourceLineNo">588</span>               }<a name="line.588"></a>
-<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span>               // Set the values.<a 
name="line.590"></a>
-<span class="sourceLineNo">591</span>               for (Map.Entry e : 
(Set&lt;Map.Entry&gt;)valueMap.entrySet()) {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>                  Object k = 
e.getKey();<a name="line.592"></a>
-<span class="sourceLineNo">593</span>                  Object v = 
e.getValue();<a name="line.593"></a>
-<span class="sourceLineNo">594</span>                  if (! 
valueType.isObject())<a name="line.594"></a>
-<span class="sourceLineNo">595</span>                     v = 
session.convertToType(v, valueType);<a name="line.595"></a>
-<span class="sourceLineNo">596</span>                  propMap.put(k, v);<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>               }<a name="line.597"></a>
-<span class="sourceLineNo">598</span>               if (setter != null || 
field != null)<a name="line.598"></a>
-<span class="sourceLineNo">599</span>                  invokeSetter(bean, 
pName, propMap);<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span>            } else if (isCollection) {<a 
name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>               if (! (value instanceof 
Collection)) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>                  if (value instanceof 
CharSequence)<a name="line.604"></a>
-<span class="sourceLineNo">605</span>                     value = new 
ObjectList((CharSequence)value).setBeanSession(session);<a name="line.605"></a>
-<span class="sourceLineNo">606</span>                  else<a 
name="line.606"></a>
-<span class="sourceLineNo">607</span>                     throw new 
BeanRuntimeException(beanMeta.c, "Cannot set property ''{0}'' of type ''{1}'' 
to object of type ''{2}''", name, propertyClass.getName(), 
findClassName(value));<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>               Collection valueList = 
(Collection)value;<a name="line.610"></a>
-<span class="sourceLineNo">611</span>               Collection propList = 
(Collection)r;<a name="line.611"></a>
-<span class="sourceLineNo">612</span>                  ClassMeta elementType = 
rawTypeMeta.getElementType();<a name="line.612"></a>
-<span class="sourceLineNo">613</span><a name="line.613"></a>
-<span class="sourceLineNo">614</span>               // If the property type is 
abstract, then we either need to reuse the existing<a name="line.614"></a>
-<span class="sourceLineNo">615</span>               // collection (if it's not 
null), or try to assign the value directly.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>               if (! 
rawTypeMeta.canCreateNewInstance()) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>                  if (propList == null) 
{<a name="line.617"></a>
-<span class="sourceLineNo">618</span>                     if (setter == null 
&amp;&amp; field == null)<a name="line.618"></a>
-<span class="sourceLineNo">619</span>                   

<TRUNCATED>

Reply via email to