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:20:09 UTC
[36/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/html/HtmlStrippedDocSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html
index 45f7d28..eebad07 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html
@@ -21,42 +21,65 @@
<span class="sourceLineNo">013</span>package org.apache.juneau.html;<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 POJOs to HTTP responses as stripped HTML.<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>text/html+stripped</code><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> * Produces <code>Content-Type</code> types: <code>text/html</code><a name="line.27"></a>
-<span class="sourceLineNo">028</span> *<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <h5 class='section'>Description:</h5><a name="line.29"></a>
-<span class="sourceLineNo">030</span> *<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Produces the same output as {@link HtmlDocSerializer}, but without the header and body tags and page title and<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * description.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Used primarily for JUnit testing the {@link HtmlDocSerializer} class.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> */<a name="line.34"></a>
-<span class="sourceLineNo">035</span>@Produces(value="text/html+stripped",contentType="text/html")<a name="line.35"></a>
-<span class="sourceLineNo">036</span>public class HtmlStrippedDocSerializer extends HtmlSerializer {<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> public HtmlStrippedDocSerializer(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 /* Serializer */<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public WriterSerializerSession createSession(SerializerSessionArgs args) {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> return new HtmlStrippedDocSerializerSession(ctx, args);<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>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 POJOs to HTTP responses as stripped HTML.<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>text/html+stripped</code><a name="line.23"></a>
+<span class="sourceLineNo">024</span> *<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>text/html</code><a name="line.26"></a>
+<span class="sourceLineNo">027</span> *<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * <h5 class='section'>Description:</h5><a name="line.28"></a>
+<span class="sourceLineNo">029</span> *<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * Produces the same output as {@link HtmlDocSerializer}, but without the header and body tags and page title and<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * description.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Used primarily for JUnit testing the {@link HtmlDocSerializer} class.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>public class HtmlStrippedDocSerializer extends HtmlSerializer {<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> * Constructor.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * @param propertyStore The property store containing all the settings for this object.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> */<a name="line.40"></a>
+<span class="sourceLineNo">041</span> public HtmlStrippedDocSerializer(PropertyStore propertyStore) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> this(propertyStore, "text/html", "text/html+stripped");<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>
+<span class="sourceLineNo">045</span> /**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Constructor.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> *<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * @param propertyStore<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * The property store containing all the settings for this object.<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * @param produces<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * The media type that this serializer produces.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @param accept<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * The accept media types that the serializer can handle.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <p><a name="line.54"></a>
+<span class="sourceLineNo">055</span> * Can contain meta-characters per the <code>media-type</code> specification of<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC2616/14.1</a><a name="line.56"></a>
+<span class="sourceLineNo">057</span> * <p><a name="line.57"></a>
+<span class="sourceLineNo">058</span> * If empty, then assumes the only media type supported is <code>produces</code>.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * For example, if this serializer produces <js>"application/json"</js> but should handle media types of<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * <js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <br><code><jk>super</jk>(propertyStore, <js>"application/json"</js>, <js>"application/json"</js>, <js>"text/json"</js>);</code><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <br>...or...<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * <br><code><jk>super</jk>(propertyStore, <js>"application/json"</js>, <js>"*&#8203;/json"</js>);</code><a name="line.64"></a>
+<span class="sourceLineNo">065</span> */<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public HtmlStrippedDocSerializer(PropertyStore propertyStore, String produces, String...accept) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> super(propertyStore, produces, accept);<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> @Override /* Serializer */<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public WriterSerializerSession createSession(SerializerSessionArgs args) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> return new HtmlStrippedDocSerializerSession(ctx, args);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span>}<a name="line.74"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/2ead32d5/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html b/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
index 5402dc2..c0e24eb 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html
@@ -165,7 +165,7 @@
<span class="sourceLineNo">157</span> *<a name="line.157"></a>
<span class="sourceLineNo">158</span> * @return The media type.<a name="line.158"></a>
<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public String getType() {<a name="line.160"></a>
+<span class="sourceLineNo">160</span> public final String getType() {<a name="line.160"></a>
<span class="sourceLineNo">161</span> return type;<a name="line.161"></a>
<span class="sourceLineNo">162</span> }<a name="line.162"></a>
<span class="sourceLineNo">163</span><a name="line.163"></a>
@@ -174,137 +174,153 @@
<span class="sourceLineNo">166</span> *<a name="line.166"></a>
<span class="sourceLineNo">167</span> * @return The media subtype.<a name="line.167"></a>
<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public String getSubType() {<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public final String getSubType() {<a name="line.169"></a>
<span class="sourceLineNo">170</span> return subType;<a name="line.170"></a>
<span class="sourceLineNo">171</span> }<a name="line.171"></a>
<span class="sourceLineNo">172</span><a name="line.172"></a>
<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Returns the subtypes broken down by fragments delimited by <js>"'"</js>.<a name="line.174"></a>
+<span class="sourceLineNo">174</span> * Returns <jk>true</jk> if the subtype contains the specified <js>'+'</js> delimited subtype value.<a name="line.174"></a>
<span class="sourceLineNo">175</span> *<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * <P><a name="line.176"></a>
-<span class="sourceLineNo">177</span> * For example, the media type <js>"text/foo+bar"</js> will return a list of<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * <code>[<js>'foo'</js>,<js>'bar'</js>]</code><a name="line.178"></a>
-<span class="sourceLineNo">179</span> *<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @return An unmodifiable list of subtype fragments. Never <jk>null</jk>.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> public List<String> getSubTypes() {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return subTypesList;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> /**<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * Returns <jk>true</jk> if this media type is a match for the specified media type.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> *<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * <p><a name="line.189"></a>
-<span class="sourceLineNo">190</span> * Matches if any of the following is true:<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * <ul><a name="line.191"></a>
-<span class="sourceLineNo">192</span> * <li>Both type and subtype are the same.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * <li>One or both types are <js>'*'</js> and the subtypes are the same.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * <li>One or both subtypes are <js>'*'</js> and the types are the same.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * <li>Either is <js>'*\/*'</js>.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * </ul><a name="line.196"></a>
-<span class="sourceLineNo">197</span> *<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @param o The media type to compare with.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * @return <jk>true</jk> if the media types match.<a name="line.199"></a>
-<span class="sourceLineNo">200</span> */<a name="line.200"></a>
-<span class="sourceLineNo">201</span> public final boolean matches(MediaType o) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return match(o) > 0;<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> * Returns a match metric against the specified media type where a larger number represents a better match.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> *<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * <ul><a name="line.208"></a>
-<span class="sourceLineNo">209</span> * <li>Exact matches (e.g. <js>"text/json"<js>/</js>"text/json"</js>) should match<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * better than meta-character matches (e.g. <js>"text/*"<js>/</js>"text/json"</js>)<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * <li>The comparison media type can have additional subtype tokens (e.g. <js>"text/json+foo"</js>)<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * that will not prevent a match. The reverse is not true, e.g. the comparison media type<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * must contain all subtype tokens found in the comparing media type.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * <ul><a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <li>We want the {@link JsonSerializer} (<js>"text/json"</js>) class to be able to handle requests for <js>"text/json+foo"</js>.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * <li>We want to make sure {@link org.apache.juneau.json.JsonSerializer.Simple} (<js>"text/json+simple"</js>) does not handle<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * requests for <js>"text/json"</js>.<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * </ul><a name="line.218"></a>
-<span class="sourceLineNo">219</span> * More token matches should result in a higher match number.<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * </ul><a name="line.220"></a>
-<span class="sourceLineNo">221</span> *<a name="line.221"></a>
-<span class="sourceLineNo">222</span> * @param o The media type to compare with.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> * @return <jk>true</jk> if the media types match.<a name="line.223"></a>
-<span class="sourceLineNo">224</span> */<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public final int match(MediaType o) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> // Perfect match<a name="line.227"></a>
-<span class="sourceLineNo">228</span> if (this == o || (type.equals(o.type) && subType.equals(o.subType)))<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return Integer.MAX_VALUE;<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> int c1 = 0, c2 = 0;<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> if (type.equals(o.type))<a name="line.233"></a>
-<span class="sourceLineNo">234</span> c1 += 10000;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> else if ("*".equals(type) || "*".equals(o.type))<a name="line.235"></a>
-<span class="sourceLineNo">236</span> c1 += 5000;<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (c1 == 0)<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return 0;<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> // Give type slightly higher comparison value than subtype simply for deterministic results.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (subType.equals(o.subType))<a name="line.242"></a>
-<span class="sourceLineNo">243</span> return c1 + 9999;<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> int c3 = 0;<a name="line.245"></a>
+<span class="sourceLineNo">176</span> * @param st <a name="line.176"></a>
+<span class="sourceLineNo">177</span> * The subtype string.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * Case is ignored. <a name="line.178"></a>
+<span class="sourceLineNo">179</span> * @return <jk>true</jk> if the subtype contains the specified subtype string.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> public final boolean hasSubType(String st) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (st != null)<a name="line.182"></a>
+<span class="sourceLineNo">183</span> for (String s : subTypes)<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (st.equalsIgnoreCase(s))<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return true;<a name="line.185"></a>
+<span class="sourceLineNo">186</span> return false;<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * Returns the subtypes broken down by fragments delimited by <js>"'"</js>.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> *<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * <P><a name="line.192"></a>
+<span class="sourceLineNo">193</span> * For example, the media type <js>"text/foo+bar"</js> will return a list of<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * <code>[<js>'foo'</js>,<js>'bar'</js>]</code><a name="line.194"></a>
+<span class="sourceLineNo">195</span> *<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @return An unmodifiable list of subtype fragments. Never <jk>null</jk>.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> */<a name="line.197"></a>
+<span class="sourceLineNo">198</span> public final List<String> getSubTypes() {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return subTypesList;<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> * Returns <jk>true</jk> if this media type is a match for the specified media type.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> *<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * <p><a name="line.205"></a>
+<span class="sourceLineNo">206</span> * Matches if any of the following is true:<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * <ul><a name="line.207"></a>
+<span class="sourceLineNo">208</span> * <li>Both type and subtype are the same.<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * <li>One or both types are <js>'*'</js> and the subtypes are the same.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * <li>One or both subtypes are <js>'*'</js> and the types are the same.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * <li>Either is <js>'*\/*'</js>.<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * </ul><a name="line.212"></a>
+<span class="sourceLineNo">213</span> *<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * @param o The media type to compare with.<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * @return <jk>true</jk> if the media types match.<a name="line.215"></a>
+<span class="sourceLineNo">216</span> */<a name="line.216"></a>
+<span class="sourceLineNo">217</span> public final boolean matches(MediaType o) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> return match(o) > 0;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<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">222</span> * Returns a match metric against the specified media type where a larger number represents a better match.<a name="line.222"></a>
+<span class="sourceLineNo">223</span> *<a name="line.223"></a>
+<span class="sourceLineNo">224</span> * <ul><a name="line.224"></a>
+<span class="sourceLineNo">225</span> * <li>Exact matches (e.g. <js>"text/json"<js>/</js>"text/json"</js>) should match<a name="line.225"></a>
+<span class="sourceLineNo">226</span> * better than meta-character matches (e.g. <js>"text/*"<js>/</js>"text/json"</js>)<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * <li>The comparison media type can have additional subtype tokens (e.g. <js>"text/json+foo"</js>)<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * that will not prevent a match. The reverse is not true, e.g. the comparison media type<a name="line.228"></a>
+<span class="sourceLineNo">229</span> * must contain all subtype tokens found in the comparing media type.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * <ul><a name="line.230"></a>
+<span class="sourceLineNo">231</span> * <li>We want the {@link JsonSerializer} (<js>"text/json"</js>) class to be able to handle requests for <js>"text/json+foo"</js>.<a name="line.231"></a>
+<span class="sourceLineNo">232</span> * <li>We want to make sure {@link org.apache.juneau.json.JsonSerializer.Simple} (<js>"text/json+simple"</js>) does not handle<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * requests for <js>"text/json"</js>.<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * </ul><a name="line.234"></a>
+<span class="sourceLineNo">235</span> * More token matches should result in a higher match number.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * </ul><a name="line.236"></a>
+<span class="sourceLineNo">237</span> *<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @param o The media type to compare with.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @return <jk>true</jk> if the media types match.<a name="line.239"></a>
+<span class="sourceLineNo">240</span> */<a name="line.240"></a>
+<span class="sourceLineNo">241</span> public final int match(MediaType o) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // Perfect match<a name="line.243"></a>
+<span class="sourceLineNo">244</span> if (this == o || (type.equals(o.type) && subType.equals(o.subType)))<a name="line.244"></a>
+<span class="sourceLineNo">245</span> return Integer.MAX_VALUE;<a name="line.245"></a>
<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span> for (String st1 : subTypes) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> if ("*".equals(st1))<a name="line.248"></a>
-<span class="sourceLineNo">249</span> c1++;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> else if (ArrayUtils.contains(st1, o.subTypes))<a name="line.250"></a>
-<span class="sourceLineNo">251</span> c1 += 100;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> else if (ArrayUtils.contains("*", o.subTypes))<a name="line.252"></a>
-<span class="sourceLineNo">253</span> c1 += 10;<a name="line.253"></a>
-<span class="sourceLineNo">254</span> else<a name="line.254"></a>
-<span class="sourceLineNo">255</span> return 0;<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> return c1 + c2 + c3;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">247</span> int c1 = 0, c2 = 0;<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (type.equals(o.type))<a name="line.249"></a>
+<span class="sourceLineNo">250</span> c1 += 10000;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> else if ("*".equals(type) || "*".equals(o.type))<a name="line.251"></a>
+<span class="sourceLineNo">252</span> c1 += 5000;<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (c1 == 0)<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return 0;<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> // Give type slightly higher comparison value than subtype simply for deterministic results.<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (subType.equals(o.subType))<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return c1 + 9999;<a name="line.259"></a>
<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * Returns the additional parameters on this media type.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> *<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * <p><a name="line.264"></a>
-<span class="sourceLineNo">265</span> * For example, given the media type string <js>"text/html;level=1"</js>, will return a map<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * with the single entry <code>{level:[<js>'1'</js>]}</code>.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> *<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * @return The map of additional parameters, or an empty map if there are no parameters.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> */<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public Map<String,Set<String>> getParameters() {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> return parameters;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">261</span> int c3 = 0;<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> for (String st1 : subTypes) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if ("*".equals(st1))<a name="line.264"></a>
+<span class="sourceLineNo">265</span> c1++;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> else if (ArrayUtils.contains(st1, o.subTypes))<a name="line.266"></a>
+<span class="sourceLineNo">267</span> c1 += 100;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> else if (ArrayUtils.contains("*", o.subTypes))<a name="line.268"></a>
+<span class="sourceLineNo">269</span> c1 += 10;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> else<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return 0;<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> @Override /* Object */<a name="line.274"></a>
-<span class="sourceLineNo">275</span> public String toString() {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if (parameters.isEmpty())<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return mediaType;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> StringBuilder sb = new StringBuilder(mediaType);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> for (Map.Entry<String,Set<String>> e : parameters.entrySet())<a name="line.279"></a>
-<span class="sourceLineNo">280</span> for (String value : e.getValue())<a name="line.280"></a>
-<span class="sourceLineNo">281</span> sb.append(';').append(e.getKey()).append('=').append(value);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> return sb.toString();<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> @Override /* Object */<a name="line.285"></a>
-<span class="sourceLineNo">286</span> public int hashCode() {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return mediaType.hashCode();<a name="line.287"></a>
+<span class="sourceLineNo">274</span> return c1 + c2 + c3;<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span> /**<a name="line.277"></a>
+<span class="sourceLineNo">278</span> * Returns the additional parameters on this media type.<a name="line.278"></a>
+<span class="sourceLineNo">279</span> *<a name="line.279"></a>
+<span class="sourceLineNo">280</span> * <p><a name="line.280"></a>
+<span class="sourceLineNo">281</span> * For example, given the media type string <js>"text/html;level=1"</js>, will return a map<a name="line.281"></a>
+<span class="sourceLineNo">282</span> * with the single entry <code>{level:[<js>'1'</js>]}</code>.<a name="line.282"></a>
+<span class="sourceLineNo">283</span> *<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * @return The map of additional parameters, or an empty map if there are no parameters.<a name="line.284"></a>
+<span class="sourceLineNo">285</span> */<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public final Map<String,Set<String>> getParameters() {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return parameters;<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> @Override /* Object */<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public boolean equals(Object o) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return this == o;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> @Override<a name="line.295"></a>
-<span class="sourceLineNo">296</span> public int compareTo(MediaType o) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return mediaType.compareTo(o.mediaType);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>}<a name="line.299"></a>
+<span class="sourceLineNo">291</span> public final String toString() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (parameters.isEmpty())<a name="line.292"></a>
+<span class="sourceLineNo">293</span> return mediaType;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> StringBuilder sb = new StringBuilder(mediaType);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> for (Map.Entry<String,Set<String>> e : parameters.entrySet())<a name="line.295"></a>
+<span class="sourceLineNo">296</span> for (String value : e.getValue())<a name="line.296"></a>
+<span class="sourceLineNo">297</span> sb.append(';').append(e.getKey()).append('=').append(value);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> return sb.toString();<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span> @Override /* Object */<a name="line.301"></a>
+<span class="sourceLineNo">302</span> public final int hashCode() {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> return mediaType.hashCode();<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> @Override /* Object */<a name="line.306"></a>
+<span class="sourceLineNo">307</span> public final boolean equals(Object o) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return this == o;<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> @Override<a name="line.311"></a>
+<span class="sourceLineNo">312</span> public final int compareTo(MediaType o) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> return mediaType.compareTo(o.mediaType);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>}<a name="line.315"></a>