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/09/10 20:32:20 UTC
[08/34] incubator-juneau-website git commit: Update javadocs
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html b/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
index 1d21b2c..f02d666 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
@@ -75,7 +75,7 @@
<span class="sourceLineNo">067</span> */<a name="line.67"></a>
<span class="sourceLineNo">068</span> public BeanPropertyDescription(String name, ClassMeta<?> type) {<a name="line.68"></a>
<span class="sourceLineNo">069</span> this.name = name;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> this.type = type.getSerializedClassMeta().toString();<a name="line.70"></a>
+<span class="sourceLineNo">070</span> this.type = type.getSerializedClassMeta(null).toString();<a name="line.70"></a>
<span class="sourceLineNo">071</span> }<a name="line.71"></a>
<span class="sourceLineNo">072</span> }<a name="line.72"></a>
<span class="sourceLineNo">073</span>}<a name="line.73"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
index 6f551f0..8ff3238 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
@@ -38,195 +38,232 @@
<span class="sourceLineNo">030</span> * <li><a name="line.30"></a>
<span class="sourceLineNo">031</span> * Sets common properties on all serializers in a single method call.<a name="line.31"></a>
<span class="sourceLineNo">032</span> * <li><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Locks all serializers in a single method call.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * <li><a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Clones existing groups and all serializers within the group in a single method call.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * </ul><a name="line.36"></a>
+<span class="sourceLineNo">033</span> * Clones existing groups and all serializers within the group in a single method call.<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> * <h6 class='topic'>Match ordering</h6><a name="line.36"></a>
<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * <h6 class='topic'>Match ordering</h6><a name="line.38"></a>
+<span class="sourceLineNo">038</span> * Serializers are matched against <code>Accept</code> strings in the order they exist in this group.<a name="line.38"></a>
<span class="sourceLineNo">039</span> *<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Serializers are matched against <code>Accept</code> strings in the order they exist in this group.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * Adding new entries will cause the entries to be prepended to the group.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * This allows for previous serializers to be overridden through subsequent calls.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> *<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <p><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * For example, calling <code>g.append(S1.<jk>class</jk>,S2.<jk>class</jk>).append(S3.<jk>class</jk>,S4.<jk>class</jk>)</code><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * will result in the order <code>S3, S4, S1, S2</code>.<a name="line.48"></a>
-<span class="sourceLineNo">049</span> *<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * <h5 class='section'>Example:</h5><a name="line.50"></a>
-<span class="sourceLineNo">051</span> * <p class='bcode'><a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <jc>// Construct a new serializer group</jc><a name="line.52"></a>
-<span class="sourceLineNo">053</span> * SerializerGroup g = <jk>new</jk> SerializerGroupBuilder();<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * .append(JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>); <jc>// Add some serializers to it</jc><a name="line.54"></a>
-<span class="sourceLineNo">055</span> * .ws().pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>) <jc>// Change settings for all serializers in the group.</jc><a name="line.55"></a>
-<span class="sourceLineNo">056</span> * .build();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> *<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <jc>// Find the appropriate serializer by Accept type</jc><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * String mediaTypeMatch = g.findMatch(<js>"text/foo, text/json;q=0.8, text/*;q:0.6, *\/*;q=0.0"</js>);<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * WriterSerializer s = g.getWriterSerializer(mediaTypeMatch);<a name="line.60"></a>
-<span class="sourceLineNo">061</span> *<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <jc>// Serialize a bean to JSON text </jc><a name="line.62"></a>
-<span class="sourceLineNo">063</span> * AddressBook addressBook = <jk>new</jk> AddressBook(); <jc>// Bean to serialize.</jc><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * String json = s.serialize(addressBook);<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * </p><a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>public final class SerializerGroup {<a name="line.67"></a>
+<span class="sourceLineNo">040</span> * <p><a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Adding new entries will cause the entries to be prepended to the group.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * This allows for previous serializers to be overridden through subsequent calls.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> *<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * <p><a name="line.44"></a>
+<span class="sourceLineNo">045</span> * For example, calling <code>g.append(S1.<jk>class</jk>,S2.<jk>class</jk>).append(S3.<jk>class</jk>,S4.<jk>class</jk>)</code><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * will result in the order <code>S3, S4, S1, S2</code>.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> *<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * <h5 class='section'>Example:</h5><a name="line.48"></a>
+<span class="sourceLineNo">049</span> * <p class='bcode'><a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <jc>// Construct a new serializer group</jc><a name="line.50"></a>
+<span class="sourceLineNo">051</span> * SerializerGroup g = <jk>new</jk> SerializerGroupBuilder();<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * .append(JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>); <jc>// Add some serializers to it</jc><a name="line.52"></a>
+<span class="sourceLineNo">053</span> * .ws().pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>) <jc>// Change settings for all serializers in the group.</jc><a name="line.53"></a>
+<span class="sourceLineNo">054</span> * .build();<a name="line.54"></a>
+<span class="sourceLineNo">055</span> *<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <jc>// Find the appropriate serializer by Accept type</jc><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * WriterSerializer s = g.getWriterSerializer(<js>"text/foo, text/json;q=0.8, text/*;q:0.6, *\/*;q=0.0"</js>);<a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <jc>// Serialize a bean to JSON text </jc><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * AddressBook addressBook = <jk>new</jk> AddressBook(); <jc>// Bean to serialize.</jc><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * String json = s.serialize(addressBook);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * </p><a name="line.62"></a>
+<span class="sourceLineNo">063</span> */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>public final class SerializerGroup {<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> // Maps Accept headers to matching serializers.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private final ConcurrentHashMap<String,SerializerMatch> cache = new ConcurrentHashMap<String,SerializerMatch>();<a name="line.67"></a>
<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> // Maps Accept headers to matching serializers.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private final ConcurrentHashMap<String,SerializerMatch> cache = new ConcurrentHashMap<String,SerializerMatch>();<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> private final MediaType[] mediaTypes;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private final List<MediaType> mediaTypesList;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private final Serializer[] mediaTypeSerializers;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private final List<Serializer> serializers;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> private final PropertyStore propertyStore;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private final BeanContext beanContext;<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * Constructor.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> *<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @param propertyStore<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * The modifiable properties that were used to initialize the serializers.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * A snapshot of these will be made so that we can clone and modify this group.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * @param serializers<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * The serializers defined in this group.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * The order is important because they will be tried in reverse order (e.g.newer first) in which they will be tried<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * to match against media types.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public SerializerGroup(PropertyStore propertyStore, Serializer[] serializers) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> this.propertyStore = propertyStore.copy();<a name="line.91"></a>
-<span class="sourceLineNo">092</span> this.beanContext = propertyStore.getBeanContext();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> this.serializers = Collections.unmodifiableList(new ArrayList<Serializer>(Arrays.asList(serializers)));<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> List<MediaType> lmt = new ArrayList<MediaType>();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> List<Serializer> l = new ArrayList<Serializer>();<a name="line.96"></a>
-<span class="sourceLineNo">097</span> for (Serializer s : serializers) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> for (MediaType m: s.getMediaTypes()) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> lmt.add(m);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> l.add(s);<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> this.mediaTypes = lmt.toArray(new MediaType[lmt.size()]);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> this.mediaTypesList = Collections.unmodifiableList(lmt);<a name="line.105"></a>
-<span class="sourceLineNo">106</span> this.mediaTypeSerializers = l.toArray(new Serializer[l.size()]);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * Searches the group for a serializer that can handle the specified <code>Accept</code> value.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> *<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <p><a name="line.112"></a>
-<span class="sourceLineNo">113</span> * The <code>accept</code> value complies with the syntax described in RFC2616, Section 14.1, as described below:<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * <p class='bcode'><a name="line.114"></a>
-<span class="sourceLineNo">115</span> * Accept = "Accept" ":"<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * #( media-range [ accept-params ] )<a name="line.116"></a>
-<span class="sourceLineNo">117</span> *<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * media-range = ( "*\/*"<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * | ( type "/" "*" )<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * | ( type "/" subtype )<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * ) *( ";" parameter )<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * accept-params = ";" "q" "=" qvalue *( accept-extension )<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * accept-extension = ";" token [ "=" ( token | quoted-string ) ]<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * </p><a name="line.124"></a>
+<span class="sourceLineNo">069</span> private final MediaType[] mediaTypes;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private final List<MediaType> mediaTypesList;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private final Serializer[] mediaTypeSerializers;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private final List<Serializer> serializers;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private final PropertyStore propertyStore;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> private final BeanContext beanContext;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Constructor.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> *<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * @param propertyStore<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * The modifiable properties that were used to initialize the serializers.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * A snapshot of these will be made so that we can clone and modify this group.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @param serializers<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * The serializers defined in this group.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * The order is important because they will be tried in reverse order (e.g.newer first) in which they will be tried<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * to match against media types.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public SerializerGroup(PropertyStore propertyStore, Serializer[] serializers) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> this.propertyStore = propertyStore.copy();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> this.beanContext = propertyStore.getBeanContext();<a name="line.89"></a>
+<span class="sourceLineNo">090</span> this.serializers = Collections.unmodifiableList(new ArrayList<Serializer>(Arrays.asList(serializers)));<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> List<MediaType> lmt = new ArrayList<MediaType>();<a name="line.92"></a>
+<span class="sourceLineNo">093</span> List<Serializer> l = new ArrayList<Serializer>();<a name="line.93"></a>
+<span class="sourceLineNo">094</span> for (Serializer s : serializers) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> for (MediaType m: s.getMediaTypes()) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> lmt.add(m);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> l.add(s);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span> }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> this.mediaTypes = lmt.toArray(new MediaType[lmt.size()]);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> this.mediaTypesList = Collections.unmodifiableList(lmt);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> this.mediaTypeSerializers = l.toArray(new Serializer[l.size()]);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * Searches the group for a serializer that can handle the specified <code>Accept</code> value.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> *<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <p><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * The <code>accept</code> value complies with the syntax described in RFC2616, Section 14.1, as described below:<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * <p class='bcode'><a name="line.111"></a>
+<span class="sourceLineNo">112</span> * Accept = "Accept" ":"<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * #( media-range [ accept-params ] )<a name="line.113"></a>
+<span class="sourceLineNo">114</span> *<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * media-range = ( "*\/*"<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * | ( type "/" "*" )<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * | ( type "/" subtype )<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * ) *( ";" parameter )<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * accept-params = ";" "q" "=" qvalue *( accept-extension )<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * accept-extension = ";" token [ "=" ( token | quoted-string ) ]<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * </p><a name="line.121"></a>
+<span class="sourceLineNo">122</span> *<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * <p><a name="line.123"></a>
+<span class="sourceLineNo">124</span> * The returned object includes both the serializer and media type that matched.<a name="line.124"></a>
<span class="sourceLineNo">125</span> *<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * <p><a name="line.126"></a>
-<span class="sourceLineNo">127</span> * The returned object includes both the serializer and media type that matched.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> *<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @param acceptHeader The HTTP <l>Accept</l> header string.<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * @return The serializer and media type that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> public SerializerMatch getSerializerMatch(String acceptHeader) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> SerializerMatch sm = cache.get(acceptHeader);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (sm != null)<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return sm;<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> Accept a = Accept.forString(acceptHeader);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> int match = a.findMatch(mediaTypes);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> if (match >= 0) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> sm = new SerializerMatch(mediaTypes[match], mediaTypeSerializers[match]);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> cache.putIfAbsent(acceptHeader, sm);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">126</span> * @param acceptHeader The HTTP <l>Accept</l> header string.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return The serializer and media type that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public SerializerMatch getSerializerMatch(String acceptHeader) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> SerializerMatch sm = cache.get(acceptHeader);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (sm != null)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> return sm;<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> Accept a = Accept.forString(acceptHeader);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> int match = a.findMatch(mediaTypes);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (match >= 0) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> sm = new SerializerMatch(mediaTypes[match], mediaTypeSerializers[match]);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> cache.putIfAbsent(acceptHeader, sm);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> return cache.get(acceptHeader);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> return cache.get(acceptHeader);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * Same as {@link #getSerializerMatch(String)} but matches using a {@link MediaType} instance.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> *<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @param mediaType The HTTP media type.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @return The serializer and media type that matched the media type, or <jk>null</jk> if no match was made.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> */<a name="line.152"></a>
-<span class="sourceLineNo">153</span> public SerializerMatch getSerializerMatch(MediaType mediaType) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> return getSerializerMatch(mediaType.toString());<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<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> * Same as {@link #getSerializerMatch(String)} but returns just the matched serializer.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> *<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @param acceptHeader The HTTP <l>Accept</l> header string.<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> */<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public Serializer getSerializer(String acceptHeader) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> SerializerMatch sm = getSerializerMatch(acceptHeader);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return sm == null ? null : sm.getSerializer();<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> /**<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * Same as {@link #getSerializerMatch(MediaType)} but returns just the matched serializer.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> *<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * @param mediaType The HTTP media type.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public Serializer getSerializer(MediaType mediaType) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> if (mediaType == null)<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return null;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> return getSerializer(mediaType.toString());<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> /**<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * Returns the media types that all serializers in this group can handle.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> *<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * <p><a name="line.183"></a>
-<span class="sourceLineNo">184</span> * Entries are ordered in the same order as the serializers in the group.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> *<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @return An unmodifiable list of media types.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> */<a name="line.187"></a>
-<span class="sourceLineNo">188</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return mediaTypesList;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * Returns a copy of the property store that was used to create the serializers in this group.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> *<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <p><a name="line.195"></a>
-<span class="sourceLineNo">196</span> * This method returns a new factory each time so is somewhat expensive.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> *<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @return A new copy of the property store passed in to the constructor.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> */<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public PropertyStore createPropertyStore() {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> return propertyStore.copy();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> /**<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * Returns a copy of the serializers in this group.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> *<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @return An unmodifiable list of serializers in this group.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> */<a name="line.208"></a>
-<span class="sourceLineNo">209</span> public List<Serializer> getSerializers() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return serializers;<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> /**<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * Returns a bean context with the same properties as this group.<a name="line.214"></a>
-<span class="sourceLineNo">215</span> *<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * @return The bean context.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> public BeanContext getBeanContext() {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> return beanContext;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> }<a name="line.220"></a>
-<span class="sourceLineNo">221</span>}<a name="line.221"></a>
+<span class="sourceLineNo">144</span> /**<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * Same as {@link #getSerializerMatch(String)} but matches using a {@link MediaType} instance.<a name="line.145"></a>
+<span class="sourceLineNo">146</span> *<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * @param mediaType The HTTP media type.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @return The serializer and media type that matched the media type, or <jk>null</jk> if no match was made.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> */<a name="line.149"></a>
+<span class="sourceLineNo">150</span> public SerializerMatch getSerializerMatch(MediaType mediaType) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> return getSerializerMatch(mediaType.toString());<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>
+<span class="sourceLineNo">155</span> * Same as {@link #getSerializerMatch(String)} but returns just the matched serializer.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> *<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @param acceptHeader The HTTP <l>Accept</l> header string.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> */<a name="line.159"></a>
+<span class="sourceLineNo">160</span> public Serializer getSerializer(String acceptHeader) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> SerializerMatch sm = getSerializerMatch(acceptHeader);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return sm == null ? null : sm.getSerializer();<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> /**<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * Same as {@link #getSerializerMatch(MediaType)} but returns just the matched serializer.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> *<a name="line.167"></a>
+<span class="sourceLineNo">168</span> * @param mediaType The HTTP media type.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.169"></a>
+<span class="sourceLineNo">170</span> */<a name="line.170"></a>
+<span class="sourceLineNo">171</span> public Serializer getSerializer(MediaType mediaType) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> if (mediaType == null)<a name="line.172"></a>
+<span class="sourceLineNo">173</span> return null;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> return getSerializer(mediaType.toString());<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> * Same as {@link #getSerializer(String)}, but casts it to a {@link WriterSerializer}.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> *<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * @param acceptHeader The HTTP <l>Accept</l> header string.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public WriterSerializer getWriterSerializer(String acceptHeader) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return (WriterSerializer)getSerializer(acceptHeader);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span> /**<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * Same as {@link #getSerializer(MediaType)}, but casts it to a {@link WriterSerializer}.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> *<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * @param mediaType The HTTP media type.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.191"></a>
+<span class="sourceLineNo">192</span> */<a name="line.192"></a>
+<span class="sourceLineNo">193</span> public WriterSerializer getWriterSerializer(MediaType mediaType) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> return (WriterSerializer)getSerializer(mediaType);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> /**<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * Same as {@link #getSerializer(String)}, but casts it to an {@link OutputStreamSerializer}.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> *<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * @param acceptHeader The HTTP <l>Accept</l> header string.<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> */<a name="line.202"></a>
+<span class="sourceLineNo">203</span> public OutputStreamSerializer getStreamSerializer(String acceptHeader) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return (OutputStreamSerializer)getSerializer(acceptHeader);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> /**<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * Same as {@link #getSerializer(MediaType)}, but casts it to a {@link OutputStreamSerializer}.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> *<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * @param mediaType The HTTP media type.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @return The serializer that matched the accept header, or <jk>null</jk> if no match was made.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public OutputStreamSerializer getStreamSerializer(MediaType mediaType) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> return (OutputStreamSerializer)getSerializer(mediaType);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> /**<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * Returns the media types that all serializers in this group can handle.<a name="line.218"></a>
+<span class="sourceLineNo">219</span> *<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <p><a name="line.220"></a>
+<span class="sourceLineNo">221</span> * Entries are ordered in the same order as the serializers in the group.<a name="line.221"></a>
+<span class="sourceLineNo">222</span> *<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * @return An unmodifiable list of media types.<a name="line.223"></a>
+<span class="sourceLineNo">224</span> */<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public List<MediaType> getSupportedMediaTypes() {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return mediaTypesList;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * Returns a copy of the property store that was used to create the serializers in this group.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> *<a name="line.231"></a>
+<span class="sourceLineNo">232</span> * <p><a name="line.232"></a>
+<span class="sourceLineNo">233</span> * This method returns a new factory each time so is somewhat expensive.<a name="line.233"></a>
+<span class="sourceLineNo">234</span> *<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @return A new copy of the property store passed in to the constructor.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> */<a name="line.236"></a>
+<span class="sourceLineNo">237</span> public PropertyStore createPropertyStore() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return propertyStore.copy();<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> /**<a name="line.241"></a>
+<span class="sourceLineNo">242</span> * Returns a copy of the serializers in this group.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> *<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * @return An unmodifiable list of serializers in this group.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> */<a name="line.245"></a>
+<span class="sourceLineNo">246</span> public List<Serializer> getSerializers() {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return serializers;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> /**<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * Returns a bean context with the same properties as this group.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> *<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * @return The bean context.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> */<a name="line.254"></a>
+<span class="sourceLineNo">255</span> public BeanContext getBeanContext() {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> return beanContext;<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>}<a name="line.258"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/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 9515d47..737e4b2 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
@@ -543,7 +543,7 @@
<span class="sourceLineNo">535</span> try {<a name="line.535"></a>
<span class="sourceLineNo">536</span> if (o == null)<a name="line.536"></a>
<span class="sourceLineNo">537</span> return null;<a name="line.537"></a>
-<span class="sourceLineNo">538</span> PojoSwap f = (type == null || type.isObject() ? getClassMeta(o.getClass()).getPojoSwap() : type.getPojoSwap());<a name="line.538"></a>
+<span class="sourceLineNo">538</span> PojoSwap f = (type == null || type.isObject() ? getClassMeta(o.getClass()).getPojoSwap(this) : type.getPojoSwap(this));<a name="line.538"></a>
<span class="sourceLineNo">539</span> if (f == null)<a name="line.539"></a>
<span class="sourceLineNo">540</span> return o;<a name="line.540"></a>
<span class="sourceLineNo">541</span> return f.swap(this, o);<a name="line.541"></a>
@@ -752,8 +752,8 @@
<span class="sourceLineNo">744</span> StringBuilder sb = new StringBuilder().append('[').append(depth).append(']');<a name="line.744"></a>
<span class="sourceLineNo">745</span> sb.append(isEmpty(name) ? "<noname>" : name).append(':');<a name="line.745"></a>
<span class="sourceLineNo">746</span> sb.append(aType.toString(simple));<a name="line.746"></a>
-<span class="sourceLineNo">747</span> if (aType != aType.getSerializedClassMeta())<a name="line.747"></a>
-<span class="sourceLineNo">748</span> sb.append('/').append(aType.getSerializedClassMeta().toString(simple));<a name="line.748"></a>
+<span class="sourceLineNo">747</span> if (aType != aType.getSerializedClassMeta(null))<a name="line.747"></a>
+<span class="sourceLineNo">748</span> sb.append('/').append(aType.getSerializedClassMeta(null).toString(simple));<a name="line.748"></a>
<span class="sourceLineNo">749</span> return sb.toString();<a name="line.749"></a>
<span class="sourceLineNo">750</span> }<a name="line.750"></a>
<span class="sourceLineNo">751</span> }<a name="line.751"></a>