JERSEY-3189: unit test fix and javadoc adjustment.

Change-Id: Iae2b909f5692ed1791d8ee633543cdc9514b57bd

Author: pavelbucek

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

@@ -205,7 +205,8 @@ private <T> T singleHeader(String name, Class<T> valueType, Function<String, T>
             return convertNull ? converter.apply(null) : null;
         }
         if (values.size() > 1) {
-            throw new HeaderValueException(LocalizationMessages.TOO_MANY_HEADER_VALUES(name, values.toString()),
+            throw new HeaderValueException(
+                    LocalizationMessages.TOO_MANY_HEADER_VALUES(name, values.toString()),
                     HeaderValueException.Context.OUTBOUND);
         }
 
@@ -356,7 +357,8 @@ public List<Locale> getAcceptableLanguages() {
             } else {
                 conversionApplied = true;
                 try {
-                    result.addAll(Lists.transform(HttpHeaderReader.readAcceptLanguage(HeaderUtils.asString(value, rd)),
+                    result.addAll(Lists.transform(
+                            HttpHeaderReader.readAcceptLanguage(HeaderUtils.asString(value, rd)),
                             new Function<AcceptableLanguageTag, Locale>() {
 
                                 @Override
@@ -428,8 +430,8 @@ public Set<String> getAllowedMethods() {
      * should be preferred over this method, since it returns a {@code long}
      * instead and is therefore more portable.</P>
      *
-     * @return Content-Length as a postive integer if present and valid number. In other
-     * cases returns -1.
+     * @return Content-Length as a postive integer if present and valid number, {@code -1} if negative number.
+     * @throws ProcessingException when {@link Integer#parseInt(String)} (String)} throws {@link NumberFormatException}.
      */
     public int getLength() {
         return singleHeader(HttpHeaders.CONTENT_LENGTH, Integer.class, new Function<String, Integer>() {
@@ -454,8 +456,8 @@ public Integer apply(String input) {
     /**
      * Get Content-Length value.
      *
-     * @return Content-Length as a positive long if present and valid number. In other
-     * cases returns -1.
+     * @return Content-Length as a positive long if present and valid number, {@code -1} if negative number.
+     * @throws ProcessingException when {@link Long#parseLong(String)} throws {@link NumberFormatException}.
      */
     public long getLengthLong() {
         return singleHeader(HttpHeaders.CONTENT_LENGTH, Long.class, new Function<String, Long>() {
@@ -581,12 +583,13 @@ public Set<Link> getLinks() {
 
         if (conversionApplied) {
             // cache converted
-            headers.put(HttpHeaders.LINK, new ArrayList<Object>(Collections2.transform(result, new Function<Link, Object>() {
-                @Override
-                public Object apply(Link input) {
-                    return input;
-                }
-            })));
+            headers.put(HttpHeaders.LINK, new ArrayList<Object>(Collections2
+                    .transform(result, new Function<Link, Object>() {
+                        @Override
+                        public Object apply(Link input) {
+                            return input;
+                        }
+                    })));
         }
 
         return Collections.unmodifiableSet(result);

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

@@ -47,6 +47,7 @@
 import java.util.List;
 import java.util.Locale;
 
+import javax.ws.rs.ProcessingException;
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Link;
@@ -63,6 +64,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * {@link OutboundMessageContext} test.
@@ -228,11 +230,19 @@ public void testGetLength() {
     @Test
     public void testGetLength_tooLongForInt() {
         OutboundMessageContext r = new OutboundMessageContext();
-        long length = Integer.MAX_VALUE + 5;
+        long length = Integer.MAX_VALUE + 5L;
         r.getHeaders().add("Content-Length", length);
 
-        // value is not a valid integer -> returning -1 (see the javadoc).
-        assertEquals(-1, r.getLength());
+
         assertEquals(length, r.getLengthLong());
+
+        // value is not a valid integer -> ProcessingException is thrown.
+        try {
+            r.getLength();
+        } catch (ProcessingException e) {
+            return;
+        }
+
+        fail();
     }
 }