Author: reschke
Date: Fri Apr 26 07:10:46 2019
New Revision: 1858178
URL: http://svn.apache.org/viewvc?rev=1858178&view=rev
Log:
OAK-8135: HTTP service may not select correct media type if multiple are
specified in Accept header field (ported to 1.10)
Added:
jackrabbit/oak/branches/1.10/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
- copied unchanged from r1855993,
jackrabbit/oak/trunk/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 26 07:10:46 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032,1858123
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032,1858123
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java?rev=1858178&r1=1858177&r2=1858178&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-http/src/main/java/org/apache/jackrabbit/oak/http/MediaRange.java
Fri Apr 26 07:10:46 2019
@@ -28,6 +28,10 @@ public class MediaRange {
private final double q;
+ private static final int QRESOLUTION = 1000;
+ private static double CORRECTIONFORSUBTYPEMATCH = 1f / (10 * QRESOLUTION);
+ private static double CORRECTIONFORTYPEANDSUBTYPEMATCH = 2f / (10 *
QRESOLUTION);
+
public static MediaRange parse(String range, MediaTypeRegistry registry) {
MediaType type = MediaType.parse(range);
if (type == null) {
@@ -56,6 +60,20 @@ public class MediaRange {
this.q = q;
}
+ /**
+ * Matches the media range against the specified media type.
+ * <p>
+ * The "derived" quality value if computed from the specified q value (0 to
+ * 1) by subtracting 1/10000 in case the subtype in the range is "*", or
+ * 2/10000 if case both type and subtype are. This takes care of the
+ * precedence specified in RFC 7231, Section 5.3.2.
+ *
+ * @param type
+ * type to match
+ * @param registry
+ * media type registry
+ * @return {@code 0.0} for "no match", the derived quality value if match
+ */
public double match(MediaType type, MediaTypeRegistry registry) {
if (type.equals(this.type)) { // shortcut
return q;
@@ -70,14 +88,16 @@ public class MediaRange {
}
}
- if ("*/*".equals(this.type.toString())) {
- return q;
- } else if ("*".equals(this.type.getSubtype())
- && type.getType().equals(this.type.getType())) {
- return q;
+ if (q > 0.0 && "*/*".equals(this.type.toString())) {
+ return q - CORRECTIONFORTYPEANDSUBTYPEMATCH;
+ } else if (q > 0.0 && "*".equals(this.type.getSubtype()) &&
type.getType().equals(this.type.getType())) {
+ return q - CORRECTIONFORSUBTYPEMATCH;
} else {
return 0.0;
}
}
+ public String toString() {
+ return String.format("type=%s, q=%f", type, q);
+ }
}
