Repository: incubator-juneau-website Updated Branches: refs/heads/asf-site 29e3a9ea4 -> 46c4861ba
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html index eb08315..ec368a2 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackParser.html @@ -144,7 +144,7 @@ <span class="sourceLineNo">136</span> ClassMeta<?> cm = bpm.getClassMeta();<a name="line.136"></a> <span class="sourceLineNo">137</span> Object value = parseAnything(session, cm, is, m.getBean(false), bpm);<a name="line.137"></a> <span class="sourceLineNo">138</span> setName(cm, value, pName);<a name="line.138"></a> -<span class="sourceLineNo">139</span> bpm.set(m, value);<a name="line.139"></a> +<span class="sourceLineNo">139</span> bpm.set(m, pName, value);<a name="line.139"></a> <span class="sourceLineNo">140</span> }<a name="line.140"></a> <span class="sourceLineNo">141</span> }<a name="line.141"></a> <span class="sourceLineNo">142</span> o = m.getBean();<a name="line.142"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html index a617156..e3d7a9e 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html +++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerSession.html @@ -699,7 +699,7 @@ <span class="sourceLineNo">691</span> */<a name="line.691"></a> <span class="sourceLineNo">692</span> public BeanPropertyValue createBeanTypeNameProperty(BeanMap<?> m, String typeName) {<a name="line.692"></a> <span class="sourceLineNo">693</span> BeanMeta<?> bm = m.getMeta();<a name="line.693"></a> -<span class="sourceLineNo">694</span> return new BeanPropertyValue(bm.getTypeProperty(), typeName, null);<a name="line.694"></a> +<span class="sourceLineNo">694</span> return new BeanPropertyValue(bm.getTypeProperty(), bm.getTypeProperty().getName(), typeName, null);<a name="line.694"></a> <span class="sourceLineNo">695</span> }<a name="line.695"></a> <span class="sourceLineNo">696</span><a name="line.696"></a> <span class="sourceLineNo">697</span> /**<a name="line.697"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html index a5f445e..0c7f078 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html +++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html @@ -469,7 +469,7 @@ <span class="sourceLineNo">461</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.461"></a> <span class="sourceLineNo">462</span> } else {<a name="line.462"></a> <span class="sourceLineNo">463</span> Object value = session.convertToType("", pMeta.getClassMeta());<a name="line.463"></a> -<span class="sourceLineNo">464</span> pMeta.set(m, value);<a name="line.464"></a> +<span class="sourceLineNo">464</span> pMeta.set(m, currAttr, value);<a name="line.464"></a> <span class="sourceLineNo">465</span> }<a name="line.465"></a> <span class="sourceLineNo">466</span> }<a name="line.466"></a> <span class="sourceLineNo">467</span> if (c == -1 || c == ')' || c == AMP)<a name="line.467"></a> @@ -486,7 +486,7 @@ <span class="sourceLineNo">478</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.478"></a> <span class="sourceLineNo">479</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), false, pMeta);<a name="line.479"></a> <span class="sourceLineNo">480</span> setName(cm, value, currAttr);<a name="line.480"></a> -<span class="sourceLineNo">481</span> pMeta.set(m, value);<a name="line.481"></a> +<span class="sourceLineNo">481</span> pMeta.set(m, currAttr, value);<a name="line.481"></a> <span class="sourceLineNo">482</span> session.setCurrentProperty(null);<a name="line.482"></a> <span class="sourceLineNo">483</span> }<a name="line.483"></a> <span class="sourceLineNo">484</span> }<a name="line.484"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.html index a5f445e..0c7f078 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.html @@ -469,7 +469,7 @@ <span class="sourceLineNo">461</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.461"></a> <span class="sourceLineNo">462</span> } else {<a name="line.462"></a> <span class="sourceLineNo">463</span> Object value = session.convertToType("", pMeta.getClassMeta());<a name="line.463"></a> -<span class="sourceLineNo">464</span> pMeta.set(m, value);<a name="line.464"></a> +<span class="sourceLineNo">464</span> pMeta.set(m, currAttr, value);<a name="line.464"></a> <span class="sourceLineNo">465</span> }<a name="line.465"></a> <span class="sourceLineNo">466</span> }<a name="line.466"></a> <span class="sourceLineNo">467</span> if (c == -1 || c == ')' || c == AMP)<a name="line.467"></a> @@ -486,7 +486,7 @@ <span class="sourceLineNo">478</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.478"></a> <span class="sourceLineNo">479</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), false, pMeta);<a name="line.479"></a> <span class="sourceLineNo">480</span> setName(cm, value, currAttr);<a name="line.480"></a> -<span class="sourceLineNo">481</span> pMeta.set(m, value);<a name="line.481"></a> +<span class="sourceLineNo">481</span> pMeta.set(m, currAttr, value);<a name="line.481"></a> <span class="sourceLineNo">482</span> session.setCurrentProperty(null);<a name="line.482"></a> <span class="sourceLineNo">483</span> }<a name="line.483"></a> <span class="sourceLineNo">484</span> }<a name="line.484"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html index 88ca1d3..52fb97a 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/urlencoding/UrlEncodingParser.html @@ -284,7 +284,7 @@ <span class="sourceLineNo">276</span> // Otherwise, leave it null.<a name="line.276"></a> <span class="sourceLineNo">277</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.277"></a> <span class="sourceLineNo">278</span> if (cm.canCreateNewInstance())<a name="line.278"></a> -<span class="sourceLineNo">279</span> pMeta.set(m, cm.newInstance());<a name="line.279"></a> +<span class="sourceLineNo">279</span> pMeta.set(m, currAttr, cm.newInstance());<a name="line.279"></a> <span class="sourceLineNo">280</span> session.setCurrentProperty(null);<a name="line.280"></a> <span class="sourceLineNo">281</span> }<a name="line.281"></a> <span class="sourceLineNo">282</span> }<a name="line.282"></a> @@ -303,12 +303,12 @@ <span class="sourceLineNo">295</span> ClassMeta et = pMeta.getClassMeta().getElementType();<a name="line.295"></a> <span class="sourceLineNo">296</span> Object value = parseAnything(session, et, r.unread(), m.getBean(false), true, pMeta);<a name="line.296"></a> <span class="sourceLineNo">297</span> setName(et, value, currAttr);<a name="line.297"></a> -<span class="sourceLineNo">298</span> pMeta.add(m, value);<a name="line.298"></a> +<span class="sourceLineNo">298</span> pMeta.add(m, currAttr, value);<a name="line.298"></a> <span class="sourceLineNo">299</span> } else {<a name="line.299"></a> <span class="sourceLineNo">300</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.300"></a> <span class="sourceLineNo">301</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), true, pMeta);<a name="line.301"></a> <span class="sourceLineNo">302</span> setName(cm, value, currAttr);<a name="line.302"></a> -<span class="sourceLineNo">303</span> pMeta.set(m, value);<a name="line.303"></a> +<span class="sourceLineNo">303</span> pMeta.set(m, currAttr, value);<a name="line.303"></a> <span class="sourceLineNo">304</span> }<a name="line.304"></a> <span class="sourceLineNo">305</span> session.setCurrentProperty(null);<a name="line.305"></a> <span class="sourceLineNo">306</span> }<a name="line.306"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html index 01fa601..9763eb5 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html @@ -266,12 +266,14 @@ <span class="sourceLineNo">258</span> protected BeanPropertyMeta getPropertyMeta(String fieldName) {<a name="line.258"></a> <span class="sourceLineNo">259</span> if (collapsedProperties != null) {<a name="line.259"></a> <span class="sourceLineNo">260</span> BeanPropertyMeta bpm = collapsedProperties.get(fieldName);<a name="line.260"></a> -<span class="sourceLineNo">261</span> if (bpm != null)<a name="line.261"></a> -<span class="sourceLineNo">262</span> return bpm;<a name="line.262"></a> -<span class="sourceLineNo">263</span> }<a name="line.263"></a> -<span class="sourceLineNo">264</span> return getBeanMeta().getPropertyMeta(fieldName);<a name="line.264"></a> -<span class="sourceLineNo">265</span> }<a name="line.265"></a> -<span class="sourceLineNo">266</span>}<a name="line.266"></a> +<span class="sourceLineNo">261</span> if (bpm == null)<a name="line.261"></a> +<span class="sourceLineNo">262</span> bpm = collapsedProperties.get("*");<a name="line.262"></a> +<span class="sourceLineNo">263</span> if (bpm != null)<a name="line.263"></a> +<span class="sourceLineNo">264</span> return bpm;<a name="line.264"></a> +<span class="sourceLineNo">265</span> }<a name="line.265"></a> +<span class="sourceLineNo">266</span> return getBeanMeta().getPropertyMeta(fieldName);<a name="line.266"></a> +<span class="sourceLineNo">267</span> }<a name="line.267"></a> +<span class="sourceLineNo">268</span>}<a name="line.268"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html index 0ecee60..5537c70 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlParser.html @@ -173,7 +173,7 @@ <span class="sourceLineNo">165</span> ClassMeta<?> cm = m.getMeta().getClassMeta();<a name="line.165"></a> <span class="sourceLineNo">166</span> Object value = parseAnything(session, cm, currAttr, r, m.getBean(false), false, null);<a name="line.166"></a> <span class="sourceLineNo">167</span> setName(cm, value, currAttr);<a name="line.167"></a> -<span class="sourceLineNo">168</span> bpm.set(m, value);<a name="line.168"></a> +<span class="sourceLineNo">168</span> bpm.set(m, currAttr, value);<a name="line.168"></a> <span class="sourceLineNo">169</span> o = m.getBean();<a name="line.169"></a> <span class="sourceLineNo">170</span> } else {<a name="line.170"></a> <span class="sourceLineNo">171</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.171"></a> @@ -286,13 +286,13 @@ <span class="sourceLineNo">278</span> BeanPropertyMeta bpm = xmlMeta.getPropertyMeta(key);<a name="line.278"></a> <span class="sourceLineNo">279</span> if (bpm == null) {<a name="line.279"></a> <span class="sourceLineNo">280</span> if (xmlMeta.getAttrsProperty() != null) {<a name="line.280"></a> -<span class="sourceLineNo">281</span> xmlMeta.getAttrsProperty().add(m, key, val);<a name="line.281"></a> +<span class="sourceLineNo">281</span> xmlMeta.getAttrsProperty().add(m, key, key, val);<a name="line.281"></a> <span class="sourceLineNo">282</span> } else {<a name="line.282"></a> <span class="sourceLineNo">283</span> Location l = r.getLocation();<a name="line.283"></a> <span class="sourceLineNo">284</span> onUnknownProperty(session, key, m, l.getLineNumber(), l.getColumnNumber());<a name="line.284"></a> <span class="sourceLineNo">285</span> }<a name="line.285"></a> <span class="sourceLineNo">286</span> } else {<a name="line.286"></a> -<span class="sourceLineNo">287</span> bpm.set(m, val);<a name="line.287"></a> +<span class="sourceLineNo">287</span> bpm.set(m, key, val);<a name="line.287"></a> <span class="sourceLineNo">288</span> }<a name="line.288"></a> <span class="sourceLineNo">289</span> }<a name="line.289"></a> <span class="sourceLineNo">290</span><a name="line.290"></a> @@ -317,7 +317,7 @@ <span class="sourceLineNo">309</span> l = new LinkedList<Object>();<a name="line.309"></a> <span class="sourceLineNo">310</span> l.add(session.getText(r, false));<a name="line.310"></a> <span class="sourceLineNo">311</span> } else {<a name="line.311"></a> -<span class="sourceLineNo">312</span> cp.set(m, session.getText(r, trim));<a name="line.312"></a> +<span class="sourceLineNo">312</span> cp.set(m, null, session.getText(r, trim));<a name="line.312"></a> <span class="sourceLineNo">313</span> }<a name="line.313"></a> <span class="sourceLineNo">314</span> } else if (cpf != ELEMENTS) {<a name="line.314"></a> <span class="sourceLineNo">315</span> String s = session.getText(r, trim);<a name="line.315"></a> @@ -350,7 +350,7 @@ <span class="sourceLineNo">342</span> l = new LinkedList<Object>();<a name="line.342"></a> <span class="sourceLineNo">343</span> l.add(session.parseWhitespaceElement(r));<a name="line.343"></a> <span class="sourceLineNo">344</span> } else {<a name="line.344"></a> -<span class="sourceLineNo">345</span> cp.set(m, session.parseWhitespaceElement(r));<a name="line.345"></a> +<span class="sourceLineNo">345</span> cp.set(m, null, session.parseWhitespaceElement(r));<a name="line.345"></a> <span class="sourceLineNo">346</span> }<a name="line.346"></a> <span class="sourceLineNo">347</span> } else {<a name="line.347"></a> <span class="sourceLineNo">348</span> if (cpcm.isCollectionOrArray()) {<a name="line.348"></a> @@ -358,11 +358,11 @@ <span class="sourceLineNo">350</span> l = new LinkedList<Object>();<a name="line.350"></a> <span class="sourceLineNo">351</span> l.add(parseAnything(session, cpcm.getElementType(), cp.getName(), r, m.getBean(false), false, cp));<a name="line.351"></a> <span class="sourceLineNo">352</span> } else {<a name="line.352"></a> -<span class="sourceLineNo">353</span> cp.set(m, parseAnything(session, cpcm, cp.getName(), r, m.getBean(false), false, cp));<a name="line.353"></a> +<span class="sourceLineNo">353</span> cp.set(m, null, parseAnything(session, cpcm, cp.getName(), r, m.getBean(false), false, cp));<a name="line.353"></a> <span class="sourceLineNo">354</span> }<a name="line.354"></a> <span class="sourceLineNo">355</span> }<a name="line.355"></a> <span class="sourceLineNo">356</span> } else if (cp != null && cpf == ELEMENTS) {<a name="line.356"></a> -<span class="sourceLineNo">357</span> cp.add(m, parseAnything(session, cpcm.getElementType(), cp.getName(), r, m.getBean(false), false, cp));<a name="line.357"></a> +<span class="sourceLineNo">357</span> cp.add(m, null, parseAnything(session, cpcm.getElementType(), cp.getName(), r, m.getBean(false), false, cp));<a name="line.357"></a> <span class="sourceLineNo">358</span> } else {<a name="line.358"></a> <span class="sourceLineNo">359</span> currAttr = session.getElementName(r);<a name="line.359"></a> <span class="sourceLineNo">360</span> BeanPropertyMeta pMeta = xmlMeta.getPropertyMeta(currAttr);<a name="line.360"></a> @@ -377,15 +377,15 @@ <span class="sourceLineNo">369</span> ClassMeta<?> et = pMeta.getClassMeta().getElementType();<a name="line.369"></a> <span class="sourceLineNo">370</span> Object value = parseAnything(session, et, currAttr, r, m.getBean(false), false, pMeta);<a name="line.370"></a> <span class="sourceLineNo">371</span> setName(et, value, currAttr);<a name="line.371"></a> -<span class="sourceLineNo">372</span> pMeta.add(m, value);<a name="line.372"></a> +<span class="sourceLineNo">372</span> pMeta.add(m, currAttr, value);<a name="line.372"></a> <span class="sourceLineNo">373</span> } else if (xf == ATTR) {<a name="line.373"></a> -<span class="sourceLineNo">374</span> pMeta.set(m, session.getAttributeValue(r, 0));<a name="line.374"></a> +<span class="sourceLineNo">374</span> pMeta.set(m, currAttr, session.getAttributeValue(r, 0));<a name="line.374"></a> <span class="sourceLineNo">375</span> r.nextTag();<a name="line.375"></a> <span class="sourceLineNo">376</span> } else {<a name="line.376"></a> <span class="sourceLineNo">377</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.377"></a> <span class="sourceLineNo">378</span> Object value = parseAnything(session, cm, currAttr, r, m.getBean(false), false, pMeta);<a name="line.378"></a> <span class="sourceLineNo">379</span> setName(cm, value, currAttr);<a name="line.379"></a> -<span class="sourceLineNo">380</span> pMeta.set(m, value);<a name="line.380"></a> +<span class="sourceLineNo">380</span> pMeta.set(m, currAttr, value);<a name="line.380"></a> <span class="sourceLineNo">381</span> }<a name="line.381"></a> <span class="sourceLineNo">382</span> session.setCurrentProperty(null);<a name="line.382"></a> <span class="sourceLineNo">383</span> }<a name="line.383"></a> @@ -407,9 +407,9 @@ <span class="sourceLineNo">399</span> } while (depth >= 0);<a name="line.399"></a> <span class="sourceLineNo">400</span><a name="line.400"></a> <span class="sourceLineNo">401</span> if (sb != null && cp != null)<a name="line.401"></a> -<span class="sourceLineNo">402</span> cp.set(m, sb.toString());<a name="line.402"></a> +<span class="sourceLineNo">402</span> cp.set(m, null, sb.toString());<a name="line.402"></a> <span class="sourceLineNo">403</span> else if (l != null && cp != null)<a name="line.403"></a> -<span class="sourceLineNo">404</span> cp.set(m, XmlUtils.collapseTextNodes(l));<a name="line.404"></a> +<span class="sourceLineNo">404</span> cp.set(m, null, XmlUtils.collapseTextNodes(l));<a name="line.404"></a> <span class="sourceLineNo">405</span><a name="line.405"></a> <span class="sourceLineNo">406</span> session.returnStringBuilder(sb);<a name="line.406"></a> <span class="sourceLineNo">407</span> return m;<a name="line.407"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html index 7de00bb..ef78ef9 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Ns.html @@ -637,7 +637,7 @@ <span class="sourceLineNo">629</span> ClassMeta<?> contentType = null;<a name="line.629"></a> <span class="sourceLineNo">630</span> for (BeanPropertyValue p : lp) {<a name="line.630"></a> <span class="sourceLineNo">631</span> String n = p.getName();<a name="line.631"></a> -<span class="sourceLineNo">632</span> if (attrs.contains(n) || n.equals(attrsProperty)) {<a name="line.632"></a> +<span class="sourceLineNo">632</span> if (attrs.contains(n) || attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.632"></a> <span class="sourceLineNo">633</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.633"></a> <span class="sourceLineNo">634</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.634"></a> <span class="sourceLineNo">635</span><a name="line.635"></a> @@ -700,7 +700,7 @@ <span class="sourceLineNo">692</span> hasContent = false;<a name="line.692"></a> <span class="sourceLineNo">693</span> else if (contentType.isArray() && Array.getLength(content) == 0)<a name="line.693"></a> <span class="sourceLineNo">694</span> hasContent = false;<a name="line.694"></a> -<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n)) {<a name="line.695"></a> +<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n) || elements.contains("*") || collapsedElements.contains("*") ) {<a name="line.695"></a> <span class="sourceLineNo">696</span> String key = p.getName();<a name="line.696"></a> <span class="sourceLineNo">697</span> Object value = p.getValue();<a name="line.697"></a> <span class="sourceLineNo">698</span> Throwable t = p.getThrown();<a name="line.698"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html index 7de00bb..ef78ef9 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSq.html @@ -637,7 +637,7 @@ <span class="sourceLineNo">629</span> ClassMeta<?> contentType = null;<a name="line.629"></a> <span class="sourceLineNo">630</span> for (BeanPropertyValue p : lp) {<a name="line.630"></a> <span class="sourceLineNo">631</span> String n = p.getName();<a name="line.631"></a> -<span class="sourceLineNo">632</span> if (attrs.contains(n) || n.equals(attrsProperty)) {<a name="line.632"></a> +<span class="sourceLineNo">632</span> if (attrs.contains(n) || attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.632"></a> <span class="sourceLineNo">633</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.633"></a> <span class="sourceLineNo">634</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.634"></a> <span class="sourceLineNo">635</span><a name="line.635"></a> @@ -700,7 +700,7 @@ <span class="sourceLineNo">692</span> hasContent = false;<a name="line.692"></a> <span class="sourceLineNo">693</span> else if (contentType.isArray() && Array.getLength(content) == 0)<a name="line.693"></a> <span class="sourceLineNo">694</span> hasContent = false;<a name="line.694"></a> -<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n)) {<a name="line.695"></a> +<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n) || elements.contains("*") || collapsedElements.contains("*") ) {<a name="line.695"></a> <span class="sourceLineNo">696</span> String key = p.getName();<a name="line.696"></a> <span class="sourceLineNo">697</span> Object value = p.getValue();<a name="line.697"></a> <span class="sourceLineNo">698</span> Throwable t = p.getThrown();<a name="line.698"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html index 7de00bb..ef78ef9 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.NsSqReadable.html @@ -637,7 +637,7 @@ <span class="sourceLineNo">629</span> ClassMeta<?> contentType = null;<a name="line.629"></a> <span class="sourceLineNo">630</span> for (BeanPropertyValue p : lp) {<a name="line.630"></a> <span class="sourceLineNo">631</span> String n = p.getName();<a name="line.631"></a> -<span class="sourceLineNo">632</span> if (attrs.contains(n) || n.equals(attrsProperty)) {<a name="line.632"></a> +<span class="sourceLineNo">632</span> if (attrs.contains(n) || attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.632"></a> <span class="sourceLineNo">633</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.633"></a> <span class="sourceLineNo">634</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.634"></a> <span class="sourceLineNo">635</span><a name="line.635"></a> @@ -700,7 +700,7 @@ <span class="sourceLineNo">692</span> hasContent = false;<a name="line.692"></a> <span class="sourceLineNo">693</span> else if (contentType.isArray() && Array.getLength(content) == 0)<a name="line.693"></a> <span class="sourceLineNo">694</span> hasContent = false;<a name="line.694"></a> -<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n)) {<a name="line.695"></a> +<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n) || elements.contains("*") || collapsedElements.contains("*") ) {<a name="line.695"></a> <span class="sourceLineNo">696</span> String key = p.getName();<a name="line.696"></a> <span class="sourceLineNo">697</span> Object value = p.getValue();<a name="line.697"></a> <span class="sourceLineNo">698</span> Throwable t = p.getThrown();<a name="line.698"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html index 7de00bb..ef78ef9 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.Sq.html @@ -637,7 +637,7 @@ <span class="sourceLineNo">629</span> ClassMeta<?> contentType = null;<a name="line.629"></a> <span class="sourceLineNo">630</span> for (BeanPropertyValue p : lp) {<a name="line.630"></a> <span class="sourceLineNo">631</span> String n = p.getName();<a name="line.631"></a> -<span class="sourceLineNo">632</span> if (attrs.contains(n) || n.equals(attrsProperty)) {<a name="line.632"></a> +<span class="sourceLineNo">632</span> if (attrs.contains(n) || attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.632"></a> <span class="sourceLineNo">633</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.633"></a> <span class="sourceLineNo">634</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.634"></a> <span class="sourceLineNo">635</span><a name="line.635"></a> @@ -700,7 +700,7 @@ <span class="sourceLineNo">692</span> hasContent = false;<a name="line.692"></a> <span class="sourceLineNo">693</span> else if (contentType.isArray() && Array.getLength(content) == 0)<a name="line.693"></a> <span class="sourceLineNo">694</span> hasContent = false;<a name="line.694"></a> -<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n)) {<a name="line.695"></a> +<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n) || elements.contains("*") || collapsedElements.contains("*") ) {<a name="line.695"></a> <span class="sourceLineNo">696</span> String key = p.getName();<a name="line.696"></a> <span class="sourceLineNo">697</span> Object value = p.getValue();<a name="line.697"></a> <span class="sourceLineNo">698</span> Throwable t = p.getThrown();<a name="line.698"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html index 7de00bb..ef78ef9 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.SqReadable.html @@ -637,7 +637,7 @@ <span class="sourceLineNo">629</span> ClassMeta<?> contentType = null;<a name="line.629"></a> <span class="sourceLineNo">630</span> for (BeanPropertyValue p : lp) {<a name="line.630"></a> <span class="sourceLineNo">631</span> String n = p.getName();<a name="line.631"></a> -<span class="sourceLineNo">632</span> if (attrs.contains(n) || n.equals(attrsProperty)) {<a name="line.632"></a> +<span class="sourceLineNo">632</span> if (attrs.contains(n) || attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.632"></a> <span class="sourceLineNo">633</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.633"></a> <span class="sourceLineNo">634</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.634"></a> <span class="sourceLineNo">635</span><a name="line.635"></a> @@ -700,7 +700,7 @@ <span class="sourceLineNo">692</span> hasContent = false;<a name="line.692"></a> <span class="sourceLineNo">693</span> else if (contentType.isArray() && Array.getLength(content) == 0)<a name="line.693"></a> <span class="sourceLineNo">694</span> hasContent = false;<a name="line.694"></a> -<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n)) {<a name="line.695"></a> +<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n) || elements.contains("*") || collapsedElements.contains("*") ) {<a name="line.695"></a> <span class="sourceLineNo">696</span> String key = p.getName();<a name="line.696"></a> <span class="sourceLineNo">697</span> Object value = p.getValue();<a name="line.697"></a> <span class="sourceLineNo">698</span> Throwable t = p.getThrown();<a name="line.698"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html index 7de00bb..ef78ef9 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html +++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializer.html @@ -637,7 +637,7 @@ <span class="sourceLineNo">629</span> ClassMeta<?> contentType = null;<a name="line.629"></a> <span class="sourceLineNo">630</span> for (BeanPropertyValue p : lp) {<a name="line.630"></a> <span class="sourceLineNo">631</span> String n = p.getName();<a name="line.631"></a> -<span class="sourceLineNo">632</span> if (attrs.contains(n) || n.equals(attrsProperty)) {<a name="line.632"></a> +<span class="sourceLineNo">632</span> if (attrs.contains(n) || attrs.contains("*") || n.equals(attrsProperty)) {<a name="line.632"></a> <span class="sourceLineNo">633</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.633"></a> <span class="sourceLineNo">634</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.634"></a> <span class="sourceLineNo">635</span><a name="line.635"></a> @@ -700,7 +700,7 @@ <span class="sourceLineNo">692</span> hasContent = false;<a name="line.692"></a> <span class="sourceLineNo">693</span> else if (contentType.isArray() && Array.getLength(content) == 0)<a name="line.693"></a> <span class="sourceLineNo">694</span> hasContent = false;<a name="line.694"></a> -<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n)) {<a name="line.695"></a> +<span class="sourceLineNo">695</span> } else if (elements.contains(n) || collapsedElements.contains(n) || elements.contains("*") || collapsedElements.contains("*") ) {<a name="line.695"></a> <span class="sourceLineNo">696</span> String key = p.getName();<a name="line.696"></a> <span class="sourceLineNo">697</span> Object value = p.getValue();<a name="line.697"></a> <span class="sourceLineNo">698</span> Throwable t = p.getThrown();<a name="line.698"></a>
