juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [10/34] incubator-juneau-website git commit: Update javadocs
Date Sun, 10 Sep 2017 20:32:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParserSession.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParserSession.html
index 3db985d..9b54a25 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParserSession.html
@@ -236,8 +236,8 @@
 <span class="sourceLineNo">228</span><a name="line.228"></a>
 <span class="sourceLineNo">229</span>      if (eType == null)<a name="line.229"></a>
 <span class="sourceLineNo">230</span>         eType = (ClassMeta&lt;T&gt;)object();<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      PojoSwap&lt;T,Object&gt; transform = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap();<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      ClassMeta&lt;?&gt; sType = eType.getSerializedClassMeta();<a name="line.232"></a>
+<span class="sourceLineNo">231</span>      PojoSwap&lt;T,Object&gt; swap = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap(this);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      ClassMeta&lt;?&gt; sType = swap == null ? eType : swap.getSwapClassMeta(this);<a name="line.232"></a>
 <span class="sourceLineNo">233</span>      setCurrentClass(sType);<a name="line.233"></a>
 <span class="sourceLineNo">234</span><a name="line.234"></a>
 <span class="sourceLineNo">235</span>      if (! sType.canCreateNewInstance(outer)) {<a name="line.235"></a>
@@ -349,8 +349,8 @@
 <span class="sourceLineNo">341</span>         throw new ParseException("Class ''{0}'' could not be instantiated.  Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.341"></a>
 <span class="sourceLineNo">342</span>      }<a name="line.342"></a>
 <span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>      if (transform != null &amp;&amp; o != null)<a name="line.344"></a>
-<span class="sourceLineNo">345</span>         o = transform.unswap(this, o, eType);<a name="line.345"></a>
+<span class="sourceLineNo">344</span>      if (swap != null &amp;&amp; o != null)<a name="line.344"></a>
+<span class="sourceLineNo">345</span>         o = swap.unswap(this, o, eType);<a name="line.345"></a>
 <span class="sourceLineNo">346</span><a name="line.346"></a>
 <span class="sourceLineNo">347</span>      if (outer != null)<a name="line.347"></a>
 <span class="sourceLineNo">348</span>         setParent(eType, o, outer);<a name="line.348"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
index 11ab1dc..2fa4143 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializerSession.html
@@ -214,212 +214,213 @@
 <span class="sourceLineNo">206</span>            aType = ((Delegate)o).getClassMeta();<a name="line.206"></a>
 <span class="sourceLineNo">207</span>         }<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>         sType = aType.getSerializedClassMeta();<a name="line.209"></a>
+<span class="sourceLineNo">209</span>         sType = aType;<a name="line.209"></a>
 <span class="sourceLineNo">210</span><a name="line.210"></a>
 <span class="sourceLineNo">211</span>         // Swap if necessary<a name="line.211"></a>
