Merge pull request #172 from sfuhrm/link-fixes-quotes

JERSEY-2880: Link HTTP Header: Headers may contain double-quote-less parameters.

Author: mgajdos

core-common/src/main/java/org/glassfish/jersey/message/internal/LinkProvider.java

@@ -106,9 +106,13 @@ static JerseyLink.Builder initBuilder(JerseyLink.Builder lb, String value) {
                     checkToken(st, ";");
                     String n = st.nextToken().trim();
                     checkToken(st, "=");
-                    checkToken(st, "\"");
-                    String v = st.nextToken();
-                    checkToken(st, "\"");
+
+                    String v = nextNonEmptyToken(st);
+                    if (v.equals("\"")) {
+                        v = st.nextToken();
+                        checkToken(st, "\"");
+                    }
+
                     lb.param(n, v);
                 }
             }
@@ -124,6 +128,17 @@ static JerseyLink.Builder initBuilder(JerseyLink.Builder lb, String value) {
         return lb;
     }
 
+    private static String nextNonEmptyToken(StringTokenizer st) throws IllegalArgumentException {
+        String token = null;
+        do {
+            token = st.nextToken().trim();
+        } while (token.length() == 0);
+        if (token == null) {
+            throw new IllegalArgumentException("Non-Empty token not found");
+        }
+        return token;
+    }
+
     private static void checkToken(StringTokenizer st, String expected) throws IllegalArgumentException {
         String token;
         do {

core-common/src/test/java/org/glassfish/jersey/message/internal/LinkProviderTest.java

@@ -118,4 +118,12 @@ public void testRoundTrip() {
         Link l2 = Link.valueOf("<http://example.org/app/link1>; foo1=\"bar1\"; foo2 = \"bar2\"");
         assertEquals(l1, l2);
     }
+
+    @Test
+    public void testWithoutDoubleQuotes() {
+        Link l1 = Link.fromUri("http://example.org/app/link1").param("foo1", "bar1").param("foo2", "bar2").build();
+        assertEquals(l1, Link.valueOf(l1.toString()));
+        Link l2 = Link.valueOf("<http://example.org/app/link1>; foo1=bar1; foo2 = bar2");
+        assertEquals(l1, l2);
+    }
 }