You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/08/27 22:19:56 UTC
[23/51] [partial] incubator-juneau-website git commit: Update
javadocs.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
index f2b088c..091c996 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializer.html
@@ -21,56 +21,54 @@
<span class="sourceLineNo">013</span>package org.apache.juneau.msgpack;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
<span class="sourceLineNo">015</span>import org.apache.juneau.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import org.apache.juneau.annotation.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.serializer.*;<a name="line.17"></a>
-<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>/**<a name="line.19"></a>
-<span class="sourceLineNo">020</span> * Serializes POJO models to MessagePack.<a name="line.20"></a>
-<span class="sourceLineNo">021</span> *<a name="line.21"></a>
-<span class="sourceLineNo">022</span> * <h5 class='section'>Media types:</h5><a name="line.22"></a>
-<span class="sourceLineNo">023</span> *<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * Handles <code>Accept</code> types: <code>octal/msgpack</code><a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <p><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Produces <code>Content-Type</code> types: <code>octal/msgpack</code><a name="line.26"></a>
-<span class="sourceLineNo">027</span> *<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <h5 class='section'>Configurable properties:</h5><a name="line.28"></a>
-<span class="sourceLineNo">029</span> *<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * This class has the following properties associated with it:<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <ul><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <li>{@link MsgPackSerializerContext}<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <li>{@link SerializerContext}<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <li>{@link BeanContext}<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * </ul><a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>@Produces("octal/msgpack")<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public class MsgPackSerializer extends OutputStreamSerializer {<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> /** Default serializer, all default settings.*/<a name="line.40"></a>
-<span class="sourceLineNo">041</span> public static final MsgPackSerializer DEFAULT = new MsgPackSerializer(PropertyStore.create());<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">016</span>import org.apache.juneau.serializer.*;<a name="line.16"></a>
+<span class="sourceLineNo">017</span><a name="line.17"></a>
+<span class="sourceLineNo">018</span>/**<a name="line.18"></a>
+<span class="sourceLineNo">019</span> * Serializes POJO models to MessagePack.<a name="line.19"></a>
+<span class="sourceLineNo">020</span> *<a name="line.20"></a>
+<span class="sourceLineNo">021</span> * <h5 class='section'>Media types:</h5><a name="line.21"></a>
+<span class="sourceLineNo">022</span> *<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * Handles <code>Accept</code> types: <code>octal/msgpack</code><a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <p><a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Produces <code>Content-Type</code> types: <code>octal/msgpack</code><a name="line.25"></a>
+<span class="sourceLineNo">026</span> *<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <h5 class='section'>Configurable properties:</h5><a name="line.27"></a>
+<span class="sourceLineNo">028</span> *<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * This class has the following properties associated with it:<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <ul><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <li>{@link MsgPackSerializerContext}<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <li>{@link SerializerContext}<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <li>{@link BeanContext}<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * </ul><a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>public class MsgPackSerializer extends OutputStreamSerializer {<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> /** Default serializer, all default settings.*/<a name="line.38"></a>
+<span class="sourceLineNo">039</span> public static final MsgPackSerializer DEFAULT = new MsgPackSerializer(PropertyStore.create());<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span> private final MsgPackSerializerContext ctx;<a name="line.42"></a>
<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span> private final MsgPackSerializerContext ctx;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> /**<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * Constructor.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> *<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span> public MsgPackSerializer(PropertyStore propertyStore) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> super(propertyStore);<a name="line.52"></a>
-<span class="sourceLineNo">053</span> this.ctx = createContext(MsgPackSerializerContext.class);<a name="line.53"></a>
-<span class="sourceLineNo">054</span> }<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> @Override /* CoreObject */<a name="line.56"></a>
-<span class="sourceLineNo">057</span> public MsgPackSerializerBuilder builder() {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> return new MsgPackSerializerBuilder(propertyStore);<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> @Override /* Serializer */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public OutputStreamSerializerSession createSession(SerializerSessionArgs args) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> return new MsgPackSerializerSession(ctx, args);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> }<a name="line.64"></a>
-<span class="sourceLineNo">065</span>}<a name="line.65"></a>
+<span class="sourceLineNo">044</span> /**<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * Constructor.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> *<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public MsgPackSerializer(PropertyStore propertyStore) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span> super(propertyStore, "octal/msgpack");<a name="line.50"></a>
+<span class="sourceLineNo">051</span> this.ctx = createContext(MsgPackSerializerContext.class);<a name="line.51"></a>
+<span class="sourceLineNo">052</span> }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> @Override /* CoreObject */<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public MsgPackSerializerBuilder builder() {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> return new MsgPackSerializerBuilder(propertyStore);<a name="line.56"></a>
+<span class="sourceLineNo">057</span> }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span> @Override /* Serializer */<a name="line.59"></a>
+<span class="sourceLineNo">060</span> public OutputStreamSerializerSession createSession(SerializerSessionArgs args) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> return new MsgPackSerializerSession(ctx, args);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span>}<a name="line.63"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
index 551f983..4460297 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/msgpack/MsgPackSerializerSession.html
@@ -25,33 +25,33 @@
<span class="sourceLineNo">017</span>import java.util.*;<a name="line.17"></a>
<span class="sourceLineNo">018</span><a name="line.18"></a>
<span class="sourceLineNo">019</span>import org.apache.juneau.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.serializer.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.juneau.transform.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * Session object that lives for the duration of a single use of {@link MsgPackSerializer}.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> *<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <p><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * This class is NOT thread safe.<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * It is typically discarded after one-time use although it can be reused within the same thread.<a name="line.28"></a>
-<span class="sourceLineNo">029</span> */<a name="line.29"></a>
-<span class="sourceLineNo">030</span>public final class MsgPackSerializerSession extends OutputStreamSerializerSession {<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span> private final boolean<a name="line.32"></a>
-<span class="sourceLineNo">033</span> addBeanTypeProperties;<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span> /**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * Create a new session using properties specified in the context.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * @param ctx<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * The context creating this session object.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * The context contains all the configuration settings for this object.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * @param args<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Runtime arguments.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * These specify session-level information such as locale and URI context.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * It also include session-level properties that override the properties defined on the bean and<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * serializer contexts.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <br>If <jk>null</jk>, defaults to {@link SerializerSessionArgs#DEFAULT}.<a name="line.46"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.internal.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.serializer.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.transform.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Session object that lives for the duration of a single use of {@link MsgPackSerializer}.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> *<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * <p><a name="line.27"></a>
+<span class="sourceLineNo">028</span> * This class is NOT thread safe.<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * It is typically discarded after one-time use although it can be reused within the same thread.<a name="line.29"></a>
+<span class="sourceLineNo">030</span> */<a name="line.30"></a>
+<span class="sourceLineNo">031</span>public final class MsgPackSerializerSession extends OutputStreamSerializerSession {<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span> private final boolean<a name="line.33"></a>
+<span class="sourceLineNo">034</span> addBeanTypeProperties;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span> /**<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * Create a new session using properties specified in the context.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * @param ctx<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * The context creating this session object.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * The context contains all the configuration settings for this object.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * @param args<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Runtime arguments.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * These specify session-level information such as locale and URI context.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * It also include session-level properties that override the properties defined on the bean and<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * serializer contexts.<a name="line.46"></a>
<span class="sourceLineNo">047</span> */<a name="line.47"></a>
<span class="sourceLineNo">048</span> protected MsgPackSerializerSession(MsgPackSerializerContext ctx, SerializerSessionArgs args) {<a name="line.48"></a>
<span class="sourceLineNo">049</span> super(ctx, args);<a name="line.49"></a>
@@ -151,88 +151,92 @@
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
<span class="sourceLineNo">144</span> else if (sType.isArray()) {<a name="line.144"></a>
<span class="sourceLineNo">145</span> serializeCollection(out, toList(sType.getInnerClass(), o), eType);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> } else<a name="line.146"></a>
-<span class="sourceLineNo">147</span> out.appendString(toString(o));<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> if (! isRecursion)<a name="line.149"></a>
-<span class="sourceLineNo">150</span> pop();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return out;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.154"></a>
-<span class="sourceLineNo">155</span> private void serializeMap(MsgPackOutputStream out, Map m, ClassMeta<?> type) throws Exception {<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> m = sort(m);<a name="line.159"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span> else if (sType.isReader() || sType.isInputStream()) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> IOUtils.pipe(o, out);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span> else<a name="line.150"></a>
+<span class="sourceLineNo">151</span> out.appendString(toString(o));<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (! isRecursion)<a name="line.153"></a>
+<span class="sourceLineNo">154</span> pop();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return out;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.158"></a>
+<span class="sourceLineNo">159</span> private void serializeMap(MsgPackOutputStream out, Map m, ClassMeta<?> type) throws Exception {<a name="line.159"></a>
<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> // The map size may change as we're iterating over it, so<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // grab a snapshot of the entries in a separate list.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> List<SimpleMapEntry> entries = new ArrayList<SimpleMapEntry>(m.size());<a name="line.163"></a>
-<span class="sourceLineNo">164</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet())<a name="line.164"></a>
-<span class="sourceLineNo">165</span> entries.add(new SimpleMapEntry(e.getKey(), e.getValue()));<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> out.startMap(entries.size());<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> for (SimpleMapEntry e : entries) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Object value = e.value;<a name="line.170"></a>
-<span class="sourceLineNo">171</span> Object key = generalize(e.key, keyType);<a name="line.171"></a>
+<span class="sourceLineNo">161</span> ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> m = sort(m);<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // The map size may change as we're iterating over it, so<a name="line.165"></a>
+<span class="sourceLineNo">166</span> // grab a snapshot of the entries in a separate list.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> List<SimpleMapEntry> entries = new ArrayList<SimpleMapEntry>(m.size());<a name="line.167"></a>
+<span class="sourceLineNo">168</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet())<a name="line.168"></a>
+<span class="sourceLineNo">169</span> entries.add(new SimpleMapEntry(e.getKey(), e.getValue()));<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> out.startMap(entries.size());<a name="line.171"></a>
<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> serializeAnything(out, key, keyType, null, null);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> serializeAnything(out, value, valueType, null, null);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span> private void serializeBeanMap(MsgPackOutputStream out, final BeanMap<?> m, String typeName) throws Exception {<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> List<BeanPropertyValue> values = m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null);<a name="line.180"></a>
+<span class="sourceLineNo">173</span> for (SimpleMapEntry e : entries) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> Object value = e.value;<a name="line.174"></a>
+<span class="sourceLineNo">175</span> Object key = generalize(e.key, keyType);<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> serializeAnything(out, key, keyType, null, null);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> serializeAnything(out, value, valueType, null, null);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> int size = values.size();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> for (BeanPropertyValue p : values)<a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (p.getThrown() != null)<a name="line.184"></a>
-<span class="sourceLineNo">185</span> size--;<a name="line.185"></a>
-<span class="sourceLineNo">186</span> out.startMap(size);<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> for (BeanPropertyValue p : values) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.189"></a>
-<span class="sourceLineNo">190</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> String key = p.getName();<a name="line.191"></a>
-<span class="sourceLineNo">192</span> Object value = p.getValue();<a name="line.192"></a>
-<span class="sourceLineNo">193</span> Throwable t = p.getThrown();<a name="line.193"></a>
-<span class="sourceLineNo">194</span> if (t != null)<a name="line.194"></a>
-<span class="sourceLineNo">195</span> onBeanGetterException(pMeta, t);<a name="line.195"></a>
-<span class="sourceLineNo">196</span> else {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> serializeAnything(out, key, null, null, null);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> serializeAnything(out, value, cMeta, key, pMeta);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> }<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> private static class SimpleMapEntry {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> final Object key;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> final Object value;<a name="line.205"></a>
+<span class="sourceLineNo">182</span> private void serializeBeanMap(MsgPackOutputStream out, final BeanMap<?> m, String typeName) throws Exception {<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> List<BeanPropertyValue> values = m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, typeName) : null);<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> int size = values.size();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> for (BeanPropertyValue p : values)<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (p.getThrown() != null)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> size--;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> out.startMap(size);<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> for (BeanPropertyValue p : values) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> ClassMeta<?> cMeta = p.getClassMeta();<a name="line.194"></a>
+<span class="sourceLineNo">195</span> String key = p.getName();<a name="line.195"></a>
+<span class="sourceLineNo">196</span> Object value = p.getValue();<a name="line.196"></a>
+<span class="sourceLineNo">197</span> Throwable t = p.getThrown();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> if (t != null)<a name="line.198"></a>
+<span class="sourceLineNo">199</span> onBeanGetterException(pMeta, t);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> else {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> serializeAnything(out, key, null, null, null);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> serializeAnything(out, value, cMeta, key, pMeta);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> private SimpleMapEntry(Object key, Object value) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> this.key = key;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> this.value = value;<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.213"></a>
-<span class="sourceLineNo">214</span> private void serializeCollection(MsgPackOutputStream out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> ClassMeta<?> elementType = type.getElementType();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> List<Object> l = new ArrayList<Object>(c.size());<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> c = sort(c);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> l.addAll(c);<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> out.startArray(l.size());<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> for (Object o : l)<a name="line.224"></a>
-<span class="sourceLineNo">225</span> serializeAnything(out, o, elementType, "<iterator>", null);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span>}<a name="line.227"></a>
+<span class="sourceLineNo">207</span> private static class SimpleMapEntry {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> final Object key;<a name="line.208"></a>
+<span class="sourceLineNo">209</span> final Object value;<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> private SimpleMapEntry(Object key, Object value) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> this.key = key;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> this.value = value;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> @SuppressWarnings({"rawtypes", "unchecked"})<a name="line.217"></a>
+<span class="sourceLineNo">218</span> private void serializeCollection(MsgPackOutputStream out, Collection c, ClassMeta<?> type) throws Exception {<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> ClassMeta<?> elementType = type.getElementType();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> List<Object> l = new ArrayList<Object>(c.size());<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> c = sort(c);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> l.addAll(c);<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> out.startArray(l.size());<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> for (Object o : l)<a name="line.228"></a>
+<span class="sourceLineNo">229</span> serializeAnything(out, o, elementType, "<iterator>", null);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>}<a name="line.231"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/parser/InputStreamParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/parser/InputStreamParser.html b/content/site/apidocs/src-html/org/apache/juneau/parser/InputStreamParser.html
index 0b3eada..7c6e04b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/parser/InputStreamParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/parser/InputStreamParser.html
@@ -21,42 +21,35 @@
<span class="sourceLineNo">013</span>package org.apache.juneau.parser;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
<span class="sourceLineNo">015</span>import org.apache.juneau.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import org.apache.juneau.annotation.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>/**<a name="line.18"></a>
-<span class="sourceLineNo">019</span> * Subclass of {@link Parser} for byte-based parsers.<a name="line.19"></a>
-<span class="sourceLineNo">020</span> *<a name="line.20"></a>
-<span class="sourceLineNo">021</span> * <h5 class='section'>Description:</h5><a name="line.21"></a>
-<span class="sourceLineNo">022</span> *<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * This class is typically the parent class of all byte-based parsers.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * It has 1 abstract method to implement...<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * <ul><a name="line.25"></a>
-<span class="sourceLineNo">026</span> * <li><code>parse(InputStream, ClassMeta, ParserContext)</code><a name="line.26"></a>
-<span class="sourceLineNo">027</span> * </ul><a name="line.27"></a>
-<span class="sourceLineNo">028</span> *<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <h6 class='topic'>@Consumes annotation</h6><a name="line.29"></a>
-<span class="sourceLineNo">030</span> *<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * The media types that this parser can handle is specified through the {@link Consumes @Consumes} annotation.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * <p><a name="line.33"></a>
-<span class="sourceLineNo">034</span> * However, the media types can also be specified programmatically by overriding the {@link #getMediaTypes()} method.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> */<a name="line.35"></a>
-<span class="sourceLineNo">036</span>public abstract class InputStreamParser extends Parser {<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span> /**<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Constructor.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> *<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span> protected InputStreamParser(PropertyStore propertyStore) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span> super(propertyStore);<a name="line.44"></a>
-<span class="sourceLineNo">045</span> }<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> @Override /* Parser */<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public final boolean isReaderParser() {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> return false;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span>}<a name="line.51"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>/**<a name="line.17"></a>
+<span class="sourceLineNo">018</span> * Subclass of {@link Parser} for byte-based parsers.<a name="line.18"></a>
+<span class="sourceLineNo">019</span> *<a name="line.19"></a>
+<span class="sourceLineNo">020</span> * <h5 class='section'>Description:</h5><a name="line.20"></a>
+<span class="sourceLineNo">021</span> *<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * This class is typically the parent class of all byte-based parsers.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> * It has 1 abstract method to implement...<a name="line.23"></a>
+<span class="sourceLineNo">024</span> * <ul><a name="line.24"></a>
+<span class="sourceLineNo">025</span> * <li><code>parse(InputStream, ClassMeta, ParserContext)</code><a name="line.25"></a>
+<span class="sourceLineNo">026</span> * </ul><a name="line.26"></a>
+<span class="sourceLineNo">027</span> */<a name="line.27"></a>
+<span class="sourceLineNo">028</span>public abstract class InputStreamParser extends Parser {<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span> /**<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * Constructor.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> *<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * @param consumes The list of media types that this parser consumes (e.g. <js>"application/json"</js>).<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span> protected InputStreamParser(PropertyStore propertyStore, String...consumes) {<a name="line.36"></a>
+<span class="sourceLineNo">037</span> super(propertyStore, consumes);<a name="line.37"></a>
+<span class="sourceLineNo">038</span> }<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> @Override /* Parser */<a name="line.40"></a>
+<span class="sourceLineNo">041</span> public final boolean isReaderParser() {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> return false;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> }<a name="line.43"></a>
+<span class="sourceLineNo">044</span>}<a name="line.44"></a>