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:26 UTC
[14/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/http/Accept.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html b/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html
index 93e09f2..f0b9175 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html
@@ -227,43 +227,44 @@
<span class="sourceLineNo">219</span><a name="line.219"></a>
<span class="sourceLineNo">220</span> for (int i = 0; i < mediaTypes.length; i++) {<a name="line.220"></a>
<span class="sourceLineNo">221</span> MediaType mt = mediaTypes[i];<a name="line.221"></a>
-<span class="sourceLineNo">222</span> int matchQuant2 = mt.match(mr.getMediaType());<a name="line.222"></a>
-<span class="sourceLineNo">223</span> if (matchQuant2 > matchQuant) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> matchIndex = i;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> matchQuant = matchQuant2;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> q = q2;<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><a name="line.230"></a>
-<span class="sourceLineNo">231</span> return matchIndex;<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> /**<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * Convenience method for searching through all of the subtypes of all the media ranges in this header for the<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * presence of a subtype fragment.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> *<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * <p><a name="line.238"></a>
-<span class="sourceLineNo">239</span> * For example, given the header <js>"text/json+activity"</js>, calling<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <code>hasSubtypePart(<js>"activity"</js>)</code> returns <jk>true</jk>.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> *<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * @param part The media type subtype fragment.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * @return <jk>true</jk> if subtype fragment exists.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> */<a name="line.244"></a>
-<span class="sourceLineNo">245</span> public boolean hasSubtypePart(String part) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span> for (MediaTypeRange mr : this.mediaRanges)<a name="line.247"></a>
-<span class="sourceLineNo">248</span> if (mr.getQValue() > 0 && mr.getMediaType().getSubTypes().indexOf(part) >= 0)<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return true;<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> return false;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span> @Override /* Object */<a name="line.254"></a>
-<span class="sourceLineNo">255</span> public String toString() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return join(mediaRanges, ',');<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>
+<span class="sourceLineNo">222</span> int matchQuant2 = mr.getMediaType().match(mt, false);<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (matchQuant2 > matchQuant) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> matchIndex = i;<a name="line.225"></a>
+<span class="sourceLineNo">226</span> matchQuant = matchQuant2;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> q = q2;<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> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> return matchIndex;<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> /**<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * Convenience method for searching through all of the subtypes of all the media ranges in this header for the<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * presence of a subtype fragment.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> *<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * <p><a name="line.239"></a>
+<span class="sourceLineNo">240</span> * For example, given the header <js>"text/json+activity"</js>, calling<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <code>hasSubtypePart(<js>"activity"</js>)</code> returns <jk>true</jk>.<a name="line.241"></a>
+<span class="sourceLineNo">242</span> *<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * @param part The media type subtype fragment.<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * @return <jk>true</jk> if subtype fragment exists.<a name="line.244"></a>
+<span class="sourceLineNo">245</span> */<a name="line.245"></a>
+<span class="sourceLineNo">246</span> public boolean hasSubtypePart(String part) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> for (MediaTypeRange mr : this.mediaRanges)<a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (mr.getQValue() > 0 && mr.getMediaType().getSubTypes().indexOf(part) >= 0)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return true;<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> return false;<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> @Override /* Object */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> public String toString() {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> return join(mediaRanges, ',');<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>}<a name="line.259"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html b/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
index d01d39a..e953f75 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html
@@ -103,7 +103,7 @@
<span class="sourceLineNo">095</span><a name="line.95"></a>
<span class="sourceLineNo">096</span> for (int i = 0; i < mediaTypes.length; i++) {<a name="line.96"></a>
<span class="sourceLineNo">097</span> MediaType mt = mediaTypes[i];<a name="line.97"></a>
-<span class="sourceLineNo">098</span> int matchQuant2 = mt.match(this);<a name="line.98"></a>
+<span class="sourceLineNo">098</span> int matchQuant2 = mt.match(this, true);<a name="line.98"></a>
<span class="sourceLineNo">099</span> if (matchQuant2 > matchQuant) {<a name="line.99"></a>
<span class="sourceLineNo">100</span> matchQuant = matchQuant2;<a name="line.100"></a>
<span class="sourceLineNo">101</span> matchIndex = i;<a name="line.101"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/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 462166a..c795479 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
@@ -20,307 +20,355 @@
<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a>
<span class="sourceLineNo">013</span>package org.apache.juneau.http;<a name="line.13"></a>
<span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import java.util.*;<a name="line.15"></a>
-<span class="sourceLineNo">016</span>import java.util.concurrent.*;<a name="line.16"></a>
-<span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.annotation.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.internal.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.json.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span><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> * Describes a single media type used in content negotiation between an HTTP client and server, as described in<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).<a name="line.25"></a>
-<span class="sourceLineNo">026</span> *<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * <h6 class='topic'>Additional Information</h6><a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <ul class='doctree'><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <li class='jp'><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a><a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <li class='extlink'><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616.html'><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Hypertext Transfer Protocol -- HTTP/1.1</a><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>@BeanIgnore<a name="line.36"></a>
-<span class="sourceLineNo">037</span>@SuppressWarnings("unchecked")<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public class MediaType implements Comparable<MediaType> {<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> private static final boolean nocache = Boolean.getBoolean("juneau.nocache");<a name="line.40"></a>
-<span class="sourceLineNo">041</span> private static final ConcurrentHashMap<String,MediaType> cache = new ConcurrentHashMap<String,MediaType>();<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> /** Reusable predefined media type */<a name="line.43"></a>
-<span class="sourceLineNo">044</span> @SuppressWarnings("javadoc")<a name="line.44"></a>
-<span class="sourceLineNo">045</span> public static final MediaType<a name="line.45"></a>
-<span class="sourceLineNo">046</span> CSV = forString("text/csv"),<a name="line.46"></a>
-<span class="sourceLineNo">047</span> HTML = forString("text/html"),<a name="line.47"></a>
-<span class="sourceLineNo">048</span> JSON = forString("application/json"),<a name="line.48"></a>
-<span class="sourceLineNo">049</span> MSGPACK = forString("octal/msgpack"),<a name="line.49"></a>
-<span class="sourceLineNo">050</span> PLAIN = forString("text/plain"),<a name="line.50"></a>
-<span class="sourceLineNo">051</span> UON = forString("text/uon"),<a name="line.51"></a>
-<span class="sourceLineNo">052</span> URLENCODING = forString("application/x-www-form-urlencoded"),<a name="line.52"></a>
-<span class="sourceLineNo">053</span> XML = forString("text/xml"),<a name="line.53"></a>
-<span class="sourceLineNo">054</span> XMLSOAP = forString("text/xml+soap"),<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> RDF = forString("text/xml+rdf"),<a name="line.56"></a>
-<span class="sourceLineNo">057</span> RDFABBREV = forString("text/xml+rdf+abbrev"),<a name="line.57"></a>
-<span class="sourceLineNo">058</span> NTRIPLE = forString("text/n-triple"),<a name="line.58"></a>
-<span class="sourceLineNo">059</span> TURTLE = forString("text/turtle"),<a name="line.59"></a>
-<span class="sourceLineNo">060</span> N3 = forString("text/n3")<a name="line.60"></a>
-<span class="sourceLineNo">061</span> ;<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span> private final String mediaType;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private final String type; // The media type (e.g. "text" for Accept, "utf-8" for Accept-Charset)<a name="line.64"></a>
-<span class="sourceLineNo">065</span> private final String subType; // The media sub-type (e.g. "json" for Accept, not used for Accept-Charset)<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private final String[] subTypes; // The media sub-type (e.g. "json" for Accept, not used for Accept-Charset)<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private final List<String> subTypesList; // The media sub-type (e.g. "json" for Accept, not used for Accept-Charset)<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private final Map<String,Set<String>> parameters; // The media type parameters (e.g. "text/html;level=1"). Does not include q!<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> /**<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * Returns the media type for the specified string.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * The same media type strings always return the same objects so that these objects<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * can be compared for equality using '=='.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> *<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <h5 class='section'>Notes:</h5><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <ul><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <li><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * Spaces are replaced with <js>'+'</js> characters.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * This gets around the issue where passing media type strings with <js>'+'</js> as HTTP GET parameters<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * get replaced with spaces by your browser. Since spaces aren't supported by the spec, this<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * is doesn't break anything.<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * <li><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * Anything including and following the <js>';'</js> character is ignored (e.g. <js>";charset=X"</js>).<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * </ul><a name="line.85"></a>
-<span class="sourceLineNo">086</span> *<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * @param s<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * The media type string.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * Will be lowercased.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * Returns <jk>null</jk> if input is null.<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @return A cached media type object.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public static MediaType forString(String s) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> if (s == null)<a name="line.94"></a>
-<span class="sourceLineNo">095</span> return null;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> MediaType mt = cache.get(s);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> if (mt == null) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> mt = new MediaType(s);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> if (nocache)<a name="line.99"></a>
-<span class="sourceLineNo">100</span> return mt;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> cache.putIfAbsent(s, mt);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return cache.get(s);<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> MediaType(String mt) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> Builder b = new Builder(mt);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> this.mediaType = b.mediaType;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> this.type = b.type;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> this.subType = b.subType;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> this.subTypes = b.subTypes;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> this.subTypesList = Collections.unmodifiableList(Arrays.asList(subTypes));<a name="line.112"></a>
-<span class="sourceLineNo">113</span> this.parameters = (b.parameters == null ? Collections.EMPTY_MAP : Collections.unmodifiableMap(b.parameters));<a name="line.113"></a>
-<span class="sourceLineNo">114</span> }<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span> private static class Builder {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private String mediaType, type, subType;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> private String[] subTypes;<a name="line.118"></a>
-<span class="sourceLineNo">119</span> private Map<String,Set<String>> parameters;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> private Builder(String mt) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> mt = mt.trim();<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> int i = mt.indexOf(';');<a name="line.124"></a>
-<span class="sourceLineNo">125</span> if (i == -1) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> this.parameters = Collections.EMPTY_MAP;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> } else {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> this.parameters = new TreeMap<String,Set<String>>();<a name="line.128"></a>
-<span class="sourceLineNo">129</span> String[] tokens = mt.substring(i+1).split(";");<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> for (int j = 0; j < tokens.length; j++) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> String[] parm = tokens[j].split("=");<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if (parm.length == 2) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> String k = parm[0].trim(), v = parm[1].trim();<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (! parameters.containsKey(k))<a name="line.135"></a>
-<span class="sourceLineNo">136</span> parameters.put(k, new TreeSet<String>());<a name="line.136"></a>
-<span class="sourceLineNo">137</span> parameters.get(k).add(v);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<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> mt = mt.substring(0, i);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">015</span>import static org.apache.juneau.internal.StringUtils.*;<a name="line.15"></a>
+<span class="sourceLineNo">016</span><a name="line.16"></a>
+<span class="sourceLineNo">017</span>import java.util.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import java.util.concurrent.*;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.annotation.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.internal.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.json.*;<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>/**<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * Describes a single media type used in content negotiation between an HTTP client and server, as described in<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).<a name="line.27"></a>
+<span class="sourceLineNo">028</span> *<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <h6 class='topic'>Additional Information</h6><a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <ul class='doctree'><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <li class='jp'><a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <li class='extlink'><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616.html'><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Hypertext Transfer Protocol -- HTTP/1.1</a><a name="line.35"></a>
+<span class="sourceLineNo">036</span> * </ul><a name="line.36"></a>
+<span class="sourceLineNo">037</span> */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>@BeanIgnore<a name="line.38"></a>
+<span class="sourceLineNo">039</span>@SuppressWarnings("unchecked")<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class MediaType implements Comparable<MediaType> {<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span> private static final boolean nocache = Boolean.getBoolean("juneau.nocache");<a name="line.42"></a>
+<span class="sourceLineNo">043</span> private static final ConcurrentHashMap<String,MediaType> cache = new ConcurrentHashMap<String,MediaType>();<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> /** Reusable predefined media type */<a name="line.45"></a>
+<span class="sourceLineNo">046</span> @SuppressWarnings("javadoc")<a name="line.46"></a>
+<span class="sourceLineNo">047</span> public static final MediaType<a name="line.47"></a>
+<span class="sourceLineNo">048</span> CSV = forString("text/csv"),<a name="line.48"></a>
+<span class="sourceLineNo">049</span> HTML = forString("text/html"),<a name="line.49"></a>
+<span class="sourceLineNo">050</span> JSON = forString("application/json"),<a name="line.50"></a>
+<span class="sourceLineNo">051</span> MSGPACK = forString("octal/msgpack"),<a name="line.51"></a>
+<span class="sourceLineNo">052</span> PLAIN = forString("text/plain"),<a name="line.52"></a>
+<span class="sourceLineNo">053</span> UON = forString("text/uon"),<a name="line.53"></a>
+<span class="sourceLineNo">054</span> URLENCODING = forString("application/x-www-form-urlencoded"),<a name="line.54"></a>
+<span class="sourceLineNo">055</span> XML = forString("text/xml"),<a name="line.55"></a>
+<span class="sourceLineNo">056</span> XMLSOAP = forString("text/xml+soap"),<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> RDF = forString("text/xml+rdf"),<a name="line.58"></a>
+<span class="sourceLineNo">059</span> RDFABBREV = forString("text/xml+rdf+abbrev"),<a name="line.59"></a>
+<span class="sourceLineNo">060</span> NTRIPLE = forString("text/n-triple"),<a name="line.60"></a>
+<span class="sourceLineNo">061</span> TURTLE = forString("text/turtle"),<a name="line.61"></a>
+<span class="sourceLineNo">062</span> N3 = forString("text/n3")<a name="line.62"></a>
+<span class="sourceLineNo">063</span> ;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> private final String mediaType;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private final String type; // The media type (e.g. "text" for Accept, "utf-8" for Accept-Charset)<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private final String subType; // The media sub-type (e.g. "json" for Accept, not used for Accept-Charset)<a name="line.67"></a>
+<span class="sourceLineNo">068</span> private final String[] subTypes; // The media sub-type (e.g. "json" for Accept, not used for Accept-Charset)<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private final String[] subTypesSorted; // Same as subTypes, but sorted so that it can be used for comparison.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private final List<String> subTypesList; // The media sub-type (e.g. "json" for Accept, not used for Accept-Charset)<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private final Map<String,Set<String>> parameters; // The media type parameters (e.g. "text/html;level=1"). Does not include q!<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private final boolean hasSubtypeMeta; // The media subtype contains meta-character '*'.<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>
+<span class="sourceLineNo">075</span> * Returns the media type for the specified string.<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * The same media type strings always return the same objects so that these objects<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * can be compared for equality using '=='.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> *<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <h5 class='section'>Notes:</h5><a name="line.79"></a>
+<span class="sourceLineNo">080</span> * <ul><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <li><a name="line.81"></a>
+<span class="sourceLineNo">082</span> * Spaces are replaced with <js>'+'</js> characters.<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * This gets around the issue where passing media type strings with <js>'+'</js> as HTTP GET parameters<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * get replaced with spaces by your browser. Since spaces aren't supported by the spec, this<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * is doesn't break anything.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <li><a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Anything including and following the <js>';'</js> character is ignored (e.g. <js>";charset=X"</js>).<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * </ul><a name="line.88"></a>
+<span class="sourceLineNo">089</span> *<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @param s<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * The media type string.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * Will be lowercased.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * Returns <jk>null</jk> if input is null or empty.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * @return A cached media type object.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public static MediaType forString(String s) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> if (isEmpty(s))<a name="line.97"></a>
+<span class="sourceLineNo">098</span> return null;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> MediaType mt = cache.get(s);<a name="line.99"></a>
+<span class="sourceLineNo">100</span> if (mt == null) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> mt = new MediaType(s);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> if (nocache)<a name="line.102"></a>
+<span class="sourceLineNo">103</span> return mt;<a name="line.103"></a>
+<span class="sourceLineNo">104</span> cache.putIfAbsent(s, mt);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> return cache.get(s);<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> * Same as {@link #forString(String)} but allows you to construct an array of <code>MediaTypes</code> from an<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * array of strings.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> *<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @param s<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * The media type strings.<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @return<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * An array of <code>MediaType</code> objects.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <br>Always the same length as the input string array.<a name="line.117"></a>
+<span class="sourceLineNo">118</span> */<a name="line.118"></a>
+<span class="sourceLineNo">119</span> public static MediaType[] forStrings(String...s) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> MediaType[] mt = new MediaType[s.length];<a name="line.120"></a>
+<span class="sourceLineNo">121</span> for (int i = 0; i < s.length; i++)<a name="line.121"></a>
+<span class="sourceLineNo">122</span> mt[i] = forString(s[i]);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> return mt;<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> MediaType(String mt) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> Builder b = new Builder(mt);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> this.mediaType = b.mediaType;<a name="line.128"></a>
+<span class="sourceLineNo">129</span> this.type = b.type;<a name="line.129"></a>
+<span class="sourceLineNo">130</span> this.subType = b.subType;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> this.subTypes = b.subTypes;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> this.subTypesSorted = b.subTypesSorted;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> this.subTypesList = Collections.unmodifiableList(Arrays.asList(subTypes));<a name="line.133"></a>
+<span class="sourceLineNo">134</span> this.parameters = (b.parameters == null ? Collections.EMPTY_MAP : Collections.unmodifiableMap(b.parameters));<a name="line.134"></a>
+<span class="sourceLineNo">135</span> this.hasSubtypeMeta = b.hasSubtypeMeta;<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> private static class Builder {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> private String mediaType, type, subType;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> private String[] subTypes, subTypesSorted;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> private Map<String,Set<String>> parameters;<a name="line.141"></a>
+<span class="sourceLineNo">142</span> private boolean hasSubtypeMeta;<a name="line.142"></a>
<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> this.mediaType = mt;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> if (mt != null) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> mt = mt.replace(' ', '+');<a name="line.146"></a>
-<span class="sourceLineNo">147</span> i = mt.indexOf('/');<a name="line.147"></a>
-<span class="sourceLineNo">148</span> type = (i == -1 ? mt : mt.substring(0, i));<a name="line.148"></a>
-<span class="sourceLineNo">149</span> subType = (i == -1 ? "*" : mt.substring(i+1));<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span> this.subTypes = StringUtils.split(subType, '+');<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> /**<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * Returns the <js>'type'</js> fragment of the <js>'type/subType'</js> string.<a name="line.156"></a>
-<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 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">144</span> private Builder(String mt) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> mt = mt.trim();<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> int i = mt.indexOf(';');<a name="line.147"></a>
+<span class="sourceLineNo">148</span> if (i == -1) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> this.parameters = Collections.EMPTY_MAP;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> } else {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> this.parameters = new TreeMap<String,Set<String>>();<a name="line.151"></a>
+<span class="sourceLineNo">152</span> String[] tokens = mt.substring(i+1).split(";");<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> for (int j = 0; j < tokens.length; j++) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> String[] parm = tokens[j].split("=");<a name="line.155"></a>
+<span class="sourceLineNo">156</span> if (parm.length == 2) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> String k = parm[0].trim(), v = parm[1].trim();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> if (! parameters.containsKey(k))<a name="line.158"></a>
+<span class="sourceLineNo">159</span> parameters.put(k, new TreeSet<String>());<a name="line.159"></a>
+<span class="sourceLineNo">160</span> parameters.get(k).add(v);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<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>
-<span class="sourceLineNo">164</span> /**<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * Returns the <js>'subType'</js> fragment of the <js>'type/subType'</js> string.<a name="line.165"></a>
-<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 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 <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> * @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> 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> 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> 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 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>
+<span class="sourceLineNo">164</span> mt = mt.substring(0, i);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> this.mediaType = mt;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (mt != null) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> mt = mt.replace(' ', '+');<a name="line.169"></a>
+<span class="sourceLineNo">170</span> i = mt.indexOf('/');<a name="line.170"></a>
+<span class="sourceLineNo">171</span> type = (i == -1 ? mt : mt.substring(0, i));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> subType = (i == -1 ? "*" : mt.substring(i+1));<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> this.subTypes = StringUtils.split(subType, '+');<a name="line.174"></a>
+<span class="sourceLineNo">175</span> this.subTypesSorted = Arrays.copyOf(subTypes, subTypes.length);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> Arrays.sort(this.subTypesSorted);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> hasSubtypeMeta = ArrayUtils.contains("*", this.subTypes);<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> /**<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * Returns the <js>'type'</js> fragment of the <js>'type/subType'</js> string.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> *<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @return The media type.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> */<a name="line.185"></a>
+<span class="sourceLineNo">186</span> public final String getType() {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> return type;<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> /**<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * Returns the <js>'subType'</js> fragment of the <js>'type/subType'</js> string.<a name="line.191"></a>
+<span class="sourceLineNo">192</span> *<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * @return The media subtype.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> public final String getSubType() {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return subType;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> /**<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * Returns <jk>true</jk> if the subtype contains the specified <js>'+'</js> delimited subtype value.<a name="line.200"></a>
+<span class="sourceLineNo">201</span> *<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * @param st<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * The subtype string.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * Case is ignored.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * @return <jk>true</jk> if the subtype contains the specified subtype string.<a name="line.205"></a>
+<span class="sourceLineNo">206</span> */<a name="line.206"></a>
+<span class="sourceLineNo">207</span> public final boolean hasSubType(String st) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> if (st != null)<a name="line.208"></a>
+<span class="sourceLineNo">209</span> for (String s : subTypes)<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (st.equalsIgnoreCase(s))<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return true;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return false;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> }<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> * Returns the subtypes broken down by fragments delimited by <js>"'"</js>.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> *<a name="line.217"></a>
+<span class="sourceLineNo">218</span> * <P><a name="line.218"></a>
+<span class="sourceLineNo">219</span> * For example, the media type <js>"text/foo+bar"</js> will return a list of<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <code>[<js>'foo'</js>,<js>'bar'</js>]</code><a name="line.220"></a>
+<span class="sourceLineNo">221</span> *<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * @return An unmodifiable list of subtype fragments. Never <jk>null</jk>.<a name="line.222"></a>
+<span class="sourceLineNo">223</span> */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> public final List<String> getSubTypes() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return subTypesList;<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">228</span> /**<a name="line.228"></a>
+<span class="sourceLineNo">229</span> * Returns <jk>true</jk> if this media type contains the <js>'*'</js> meta character.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> *<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * @return <jk>true</jk> if this media type contains the <js>'*'</js> meta character.<a name="line.231"></a>
+<span class="sourceLineNo">232</span> */<a name="line.232"></a>
+<span class="sourceLineNo">233</span> public final boolean isMeta() {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> return hasSubtypeMeta;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> /**<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * Returns a match metric against the specified media type where a larger number represents a better match.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> *<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * <p><a name="line.240"></a>
+<span class="sourceLineNo">241</span> * This media type can contain <js>'*'</js> metacharacters.<a name="line.241"></a>
+<span class="sourceLineNo">242</span> * <br>The comparison media type must not.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> *<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * <ul><a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <li>Exact matches (e.g. <js>"text/json"<js>/</js>"text/json"</js>) should match<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * better than meta-character matches (e.g. <js>"text/*"<js>/</js>"text/json"</js>)<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * <li>The comparison media type can have additional subtype tokens (e.g. <js>"text/json+foo"</js>)<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * that will not prevent a match if the <code>allowExtraSubTypes</code> flag is set.<a name="line.248"></a>
+<span class="sourceLineNo">249</span> * The reverse is not true, e.g. the comparison media type must contain all subtype tokens found in the<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * comparing media type.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * <ul><a name="line.251"></a>
+<span class="sourceLineNo">252</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.252"></a>
+<span class="sourceLineNo">253</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.253"></a>
+<span class="sourceLineNo">254</span> * requests for <js>"text/json"</js>.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * </ul><a name="line.255"></a>
+<span class="sourceLineNo">256</span> * More token matches should result in a higher match number.<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * </ul><a name="line.257"></a>
+<span class="sourceLineNo">258</span> *<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * The formula is as follows for <code>type/subTypes</code>:<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * <ul><a name="line.260"></a>
+<span class="sourceLineNo">261</span> * <li>An exact match is <code>100,000</code>.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * <li>Add the following for type (assuming subtype match is &lt;0):<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * <ul><a name="line.263"></a>
+<span class="sourceLineNo">264</span> * <li><code>10,000</code> for an exact match (e.g. <js>"text"</js>==<js>"text"</js>).<a name="line.264"></a>
+<span class="sourceLineNo">265</span> * <li><code>5,000</code> for a meta match (e.g. <js>"*"</js>==<js>"text"</js>).<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * <ul><a name="line.266"></a>
+<span class="sourceLineNo">267</span> * <li>Add the following for subtype (assuming type match is &lt;0):<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * <ul><a name="line.268"></a>
+<span class="sourceLineNo">269</span> * <li><code>7,500</code> for an exact match (e.g. <js>"json+foo"</js>==<js>"json+foo"</js> or <js>"json+foo"</js>==<js>"foo+json"</js>)<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * <li><code>100</code> for every subtype entry match (e.g. <js>"json"</js>/<js>"json+foo"</js>)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * <li><code>10</code> for a subtype entry meta match (e.g. <js>"*"</js>/<js>"json"</js> or <js>"json+*"</js>/<js>"json+foo"</js>)<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * </ul><a name="line.272"></a>
+<span class="sourceLineNo">273</span> * </ul><a name="line.273"></a>
+<span class="sourceLineNo">274</span> *<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @param o The media type to compare with.<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * @param allowExtraSubTypes If <jk>true</jk>,<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * @return <jk>true</jk> if the media types match.<a name="line.277"></a>
+<span class="sourceLineNo">278</span> */<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public final int match(MediaType o, boolean allowExtraSubTypes) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> // Perfect match<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (this == o || (type.equals(o.type) && subType.equals(o.subType)))<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return 100000;<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> int c = 0;<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (type.equals(o.type))<a name="line.287"></a>
+<span class="sourceLineNo">288</span> c += 10000;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> else if ("*".equals(type) || "*".equals(o.type))<a name="line.289"></a>
+<span class="sourceLineNo">290</span> c += 5000;<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (c == 0)<a name="line.292"></a>
+<span class="sourceLineNo">293</span> return 0;<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> // Subtypes match but are ordered different<a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (ArrayUtils.equals(subTypesSorted, o.subTypesSorted))<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return c + 7500;<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> for (String st1 : subTypes) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if ("*".equals(st1))<a name="line.300"></a>
+<span class="sourceLineNo">301</span> c += 0;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> else if (ArrayUtils.contains(st1, o.subTypes))<a name="line.302"></a>
+<span class="sourceLineNo">303</span> c += 100;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> else if (o.hasSubtypeMeta)<a name="line.304"></a>
+<span class="sourceLineNo">305</span> c += 10;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> else<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return 0;<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span> for (String st2 : o.subTypes) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if ("*".equals(st2))<a name="line.310"></a>
+<span class="sourceLineNo">311</span> c += 0;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> else if (ArrayUtils.contains(st2, subTypes))<a name="line.312"></a>
+<span class="sourceLineNo">313</span> c += 100;<a name="line.313"></a>
+<span class="sourceLineNo">314</span> else if (hasSubtypeMeta)<a name="line.314"></a>
+<span class="sourceLineNo">315</span> c += 10;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> else if (! allowExtraSubTypes)<a name="line.316"></a>
+<span class="sourceLineNo">317</span> return 0;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> else<a name="line.318"></a>
+<span class="sourceLineNo">319</span> c += 10;<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> return c;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * Returns the additional parameters on this media type.<a name="line.326"></a>
+<span class="sourceLineNo">327</span> *<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * <p><a name="line.328"></a>
+<span class="sourceLineNo">329</span> * For example, given the media type string <js>"text/html;level=1"</js>, will return a map<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * with the single entry <code>{level:[<js>'1'</js>]}</code>.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> *<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * @return The map of additional parameters, or an empty map if there are no parameters.<a name="line.332"></a>
+<span class="sourceLineNo">333</span> */<a name="line.333"></a>
+<span class="sourceLineNo">334</span> public final Map<String,Set<String>> getParameters() {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return parameters;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> @Override /* Object */<a name="line.338"></a>
+<span class="sourceLineNo">339</span> public final String toString() {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> if (parameters.isEmpty())<a name="line.340"></a>
+<span class="sourceLineNo">341</span> return mediaType;<a name="line.341"></a>
+<span class="sourceLineNo">342</span> StringBuilder sb = new StringBuilder(mediaType);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> for (Map.Entry<String,Set<String>> e : parameters.entrySet())<a name="line.343"></a>
+<span class="sourceLineNo">344</span> for (String value : e.getValue())<a name="line.344"></a>
+<span class="sourceLineNo">345</span> sb.append(';').append(e.getKey()).append('=').append(value);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return sb.toString();<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> @Override /* Object */<a name="line.349"></a>
+<span class="sourceLineNo">350</span> public final int hashCode() {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> return mediaType.hashCode();<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> @Override /* Object */<a name="line.354"></a>
+<span class="sourceLineNo">355</span> public final boolean equals(Object o) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return this == o;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> @Override<a name="line.359"></a>
+<span class="sourceLineNo">360</span> public final int compareTo(MediaType o) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> return mediaType.compareTo(o.mediaType);<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span>}<a name="line.363"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/http/MediaTypeRange.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/MediaTypeRange.html b/content/site/apidocs/src-html/org/apache/juneau/http/MediaTypeRange.html
index 5052e42..9ee6bbc 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/http/MediaTypeRange.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/http/MediaTypeRange.html
@@ -286,20 +286,7 @@
<span class="sourceLineNo">278</span> int i = o.mediaType.toString().compareTo(mediaType.toString());<a name="line.278"></a>
<span class="sourceLineNo">279</span> return i;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> /**<a name="line.282"></a>
-<span class="sourceLineNo">283</span> * Matches the specified media type against this range and returns a q-value between 0 and 1 indicating the<a name="line.283"></a>
-<span class="sourceLineNo">284</span> * quality of the match.<a name="line.284"></a>
-<span class="sourceLineNo">285</span> *<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * @param o The media type to match against.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * @return A float between 0 and 1. 1 is a perfect match. 0 is no match at all.<a name="line.287"></a>
-<span class="sourceLineNo">288</span> */<a name="line.288"></a>
-<span class="sourceLineNo">289</span> public float matches(MediaType o) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (this.mediaType == o || mediaType.matches(o))<a name="line.290"></a>
-<span class="sourceLineNo">291</span> return qValue;<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return 0;<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">281</span>}<a name="line.281"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
index 0bf3cd2..faa8fbb 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ArrayUtils.html
@@ -424,7 +424,23 @@
<span class="sourceLineNo">416</span> r[i++] = StringUtils.toString(o);<a name="line.416"></a>
<span class="sourceLineNo">417</span> return r;<a name="line.417"></a>
<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>}<a name="line.419"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> /**<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * Returns <jk>true</jk> if the following sorted arrays are equals.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> *<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * @param a1 Array #1.<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * @param a2 Array #2.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @return <jk>true</jk> if the following sorted arrays are equals.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> */<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public static boolean equals(String[] a1, String[] a2) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (a1.length != a2.length)<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return false;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> for (int i = 0; i < a1.length; i++)<a name="line.430"></a>
+<span class="sourceLineNo">431</span> if (! StringUtils.isEquals(a1[i], a2[i]))<a name="line.431"></a>
+<span class="sourceLineNo">432</span> return false;<a name="line.432"></a>
+<span class="sourceLineNo">433</span> return true;<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>}<a name="line.435"></a>