-<span class="sourceLineNo">212</span>         PojoSwap swap = aType.getPojoSwap();<a name="line.212"></a>
+<span class="sourceLineNo">212</span>         PojoSwap swap = aType.getPojoSwap(this);<a name="line.212"></a>
 <span class="sourceLineNo">213</span>         if (swap != null) {<a name="line.213"></a>
 <span class="sourceLineNo">214</span>            o = swap.swap(this, o);<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>            // If the getSwapClass() method returns Object, we need to figure out<a name="line.216"></a>
-<span class="sourceLineNo">217</span>            // the actual type now.<a name="line.217"></a>
-<span class="sourceLineNo">218</span>            if (sType.isObject())<a name="line.218"></a>
-<span class="sourceLineNo">219</span>               sType = getClassMetaForObject(o);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>         }<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      } else {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>         sType = eType.getSerializedClassMeta();<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>      String typeName = getBeanTypeName(eType, aType, bpm);<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>      RDFNode n = null;<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>      if (o == null || sType.isChar() &amp;&amp; ((Character)o).charValue() == 0) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>         if (bpm != null) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>            if (! isTrimNulls()) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>               n = m.createResource(RDF_NIL);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>            }<a name="line.233"></a>
-<span class="sourceLineNo">234</span>         } else {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>            n = m.createResource(RDF_NIL);<a name="line.235"></a>
-<span class="sourceLineNo">236</span>         }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span>      } else if (sType.isUri() || isURI) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>         // Note that RDF URIs must be absolute to be valid!<a name="line.239"></a>
-<span class="sourceLineNo">240</span>         String uri = getUri(o, null);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>         if (StringUtils.isAbsoluteUri(uri))<a name="line.241"></a>
-<span class="sourceLineNo">242</span>            n = m.createResource(uri);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>         else<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            n = m.createLiteral(encodeTextInvalidChars(uri));<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span>      } else if (sType.isCharSequence() || sType.isChar()) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>         n = m.createLiteral(encodeTextInvalidChars(o));<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>      } else if (sType.isNumber() || sType.isBoolean()) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>         if (! addLiteralTypes)<a name="line.250"></a>
-<span class="sourceLineNo">251</span>            n = m.createLiteral(o.toString());<a name="line.251"></a>
-<span class="sourceLineNo">252</span>         else<a name="line.252"></a>
-<span class="sourceLineNo">253</span>            n = m.createTypedLiteral(o);<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>      } else if (sType.isMap() || (wType != null &amp;&amp; wType.isMap())) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>         if (o instanceof BeanMap) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>            BeanMap bm = (BeanMap)o;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>            Object uri = null;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>            RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.259"></a>
-<span class="sourceLineNo">260</span>            if (rbm.hasBeanUri())<a name="line.260"></a>
-<span class="sourceLineNo">261</span>               uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>            String uri2 = getUri(uri, null);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>            n = m.createResource(uri2);<a name="line.263"></a>
-<span class="sourceLineNo">264</span>            serializeBeanMap(bm, (Resource)n, typeName);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>         } else {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>            Map m2 = (Map)o;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            n = m.createResource();<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            serializeMap(m2, (Resource)n, sType);<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>      } else if (sType.isBean()) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>         BeanMap bm = toBeanMap(o);<a name="line.272"></a>
-<span class="sourceLineNo">273</span>         Object uri = null;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>         RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>         if (rbm.hasBeanUri())<a name="line.275"></a>
-<span class="sourceLineNo">276</span>            uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>         String uri2 = getUri(uri, null);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>         n = m.createResource(uri2);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>         serializeBeanMap(bm, (Resource)n, typeName);<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>      } else if (sType.isCollectionOrArray() || (wType != null &amp;&amp; wType.isCollection())) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>         Collection c = sort(sType.isCollection() ? (Collection)o : toList(sType.getInnerClass(), o));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>         RdfCollectionFormat f = collectionFormat;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>         RdfClassMeta rcm = sType.getExtendedMeta(RdfClassMeta.class);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>         if (rcm.getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            f = rcm.getCollectionFormat();<a name="line.286"></a>
-<span class="sourceLineNo">287</span>         if (bpm != null &amp;&amp; bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.287"></a>
-<span class="sourceLineNo">288</span>            f = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat();<a name="line.288"></a>
-<span class="sourceLineNo">289</span>         switch (f) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>            case BAG: n = serializeToContainer(c, eType, m.createBag()); break;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>            case LIST: n = serializeToList(c, eType); break;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>            case MULTI_VALUED: serializeToMultiProperties(c, eType, bpm, attrName, parentResource); break;<a name="line.292"></a>
-<span class="sourceLineNo">293</span>            default: n = serializeToContainer(c, eType, m.createSeq());<a name="line.293"></a>
-<span class="sourceLineNo">294</span>         }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      <a name="line.295"></a>
-<span class="sourceLineNo">296</span>      } else if (sType.isReader() || sType.isInputStream()) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>         n = m.createLiteral(encodeTextInvalidChars(IOUtils.read(o)));<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      <a name="line.298"></a>
-<span class="sourceLineNo">299</span>      } else {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>         n = m.createLiteral(encodeTextInvalidChars(toString(o)));<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>      pop();<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>      return n;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span>   private String getUri(Object uri, Object uri2) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      String s = null;<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      if (uri != null)<a name="line.310"></a>
-<span class="sourceLineNo">311</span>         s = uri.toString();<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      if ((s == null || s.isEmpty()) &amp;&amp; uri2 != null)<a name="line.312"></a>
-<span class="sourceLineNo">313</span>         s = uri2.toString();<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      if (s == null)<a name="line.314"></a>
-<span class="sourceLineNo">315</span>         return null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      return getUriResolver().resolve(s);<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>   private void serializeMap(Map m, Resource r, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>      m = sort(m);<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>      ClassMeta&lt;?&gt; keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>      ArrayList&lt;Map.Entry&lt;Object,Object&gt;&gt; l = new ArrayList&lt;Map.Entry&lt;Object,Object&gt;&gt;(m.entrySet());<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      Collections.reverse(l);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      for (Map.Entry&lt;Object,Object&gt; me : l) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>         Object value = me.getValue();<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>         Object key = generalize(me.getKey(), keyType);<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>         Namespace ns = juneauBpNs;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>         Property p = model.createProperty(ns.getUri(), encodeElementName(toString(key)));<a name="line.333"></a>
-<span class="sourceLineNo">334</span>         RDFNode n = serializeAnything(value, false, valueType, key == null ? null : toString(key), null, r);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>         if (n != null)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>            r.addProperty(p, n);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>   }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>   private void serializeBeanMap(BeanMap&lt;?&gt; m, Resource r, String typeName) throws Exception {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      List&lt;BeanPropertyValue&gt; l = m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null);<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      Collections.reverse(l);<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      for (BeanPropertyValue bpv : l) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>         BeanPropertyMeta pMeta = bpv.getMeta();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>         ClassMeta&lt;?&gt; cMeta = pMeta.getClassMeta();<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span>         if (pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).isBeanUri())<a name="line.347"></a>
-<span class="sourceLineNo">348</span>            continue;<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>         String key = bpv.getName();<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         Object value = bpv.getValue();<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         Throwable t = bpv.getThrown();<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         if (t != null)<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            onBeanGetterException(pMeta, t);<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span>         if (canIgnoreValue(cMeta, key, value))<a name="line.356"></a>
-<span class="sourceLineNo">357</span>            continue;<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>         BeanPropertyMeta bpm = bpv.getMeta();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>         Namespace ns = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getNamespace();<a name="line.360"></a>
-<span class="sourceLineNo">361</span>         if (ns == null &amp;&amp; useXmlNamespaces)<a name="line.361"></a>
-<span class="sourceLineNo">362</span>            ns = bpm.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace();<a name="line.362"></a>
-<span class="sourceLineNo">363</span>         if (ns == null)<a name="line.363"></a>
-<span class="sourceLineNo">364</span>            ns = juneauBpNs;<a name="line.364"></a>
-<span class="sourceLineNo">365</span>         else if (autoDetectNamespaces)<a name="line.365"></a>
-<span class="sourceLineNo">366</span>            addModelPrefix(ns);<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span>         Property p = model.createProperty(ns.getUri(), encodeElementName(key));<a name="line.368"></a>
-<span class="sourceLineNo">369</span>         RDFNode n = serializeAnything(value, pMeta.isUri(), cMeta, key, pMeta, r);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>         if (n != null)<a name="line.370"></a>
-<span class="sourceLineNo">371</span>            r.addProperty(p, n);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">215</span>            sType = swap.getSwapClassMeta(this);<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>            // If the getSwapClass() method returns Object, we need to figure out<a name="line.217"></a>
+<span class="sourceLineNo">218</span>            // the actual type now.<a name="line.218"></a>
+<span class="sourceLineNo">219</span>            if (sType.isObject())<a name="line.219"></a>
+<span class="sourceLineNo">220</span>               sType = getClassMetaForObject(o);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>         }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      } else {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>         sType = eType.getSerializedClassMeta(this);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>      String typeName = getBeanTypeName(eType, aType, bpm);<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>      RDFNode n = null;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>      if (o == null || sType.isChar() &amp;&amp; ((Character)o).charValue() == 0) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>         if (bpm != null) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>            if (! isTrimNulls()) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>               n = m.createResource(RDF_NIL);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>            }<a name="line.234"></a>
+<span class="sourceLineNo">235</span>         } else {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>            n = m.createResource(RDF_NIL);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>         }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>      } else if (sType.isUri() || isURI) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>         // Note that RDF URIs must be absolute to be valid!<a name="line.240"></a>
+<span class="sourceLineNo">241</span>         String uri = getUri(o, null);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>         if (StringUtils.isAbsoluteUri(uri))<a name="line.242"></a>
+<span class="sourceLineNo">243</span>            n = m.createResource(uri);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>         else<a name="line.244"></a>
+<span class="sourceLineNo">245</span>            n = m.createLiteral(encodeTextInvalidChars(uri));<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>      } else if (sType.isCharSequence() || sType.isChar()) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>         n = m.createLiteral(encodeTextInvalidChars(o));<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>      } else if (sType.isNumber() || sType.isBoolean()) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>         if (! addLiteralTypes)<a name="line.251"></a>
+<span class="sourceLineNo">252</span>            n = m.createLiteral(o.toString());<a name="line.252"></a>
+<span class="sourceLineNo">253</span>         else<a name="line.253"></a>
+<span class="sourceLineNo">254</span>            n = m.createTypedLiteral(o);<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>      } else if (sType.isMap() || (wType != null &amp;&amp; wType.isMap())) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span>         if (o instanceof BeanMap) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>            BeanMap bm = (BeanMap)o;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>            Object uri = null;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>            RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>            if (rbm.hasBeanUri())<a name="line.261"></a>
+<span class="sourceLineNo">262</span>               uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>            String uri2 = getUri(uri, null);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>            n = m.createResource(uri2);<a name="line.264"></a>
+<span class="sourceLineNo">265</span>            serializeBeanMap(bm, (Resource)n, typeName);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>         } else {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>            Map m2 = (Map)o;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            n = m.createResource();<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            serializeMap(m2, (Resource)n, sType);<a name="line.269"></a>
+<span class="sourceLineNo">270</span>         }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>      } else if (sType.isBean()) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>         BeanMap bm = toBeanMap(o);<a name="line.273"></a>
+<span class="sourceLineNo">274</span>         Object uri = null;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>         RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>         if (rbm.hasBeanUri())<a name="line.276"></a>
+<span class="sourceLineNo">277</span>            uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>         String uri2 = getUri(uri, null);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>         n = m.createResource(uri2);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>         serializeBeanMap(bm, (Resource)n, typeName);<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>      } else if (sType.isCollectionOrArray() || (wType != null &amp;&amp; wType.isCollection())) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>         Collection c = sort(sType.isCollection() ? (Collection)o : toList(sType.getInnerClass(), o));<a name="line.283"></a>
+<span class="sourceLineNo">284</span>         RdfCollectionFormat f = collectionFormat;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>         RdfClassMeta rcm = sType.getExtendedMeta(RdfClassMeta.class);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>         if (rcm.getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>            f = rcm.getCollectionFormat();<a name="line.287"></a>
+<span class="sourceLineNo">288</span>         if (bpm != null &amp;&amp; bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)<a name="line.288"></a>
+<span class="sourceLineNo">289</span>            f = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat();<a name="line.289"></a>
+<span class="sourceLineNo">290</span>         switch (f) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>            case BAG: n = serializeToContainer(c, eType, m.createBag()); break;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>            case LIST: n = serializeToList(c, eType); break;<a name="line.292"></a>
+<span class="sourceLineNo">293</span>            case MULTI_VALUED: serializeToMultiProperties(c, eType, bpm, attrName, parentResource); break;<a name="line.293"></a>
+<span class="sourceLineNo">294</span>            default: n = serializeToContainer(c, eType, m.createSeq());<a name="line.294"></a>
+<span class="sourceLineNo">295</span>         }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      <a name="line.296"></a>
+<span class="sourceLineNo">297</span>      } else if (sType.isReader() || sType.isInputStream()) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>         n = m.createLiteral(encodeTextInvalidChars(IOUtils.read(o)));<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      <a name="line.299"></a>
+<span class="sourceLineNo">300</span>      } else {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>         n = m.createLiteral(encodeTextInvalidChars(toString(o)));<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span>      pop();<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>      return n;<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 String getUri(Object uri, Object uri2) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      String s = null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      if (uri != null)<a name="line.311"></a>
+<span class="sourceLineNo">312</span>         s = uri.toString();<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      if ((s == null || s.isEmpty()) &amp;&amp; uri2 != null)<a name="line.313"></a>
+<span class="sourceLineNo">314</span>         s = uri2.toString();<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      if (s == null)<a name="line.315"></a>
+<span class="sourceLineNo">316</span>         return null;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      return getUriResolver().resolve(s);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>   private void serializeMap(Map m, Resource r, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>      m = sort(m);<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>      ClassMeta&lt;?&gt; keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>      ArrayList&lt;Map.Entry&lt;Object,Object&gt;&gt; l = new ArrayList&lt;Map.Entry&lt;Object,Object&gt;&gt;(m.entrySet());<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      Collections.reverse(l);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      for (Map.Entry&lt;Object,Object&gt; me : l) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>         Object value = me.getValue();<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span>         Object key = generalize(me.getKey(), keyType);<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>         Namespace ns = juneauBpNs;<a name="line.333"></a>
+<span class="sourceLineNo">334</span>         Property p = model.createProperty(ns.getUri(), encodeElementName(toString(key)));<a name="line.334"></a>
+<span class="sourceLineNo">335</span>         RDFNode n = serializeAnything(value, false, valueType, key == null ? null : toString(key), null, r);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>         if (n != null)<a name="line.336"></a>
+<span class="sourceLineNo">337</span>            r.addProperty(p, n);<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>   private void serializeBeanMap(BeanMap&lt;?&gt; m, Resource r, String typeName) throws Exception {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      List&lt;BeanPropertyValue&gt; l = m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null);<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      Collections.reverse(l);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      for (BeanPropertyValue bpv : l) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>         BeanPropertyMeta pMeta = bpv.getMeta();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>         ClassMeta&lt;?&gt; cMeta = pMeta.getClassMeta();<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>         if (pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).isBeanUri())<a name="line.348"></a>
+<span class="sourceLineNo">349</span>            continue;<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>         String key = bpv.getName();<a name="line.351"></a>
+<span class="sourceLineNo">352</span>         Object value = bpv.getValue();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>         Throwable t = bpv.getThrown();<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         if (t != null)<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            onBeanGetterException(pMeta, t);<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>         if (canIgnoreValue(cMeta, key, value))<a name="line.357"></a>
+<span class="sourceLineNo">358</span>            continue;<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span>         BeanPropertyMeta bpm = bpv.getMeta();<a name="line.360"></a>
+<span class="sourceLineNo">361</span>         Namespace ns = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getNamespace();<a name="line.361"></a>
+<span class="sourceLineNo">362</span>         if (ns == null &amp;&amp; useXmlNamespaces)<a name="line.362"></a>
+<span class="sourceLineNo">363</span>            ns = bpm.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace();<a name="line.363"></a>
+<span class="sourceLineNo">364</span>         if (ns == null)<a name="line.364"></a>
+<span class="sourceLineNo">365</span>            ns = juneauBpNs;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>         else if (autoDetectNamespaces)<a name="line.366"></a>
+<span class="sourceLineNo">367</span>            addModelPrefix(ns);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>         Property p = model.createProperty(ns.getUri(), encodeElementName(key));<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         RDFNode n = serializeAnything(value, pMeta.isUri(), cMeta, key, pMeta, r);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>         if (n != null)<a name="line.371"></a>
+<span class="sourceLineNo">372</span>            r.addProperty(p, n);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
+<span class="sourceLineNo">374</span>   }<a name="line.374"></a>
 <span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span>   private Container serializeToContainer(Collection c, ClassMeta&lt;?&gt; type, Container list) throws Exception {<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      for (Object e : c) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>         RDFNode n = serializeAnything(e, false, elementType, null, null, null);<a name="line.380"></a>
-<span class="sourceLineNo">381</span>         list = list.add(n);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      return list;<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span>   private RDFList serializeToList(Collection c, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      List&lt;RDFNode&gt; l = new ArrayList&lt;RDFNode&gt;(c.size());<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      for (Object e : c) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>         l.add(serializeAnything(e, false, elementType, null, null, null));<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      }<a name="line.391"></a>
-<span class="sourceLineNo">392</span>      return model.createList(l.iterator());<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   }<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span>   private void serializeToMultiProperties(Collection c, ClassMeta&lt;?&gt; sType, <a name="line.395"></a>
-<span class="sourceLineNo">396</span>         BeanPropertyMeta bpm, String attrName, Resource parentResource) throws Exception {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      ClassMeta&lt;?&gt; elementType = sType.getElementType();<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      for (Object e : c) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>         Namespace ns = null;<a name="line.399"></a>
-<span class="sourceLineNo">400</span>         if (bpm != null) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>            ns = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getNamespace();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>            if (ns == null &amp;&amp; useXmlNamespaces)<a name="line.402"></a>
-<span class="sourceLineNo">403</span>               ns = bpm.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>         }<a name="line.404"></a>
-<span class="sourceLineNo">405</span>         if (ns == null)<a name="line.405"></a>
-<span class="sourceLineNo">406</span>            ns = juneauBpNs;<a name="line.406"></a>
-<span class="sourceLineNo">407</span>         else if (autoDetectNamespaces)<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            addModelPrefix(ns);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>         RDFNode n2 = serializeAnything(e, false, elementType, null, null, null);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>         Property p = model.createProperty(ns.getUri(), encodeElementName(attrName));<a name="line.410"></a>
-<span class="sourceLineNo">411</span>         parentResource.addProperty(p, n2);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   }<a name="line.413"></a>
-<span class="sourceLineNo">414</span>}<a name="line.414"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>   private Container serializeToContainer(Collection c, ClassMeta&lt;?&gt; type, Container list) throws Exception {<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      for (Object e : c) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>         RDFNode n = serializeAnything(e, false, elementType, null, null, null);<a name="line.381"></a>
+<span class="sourceLineNo">382</span>         list = list.add(n);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      return list;<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>   private RDFList serializeToList(Collection c, ClassMeta&lt;?&gt; type) throws Exception {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      ClassMeta&lt;?&gt; elementType = type.getElementType();<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      List&lt;RDFNode&gt; l = new ArrayList&lt;RDFNode&gt;(c.size());<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      for (Object e : c) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>         l.add(serializeAnything(e, false, elementType, null, null, null));<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      return model.createList(l.iterator());<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   }<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>   private void serializeToMultiProperties(Collection c, ClassMeta&lt;?&gt; sType, <a name="line.396"></a>
+<span class="sourceLineNo">397</span>         BeanPropertyMeta bpm, String attrName, Resource parentResource) throws Exception {<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      ClassMeta&lt;?&gt; elementType = sType.getElementType();<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      for (Object e : c) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>         Namespace ns = null;<a name="line.400"></a>
+<span class="sourceLineNo">401</span>         if (bpm != null) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>            ns = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getNamespace();<a name="line.402"></a>
+<span class="sourceLineNo">403</span>            if (ns == null &amp;&amp; useXmlNamespaces)<a name="line.403"></a>
+<span class="sourceLineNo">404</span>               ns = bpm.getExtendedMeta(XmlBeanPropertyMeta.class).getNamespace();<a name="line.404"></a>
+<span class="sourceLineNo">405</span>         }<a name="line.405"></a>
+<span class="sourceLineNo">406</span>         if (ns == null)<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            ns = juneauBpNs;<a name="line.407"></a>
+<span class="sourceLineNo">408</span>         else if (autoDetectNamespaces)<a name="line.408"></a>
+<span class="sourceLineNo">409</span>            addModelPrefix(ns);<a name="line.409"></a>
+<span class="sourceLineNo">410</span>         RDFNode n2 = serializeAnything(e, false, elementType, null, null, null);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>         Property p = model.createProperty(ns.getUri(), encodeElementName(attrName));<a name="line.411"></a>
+<span class="sourceLineNo">412</span>         parentResource.addProperty(p, n2);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      }<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>}<a name="line.415"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html
index 293396f..4dee7de 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParserSession.html
@@ -117,8 +117,8 @@
 <span class="sourceLineNo">109</span><a name="line.109"></a>
 <span class="sourceLineNo">110</span>      if (eType == null)<a name="line.110"></a>
 <span class="sourceLineNo">111</span>         eType = (ClassMeta&lt;T&gt;)object();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      PojoSwap&lt;T,Object&gt; transform = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap();<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      ClassMeta&lt;?&gt; sType = eType.getSerializedClassMeta();<a name="line.113"></a>
