You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/02/10 16:02:02 UTC

[02/16] incubator-juneau-website git commit: Update docs and about page.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/7170135e/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 1ca5859..583ddea 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
@@ -50,862 +50,904 @@
 <span class="sourceLineNo">042</span>@SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.42"></a>
 <span class="sourceLineNo">043</span>public class BeanPropertyMeta {<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   private Field field;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   private Method getter, setter;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   private boolean isConstructorArg, isUri;<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>   private final BeanMeta&lt;?&gt; beanMeta;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   private final BeanContext beanContext;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>   private String name;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   private ClassMeta&lt;?&gt;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      rawTypeMeta,                           // The real class type of the bean property.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      typeMeta;                              // The transformed class type of the bean property.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   private String[] properties;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   private PojoSwap swap;                     // PojoSwap defined only via @BeanProperty annotation.<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>   private MetadataMap extMeta = new MetadataMap();  // Extended metadata<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   BeanRegistry beanRegistry;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>   /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    * Constructor.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    *<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    * @param beanMeta The metadata of the bean containing this property.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    * @param name This property name.<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   protected BeanPropertyMeta(BeanMeta&lt;?&gt; beanMeta, String name) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      this.beanMeta = beanMeta;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      this.beanContext = beanMeta.ctx;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      this.name = name;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>   BeanPropertyMeta(BeanMeta&lt;?&gt; beanMeta, String name, ClassMeta&lt;?&gt; rawTypeMeta, BeanRegistry beanRegistry) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      this(beanMeta, name);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      this.rawTypeMeta = rawTypeMeta;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      this.beanRegistry = beanRegistry;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>   BeanPropertyMeta(BeanMeta&lt;?&gt; beanMeta, String name, Method getter, Method setter) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      this(beanMeta, name);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      setGetter(getter);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      setSetter(setter);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>   /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    * Returns the name of this bean property.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    *<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    * @return The name of the bean property.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   public String getName() {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      return name;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>   /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    * Returns the bean meta that this property belongs to.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    *<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    * @return The bean meta that this property belongs to.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    */<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   @BeanIgnore<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   public BeanMeta&lt;?&gt; getBeanMeta() {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      return beanMeta;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>   /**<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    * Returns the getter method for this property.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    *<a name="line.107"></a>
-<span class="sourceLineNo">108</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.108"></a>
-<span class="sourceLineNo">109</span>    */<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   public Method getGetter() {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      return getter;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   }<a name="line.112"></a>
+<span class="sourceLineNo">045</span>   final BeanMeta&lt;?&gt; beanMeta;                               // The bean that this property belongs to.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>   private final BeanContext beanContext;                    // The context that created this meta.<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>   private final String name;                                // The name of the property.<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   private final Field field;                                // The bean property field (if it has one).<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   private final Method getter, setter;                      // The bean property getter and setter.<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   private final boolean isUri;                              // True if this is a URL/URI or annotated with @URI.<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>   private final ClassMeta&lt;?&gt;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      rawTypeMeta,                                           // The real class type of the bean property.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      typeMeta;                                              // The transformed class type of the bean property.<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>   private final String[] properties;                        // The value of the @BeanProperty(properties) annotation.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   private final PojoSwap swap;                              // PojoSwap defined only via @BeanProperty annotation.<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>   private final MetadataMap extMeta = new MetadataMap();    // Extended metadata<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   private final BeanRegistry beanRegistry;<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>   private final Object overrideValue;                       // The bean property value (if it's an overridden delegate).<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   private final BeanPropertyMeta delegateFor;               // The bean property that this meta is a delegate for.<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>   /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    * BeanPropertyMeta builder class.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   public static class Builder {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      private BeanMeta&lt;?&gt; beanMeta;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      private BeanContext beanContext;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      String name;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      Field field;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      Method getter, setter;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      private boolean isConstructorArg, isUri;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      private ClassMeta&lt;?&gt; rawTypeMeta, typeMeta;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      private String[] properties;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      private PojoSwap swap;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      private BeanRegistry beanRegistry;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      private Object overrideValue;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      private BeanPropertyMeta delegateFor;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>      Builder(BeanMeta&lt;?&gt; beanMeta, String name) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         this.beanMeta = beanMeta;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>         this.beanContext = beanMeta.ctx;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>         this.name = name;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>      Builder(BeanMeta&lt;?&gt; beanMeta, String name, ClassMeta&lt;?&gt; rawTypeMeta, BeanRegistry beanRegistry) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>         this(beanMeta, name);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>         this.rawTypeMeta = rawTypeMeta;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         if (rawTypeMeta == null)<a name="line.92"></a>
+<span class="sourceLineNo">093</span>            throw new RuntimeException("xxx");<a name="line.93"></a>
+<span class="sourceLineNo">094</span>         this.typeMeta = rawTypeMeta;<a name="line.94"></a>
+<span class="sourceLineNo">095</span>         this.beanRegistry = beanRegistry;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>      /**<a name="line.98"></a>
+<span class="sourceLineNo">099</span>       * BeanPropertyMeta builder for delegate classes.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>       *<a name="line.100"></a>
+<span class="sourceLineNo">101</span>       * @param beanMeta The Bean that this property belongs to.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>       * @param name The property name.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>       * @param overrideValue The overridden value of this bean property.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>       * @param delegateFor The original bean property that this one is overriding.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>       */<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      public Builder(BeanMeta&lt;?&gt; beanMeta, String name, Object overrideValue, BeanPropertyMeta delegateFor) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         this(beanMeta, name);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>         this.delegateFor = delegateFor;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>         this.overrideValue = overrideValue;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>      boolean validate(BeanContext f, BeanRegistry parentBeanRegistry, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) throws Exception {<a name="line.112"></a>
 <span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>   /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    * Returns the setter method for this property.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    *<a name="line.116"></a>
-<span class="sourceLineNo">117</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.117"></a>
-<span class="sourceLineNo">118</span>    */<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   public Method getSetter() {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return setter;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>   /**<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    * Returns the field for this property.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    *<a name="line.125"></a>
-<span class="sourceLineNo">126</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.126"></a>
-<span class="sourceLineNo">127</span>    */<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   public Field getField() {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      return field;<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>   /**<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    * Returns the {@link ClassMeta} of the class of this property.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    * &lt;p&gt;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    * If this property or the property type class has a {@link PojoSwap} associated with it, this<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    *    method returns the transformed class meta.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * This matches the class type that is used by the {@link #get(BeanMap)} and {@link #set(BeanMap, Object)} methods.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    *<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * @return The {@link ClassMeta} of the class of this property.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    */<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   public ClassMeta&lt;?&gt; getClassMeta() {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      if (typeMeta == null)<a name="line.142"></a>
-<span class="sourceLineNo">143</span>         typeMeta = (swap != null ? swap.getSwapClassMeta(beanContext) : rawTypeMeta == null ? beanContext.object() : rawTypeMeta.getSerializedClassMeta());<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      return typeMeta;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>   /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * Returns the bean dictionary in use for this bean property.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    * The order of lookup for the dictionary is as follows:<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * &lt;ol&gt;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    *    &lt;li&gt;Dictionary defined via {@link BeanProperty#beanDictionary()}.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    *    &lt;li&gt;Dictionary defined via {@link BeanContext#BEAN_beanDictionary} context property.<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    * &lt;/ol&gt;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    * @return The bean dictionary in use for this bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   public BeanRegistry getBeanRegistry() {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return beanRegistry;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>   /**<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * Sets the getter method for this property.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    *<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * @param getter The getter method to associate with this property.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    * @return This object (for method chaining).<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   BeanPropertyMeta setGetter(Method getter) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      setAccessible(getter);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      this.getter = getter;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      return this;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>   /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    * Sets the setter method for this property.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    *<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    * @param setter The setter method to associate with this property.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    * @return This object (for method chaining).<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    */<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   BeanPropertyMeta setSetter(Method setter) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      setAccessible(setter);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      this.setter = setter;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return this;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   }<a name="line.182"></a>
+<span class="sourceLineNo">114</span>         List&lt;Class&lt;?&gt;&gt; bdClasses = new ArrayList&lt;Class&lt;?&gt;&gt;();<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>         if (field == null &amp;&amp; getter == null)<a name="line.116"></a>
+<span class="sourceLineNo">117</span>            return false;<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>         if (field == null &amp;&amp; setter == null &amp;&amp; f.beansRequireSettersForGetters &amp;&amp; ! isConstructorArg)<a name="line.119"></a>
+<span class="sourceLineNo">120</span>            return false;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>         if (field != null) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>            BeanProperty p = field.getAnnotation(BeanProperty.class);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>            rawTypeMeta = f.resolveClassMeta(p, field.getGenericType(), typeVarImpls);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>            isUri |= (rawTypeMeta.isUri() || field.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a name="line.125"></a>
+<span class="sourceLineNo">126</span>            if (p != null) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>               swap = getPropertyPojoSwap(p);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>               if (! p.properties().isEmpty())<a name="line.128"></a>
+<span class="sourceLineNo">129</span>                  properties = StringUtils.split(p.properties(), ',');<a name="line.129"></a>
+<span class="sourceLineNo">130</span>               bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.130"></a>
+<span class="sourceLineNo">131</span>            }<a name="line.131"></a>
+<span class="sourceLineNo">132</span>         }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>         if (getter != null) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            BeanProperty p = getter.getAnnotation(BeanProperty.class);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>            if (rawTypeMeta == null)<a name="line.136"></a>
+<span class="sourceLineNo">137</span>               rawTypeMeta = f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            isUri |= (rawTypeMeta.isUri() || getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            if (p != null) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>               if (swap == null)<a name="line.140"></a>
+<span class="sourceLineNo">141</span>                  swap = getPropertyPojoSwap(p);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>               if (properties != null &amp;&amp; ! p.properties().isEmpty())<a name="line.142"></a>
+<span class="sourceLineNo">143</span>                  properties = StringUtils.split(p.properties(), ',');<a name="line.143"></a>
+<span class="sourceLineNo">144</span>               bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.144"></a>
+<span class="sourceLineNo">145</span>            }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>         }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>         if (setter != null) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>            BeanProperty p = setter.getAnnotation(BeanProperty.class);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            if (rawTypeMeta == null)<a name="line.150"></a>
+<span class="sourceLineNo">151</span>               rawTypeMeta = f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            isUri |= (rawTypeMeta.isUri() || setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a name="line.152"></a>
+<span class="sourceLineNo">153</span>            if (p != null) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>            if (swap == null)<a name="line.154"></a>
+<span class="sourceLineNo">155</span>               swap = getPropertyPojoSwap(p);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>               if (properties != null &amp;&amp; ! p.properties().isEmpty())<a name="line.156"></a>
+<span class="sourceLineNo">157</span>                  properties = StringUtils.split(p.properties(), ',');<a name="line.157"></a>
+<span class="sourceLineNo">158</span>               bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.158"></a>
+<span class="sourceLineNo">159</span>            }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>         }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>         if (rawTypeMeta == null)<a name="line.162"></a>
+<span class="sourceLineNo">163</span>            return false;<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>         this.beanRegistry = new BeanRegistry(beanContext, parentBeanRegistry, bdClasses.toArray(new Class&lt;?&gt;[0]));<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>         // Do some annotation validation.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>         Class&lt;?&gt; c = rawTypeMeta.getInnerClass();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         if (getter != null &amp;&amp; ! isParentClass(getter.getReturnType(), c))<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            return false;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>         if (setter != null &amp;&amp; ! isParentClass(setter.getParameterTypes()[0], c))<a name="line.171"></a>
+<span class="sourceLineNo">172</span>            return false;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>         if (field != null &amp;&amp; ! isParentClass(field.getType(), c))<a name="line.173"></a>
+<span class="sourceLineNo">174</span>            return false;<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>         if (typeMeta == null)<a name="line.176"></a>
+<span class="sourceLineNo">177</span>            typeMeta = (swap != null ? swap.getSwapClassMeta(beanContext) : rawTypeMeta == null ? beanContext.object() : rawTypeMeta.getSerializedClassMeta());<a name="line.177"></a>
+<span class="sourceLineNo">178</span>         if (typeMeta == null)<a name="line.178"></a>
+<span class="sourceLineNo">179</span>            typeMeta = rawTypeMeta;<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>         return true;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<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>    * Sets the field for this property.<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    *<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    * @param field The field to associate with this property.<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    * @return This object (for method chaining).<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    */<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   BeanPropertyMeta setField(Field field) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      setAccessible(field);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      this.field = field;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return this;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   }<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>    * Marks this property as only settable through a constructor arg.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    * @return This object (for method chaining).<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   BeanPropertyMeta setAsConstructorArg() {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      this.isConstructorArg = true;<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      return this;<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>    * Returns &lt;jk&gt;true&lt;/jk&gt; if this bean property is a URI.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    * &lt;p&gt;<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    * A bean property can be considered a URI if any of the following are true:<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    * &lt;ul class='spaced-list'&gt;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    *    &lt;li&gt;Property class type is {@link URL} or {@link URI}.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    *    &lt;li&gt;Property class type is annotated with {@link org.apache.juneau.annotation.URI}.<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    *    &lt;li&gt;Property getter, setter, or field is annotated with {@link org.apache.juneau.annotation.URI}.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    * &lt;/ul&gt;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    *<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if this bean property is a URI.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    */<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   public boolean isUri() {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      return isUri;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>   /**<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    * Returns the override list of properties defined through a {@link BeanProperty#properties()} annotation<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    *  on this property.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    *<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    * @return The list of override properties, or &lt;jk&gt;null&lt;/jk&gt; if annotation not specified.<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   public String[] getProperties() {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      return properties;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>   /**<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    * Returns the language-specified extended metadata on this bean property.<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    *<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    * @param c The name of the metadata class to create.<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    * @return Extended metadata on this bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   public &lt;M extends BeanPropertyMetaExtended&gt; M getExtendedMeta(Class&lt;M&gt; c) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return extMeta.get(c, this);<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>   boolean validate(BeanContext f, BeanRegistry parentBeanRegistry, Map&lt;Class&lt;?&gt;,Class&lt;?&gt;[]&gt; typeVarImpls) throws Exception {<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>      List&lt;Class&lt;?&gt;&gt; bdClasses = new ArrayList&lt;Class&lt;?&gt;&gt;();<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span>      if (field == null &amp;&amp; getter == null)<a name="line.246"></a>
-<span class="sourceLineNo">247</span>         return false;<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>      if (field == null &amp;&amp; setter == null &amp;&amp; f.beansRequireSettersForGetters &amp;&amp; ! isConstructorArg)<a name="line.249"></a>
-<span class="sourceLineNo">250</span>         return false;<a name="line.250"></a>
+<span class="sourceLineNo">184</span>      /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span>       * @return A new BeanPropertyMeta object using this builder.<a name="line.185"></a>
+<span class="sourceLineNo">186</span>       */<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      public BeanPropertyMeta build() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>         return new BeanPropertyMeta(this);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>      private PojoSwap getPropertyPojoSwap(BeanProperty p) throws Exception {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>         Class&lt;?&gt; c = p.swap();<a name="line.192"></a>
+<span class="sourceLineNo">193</span>         if (c == Null.class)<a name="line.193"></a>
+<span class="sourceLineNo">194</span>            return null;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>         try {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            if (ClassUtils.isParentClass(PojoSwap.class, c)) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>               return (PojoSwap)c.newInstance();<a name="line.197"></a>
+<span class="sourceLineNo">198</span>            }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>            throw new RuntimeException("TODO - Surrogate swaps not yet supported.");<a name="line.199"></a>
+<span class="sourceLineNo">200</span>         } catch (Exception e) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>            throw new BeanRuntimeException(this.beanMeta.c, "Could not instantiate PojoSwap ''{0}'' for bean property ''{1}''", c.getName(), this.name).initCause(e);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>         }<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>      BeanPropertyMeta.Builder setGetter(Method getter) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>         setAccessible(getter);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>         this.getter = getter;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>         return this;<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>      BeanPropertyMeta.Builder setSetter(Method setter) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>         setAccessible(setter);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>         this.setter = setter;<a name="line.213"></a>
+<span class="sourceLineNo">214</span>         return this;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>      BeanPropertyMeta.Builder setField(Field field) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>         setAccessible(field);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>         this.field = field;<a name="line.219"></a>
+<span class="sourceLineNo">220</span>         return this;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>      BeanPropertyMeta.Builder setAsConstructorArg() {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>         this.isConstructorArg = true;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>         return this;<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      }<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>   /**<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * Creates a new BeanPropertyMeta using the contents of the specified builder.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    *<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    * @param b The builder to copy fields from.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    */<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   protected BeanPropertyMeta(BeanPropertyMeta.Builder b) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      this.field = b.field;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      this.getter = b.getter;<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      this.setter = b.setter;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      this.isUri = b.isUri;<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      this.beanMeta = b.beanMeta;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      this.beanContext = b.beanContext;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      this.name = b.name;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      this.rawTypeMeta = b.rawTypeMeta;<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      this.typeMeta = b.typeMeta;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      this.properties = b.properties;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      this.swap = b.swap;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      this.beanRegistry = b.beanRegistry;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      this.overrideValue = b.overrideValue;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      this.delegateFor = b.delegateFor;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   }<a name="line.250"></a>
 <span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>      if (field != null) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>         BeanProperty p = field.getAnnotation(BeanProperty.class);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>         rawTypeMeta = f.resolveClassMeta(p, field.getGenericType(), typeVarImpls);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>         isUri |= (rawTypeMeta.isUri() || field.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a name="line.255"></a>
-<span class="sourceLineNo">256</span>         if (p != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>            swap = getPropertyPojoSwap(p);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>            if (! p.properties().isEmpty())<a name="line.258"></a>
-<span class="sourceLineNo">259</span>               properties = StringUtils.split(p.properties(), ',');<a name="line.259"></a>
-<span class="sourceLineNo">260</span>            bdClasses.addAll(Arrays.asList(p.beanDictionary()));<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>      if (getter != null) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span>         BeanProperty p = getter.getAnnotation(BeanProperty.class);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>         if (rawTypeMeta == null)<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            rawTypeMeta = f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>         isUri |= (rawTypeMeta.isUri() || getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a name="line.268"></a>
-<span class="sourceLineNo">269</span>         if (p != null) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>            if (swap == null)<a name="line.270"></a>
-<span class="sourceLineNo">271</span>               swap = getPropertyPojoSwap(p);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>            if (properties != null &amp;&amp; ! p.properties().isEmpty())<a name="line.272"></a>
-<span class="sourceLineNo">273</span>               properties = StringUtils.split(p.properties(), ',');<a name="line.273"></a>
-<span class="sourceLineNo">274</span>            bdClasses.addAll(Arrays.asList(p.beanDictionary()));<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><a name="line.277"></a>
-<span class="sourceLineNo">278</span>      if (setter != null) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>         BeanProperty p = setter.getAnnotation(BeanProperty.class);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>         if (rawTypeMeta == null)<a name="line.280"></a>
-<span class="sourceLineNo">281</span>            rawTypeMeta = f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);<a name="line.281"></a>
-<span class="sourceLineNo">282</span>         isUri |= (rawTypeMeta.isUri() || setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>         if (p != null) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>         if (swap == null)<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            swap = getPropertyPojoSwap(p);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            if (properties != null &amp;&amp; ! p.properties().isEmpty())<a name="line.286"></a>
-<span class="sourceLineNo">287</span>               properties = StringUtils.split(p.properties(), ',');<a name="line.287"></a>
-<span class="sourceLineNo">288</span>            bdClasses.addAll(Arrays.asList(p.beanDictionary()));<a name="line.288"></a>
-<span class="sourceLineNo">289</span>         }<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>      if (rawTypeMeta == null)<a name="line.292"></a>
-<span class="sourceLineNo">293</span>         return false;<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>      this.beanRegistry = new BeanRegistry(beanContext, parentBeanRegistry, bdClasses.toArray(new Class&lt;?&gt;[0]));<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>      // Do some annotation validation.<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      Class&lt;?&gt; c = rawTypeMeta.getInnerClass();<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      if (getter != null &amp;&amp; ! isParentClass(getter.getReturnType(), c))<a name="line.299"></a>
-<span class="sourceLineNo">300</span>         return false;<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      if (setter != null &amp;&amp; ! isParentClass(setter.getParameterTypes()[0], c))<a name="line.301"></a>
-<span class="sourceLineNo">302</span>         return false;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      if (field != null &amp;&amp; ! isParentClass(field.getType(), c))<a name="line.303"></a>
-<span class="sourceLineNo">304</span>         return false;<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>      return true;<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>   private PojoSwap getPropertyPojoSwap(BeanProperty p) throws Exception {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      Class&lt;?&gt; c = p.swap();<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      if (c == Null.class)<a name="line.311"></a>
-<span class="sourceLineNo">312</span>         return null;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      try {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>         if (ClassUtils.isParentClass(PojoSwap.class, c)) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>            return (PojoSwap)c.newInstance();<a name="line.315"></a>
-<span class="sourceLineNo">316</span>         }<a name="line.316"></a>
-<span class="sourceLineNo">317</span>         throw new RuntimeException("TODO - Surrogate swaps not yet supported.");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      } catch (Exception e) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>         throw new BeanRuntimeException(this.beanMeta.c, "Could not instantiate PojoSwap ''{0}'' for bean property ''{1}''", c.getName(), this.name).initCause(e);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      }<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   }<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>    * Equivalent to calling {@link BeanMap#get(Object)}, but is faster since it avoids looking up the property meta.<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    *<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    * @param m The bean map to get the transformed value from.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    * @return The property value.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    */<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   public Object get(BeanMap&lt;?&gt; m) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      try {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>         // Read-only beans have their properties stored in a cache until getBean() is called.<a name="line.331"></a>
-<span class="sourceLineNo">332</span>         Object bean = m.bean;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>         if (bean == null)<a name="line.333"></a>
-<span class="sourceLineNo">334</span>            return m.propertyCache.get(name);<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>         Object o = null;<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>         if (getter == null &amp;&amp; field == null)<a name="line.338"></a>
-<span class="sourceLineNo">339</span>            throw new BeanRuntimeException(beanMeta.c, "Getter or public field not defined on property ''{0}''", name);<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>         if (getter != null)<a name="line.341"></a>
-<span class="sourceLineNo">342</span>            o = getter.invoke(bean, (Object[])null);<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>         else if (field != null)<a name="line.344"></a>
-<span class="sourceLineNo">345</span>            o = field.get(bean);<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span>         return toSerializedForm(m.getBeanSession(), o);<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>      } catch (Throwable e) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>         if (beanContext.ignoreInvocationExceptionsOnGetters) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>            if (rawTypeMeta.isPrimitive())<a name="line.351"></a>
-<span class="sourceLineNo">352</span>               return rawTypeMeta.getPrimitiveDefault();<a name="line.352"></a>
-<span class="sourceLineNo">353</span>            return null;<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         }<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         throw new BeanRuntimeException(beanMeta.c, "Exception occurred while getting property ''{0}''", name).initCause(e);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      }<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   }<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>   /**<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    * Converts a raw bean property value to serialized form.<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    * Applies transforms and child property filters.<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    */<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   final Object toSerializedForm(BeanSession session, Object o) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      try {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>         o = transform(session, o);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>         if (o == null)<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            return null;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>         if (properties != null) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>            if (rawTypeMeta.isArray()) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>               Object[] a = (Object[])o;<a name="line.370"></a>
-<span class="sourceLineNo">371</span>               List l = new DelegateList(rawTypeMeta);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>               ClassMeta childType = rawTypeMeta.getElementType();<a name="line.372"></a>
-<span class="sourceLineNo">373</span>               for (Object c : a)<a name="line.373"></a>
-<span class="sourceLineNo">374</span>                  l.add(applyChildPropertiesFilter(session, childType, c));<a name="line.374"></a>
-<span class="sourceLineNo">375</span>               return l;<a name="line.375"></a>
-<span class="sourceLineNo">376</span>            } else if (rawTypeMeta.isCollection()) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>               Collection c = (Collection)o;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>               List l = new ArrayList(c.size());<a name="line.378"></a>
-<span class="sourceLineNo">379</span>               ClassMeta childType = rawTypeMeta.getElementType();<a name="line.379"></a>
-<span class="sourceLineNo">380</span>               for (Object cc : c)<a name="line.380"></a>
-<span class="sourceLineNo">381</span>                  l.add(applyChildPropertiesFilter(session, childType, cc));<a name="line.381"></a>
-<span class="sourceLineNo">382</span>               return l;<a name="line.382"></a>
-<span class="sourceLineNo">383</span>            } else {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>               return applyChildPropertiesFilter(session, rawTypeMeta, o);<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>         return o;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      } catch (SerializeException e) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>         throw new BeanRuntimeException(e);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>   /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    * Equivalent to calling {@link BeanMap#put(String, Object)}, but is faster since it avoids<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    *    looking up the property meta.<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    *<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    * @param m The bean map to set the property value on.<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    * @param value The value to set.<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    * @return The previous property value.<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    * @throws BeanRuntimeException If property could not be set.<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    */<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   public Object set(BeanMap&lt;?&gt; m, Object value) throws BeanRuntimeException {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      try {<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>         BeanSession session = m.getBeanSession();<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>         // Comvert to raw form.<a name="line.407"></a>
-<span class="sourceLineNo">408</span>         value = unswap(session, value);<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span>         if (m.bean == null) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>            // If this bean has subtypes, and we haven't set the subtype yet,<a name="line.412"></a>
-<span class="sourceLineNo">413</span>            // store the property in a temporary cache until the bean can be instantiated.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>            if (m.meta.subTypeProperty != null &amp;&amp; m.propertyCache == null)<a name="line.414"></a>
-<span class="sourceLineNo">415</span>               m.propertyCache = new TreeMap&lt;String,Object&gt;();<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span>            // Read-only beans get their properties stored in a cache.<a name="line.417"></a>
-<span class="sourceLineNo">418</span>            if (m.propertyCache != null)<a name="line.418"></a>
-<span class="sourceLineNo">419</span>               return m.propertyCache.put(name, value);<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>            throw new BeanRuntimeException("Non-existent bean instance on bean.");<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>            boolean isMap = rawTypeMeta.isMap();<a name="line.424"></a>
-<span class="sourceLineNo">425</span>            boolean isCollection = rawTypeMeta.isCollection();<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>         if (field == null &amp;&amp; setter == null &amp;&amp; ! (isMap || isCollection)) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>            if ((value == null &amp;&amp; beanContext.ignoreUnknownNullBeanProperties) || beanContext.ignorePropertiesWithoutSetters)<a name="line.428"></a>
-<span class="sourceLineNo">429</span>               return null;<a name="line.429"></a>
-<span class="sourceLineNo">430</span>            throw new BeanRuntimeException(beanMeta.c, "Setter or public field not defined on property ''{0}''", name);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>         }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>         Object bean = m.getBean(true);  // Don't use getBean() because it triggers array creation!<a name="line.433"></a>
+<span class="sourceLineNo">252</span>   /**<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    * Returns the name of this bean property.<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    *<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    * @return The name of the bean property.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   public String getName() {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      return name;<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>    * Returns the bean meta that this property belongs to.<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    *<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    * @return The bean meta that this property belongs to.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    */<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   @BeanIgnore<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   public BeanMeta&lt;?&gt; getBeanMeta() {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      return beanMeta;<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>    * Returns the getter method for this property.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    *<a name="line.273"></a>
+<span class="sourceLineNo">274</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.274"></a>
+<span class="sourceLineNo">275</span>    */<a name="line.275"></a>
+<span class="sourceLineNo">276</span>   public Method getGetter() {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      return getter;<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>   /**<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    * Returns the setter method for this property.<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    *<a name="line.282"></a>
+<span class="sourceLineNo">283</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.283"></a>
+<span class="sourceLineNo">284</span>    */<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   public Method getSetter() {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      return setter;<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>   /**<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    * Returns the field for this property.<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    *<a name="line.291"></a>
+<span class="sourceLineNo">292</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.292"></a>
+<span class="sourceLineNo">293</span>    */<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   public Field getField() {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      return field;<a name="line.295"></a>
+<span class="sourceLineNo">296</span>   }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>   /**<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    * Returns the {@link ClassMeta} of the class of this property.<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    * &lt;p&gt;<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    * If this property or the property type class has a {@link PojoSwap} associated with it, this<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    *    method returns the transformed class meta.<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    * This matches the class type that is used by the {@link #get(BeanMap)} and {@link #set(BeanMap, Object)} methods.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    *<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    * @return The {@link ClassMeta} of the class of this property.<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    */<a name="line.306"></a>
+<span class="sourceLineNo">307</span>   public ClassMeta&lt;?&gt; getClassMeta() {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      return typeMeta;<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>   /**<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    * Returns the bean dictionary in use for this bean property.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    * The order of lookup for the dictionary is as follows:<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    * &lt;ol&gt;<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    *    &lt;li&gt;Dictionary defined via {@link BeanProperty#beanDictionary()}.<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    *    &lt;li&gt;Dictionary defined via {@link BeanContext#BEAN_beanDictionary} context property.<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    * &lt;/ol&gt;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    * @return The bean dictionary in use for this bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    */<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   public BeanRegistry getBeanRegistry() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      return beanRegistry;<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 &lt;jk&gt;true&lt;/jk&gt; if this bean property is a URI.<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    * &lt;p&gt;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    * A bean property can be considered a URI if any of the following are true:<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    * &lt;ul class='spaced-list'&gt;<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    *    &lt;li&gt;Property class type is {@link URL} or {@link URI}.<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    *    &lt;li&gt;Property class type is annotated with {@link org.apache.juneau.annotation.URI}.<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    *    &lt;li&gt;Property getter, setter, or field is annotated with {@link org.apache.juneau.annotation.URI}.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    * &lt;/ul&gt;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    *<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    * @return &lt;jk&gt;true&lt;/jk&gt; if this bean property is a URI.<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    */<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   public boolean isUri() {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      return isUri;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>   /**<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    * Returns the override list of properties defined through a {@link BeanProperty#properties()} annotation<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    *  on this property.<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    *<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    * @return The list of override properties, or &lt;jk&gt;null&lt;/jk&gt; if annotation not specified.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    */<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   public String[] getProperties() {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      return properties;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>   /**<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    * Returns the language-specified extended metadata on this bean property.<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    *<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    * @param c The name of the metadata class to create.<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    * @return Extended metadata on this bean property.  Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    */<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   public &lt;M extends BeanPropertyMetaExtended&gt; M getExtendedMeta(Class&lt;M&gt; c) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      if (delegateFor != null)<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         return delegateFor.getExtendedMeta(c);<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      return extMeta.get(c, this);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>   /**<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    * Equivalent to calling {@link BeanMap#get(Object)}, but is faster since it avoids looking up the property meta.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    *<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    * @param m The bean map to get the transformed value from.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    * @return The property value.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   public Object get(BeanMap&lt;?&gt; m) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      try {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         if (overrideValue != null)<a name="line.370"></a>
+<span class="sourceLineNo">371</span>            return overrideValue;<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span>         // Read-only beans have their properties stored in a cache until getBean() is called.<a name="line.373"></a>
+<span class="sourceLineNo">374</span>         Object bean = m.bean;<a name="line.374"></a>
+<span class="sourceLineNo">375</span>         if (bean == null)<a name="line.375"></a>
+<span class="sourceLineNo">376</span>            return m.propertyCache.get(name);<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>         Object o = null;<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span>         if (getter == null &amp;&amp; field == null)<a name="line.380"></a>
+<span class="sourceLineNo">381</span>            throw new BeanRuntimeException(beanMeta.c, "Getter or public field not defined on property ''{0}''", name);<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>         if (getter != null)<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            o = getter.invoke(bean, (Object[])null);<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>         else if (field != null)<a name="line.386"></a>
+<span class="sourceLineNo">387</span>            o = field.get(bean);<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span>         return toSerializedForm(m.getBeanSession(), o);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>      } catch (Throwable e) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>         if (beanContext.ignoreInvocationExceptionsOnGetters) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>            if (rawTypeMeta.isPrimitive())<a name="line.393"></a>
+<span class="sourceLineNo">394</span>               return rawTypeMeta.getPrimitiveDefault();<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            return null;<a name="line.395"></a>
+<span class="sourceLineNo">396</span>         }<a name="line.396"></a>
+<span class="sourceLineNo">397</span>         throw new BeanRuntimeException(beanMeta.c, "Exception occurred while getting property ''{0}''", name).initCause(e);<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>   /**<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    * Converts a raw bean property value to serialized form.<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    * Applies transforms and child property filters.<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    */<a name="line.404"></a>
+<span class="sourceLineNo">405</span>   final Object toSerializedForm(BeanSession session, Object o) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      try {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>         o = transform(session, o);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>         if (o == null)<a name="line.408"></a>
+<span class="sourceLineNo">409</span>            return null;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>         if (properties != null) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            if (rawTypeMeta.isArray()) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span>               Object[] a = (Object[])o;<a name="line.412"></a>
+<span class="sourceLineNo">413</span>               List l = new DelegateList(rawTypeMeta);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>               ClassMeta childType = rawTypeMeta.getElementType();<a name="line.414"></a>
+<span class="sourceLineNo">415</span>               for (Object c : a)<a name="line.415"></a>
+<span class="sourceLineNo">416</span>                  l.add(applyChildPropertiesFilter(session, childType, c));<a name="line.416"></a>
+<span class="sourceLineNo">417</span>               return l;<a name="line.417"></a>
+<span class="sourceLineNo">418</span>            } else if (rawTypeMeta.isCollection()) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>               Collection c = (Collection)o;<a name="line.419"></a>
+<span class="sourceLineNo">420</span>               List l = new ArrayList(c.size());<a name="line.420"></a>
+<span class="sourceLineNo">421</span>               ClassMeta childType = rawTypeMeta.getElementType();<a name="line.421"></a>
+<span class="sourceLineNo">422</span>               for (Object cc : c)<a name="line.422"></a>
+<span class="sourceLineNo">423</span>                  l.add(applyChildPropertiesFilter(session, childType, cc));<a name="line.423"></a>
+<span class="sourceLineNo">424</span>               return l;<a name="line.424"></a>
+<span class="sourceLineNo">425</span>            } else {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>               return applyChildPropertiesFilter(session, rawTypeMeta, o);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>            }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>         }<a name="line.428"></a>
+<span class="sourceLineNo">429</span>         return o;<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      } catch (SerializeException e) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>         throw new BeanRuntimeException(e);<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>         try {<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span>            Object r = beanContext.beanMapPutReturnsOldValue || isMap || isCollection ? get(m) : null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span>               Class&lt;?&gt; propertyClass = rawTypeMeta.getInnerClass();<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>            if (value == null &amp;&amp; (isMap || isCollection)) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>               if (setter != null) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>                  setter.invoke(bean, new Object[] { null });<a name="line.442"></a>
-<span class="sourceLineNo">443</span>                  return r;<a name="line.443"></a>
-<span class="sourceLineNo">444</span>               } else if (field != null) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>                  field.set(bean, null);<a name="line.445"></a>
-<span class="sourceLineNo">446</span>                  return r;<a name="line.446"></a>
-<span class="sourceLineNo">447</span>               }<a name="line.447"></a>
-<span class="sourceLineNo">448</span>               throw new BeanRuntimeException(beanMeta.c, "Cannot set property ''{0}'' to null because no setter or public field is defined", name);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>            }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>            if (isMap) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span>               if (! (value instanceof Map)) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>                  if (value instanceof CharSequence)<a name="line.454"></a>
-<span class="sourceLineNo">455</span>                     value = new ObjectMap((CharSequence)value).setBeanSession(session);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>                  else<a name="line.456"></a>
-<span class="sourceLineNo">457</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.457"></a>
-<span class="sourceLineNo">458</span>               }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>               Map valueMap = (Map)value;<a name="line.460"></a>
-<span class="sourceLineNo">461</span>               Map propMap = (Map)r;<a name="line.461"></a>
-<span class="sourceLineNo">462</span>                  ClassMeta&lt;?&gt; valueType = rawTypeMeta.getValueType();<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>               // If the property type is abstract, then we either need to reuse the existing<a name="line.464"></a>
-<span class="sourceLineNo">465</span>               // map (if it's not null), or try to assign the value directly.<a name="line.465"></a>
-<span class="sourceLineNo">466</span>                  if (! rawTypeMeta.canCreateNewInstance()) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>                  if (propMap == null) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span>                     if (setter == null &amp;&amp; field == null)<a name="line.468"></a>
-<span class="sourceLineNo">469</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.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span>                     if (propertyClass.isInstance(valueMap)) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span>                        if (! valueType.isObject()) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>                           for (Map.Entry e : (Set&lt;Map.Entry&gt;)valueMap.entrySet()) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>                              Object v = e.getValue();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>                              if (v != null &amp;&amp; ! valueType.getInnerClass().isInstance(v))<a name="line.475"></a>
-<span class="sourceLineNo">476</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.476"></a>
-<span class="sourceLineNo">477</span>                           }<a name="line.477"></a>
-<span class="sourceLineNo">478</span>                        }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>                        if (setter != null)<a name="line.479"></a>
-<span class="sourceLineNo">480</span>                           setter.invoke(bean, valueMap);<a name="line.480"></a>
-<span class="sourceLineNo">481</span>                        else<a name="line.481"></a>
-<span class="sourceLineNo">482</span>                           field.set(bean, valueMap);<a name="line.482"></a>
-<span class="sourceLineNo">483</span>                        return r;<a name="line.483"></a>
-<span class="sourceLineNo">484</span>                     }<a name="line.484"></a>
-<span class="sourceLineNo">485</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.485"></a>
-<span class="sourceLineNo">486</span>                  }<a name="line.486"></a>
-<span class="sourceLineNo">487</span>               } else {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>                  if (propMap == null) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>                     propMap = (Map)propertyClass.newInstance();<a name="line.489"></a>
-<span class="sourceLineNo">490</span>                     if (setter != null)<a name="line.490"></a>
-<span class="sourceLineNo">491</span>                        setter.invoke(bean, propMap);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>                     else if (field != null)<a name="line.492"></a>
-<span class="sourceLineNo">493</span>                        field.set(bean, propMap);<a name="line.493"></a>
-<span class="sourceLineNo">494</span>                     else<a name="line.494"></a>
-<span class="sourceLineNo">495</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 on this property, and the existing property value is null", name, propertyClass.getName(), findClassName(value));<a name="line.495"></a>
-<span class="sourceLineNo">496</span>                  } else {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>                     propMap.clear();<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>               // Set the values.<a name="line.501"></a>
-<span class="sourceLineNo">502</span>               for (Map.Entry e : (Set&lt;Map.Entry&gt;)valueMap.entrySet()) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>                  Object k = e.getKey();<a name="line.503"></a>
-<span class="sourceLineNo">504</span>                  Object v = e.getValue();<a name="line.504"></a>
-<span class="sourceLineNo">505</span>                  if (! valueType.isObject())<a name="line.505"></a>
-<span class="sourceLineNo">506</span>                     v = session.convertToType(v, valueType);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>                  propMap.put(k, v);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>               }<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span>            } else if (isCollection) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>               if (! (value instanceof Collection)) {<a name="line.512"></a>
-<span class="sourceLineNo">513</span>                  if (value instanceof CharSequence)<a name="line.513"></a>
-<span class="sourceLineNo">514</span>                     value = new ObjectList((CharSequence)value).setBeanSession(session);<a name="line.514"></a>
-<span class="sourceLineNo">515</span>                  else<a name="line.515"></a>
-<span class="sourceLineNo">516</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.516"></a>
-<span class="sourceLineNo">517</span>               }<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>               Collection valueList = (Collection)value;<a name="line.519"></a>
-<span class="sourceLineNo">520</span>               Collection propList = (Collection)r;<a name="line.520"></a>
-<span class="sourceLineNo">521</span>                  ClassMeta elementType = rawTypeMeta.getElementType();<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>               // If the property type is abstract, then we either need to reuse the existing<a name="line.523"></a>
-<span class="sourceLineNo">524</span>               // collection (if it's not null), or try to assign the value directly.<a name="line.524"></a>
-<span class="sourceLineNo">525</span>                  if (! rawTypeMeta.canCreateNewInstance()) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>                  if (propList == null) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>                     if (setter == null &amp;&amp; field == null)<a name="line.527"></a>
-<span class="sourceLineNo">528</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.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>                     if (propertyClass.isInstance(valueList)) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span>                        if (! elementType.isObject()) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>                              List l = new ObjectList(valueList);<a name="line.532"></a>
-<span class="sourceLineNo">533</span>                              for (ListIterator&lt;Object&gt; i = l.listIterator(); i.hasNext(); ) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>                                 Object v = i.next();<a name="line.534"></a>
-<span class="sourceLineNo">535</span>                                 if (v != null &amp;&amp; (! elementType.getInnerClass().isInstance(v))) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span>                                    i.set(session.convertToType(v, elementType));<a name="line.536"></a>
-<span class="sourceLineNo">537</span>                                 }<a name="line.537"></a>
-<span class="sourceLineNo">538</span

<TRUNCATED>