juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [09/34] incubator-juneau-website git commit: Update javadocs
Date Sun, 10 Sep 2017 20:32:21 GMT
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
index d6f6d8a..f780d6c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
@@ -102,172 +102,173 @@
 <span class="sourceLineNo">094</span>         aType = object();<a name="line.94"></a>
 <span class="sourceLineNo">095</span>      }<a name="line.95"></a>
 <span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>      sType = aType.getSerializedClassMeta();<a name="line.97"></a>
+<span class="sourceLineNo">097</span>      sType = aType;<a name="line.97"></a>
 <span class="sourceLineNo">098</span>      String typeName = getBeanTypeName(eType, aType, pMeta);<a name="line.98"></a>
 <span class="sourceLineNo">099</span><a name="line.99"></a>
 <span class="sourceLineNo">100</span>      // Swap if necessary<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      PojoSwap swap = aType.getPojoSwap();<a name="line.101"></a>
+<span class="sourceLineNo">101</span>      PojoSwap swap = aType.getPojoSwap(this);<a name="line.101"></a>
 <span class="sourceLineNo">102</span>      if (swap != null) {<a name="line.102"></a>
 <span class="sourceLineNo">103</span>         o = swap.swap(this, o);<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>         // If the getSwapClass() method returns Object, we need to figure out<a name="line.105"></a>
-<span class="sourceLineNo">106</span>         // the actual type now.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>         if (sType.isObject())<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            sType = getClassMetaForObject(o);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>      String wrapperAttr = sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      if (wrapperAttr != null) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>         out.append('{').cr(indent).attr(wrapperAttr).append(':').s(indent);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>         indent++;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>      // '\0' characters are considered null.<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      if (o == null || (sType.isChar() &amp;&amp; ((Character)o).charValue() == 0))<a name="line.118"></a>
-<span class="sourceLineNo">119</span>         out.append("null");<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      else if (sType.isNumber() || sType.isBoolean())<a name="line.120"></a>
-<span class="sourceLineNo">121</span>         out.append(o);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      else if (sType.isBean())<a name="line.122"></a>
-<span class="sourceLineNo">123</span>         serializeBeanMap(out, toBeanMap(o), typeName);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      else if (sType.isUri() || (pMeta != null &amp;&amp; pMeta.isUri()))<a name="line.124"></a>
-<span class="sourceLineNo">125</span>         out.uriValue(o);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      else if (sType.isMap()) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>         if (o instanceof BeanMap)<a name="line.127"></a>
-<span class="sourceLineNo">128</span>            serializeBeanMap(out, (BeanMap)o, typeName);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>         else<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            serializeMap(out, (Map)o, eType);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      else if (sType.isCollection()) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>         serializeCollection(out, (Collection) o, eType);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      else if (sType.isArray()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         serializeCollection(out, toList(sType.getInnerClass(), o), eType);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      else if (sType.isReader() || sType.isInputStream()) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>         IOUtils.pipe(o, out);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      else<a name="line.141"></a>
-<span class="sourceLineNo">142</span>         out.stringValue(toString(o));<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>      if (wrapperAttr != null) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>         indent--;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>         out.cre(indent-1).append('}');<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>      if (! isRecursion)<a name="line.149"></a>
-<span class="sourceLineNo">150</span>         pop();<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      return out;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   private SerializerWriter serializeMap(JsonWriter out, Map m, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>      ClassMeta&lt;?&gt; keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>      m = sort(m);<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>      int i = indent;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      out.append('{');<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>      Iterator mapEntries = m.entrySet().iterator();<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>      while (mapEntries.hasNext()) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>         Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.167"></a>
-<span class="sourceLineNo">168</span>         Object value = e.getValue();<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>         Object key = generalize(e.getKey(), keyType);<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>         out.cr(i).attr(toString(key)).append(':').s(i);<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>         serializeAnything(out, value, valueType, (key == null ? null : toString(key)), null);<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>         if (mapEntries.hasNext())<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            out.append(',').smi(i);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>      out.cre(i-1).append('}');<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>      return out;<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>   private SerializerWriter serializeBeanMap(JsonWriter out, BeanMap&lt;?&gt; m, String typeName) throws Exception {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      int i = indent;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      out.append('{');<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>      boolean addComma = false;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      for (BeanPropertyValue p : m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.191"></a>
-<span class="sourceLineNo">192</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.192"></a>
-<span class="sourceLineNo">193</span>         String key = p.getName();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>         Object value = p.getValue();<a name="line.194"></a>
-<span class="sourceLineNo">195</span>         Throwable t = p.getThrown();<a name="line.195"></a>
-<span class="sourceLineNo">196</span>         if (t != null)<a name="line.196"></a>
-<span class="sourceLineNo">197</span>            onBeanGetterException(pMeta, t);<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>         if (canIgnoreValue(cMeta, key, value))<a name="line.199"></a>
-<span class="sourceLineNo">200</span>            continue;<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>         if (addComma)<a name="line.202"></a>
-<span class="sourceLineNo">203</span>            out.append(',').smi(i);<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>         out.cr(i).attr(key).append(':').s(i);<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>         serializeAnything(out, value, cMeta, key, pMeta);<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>         addComma = true;<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      out.cre(i-1).append('}');<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      return out;<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>   @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   private SerializerWriter serializeCollection(JsonWriter out, Collection c, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>      c = sort(c);<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>      out.append('[');<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>      for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>         Object value = i.next();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>         out.cr(indent);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>         serializeAnything(out, value, elementType, "&lt;iterator&gt;", null);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>         if (i.hasNext())<a name="line.228"></a>
-<span class="sourceLineNo">229</span>            out.append(',').smi(indent);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      out.cre(indent-1).append(']');<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      return out;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">104</span>         sType = swap.getSwapClassMeta(this);<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>         // If the getSwapClass() method returns Object, we need to figure out<a name="line.106"></a>
+<span class="sourceLineNo">107</span>         // the actual type now.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>         if (sType.isObject())<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            sType = getClassMetaForObject(o);<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>      String wrapperAttr = sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      if (wrapperAttr != null) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>         out.append('{').cr(indent).attr(wrapperAttr).append(':').s(indent);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         indent++;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>      // '\0' characters are considered null.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      if (o == null || (sType.isChar() &amp;&amp; ((Character)o).charValue() == 0))<a name="line.119"></a>
+<span class="sourceLineNo">120</span>         out.append("null");<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      else if (sType.isNumber() || sType.isBoolean())<a name="line.121"></a>
+<span class="sourceLineNo">122</span>         out.append(o);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      else if (sType.isBean())<a name="line.123"></a>
+<span class="sourceLineNo">124</span>         serializeBeanMap(out, toBeanMap(o), typeName);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      else if (sType.isUri() || (pMeta != null &amp;&amp; pMeta.isUri()))<a name="line.125"></a>
+<span class="sourceLineNo">126</span>         out.uriValue(o);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      else if (sType.isMap()) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>         if (o instanceof BeanMap)<a name="line.128"></a>
+<span class="sourceLineNo">129</span>            serializeBeanMap(out, (BeanMap)o, typeName);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>         else<a name="line.130"></a>
+<span class="sourceLineNo">131</span>            serializeMap(out, (Map)o, eType);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      else if (sType.isCollection()) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>         serializeCollection(out, (Collection) o, eType);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      else if (sType.isArray()) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>         serializeCollection(out, toList(sType.getInnerClass(), o), eType);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      else if (sType.isReader() || sType.isInputStream()) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>         IOUtils.pipe(o, out);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      else<a name="line.142"></a>
+<span class="sourceLineNo">143</span>         out.stringValue(toString(o));<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>      if (wrapperAttr != null) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>         indent--;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>         out.cre(indent-1).append('}');<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>      if (! isRecursion)<a name="line.150"></a>
+<span class="sourceLineNo">151</span>         pop();<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      return out;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   private SerializerWriter serializeMap(JsonWriter out, Map m, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>      ClassMeta&lt;?&gt; keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>      m = sort(m);<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>      int i = indent;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      out.append('{');<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>      Iterator mapEntries = m.entrySet().iterator();<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>      while (mapEntries.hasNext()) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>         Map.Entry e = (Map.Entry) mapEntries.next();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>         Object value = e.getValue();<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>         Object key = generalize(e.getKey(), keyType);<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>         out.cr(i).attr(toString(key)).append(':').s(i);<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>         serializeAnything(out, value, valueType, (key == null ? null : toString(key)), null);<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>         if (mapEntries.hasNext())<a name="line.177"></a>
+<span class="sourceLineNo">178</span>            out.append(',').smi(i);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>      out.cre(i-1).append('}');<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return out;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>   private SerializerWriter serializeBeanMap(JsonWriter out, BeanMap&lt;?&gt; m, String typeName) throws Exception {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      int i = indent;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      out.append('{');<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>      boolean addComma = false;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      for (BeanPropertyValue p : m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.192"></a>
+<span class="sourceLineNo">193</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>         String key = p.getName();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>         Object value = p.getValue();<a name="line.195"></a>
+<span class="sourceLineNo">196</span>         Throwable t = p.getThrown();<a name="line.196"></a>
+<span class="sourceLineNo">197</span>         if (t != null)<a name="line.197"></a>
+<span class="sourceLineNo">198</span>            onBeanGetterException(pMeta, t);<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>         if (canIgnoreValue(cMeta, key, value))<a name="line.200"></a>
+<span class="sourceLineNo">201</span>            continue;<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>         if (addComma)<a name="line.203"></a>
+<span class="sourceLineNo">204</span>            out.append(',').smi(i);<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>         out.cr(i).attr(key).append(':').s(i);<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>         serializeAnything(out, value, cMeta, key, pMeta);<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>         addComma = true;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      out.cre(i-1).append('}');<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      return out;<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>   @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.216"></a>
+<span class="sourceLineNo">217</span>   private SerializerWriter serializeCollection(JsonWriter out, Collection c, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>      c = sort(c);<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>      out.append('[');<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>      for (Iterator i = c.iterator(); i.hasNext();) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>         Object value = i.next();<a name="line.226"></a>
+<span class="sourceLineNo">227</span>         out.cr(indent);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>         serializeAnything(out, value, elementType, "&lt;iterator&gt;", null);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>         if (i.hasNext())<a name="line.229"></a>
+<span class="sourceLineNo">230</span>            out.append(',').smi(indent);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      out.cre(indent-1).append(']');<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      return out;<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>   /**<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    * Returns the {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    *<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    * @return The {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    */<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   @Override /* SerializerSession */<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   protected final boolean isAddBeanTypeProperties() {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      return addBeanTypeProperties;<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span>   /**<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    * Converts the specified output target object to an {@link JsonWriter}.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    *<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    * @param out The output target object.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    * @return The output target object wrapped in an {@link JsonWriter}.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    * @throws Exception<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    */<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   protected final JsonWriter getJsonWriter(SerializerPipe out) throws Exception {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      Object output = out.getRawOutput();<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      if (output instanceof JsonWriter)<a name="line.255"></a>
-<span class="sourceLineNo">256</span>         return (JsonWriter)output;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      JsonWriter w = new JsonWriter(out.getWriter(), isUseWhitespace(), getMaxIndent(), escapeSolidus, getQuoteChar(),<a name="line.257"></a>
-<span class="sourceLineNo">258</span>         simpleMode, isTrimStrings(), getUriResolver());<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      out.setWriter(w);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return w;<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">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span>   /**<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    * Returns the {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    *<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    * @return The {@link JsonSerializerContext#JSON_addBeanTypeProperties} setting value for this session.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    */<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   @Override /* SerializerSession */<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   protected final boolean isAddBeanTypeProperties() {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      return addBeanTypeProperties;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>   /**<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    * Converts the specified output target object to an {@link JsonWriter}.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    *<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    * @param out The output target object.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    * @return The output target object wrapped in an {@link JsonWriter}.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    * @throws Exception<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    */<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   protected final JsonWriter getJsonWriter(SerializerPipe out) throws Exception {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      Object output = out.getRawOutput();<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      if (output instanceof JsonWriter)<a name="line.256"></a>
+<span class="sourceLineNo">257</span>         return (JsonWriter)output;<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      JsonWriter w = new JsonWriter(out.getWriter(), isUseWhitespace(), getMaxIndent(), escapeSolidus, getQuoteChar(),<a name="line.258"></a>
+<span class="sourceLineNo">259</span>         simpleMode, isTrimStrings(), getUriResolver());<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      out.setWriter(w);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      return w;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
index c4dd4db..26a50e7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
@@ -329,7 +329,7 @@
 <span class="sourceLineNo">321</span>      /**<a name="line.321"></a>
 <span class="sourceLineNo">322</span>       * @return The file last modified timestamp.<a name="line.322"></a>
 <span class="sourceLineNo">323</span>       */<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      @BeanProperty(swap=DateSwap.ISO8601DTP.class)<a name="line.324"></a>
+<span class="sourceLineNo">324</span>      @Swap(DateSwap.ISO8601DTP.class)<a name="line.324"></a>
 <span class="sourceLineNo">325</span>      public Date getLastModified() {<a name="line.325"></a>
 <span class="sourceLineNo">326</span>         return new Date(f.lastModified());<a name="line.326"></a>
 <span class="sourceLineNo">327</span>      }<a name="line.327"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
index c4dd4db..26a50e7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/DirectoryResource.html
@@ -329,7 +329,7 @@
 <span class="sourceLineNo">321</span>      /**<a name="line.321"></a>
 <span class="sourceLineNo">322</span>       * @return The file last modified timestamp.<a name="line.322"></a>
 <span class="sourceLineNo">323</span>       */<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      @BeanProperty(swap=DateSwap.ISO8601DTP.class)<a name="line.324"></a>
+<span class="sourceLineNo">324</span>      @Swap(DateSwap.ISO8601DTP.class)<a name="line.324"></a>
 <span class="sourceLineNo">325</span>      public Date getLastModified() {<a name="line.325"></a>
 <span class="sourceLineNo">326</span>         return new Date(f.lastModified());<a name="line.326"></a>
 <span class="sourceLineNo">327</span>      }<a name="line.327"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
index 3b7caa2..d0471f6 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
@@ -316,7 +316,7 @@
 <span class="sourceLineNo">308</span>      public String type;<a name="line.308"></a>
 <span class="sourceLineNo">309</span>      public Object name;<a name="line.309"></a>
 <span class="sourceLineNo">310</span>      public Long size;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      @BeanProperty(swap=DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.311"></a>
+<span class="sourceLineNo">311</span>      @Swap(DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.311"></a>
 <span class="sourceLineNo">312</span>      public URI view, highlighted, parsed, download, delete;<a name="line.312"></a>
 <span class="sourceLineNo">313</span><a name="line.313"></a>
 <span class="sourceLineNo">314</span>      public FileResource(File f, URI uri) throws Exception {<a name="line.314"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
index 3b7caa2..d0471f6 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/resources/LogsResource.html
@@ -316,7 +316,7 @@
 <span class="sourceLineNo">308</span>      public String type;<a name="line.308"></a>
 <span class="sourceLineNo">309</span>      public Object name;<a name="line.309"></a>
 <span class="sourceLineNo">310</span>      public Long size;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      @BeanProperty(swap=DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.311"></a>
+<span class="sourceLineNo">311</span>      @Swap(DateSwap.DateTimeMedium.class) public Date lastModified;<a name="line.311"></a>
 <span class="sourceLineNo">312</span>      public URI view, highlighted, parsed, download, delete;<a name="line.312"></a>
 <span class="sourceLineNo">313</span><a name="line.313"></a>
 <span class="sourceLineNo">314</span>      public FileResource(File f, URI uri) throws Exception {<a name="line.314"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParserSession.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParserSession.html
index 25a094e..d34d11a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParserSession.html
@@ -65,8 +65,8 @@
 <span class="sourceLineNo">057</span><a name="line.57"></a>
 <span class="sourceLineNo">058</span>      if (eType == null)<a name="line.58"></a>
 <span class="sourceLineNo">059</span>         eType = (ClassMeta&lt;T&gt;)object();<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      PojoSwap&lt;T,Object&gt; transform = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap();<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      ClassMeta&lt;?&gt; sType = eType.getSerializedClassMeta();<a name="line.61"></a>
+<span class="sourceLineNo">060</span>      PojoSwap&lt;T,Object&gt; swap = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap(this);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      ClassMeta&lt;?&gt; sType = swap == null ? eType : swap.getSwapClassMeta(this);<a name="line.61"></a>
 <span class="sourceLineNo">062</span>      setCurrentClass(sType);<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
 <span class="sourceLineNo">064</span>      Object o = null;<a name="line.64"></a>
@@ -194,8 +194,8 @@
 <span class="sourceLineNo">186</span>         }<a name="line.186"></a>
 <span class="sourceLineNo">187</span>      }<a name="line.187"></a>
 <span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>      if (transform != null &amp;&amp; o != null)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>         o = transform.unswap(this, o, eType);<a name="line.190"></a>
+<span class="sourceLineNo">189</span>      if (swap != null &amp;&amp; o != null)<a name="line.189"></a>
+<span class="sourceLineNo">190</span>         o = swap.unswap(this, o, eType);<a name="line.190"></a>
 <span class="sourceLineNo">191</span><a name="line.191"></a>
 <span class="sourceLineNo">192</span>      if (outer != null)<a name="line.192"></a>
 <span class="sourceLineNo">193</span>         setParent(eType, o, outer);<a name="line.193"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
index 4460297..19ae259 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
@@ -115,128 +115,129 @@
 <span class="sourceLineNo">107</span>         aType = object();<a name="line.107"></a>
 <span class="sourceLineNo">108</span>      }<a name="line.108"></a>
 <span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>      sType = aType.getSerializedClassMeta();<a name="line.110"></a>
+<span class="sourceLineNo">110</span>      sType = aType;<a name="line.110"></a>
 <span class="sourceLineNo">111</span>      String typeName = getBeanTypeName(eType, aType, pMeta);<a name="line.111"></a>
 <span class="sourceLineNo">112</span><a name="line.112"></a>
 <span class="sourceLineNo">113</span>      // Swap if necessary<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      PojoSwap swap = aType.getPojoSwap();<a name="line.114"></a>
+<span class="sourceLineNo">114</span>      PojoSwap swap = aType.getPojoSwap(this);<a name="line.114"></a>
 <span class="sourceLineNo">115</span>      if (swap != null) {<a name="line.115"></a>
 <span class="sourceLineNo">116</span>         o = swap.swap(this, o);<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>         // If the getSwapClass() method returns Object, we need to figure out<a name="line.118"></a>
-<span class="sourceLineNo">119</span>         // the actual type now.<a name="line.119"></a>
-<span class="sourceLineNo">120</span>         if (sType.isObject())<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            sType = getClassMetaForObject(o);<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>      // '\0' characters are considered null.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      if (o == null || (sType.isChar() &amp;&amp; ((Character)o).charValue() == 0))<a name="line.125"></a>
-<span class="sourceLineNo">126</span>         out.appendNull();<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      else if (sType.isBoolean())<a name="line.127"></a>
-<span class="sourceLineNo">128</span>         out.appendBoolean((Boolean)o);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      else if (sType.isNumber())<a name="line.129"></a>
-<span class="sourceLineNo">130</span>         out.appendNumber((Number)o);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      else if (sType.isBean())<a name="line.131"></a>
-<span class="sourceLineNo">132</span>         serializeBeanMap(out, toBeanMap(o), typeName);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      else if (sType.isUri() || (pMeta != null &amp;&amp; pMeta.isUri()))<a name="line.133"></a>
-<span class="sourceLineNo">134</span>         out.appendString(resolveUri(o.toString()));<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      else if (sType.isMap()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>         if (o instanceof BeanMap)<a name="line.136"></a>
-<span class="sourceLineNo">137</span>            serializeBeanMap(out, (BeanMap)o, typeName);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>         else<a name="line.138"></a>
-<span class="sourceLineNo">139</span>            serializeMap(out, (Map)o, eType);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      else if (sType.isCollection()) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>         serializeCollection(out, (Collection) o, eType);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      else if (sType.isArray()) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>         serializeCollection(out, toList(sType.getInnerClass(), o), eType);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      }<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      else if (sType.isReader() || sType.isInputStream()) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>         IOUtils.pipe(o, out);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      else<a name="line.150"></a>
-<span class="sourceLineNo">151</span>         out.appendString(toString(o));<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>      if (! isRecursion)<a name="line.153"></a>
-<span class="sourceLineNo">154</span>         pop();<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return out;<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>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   private void serializeMap(MsgPackOutputStream out, Map m, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>      ClassMeta&lt;?&gt; keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>      m = sort(m);<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>      // The map size may change as we're iterating over it, so<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      // grab a snapshot of the entries in a separate list.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      List&lt;SimpleMapEntry&gt; entries = new ArrayList&lt;SimpleMapEntry&gt;(m.size());<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet())<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         entries.add(new SimpleMapEntry(e.getKey(), e.getValue()));<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>      out.startMap(entries.size());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>      for (SimpleMapEntry e : entries) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>         Object value = e.value;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>         Object key = generalize(e.key, keyType);<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>         serializeAnything(out, key, keyType, null, null);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>         serializeAnything(out, value, valueType, null, null);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>   private void serializeBeanMap(MsgPackOutputStream out, final BeanMap&lt;?&gt; m, String typeName) throws Exception {<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>      List&lt;BeanPropertyValue&gt; values = m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null);<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>      int size = values.size();<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      for (BeanPropertyValue p : values)<a name="line.187"></a>
-<span class="sourceLineNo">188</span>         if (p.getThrown() != null)<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            size--;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      out.startMap(size);<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>      for (BeanPropertyValue p : values) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.194"></a>
-<span class="sourceLineNo">195</span>         String key = p.getName();<a name="line.195"></a>
-<span class="sourceLineNo">196</span>         Object value = p.getValue();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>         Throwable t = p.getThrown();<a name="line.197"></a>
-<span class="sourceLineNo">198</span>         if (t != null)<a name="line.198"></a>
-<span class="sourceLineNo">199</span>            onBeanGetterException(pMeta, t);<a name="line.199"></a>
-<span class="sourceLineNo">200</span>         else {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>            serializeAnything(out, key, null, null, null);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>            serializeAnything(out, value, cMeta, key, pMeta);<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>   }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>   private static class SimpleMapEntry {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      final Object key;<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      final Object value;<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>      private SimpleMapEntry(Object key, Object value) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>         this.key = key;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>         this.value = value;<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><a name="line.216"></a>
-<span class="sourceLineNo">217</span>   @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   private void serializeCollection(MsgPackOutputStream out, Collection c, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      List&lt;Object&gt; l = new ArrayList&lt;Object&gt;(c.size());<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>      c = sort(c);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      l.addAll(c);<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>      out.startArray(l.size());<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>      for (Object o : l)<a name="line.228"></a>
-<span class="sourceLineNo">229</span>         serializeAnything(out, o, elementType, "&lt;iterator&gt;", null);<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">117</span>         sType = swap.getSwapClassMeta(this);<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>         // If the getSwapClass() method returns Object, we need to figure out<a name="line.119"></a>
+<span class="sourceLineNo">120</span>         // the actual type now.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>         if (sType.isObject())<a name="line.121"></a>
+<span class="sourceLineNo">122</span>            sType = getClassMetaForObject(o);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>      // '\0' characters are considered null.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      if (o == null || (sType.isChar() &amp;&amp; ((Character)o).charValue() == 0))<a name="line.126"></a>
+<span class="sourceLineNo">127</span>         out.appendNull();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      else if (sType.isBoolean())<a name="line.128"></a>
+<span class="sourceLineNo">129</span>         out.appendBoolean((Boolean)o);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      else if (sType.isNumber())<a name="line.130"></a>
+<span class="sourceLineNo">131</span>         out.appendNumber((Number)o);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      else if (sType.isBean())<a name="line.132"></a>
+<span class="sourceLineNo">133</span>         serializeBeanMap(out, toBeanMap(o), typeName);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      else if (sType.isUri() || (pMeta != null &amp;&amp; pMeta.isUri()))<a name="line.134"></a>
+<span class="sourceLineNo">135</span>         out.appendString(resolveUri(o.toString()));<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      else if (sType.isMap()) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>         if (o instanceof BeanMap)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            serializeBeanMap(out, (BeanMap)o, typeName);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>         else<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            serializeMap(out, (Map)o, eType);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      else if (sType.isCollection()) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>         serializeCollection(out, (Collection) o, eType);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      }<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      else if (sType.isArray()) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>         serializeCollection(out, toList(sType.getInnerClass(), o), eType);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      else if (sType.isReader() || sType.isInputStream()) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>         IOUtils.pipe(o, out);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      else<a name="line.151"></a>
+<span class="sourceLineNo">152</span>         out.appendString(toString(o));<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>      if (! isRecursion)<a name="line.154"></a>
+<span class="sourceLineNo">155</span>         pop();<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return out;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>   @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   private void serializeMap(MsgPackOutputStream out, Map m, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>      ClassMeta&lt;?&gt; keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>      m = sort(m);<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      // The map size may change as we're iterating over it, so<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      // grab a snapshot of the entries in a separate list.<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      List&lt;SimpleMapEntry&gt; entries = new ArrayList&lt;SimpleMapEntry&gt;(m.size());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      for (Map.Entry e : (Set&lt;Map.Entry&gt;)m.entrySet())<a name="line.169"></a>
+<span class="sourceLineNo">170</span>         entries.add(new SimpleMapEntry(e.getKey(), e.getValue()));<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>      out.startMap(entries.size());<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>      for (SimpleMapEntry e : entries) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>         Object value = e.value;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>         Object key = generalize(e.key, keyType);<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>         serializeAnything(out, key, keyType, null, null);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>         serializeAnything(out, value, valueType, null, null);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   }<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>   private void serializeBeanMap(MsgPackOutputStream out, final BeanMap&lt;?&gt; m, String typeName) throws Exception {<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>      List&lt;BeanPropertyValue&gt; values = m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null);<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>      int size = values.size();<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      for (BeanPropertyValue p : values)<a name="line.188"></a>
+<span class="sourceLineNo">189</span>         if (p.getThrown() != null)<a name="line.189"></a>
+<span class="sourceLineNo">190</span>            size--;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      out.startMap(size);<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (BeanPropertyValue p : values) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>         BeanPropertyMeta pMeta = p.getMeta();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>         ClassMeta&lt;?&gt; cMeta = p.getClassMeta();<a name="line.195"></a>
+<span class="sourceLineNo">196</span>         String key = p.getName();<a name="line.196"></a>
+<span class="sourceLineNo">197</span>         Object value = p.getValue();<a name="line.197"></a>
+<span class="sourceLineNo">198</span>         Throwable t = p.getThrown();<a name="line.198"></a>
+<span class="sourceLineNo">199</span>         if (t != null)<a name="line.199"></a>
+<span class="sourceLineNo">200</span>            onBeanGetterException(pMeta, t);<a name="line.200"></a>
+<span class="sourceLineNo">201</span>         else {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>            serializeAnything(out, key, null, null, null);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>            serializeAnything(out, value, cMeta, key, pMeta);<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><a name="line.207"></a>
+<span class="sourceLineNo">208</span>   private static class SimpleMapEntry {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      final Object key;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      final Object value;<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>      private SimpleMapEntry(Object key, Object value) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>         this.key = key;<a name="line.213"></a>
+<span class="sourceLineNo">214</span>         this.value = value;<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><a name="line.217"></a>
+<span class="sourceLineNo">218</span>   @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   private void serializeCollection(MsgPackOutputStream out, Collection c, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      List&lt;Object&gt; l = new ArrayList&lt;Object&gt;(c.size());<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>      c = sort(c);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      l.addAll(c);<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>      out.startArray(l.size());<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>      for (Object o : l)<a name="line.229"></a>
+<span class="sourceLineNo">230</span>         serializeAnything(out, o, elementType, "&lt;iterator&gt;", null);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
index b724b67..ce09c9d 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/parser/ParserSession.html
@@ -700,8 +700,8 @@
 <span class="sourceLineNo">692</span><a name="line.692"></a>
 <span class="sourceLineNo">693</span>      if (type == null)<a name="line.693"></a>
 <span class="sourceLineNo">694</span>         type = (ClassMeta&lt;T&gt;)object();<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      PojoSwap transform = type.getPojoSwap();<a name="line.695"></a>
-<span class="sourceLineNo">696</span>      ClassMeta&lt;?&gt; sType = type.getSerializedClassMeta();<a name="line.696"></a>
+<span class="sourceLineNo">695</span>      PojoSwap swap = type.getPojoSwap(this);<a name="line.695"></a>
+<span class="sourceLineNo">696</span>      ClassMeta&lt;?&gt; sType = swap == null ? type : swap.getSwapClassMeta(this);<a name="line.696"></a>
 <span class="sourceLineNo">697</span><a name="line.697"></a>
 <span class="sourceLineNo">698</span>      Object o = s;<a name="line.698"></a>
 <span class="sourceLineNo">699</span>      if (sType.isChar())<a name="line.699"></a>
@@ -720,8 +720,8 @@
 <span class="sourceLineNo">712</span>            throw new ParseException(getLastLocation(), "Invalid conversion from string to class ''{0}''", type);<a name="line.712"></a>
 <span class="sourceLineNo">713</span>      }<a name="line.713"></a>
 <span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span>      if (transform != null)<a name="line.715"></a>
-<span class="sourceLineNo">716</span>         o = transform.unswap(this, o, type);<a name="line.716"></a>
+<span class="sourceLineNo">715</span>      if (swap != null)<a name="line.715"></a>
+<span class="sourceLineNo">716</span>         o = swap.unswap(this, o, type);<a name="line.716"></a>
 <span class="sourceLineNo">717</span><a name="line.717"></a>
 <span class="sourceLineNo">718</span>      return (T)o;<a name="line.718"></a>
 <span class="sourceLineNo">719</span>   }<a name="line.719"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Introspectable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Introspectable.html b/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Introspectable.html
index f68ce0d..f6747a6 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Introspectable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Introspectable.html
@@ -25,55 +25,58 @@
 <span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
 <span class="sourceLineNo">018</span>import org.apache.juneau.json.*;<a name="line.18"></a>
 <span class="sourceLineNo">019</span>import org.apache.juneau.rest.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.utils.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Converter for enablement of {@link PojoIntrospector} support on response objects returned by a<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;code&gt;@RestMethod&lt;/code&gt; method.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;p&gt;<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * When enabled, public methods can be called on objects returned through the {@link RestResponse#setOutput(Object)}<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * method.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * &lt;p&gt;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Note that opening up public methods for calling through a REST interface can be dangerous, and should be done with<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * caution.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * &lt;p&gt;<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Java methods are invoked by passing in the following URL parameters:<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * &lt;ul class='spaced-list'&gt;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *    &lt;li&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       &lt;code&gt;&amp;amp;invokeMethod&lt;/code&gt; - The Java method name, optionally with arguments if necessary to<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *       differentiate between methods.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *    &lt;li&gt;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *       &lt;code&gt;&amp;amp;invokeArgs&lt;/code&gt; - The arguments as a JSON array.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * &lt;/ul&gt;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * &lt;p&gt;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * See {@link PojoIntrospector} for additional information on introspection of POJO methods.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>public final class Introspectable implements RestConverter {<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>   @Override /* RestConverter */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   @SuppressWarnings({"unchecked", "rawtypes"})<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   public Object convert(RestRequest req, Object o, ClassMeta cm) throws RestException {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      String method = req.getQuery().getString("invokeMethod");<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      String args = req.getQuery().getString("invokeArgs");<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      if (method == null)<a name="line.54"></a>
-<span class="sourceLineNo">055</span>         return o;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>      try {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>         if (cm.getPojoSwap() != null)<a name="line.57"></a>
-<span class="sourceLineNo">058</span>            o = cm.getPojoSwap().swap(req.getBeanSession(), o);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>         return new PojoIntrospector(o, JsonParser.DEFAULT).invokeMethod(method, args);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      } catch (Exception e) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>         e.printStackTrace();<a name="line.61"></a>
-<span class="sourceLineNo">062</span>         return new RestException(SC_INTERNAL_SERVER_ERROR,<a name="line.62"></a>
-<span class="sourceLineNo">063</span>            "Error occurred trying to invoke method: {0}",<a name="line.63"></a>
-<span class="sourceLineNo">064</span>            e.getLocalizedMessage()<a name="line.64"></a>
-<span class="sourceLineNo">065</span>         ).initCause(e);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      }<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   }<a name="line.67"></a>
-<span class="sourceLineNo">068</span>}<a name="line.68"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.transform.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.utils.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * Converter for enablement of {@link PojoIntrospector} support on response objects returned by a<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;code&gt;@RestMethod&lt;/code&gt; method.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * &lt;p&gt;<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * When enabled, public methods can be called on objects returned through the {@link RestResponse#setOutput(Object)}<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * method.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * &lt;p&gt;<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Note that opening up public methods for calling through a REST interface can be dangerous, and should be done with<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * caution.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * &lt;p&gt;<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Java methods are invoked by passing in the following URL parameters:<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * &lt;ul class='spaced-list'&gt;<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *    &lt;li&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *       &lt;code&gt;&amp;amp;invokeMethod&lt;/code&gt; - The Java method name, optionally with arguments if necessary to<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *       differentiate between methods.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *    &lt;li&gt;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> *       &lt;code&gt;&amp;amp;invokeArgs&lt;/code&gt; - The arguments as a JSON array.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * &lt;/ul&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * &lt;p&gt;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * See {@link PojoIntrospector} for additional information on introspection of POJO methods.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>public final class Introspectable implements RestConverter {<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>   @Override /* RestConverter */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   @SuppressWarnings({"unchecked", "rawtypes"})<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   public Object convert(RestRequest req, Object o, ClassMeta cm) throws RestException {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      String method = req.getQuery().getString("invokeMethod");<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      String args = req.getQuery().getString("invokeArgs");<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      if (method == null)<a name="line.55"></a>
+<span class="sourceLineNo">056</span>         return o;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>      try {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>         BeanSession bs = req.getBeanSession();<a name="line.58"></a>
+<span class="sourceLineNo">059</span>         PojoSwap swap = cm.getPojoSwap(bs);<a name="line.59"></a>
+<span class="sourceLineNo">060</span>         if (swap != null)<a name="line.60"></a>
+<span class="sourceLineNo">061</span>            o = swap.swap(bs, o);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>         return new PojoIntrospector(o, JsonParser.DEFAULT).invokeMethod(method, args);<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      } catch (Exception e) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>         e.printStackTrace();<a name="line.64"></a>
+<span class="sourceLineNo">065</span>         return new RestException(SC_INTERNAL_SERVER_ERROR,<a name="line.65"></a>
+<span class="sourceLineNo">066</span>            "Error occurred trying to invoke method: {0}",<a name="line.66"></a>
+<span class="sourceLineNo">067</span>            e.getLocalizedMessage()<a name="line.67"></a>
+<span class="sourceLineNo">068</span>         ).initCause(e);<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      }<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   }<a name="line.70"></a>
+<span class="sourceLineNo">071</span>}<a name="line.71"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Traversable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Traversable.html b/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Traversable.html
index 8f7710c..bd41e71 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Traversable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/converters/Traversable.html
@@ -24,57 +24,60 @@
 <span class="sourceLineNo">016</span><a name="line.16"></a>
 <span class="sourceLineNo">017</span>import org.apache.juneau.*;<a name="line.17"></a>
 <span class="sourceLineNo">018</span>import org.apache.juneau.rest.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.utils.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * Converter for enabling of {@link PojoRest} support on response objects returned by a &lt;code&gt;@RestMethod&lt;/code&gt; method.<a name="line.22"></a>
-<span class="sourceLineNo">023</span> *<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;p&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * When enabled, objects in a POJO tree returned by the REST method can be addressed through additional URL path<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * information.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> *<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * &lt;p class='bcode'&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> *    &lt;jc&gt;// Resource method on resource "http://localhost:8080/sample/addressBook"&lt;/jc&gt;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(name=&lt;js&gt;"GET"&lt;/js&gt;, converters=Traversable.&lt;jk&gt;class&lt;/jk&gt;)<a name="line.30"></a>
-<span class="sourceLineNo">031</span> *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req, RestResponse res) {<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *       &lt;jk&gt;return new&lt;/jk&gt; AddressBook();<a name="line.32"></a>
-<span class="sourceLineNo">033</span> *    }<a name="line.33"></a>
-<span class="sourceLineNo">034</span> *<a name="line.34"></a>
-<span class="sourceLineNo">035</span> *    &lt;jc&gt;// Sample usage&lt;/jc&gt;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> *    &lt;jk&gt;public static void&lt;/jk&gt; main(String[] args) {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *       &lt;jc&gt;// Get the zip code of the 2nd address of the first person in the address book.&lt;/jc&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> *       RestCall r = &lt;jk&gt;new&lt;/jk&gt; RestClient().doGet(&lt;js&gt;"http://localhost:8080/sample/addressBook/0/addresses/1/zip"&lt;/js&gt;);<a name="line.38"></a>
-<span class="sourceLineNo">039</span> *       &lt;jk&gt;int&lt;/jk&gt; zip = r.getResponse(Integer.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *    }<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;/p&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * See {@link PojoRest} for additional information on addressing elements in a POJO tree using URL notation.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>public final class Traversable implements RestConverter {<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>   @Override /* RestConverter */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   public Object convert(RestRequest req, Object o, ClassMeta cm) throws RestException {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>      if (o == null)<a name="line.51"></a>
-<span class="sourceLineNo">052</span>         return null;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>      if (req.getPathMatch().getRemainder() != null) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>         try {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>            if (cm.getPojoSwap() != null)<a name="line.56"></a>
-<span class="sourceLineNo">057</span>               o = cm.getPojoSwap().swap(req.getBeanSession(), o);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>            PojoRest p = new PojoRest(o, req.getBody().getReaderParser());<a name="line.58"></a>
-<span class="sourceLineNo">059</span>            o = p.get(req.getPathMatch().getRemainder());<a name="line.59"></a>
-<span class="sourceLineNo">060</span>         } catch (PojoRestException e) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>            throw new RestException(e.getStatus(), e);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>         } catch (Exception e) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>            throw new RestException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>         }<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>      return o;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   }<a name="line.68"></a>
-<span class="sourceLineNo">069</span>}<a name="line.69"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.transform.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.utils.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * Converter for enabling of {@link PojoRest} support on response objects returned by a &lt;code&gt;@RestMethod&lt;/code&gt; method.<a name="line.23"></a>
+<span class="sourceLineNo">024</span> *<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * &lt;p&gt;<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * When enabled, objects in a POJO tree returned by the REST method can be addressed through additional URL path<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * information.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * &lt;p class='bcode'&gt;<a name="line.29"></a>
+<span class="sourceLineNo">030</span> *    &lt;jc&gt;// Resource method on resource "http://localhost:8080/sample/addressBook"&lt;/jc&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *    &lt;ja&gt;@RestMethod&lt;/ja&gt;(name=&lt;js&gt;"GET"&lt;/js&gt;, converters=Traversable.&lt;jk&gt;class&lt;/jk&gt;)<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *    &lt;jk&gt;public void&lt;/jk&gt; doGet(RestRequest req, RestResponse res) {<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *       &lt;jk&gt;return new&lt;/jk&gt; AddressBook();<a name="line.33"></a>
+<span class="sourceLineNo">034</span> *    }<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *<a name="line.35"></a>
+<span class="sourceLineNo">036</span> *    &lt;jc&gt;// Sample usage&lt;/jc&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *    &lt;jk&gt;public static void&lt;/jk&gt; main(String[] args) {<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *       &lt;jc&gt;// Get the zip code of the 2nd address of the first person in the address book.&lt;/jc&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *       RestCall r = &lt;jk&gt;new&lt;/jk&gt; RestClient().doGet(&lt;js&gt;"http://localhost:8080/sample/addressBook/0/addresses/1/zip"&lt;/js&gt;);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *       &lt;jk&gt;int&lt;/jk&gt; zip = r.getResponse(Integer.&lt;jk&gt;class&lt;/jk&gt;);<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *    }<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * &lt;/p&gt;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * &lt;p&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * See {@link PojoRest} for additional information on addressing elements in a POJO tree using URL notation.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public final class Traversable implements RestConverter {<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>   @Override /* RestConverter */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   public Object convert(RestRequest req, Object o, ClassMeta cm) throws RestException {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      if (o == null)<a name="line.52"></a>
+<span class="sourceLineNo">053</span>         return null;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>      if (req.getPathMatch().getRemainder() != null) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>         try {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>            BeanSession bs = req.getBeanSession();<a name="line.57"></a>
+<span class="sourceLineNo">058</span>            PojoSwap swap = cm.getPojoSwap(bs);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>            if (swap != null)<a name="line.59"></a>
+<span class="sourceLineNo">060</span>               o = swap.swap(bs, o);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>            PojoRest p = new PojoRest(o, req.getBody().getReaderParser());<a name="line.61"></a>
+<span class="sourceLineNo">062</span>            o = p.get(req.getPathMatch().getRemainder());<a name="line.62"></a>
+<span class="sourceLineNo">063</span>         } catch (PojoRestException e) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>            throw new RestException(e.getStatus(), e);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>         } catch (Exception e) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>            throw new RestException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);<a name="line.66"></a>
+<span class="sourceLineNo">067</span>         }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>      return o;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   }<a name="line.71"></a>
+<span class="sourceLineNo">072</span>}<a name="line.72"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.BeanPropertyDescription.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.BeanPropertyDescription.html b/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.BeanPropertyDescription.html
index 1d21b2c..f02d666 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.BeanPropertyDescription.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.BeanPropertyDescription.html
@@ -75,7 +75,7 @@
 <span class="sourceLineNo">067</span>       */<a name="line.67"></a>
 <span class="sourceLineNo">068</span>      public BeanPropertyDescription(String name, ClassMeta&lt;?&gt; type) {<a name="line.68"></a>
 <span class="sourceLineNo">069</span>         this.name = name;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>         this.type = type.getSerializedClassMeta().toString();<a name="line.70"></a>
+<span class="sourceLineNo">070</span>         this.type = type.getSerializedClassMeta(null).toString();<a name="line.70"></a>
 <span class="sourceLineNo">071</span>      }<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>



Mime
View raw message