+<span class="sourceLineNo">112</span>      PojoSwap&lt;T,Object&gt; swap = (PojoSwap&lt;T,Object&gt;)eType.getPojoSwap(this);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      ClassMeta&lt;?&gt; sType = swap == null ? eType : swap.getSwapClassMeta(this);<a name="line.113"></a>
 <span class="sourceLineNo">114</span>      setCurrentClass(sType);<a name="line.114"></a>
 <span class="sourceLineNo">115</span>      String wrapperAttr = sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();<a name="line.115"></a>
 <span class="sourceLineNo">116</span><a name="line.116"></a>
@@ -213,8 +213,8 @@
 <span class="sourceLineNo">205</span>      if (wrapperAttr != null)<a name="line.205"></a>
 <span class="sourceLineNo">206</span>         skipWrapperAttrEnd(r);<a name="line.206"></a>
 <span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>      if (transform != null &amp;&amp; o != null)<a name="line.208"></a>
-<span class="sourceLineNo">209</span>         o = transform.unswap(this, o, eType);<a name="line.209"></a>
+<span class="sourceLineNo">208</span>      if (swap != null &amp;&amp; o != null)<a name="line.208"></a>
+<span class="sourceLineNo">209</span>         o = swap.unswap(this, o, eType);<a name="line.209"></a>
 <span class="sourceLineNo">210</span><a name="line.210"></a>
 <span class="sourceLineNo">211</span>      if (outer != null)<a name="line.211"></a>
 <span class="sourceLineNo">212</span>         setParent(eType, o, outer);<a name="line.212"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
