Merge changes I6f82acbd,I7a6149c5

* changes:
  Added some delay to multipart tests to make sure temporary files are properly deleted.
  Fixed copyrights + few other minor improvements.

Author: japod

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -68,29 +68,29 @@ public class LinkProvider implements HeaderDelegateProvider<Link> {
     private static final Logger LOGGER = Logger.getLogger(LinkProvider.class.getName());
 
     @Override
-    public boolean supports(Class<?> type) {
+    public boolean supports(final Class<?> type) {
         return Link.class.isAssignableFrom(type);
     }
 
     @Override
-    public Link fromString(String value) throws IllegalArgumentException {
+    public Link fromString(final String value) throws IllegalArgumentException {
         return initBuilder(new JerseyLink.Builder(), value).build();
     }
 
     /**
      * Initialize an existing Jersey link builder with the link data provided in a form of a string.
      *
-     * @param lb link builder to be initialized.
+     * @param lb    link builder to be initialized.
      * @param value link data as a string.
      * @return initialized link builder.
      */
     static JerseyLink.Builder initBuilder(JerseyLink.Builder lb, String value) {
         throwIllegalArgumentExceptionIfNull(value, LocalizationMessages.LINK_IS_NULL());
         try {
             value = value.trim();
-            String params;
+            final String params;
             if (value.startsWith("<")) {
-                int gtIndex = value.indexOf('>');
+                final int gtIndex = value.indexOf('>');
                 if (gtIndex != -1) {
                     lb.uri(value.substring(1, gtIndex).trim());
                     params = value.substring(gtIndex + 1).trim();
@@ -100,23 +100,22 @@ static JerseyLink.Builder initBuilder(JerseyLink.Builder lb, String value) {
             } else {
                 throw new IllegalArgumentException("Missing starting token < in " + value);
             }
-            if (params != null) {
-                StringTokenizer st = new StringTokenizer(params, ";=\"", true);
-                while (st.hasMoreTokens()) {
-                    checkToken(st, ";");
-                    String n = st.nextToken().trim();
-                    checkToken(st, "=");
-
-                    String v = nextNonEmptyToken(st);
-                    if (v.equals("\"")) {
-                        v = st.nextToken();
-                        checkToken(st, "\"");
-                    }
-
-                    lb.param(n, v);
+
+            final StringTokenizer st = new StringTokenizer(params, ";=\"", true);
+            while (st.hasMoreTokens()) {
+                checkToken(st, ";");
+                final String n = st.nextToken().trim();
+                checkToken(st, "=");
+
+                String v = nextNonEmptyToken(st);
+                if (v.equals("\"")) {
+                    v = st.nextToken();
+                    checkToken(st, "\"");
                 }
+
+                lb.param(n, v);
             }
-        } catch (Throwable e) {
+        } catch (final Throwable e) {
             if (LOGGER.isLoggable(Level.FINER)) {
                 LOGGER.log(Level.FINER, "Error parsing link value '" + value + "'", e);
             }
@@ -128,18 +127,16 @@ static JerseyLink.Builder initBuilder(JerseyLink.Builder lb, String value) {
         return lb;
     }
 
-    private static String nextNonEmptyToken(StringTokenizer st) throws IllegalArgumentException {
-        String token = null;
+    private static String nextNonEmptyToken(final StringTokenizer st) throws IllegalArgumentException {
+        String token;
         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 {
+    private static void checkToken(final StringTokenizer st, final String expected) throws IllegalArgumentException {
         String token;
         do {
             token = st.nextToken().trim();
@@ -150,7 +147,7 @@ private static void checkToken(StringTokenizer st, String expected) throws Illeg
     }
 
     @Override
-    public String toString(Link value) {
+    public String toString(final Link value) {
         return stringfy(value);
     }
 
@@ -160,14 +157,14 @@ public String toString(Link value) {
      * @param value link instance to be stringified.
      * @return string version of a given link instance.
      */
-    static String stringfy(Link value) {
+    static String stringfy(final Link value) {
         throwIllegalArgumentExceptionIfNull(value, LocalizationMessages.LINK_IS_NULL());
 
-        Map<String, String> map = value.getParams();
-        StringBuilder sb = new StringBuilder();
+        final Map<String, String> map = value.getParams();
+        final StringBuilder sb = new StringBuilder();
         sb.append('<').append(value.getUri()).append('>');
 
-        for (Map.Entry<String, String> entry : map.entrySet()) {
+        for (final Map.Entry<String, String> entry : map.entrySet()) {
             sb.append("; ").append(entry.getKey()).append("=\"").append(entry.getValue()).append("\"");
         }
         return sb.toString();

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -68,7 +68,7 @@ public void tearDown() throws Exception {
 
     @Test
     public void testValueOf() {
-        Link l1 = Link.fromUri("http://example.org/app/link1").build();
+        final Link l1 = Link.fromUri("http://example.org/app/link1").build();
         Link l2 = Link.valueOf("<http://example.org/app/link1>");
         assertEquals(l1, l2);
         l2 = Link.valueOf(" <http://example.org/app/link1>");
@@ -82,25 +82,25 @@ public void testValueOfExceptions() {
         int nOfExceptions = 0;
         try {
             Link.valueOf("http://example.org/app/link1>");
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             nOfExceptions++;
         }
         try {
             Link.valueOf("<http://example.org/app/link1");
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             nOfExceptions++;
         }
         try {
             Link.valueOf("http://example.org/app/link1");
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             nOfExceptions++;
         }
         assertEquals(nOfExceptions, 3);
     }
 
     @Test
     public void testValueOfParams() {
-        Link l1 = Link.fromUri("http://example.org/app/link1").param("foo1", "bar1").param("foo2", "bar2").build();
+        final Link l1 = Link.fromUri("http://example.org/app/link1").param("foo1", "bar1").param("foo2", "bar2").build();
         Link l2 = Link.valueOf("<http://example.org/app/link1>; foo1=\"bar1\"; foo2 = \"bar2\"");
         assertEquals(l1, l2);
         l2 = Link.valueOf("<http://example.org/app/link1>; foo2=\"bar2\"; foo1= \"bar1\"");
@@ -113,17 +113,17 @@ public void testValueOfParams() {
 
     @Test
     public void testRoundTrip() {
-        Link l1 = Link.fromUri("http://example.org/app/link1").param("foo1", "bar1").param("foo2", "bar2").build();
+        final 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\"");
+        final 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();
+        final 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");
+        final Link l2 = Link.valueOf("<http://example.org/app/link1>; foo1=bar1; foo2 = bar2");
         assertEquals(l1, l2);
     }
 }

media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/FormDataMultiPartReaderWriterTest.java

@@ -706,6 +706,9 @@ public void testInjectedFileNotCopied(@Mocked final BodyPartEntity entity) throw
 
         // Make sure that the temp file has been removed.
         final String pathname = response.readEntity(String.class);
+        // Wait a second to make sure the file doesn't exist.
+        Thread.sleep(1000);
+
         assertThat("Temporary file, " + pathname + ", on the server has not been removed",
                 new File(pathname).exists(), is(false));
     }
@@ -726,6 +729,9 @@ public void tempFileDeletedAfterSuccessfulProcessing() throws Exception {
 
         // Make sure that the temp file has been removed.
         final String pathname = response.readEntity(String.class);
+        // Wait a second to make sure the file doesn't exist.
+        Thread.sleep(1000);
+
         assertThat("Temporary file, " + pathname + ", on the server has not been removed",
                 new File(pathname).exists(), is(false));
     }
@@ -746,6 +752,9 @@ public void tempFileDeletedAfterExceptionInMethod() throws Exception {
 
         // Make sure that the temp file has been removed.
         final String pathname = response.readEntity(String.class);
+        // Wait a second to make sure the file doesn't exist.
+        Thread.sleep(1000);
+
         assertThat("Temporary file, " + pathname + ", on the server has not been removed",
                 new File(pathname).exists(), is(false));
     }

tests/integration/jersey-2846/src/test/java/org/glassfish/jersey/tests/integration/jersey2846/Jersey2846ITCase.java

@@ -138,6 +138,8 @@ public void _test(final String path, final int status, final Object entity) thro
 
         // Get Response ...
         assertThat(response.getStatus(), is(status));
+        // Wait a second to make sure the files don't exist.
+        Thread.sleep(1000);
 
         // Make sure that the message and it's parts have been closed and temporary files deleted.
         assertThat("Temporary files were not deleted", matchingTempFiles(tempDir), is(expectedTempFiles));