JERSEY-3189: Using HttpUrlConnection#setFixedLengthStreamingMode(long) when available.

Change-Id: I879f9b8fb9886e2fb0bae431f8c30e7c6f58d5c9

Author: pavelbucek

connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java

@@ -249,10 +249,10 @@ public void operationComplete(io.netty.util.concurrent.Future<? super Void> futu
             nettyRequest.headers().add(HttpHeaderNames.HOST, jerseyRequest.getUri().getHost());
 
             if (jerseyRequest.hasEntity()) {
-                if (jerseyRequest.getLength() == -1) {
+                if (jerseyRequest.getLengthLong() == -1) {
                     HttpUtil.setTransferEncodingChunked(nettyRequest, true);
                 } else {
-                    nettyRequest.headers().add(HttpHeaderNames.CONTENT_LENGTH, jerseyRequest.getLength());
+                    nettyRequest.headers().add(HttpHeaderNames.CONTENT_LENGTH, jerseyRequest.getLengthLong());
                 }
             }
 

core-client/src/main/java/org/glassfish/jersey/client/internal/HttpUrlConnector.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011-2016 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
@@ -361,9 +361,14 @@ private ClientResponse _apply(final ClientRequest request) throws IOException {
                     ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.class);
 
             if (entityProcessing == null || entityProcessing != RequestEntityProcessing.BUFFERED) {
-                final int length = request.getLength();
+                final long length = request.getLengthLong();
                 if (fixLengthStreaming && length > 0) {
-                    uc.setFixedLengthStreamingMode(length);
+                    // uc.setFixedLengthStreamingMode(long) was introduced in JDK 1.7 and Jersey client supports 1.6+
+                    if ("1.6".equals(Runtime.class.getPackage().getSpecificationVersion())) {
+                        uc.setFixedLengthStreamingMode(request.getLength());
+                    } else {
+                        uc.setFixedLengthStreamingMode(length);
+                    }
                 } else if (entityProcessing == RequestEntityProcessing.CHUNKED) {
                     uc.setChunkedStreamingMode(chunkSize);
                 }

core-client/src/test/java/org/glassfish/jersey/client/HttpUrlConnectorTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2016 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
@@ -130,7 +130,7 @@ public HttpURLConnection getConnection(URL endpointUrl) throws IOException {
 
 
         res.getHeaders().putSingle(HttpHeaders.LINK, Link.fromPath("action").rel("test").build().toString());
-                assertEquals(URI.create("http://redirected.org:8080/action"), res.getLink("test").getUri());
+        assertEquals(URI.create("http://redirected.org:8080/action"), res.getLink("test").getUri());
     }
 
     private HttpURLConnection wrapRedirectedHttp(final HttpURLConnection connection) {

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 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
@@ -113,7 +113,6 @@ public static interface StreamProvider {
          * which will cause ignoring the written entity (in that case the entity will
          * still be written by {@link javax.ws.rs.ext.MessageBodyWriter message body writers}
          * but the output will be ignored).
-         *
          * @throws java.io.IOException in case of an IO error.
          */
         public OutputStream getOutputStream(int contentLength) throws IOException;
@@ -169,7 +168,7 @@ public MultivaluedMap<String, String> getStringHeaders() {
 
     /**
      * Get a message header as a single string value.
-     *
+     * <p>
      * Each single header value is converted to String using a
      * {@link javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate} if one is available
      * via {@link javax.ws.rs.ext.RuntimeDelegate#createHeaderDelegate(java.lang.Class)}
@@ -424,16 +423,52 @@ public Set<String> getAllowedMethods() {
 
     /**
      * Get Content-Length value.
+     * <p>
+     * <B>Note</B>: {@link #getLengthLong() getLengthLong()}
+     * should be preferred over this method, since it returns a {@code long}
+     * instead and is therefore more portable.</P>
      *
-     * @return Content-Length as integer if present and valid number. In other
+     * @return Content-Length as a postive integer if present and valid number. In other
      * cases returns -1.
      */
     public int getLength() {
         return singleHeader(HttpHeaders.CONTENT_LENGTH, Integer.class, new Function<String, Integer>() {
             @Override
             public Integer apply(String input) {
                 try {
-                    return (input != null && !input.isEmpty()) ? Integer.parseInt(input) : -1;
+                    if (input != null && !input.isEmpty()) {
+                        int i = Integer.parseInt(input);
+                        if (i >= 0) {
+                            return i;
+                        }
+                    }
+                    return -1;
+
+                } catch (NumberFormatException ex) {
+                    throw new ProcessingException(ex);
+                }
+            }
+        }, true);
+    }
+
+    /**
+     * Get Content-Length value.
+     *
+     * @return Content-Length as a positive long if present and valid number. In other
+     * cases returns -1.
+     */
+    public long getLengthLong() {
+        return singleHeader(HttpHeaders.CONTENT_LENGTH, Long.class, new Function<String, Long>() {
+            @Override
+            public Long apply(String input) {
+                try {
+                    if (input != null && !input.isEmpty()) {
+                        long l = Long.parseLong(input);
+                        if (l >= 0) {
+                            return l;
+                        }
+                    }
+                    return -1L;
                 } catch (NumberFormatException ex) {
                     throw new ProcessingException(ex);
                 }
@@ -611,7 +646,7 @@ public Link.Builder getLinkBuilder(String relation) {
 
     /**
      * Check if there is an entity available in the message.
-     *
+     * <p>
      * The method returns {@code true} if the entity is present, returns
      * {@code false} otherwise.
      *
@@ -624,7 +659,7 @@ public boolean hasEntity() {
 
     /**
      * Get the message entity Java instance.
-     *
+     * <p>
      * Returns {@code null} if the message does not contain an entity.
      *
      * @return the message entity or {@code null} if message does not contain an
@@ -728,7 +763,7 @@ public Type getEntityType() {
 
     /**
      * Set the message entity type information.
-     *
+     * <p>
      * This method overrides any computed or previously set entity type information.
      *
      * @param type overriding message entity type.

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 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
@@ -58,13 +58,12 @@
 import org.junit.Test;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 /**
  * {@link OutboundMessageContext} test.
  *
@@ -218,4 +217,22 @@ public void testGetLink() {
         assertTrue(r.getLink("self").equals(link1));
         assertTrue(r.getLink("update").equals(link2) || r.getLink("update").equals(link3));
     }
+
+    @Test
+    public void testGetLength() {
+        OutboundMessageContext r = new OutboundMessageContext();
+        r.getHeaders().add("Content-Length", 50);
+        assertEquals(50, r.getLengthLong());
+    }
+
+    @Test
+    public void testGetLength_tooLongForInt() {
+        OutboundMessageContext r = new OutboundMessageContext();
+        long length = Integer.MAX_VALUE + 5;
+        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());
+    }
 }