index 08fa670..18919d7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializerSession.html
@@ -80,7 +80,7 @@
 <span class="sourceLineNo">072</span><a name="line.72"></a>
 <span class="sourceLineNo">073</span>      aType = push(attrName, eType, null);<a name="line.73"></a>
 <span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>      sType = eType.getSerializedClassMeta();<a name="line.75"></a>
+<span class="sourceLineNo">075</span>      sType = eType.getSerializedClassMeta(this);<a name="line.75"></a>
 <span class="sourceLineNo">076</span>      String type = null;<a name="line.76"></a>
 <span class="sourceLineNo">077</span><a name="line.77"></a>
 <span class="sourceLineNo">078</span>      if (sType.isEnum() || sType.isCharSequence() || sType.isChar())<a name="line.78"></a>
@@ -98,7 +98,7 @@
 <span class="sourceLineNo">090</span><a name="line.90"></a>
 <span class="sourceLineNo">091</span>      out.put("type", type);<a name="line.91"></a>
 <span class="sourceLineNo">092</span>      out.put("description", eType.toString());<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      PojoSwap f = eType.getPojoSwap();<a name="line.93"></a>
+<span class="sourceLineNo">093</span>      PojoSwap f = eType.getPojoSwap(this);<a name="line.93"></a>
 <span class="sourceLineNo">094</span>      if (f != null)<a name="line.94"></a>
 <span class="sourceLineNo">095</span>         out.put("transform", f);<a name="line.95"></a>
 <span class="sourceLineNo">096</span><a name="line.96"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
index 3a31851..3e2afe3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Readable.html
@@ -156,7 +156,7 @@
 <span class="sourceLineNo">148</span>               .append(JSON_simpleMode, true)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>               .append(SERIALIZER_quoteChar, '\''),<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            "application/json",<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            "application/json+simple", "text/json+simple"<a name="line.151"></a>
+<span class="sourceLineNo">151</span>            "application/json+simple", "application/json+simple+*", "text/json+simple", "text/json+simple+*"<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>   }<a name="line.154"></a>
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>    *    The property store containing all the settings for this object.<a name="line.204"></a>
 <span class="sourceLineNo">205</span>    */<a name="line.205"></a>
 <span class="sourceLineNo">206</span>   public JsonSerializer(PropertyStore propertyStore) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "text/json");<a name="line.207"></a>
+<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "application/json+*", "text/json", "text/json+*");<a name="line.207"></a>
 <span class="sourceLineNo">208</span>   }<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>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
index 3a31851..3e2afe3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.Simple.html
@@ -156,7 +156,7 @@
 <span class="sourceLineNo">148</span>               .append(JSON_simpleMode, true)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>               .append(SERIALIZER_quoteChar, '\''),<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            "application/json",<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            "application/json+simple", "text/json+simple"<a name="line.151"></a>
+<span class="sourceLineNo">151</span>            "application/json+simple", "application/json+simple+*", "text/json+simple", "text/json+simple+*"<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>   }<a name="line.154"></a>
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>    *    The property store containing all the settings for this object.<a name="line.204"></a>
 <span class="sourceLineNo">205</span>    */<a name="line.205"></a>
 <span class="sourceLineNo">206</span>   public JsonSerializer(PropertyStore propertyStore) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "text/json");<a name="line.207"></a>
+<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "application/json+*", "text/json", "text/json+*");<a name="line.207"></a>
 <span class="sourceLineNo">208</span>   }<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>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
index 3a31851..3e2afe3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadable.html
@@ -156,7 +156,7 @@
 <span class="sourceLineNo">148</span>               .append(JSON_simpleMode, true)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>               .append(SERIALIZER_quoteChar, '\''),<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            "application/json",<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            "application/json+simple", "text/json+simple"<a name="line.151"></a>
+<span class="sourceLineNo">151</span>            "application/json+simple", "application/json+simple+*", "text/json+simple", "text/json+simple+*"<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>   }<a name="line.154"></a>
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>    *    The property store containing all the settings for this object.<a name="line.204"></a>
 <span class="sourceLineNo">205</span>    */<a name="line.205"></a>
 <span class="sourceLineNo">206</span>   public JsonSerializer(PropertyStore propertyStore) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "text/json");<a name="line.207"></a>
+<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "application/json+*", "text/json", "text/json+*");<a name="line.207"></a>
 <span class="sourceLineNo">208</span>   }<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>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
index 3a31851..3e2afe3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.SimpleReadableSafe.html
@@ -156,7 +156,7 @@
 <span class="sourceLineNo">148</span>               .append(JSON_simpleMode, true)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>               .append(SERIALIZER_quoteChar, '\''),<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            "application/json",<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            "application/json+simple", "text/json+simple"<a name="line.151"></a>
+<span class="sourceLineNo">151</span>            "application/json+simple", "application/json+simple+*", "text/json+simple", "text/json+simple+*"<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>   }<a name="line.154"></a>
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>    *    The property store containing all the settings for this object.<a name="line.204"></a>
 <span class="sourceLineNo">205</span>    */<a name="line.205"></a>
 <span class="sourceLineNo">206</span>   public JsonSerializer(PropertyStore propertyStore) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "text/json");<a name="line.207"></a>
+<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "application/json+*", "text/json", "text/json+*");<a name="line.207"></a>
 <span class="sourceLineNo">208</span>   }<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>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
index 3a31851..3e2afe3 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializer.html
@@ -156,7 +156,7 @@
 <span class="sourceLineNo">148</span>               .append(JSON_simpleMode, true)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>               .append(SERIALIZER_quoteChar, '\''),<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            "application/json",<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            "application/json+simple", "text/json+simple"<a name="line.151"></a>
+<span class="sourceLineNo">151</span>            "application/json+simple", "application/json+simple+*", "text/json+simple", "text/json+simple+*"<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>   }<a name="line.154"></a>
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>    *    The property store containing all the settings for this object.<a name="line.204"></a>
 <span class="sourceLineNo">205</span>    */<a name="line.205"></a>
 <span class="sourceLineNo">206</span>   public JsonSerializer(PropertyStore propertyStore) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "text/json");<a name="line.207"></a>
+<span class="sourceLineNo">207</span>      this(propertyStore, "application/json", "application/json", "application/json+*", "text/json", "text/json+*");<a name="line.207"></a>
 <span class="sourceLineNo">208</span>   }<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>


Mime
View raw message