Port Netty buffers usage

Author: Stephane Landelle

api/src/main/java/com/ning/http/client/Response.java

@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -33,22 +34,30 @@ public interface Response {
      *
      * @return The status code
      */
-    public int getStatusCode();
+    int getStatusCode();
 
     /**
      * Returns the status text for the request.
      *
      * @return The status text
      */
-    public String getStatusText();
+    String getStatusText();
 
     /**
      * Return the entire response body as a byte[].
      *
      * @return the entire response body as a byte[].
      * @throws IOException
      */
-    public byte[] getResponseBodyAsBytes() throws IOException;
+    byte[] getResponseBodyAsBytes() throws IOException;
+    
+    /**
+     * Return the entire response body as a ByteBuffer.
+     *
+     * @return the entire response body as a ByteBuffer.
+     * @throws IOException
+     */
+    ByteBuffer getResponseBodyAsByteBuffer() throws IOException;
 
     /**
      * Returns an input stream for the response body. Note that you should not try to get this more than once,
@@ -57,7 +66,7 @@ public interface Response {
      * @return The input stream
      * @throws java.io.IOException
      */
-    public InputStream getResponseBodyAsStream() throws IOException;
+    InputStream getResponseBodyAsStream() throws IOException;
 
     /**
      * Returns the first maxLength bytes of the response body as a string. Note that this does not check
@@ -69,7 +78,7 @@ public interface Response {
      * @return The response body
      * @throws java.io.IOException
      */
-    public String getResponseBodyExcerpt(int maxLength, String charset) throws IOException;
+    String getResponseBodyExcerpt(int maxLength, String charset) throws IOException;
 
     /**
      * Return the entire response body as a String.
@@ -78,7 +87,7 @@ public interface Response {
      * @return the entire response body as a String.
      * @throws IOException
      */
-    public String getResponseBody(String charset) throws IOException;
+    String getResponseBody(String charset) throws IOException;
 
     /**
      * Returns the first maxLength bytes of the response body as a string. Note that this does not check
@@ -89,15 +98,15 @@ public interface Response {
      * @return The response body
      * @throws java.io.IOException
      */
-    public String getResponseBodyExcerpt(int maxLength) throws IOException;
+    String getResponseBodyExcerpt(int maxLength) throws IOException;
 
     /**
      * Return the entire response body as a String.
      *
      * @return the entire response body as a String.
      * @throws IOException
      */
-    public String getResponseBody() throws IOException;
+    String getResponseBody() throws IOException;
 
     /**
      * Return the request {@link URI}. Note that if the request got redirected, the value of the {@link URI} will be
@@ -106,30 +115,30 @@ public interface Response {
      * @return the request {@link URI}.
      * @throws MalformedURLException
      */
-    public URI getUri() throws MalformedURLException;
+    URI getUri() throws MalformedURLException;
 
     /**
      * Return the content-type header value.
      *
      * @return the content-type header value.
      */
-    public String getContentType();
+    String getContentType();
 
     /**
      * Return the response header
      *
      * @return the response header
      */
-    public String getHeader(String name);
+    String getHeader(String name);
 
     /**
      * Return a {@link List} of the response header value.
      *
      * @return the response header
      */
-    public List<String> getHeaders(String name);
+    List<String> getHeaders(String name);
 
-    public FluentCaseInsensitiveStringsMap getHeaders();
+    FluentCaseInsensitiveStringsMap getHeaders();
 
     /**
      * Return true if the response redirects to another object.
@@ -143,19 +152,19 @@ public interface Response {
      *
      * @return The textual representation
      */
-    public String toString();
+    String toString();
 
     /**
      * Return the list of {@link Cookie}.
      */
-    public List<Cookie> getCookies();
+    List<Cookie> getCookies();
 
     /**
      * Return true if the response's status has been computed by an {@link AsyncHandler}
      *
      * @return true if the response's status has been computed by an {@link AsyncHandler}
      */
-    public boolean hasResponseStatus();
+    boolean hasResponseStatus();
 
     /**
      * Return true if the response's headers has been computed by an {@link AsyncHandler} It will return false if the
@@ -164,7 +173,7 @@ public interface Response {
      *
      * @return true if the response's headers has been computed by an {@link AsyncHandler}
      */
-    public boolean hasResponseHeaders();
+    boolean hasResponseHeaders();
 
     /**
      * Return true if the response's body has been computed by an {@link AsyncHandler}. It will return false if the
@@ -173,8 +182,7 @@ public interface Response {
      *
      * @return true if the response's body has been computed by an {@link AsyncHandler}
      */
-    public boolean hasResponseBody();
-
+    boolean hasResponseBody();
 
     public static class ResponseBuilder {
         private final List<HttpResponseBodyPart> bodies =

api/src/main/java/com/ning/http/client/providers/ResponseBase.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.List;
 
@@ -42,7 +43,6 @@ public final String getStatusText() {
         return status.getStatusText();
     }
 
-
     /* @Override */
     public final URI getUri() /*throws MalformedURLException*/ {
         return status.getUrl();
@@ -78,6 +78,10 @@ public byte[] getResponseBodyAsBytes() throws IOException {
         return AsyncHttpProviderUtils.contentToBytes(bodyParts);
     }
 
+    public ByteBuffer getResponseBodyAsByteBuffer() throws IOException {
+        return ByteBuffer.wrap(getResponseBodyAsBytes());
+    }
+
     /* @Override */
     public String getResponseBody() throws IOException {
         return getResponseBody(DEFAULT_CHARSET);

api/src/main/java/com/ning/http/client/webdav/WebDavResponse.java

@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.nio.ByteBuffer;
 import java.util.List;
 
 /**
@@ -49,6 +50,10 @@ public byte[] getResponseBodyAsBytes() throws IOException {
         return response.getResponseBodyAsBytes();
     }
 
+    public ByteBuffer getResponseBodyAsByteBuffer() throws IOException {
+        return response.getResponseBodyAsByteBuffer();
+    }
+
     public InputStream getResponseBodyAsStream() throws IOException {
         return response.getResponseBodyAsStream();
     }

providers/netty/pom.xml

@@ -20,25 +20,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
-            <version>3.4.4.Final</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>3.6.3.Final</version>
         </dependency>
     </dependencies>
 

providers/netty/src/main/java/com/ning/http/client/providers/netty/NettyResponse.java

@@ -23,11 +23,18 @@
 import com.ning.http.util.AsyncHttpProviderUtils;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBufferInputStream;
+import org.jboss.netty.buffer.ChannelBuffers;
+
 /**
  * Wrapper around the {@link com.ning.http.client.Response} API.
  */
@@ -65,4 +72,49 @@ protected List<Cookie> buildCookies() {
         }
         return Collections.unmodifiableList(cookies);
     }
+
+    /* @Override */
+    public byte[] getResponseBodyAsBytes() throws IOException {
+        return getResponseBodyAsByteBuffer().array();
+    }
+
+    /* @Override */
+    public ByteBuffer getResponseBodyAsByteBuffer() throws IOException {
+        return getResponseBodyAsChannelBuffer().toByteBuffer();
+    }
+
+    /* @Override */
+    public String getResponseBody() throws IOException {
+        return getResponseBody(null);
+    }
+
+    /* @Override */
+    public String getResponseBody(String charset) throws IOException {
+        return getResponseBodyAsChannelBuffer().toString(Charset.forName(calculateCharset(charset)));
+    }
+
+    /* @Override */
+    public InputStream getResponseBodyAsStream() throws IOException {
+        return new ChannelBufferInputStream(getResponseBodyAsChannelBuffer());
+    }
+
+    public ChannelBuffer getResponseBodyAsChannelBuffer() throws IOException {
+        ChannelBuffer b = null;
+        switch (bodyParts.size()) {
+        case 0:
+            b = ChannelBuffers.EMPTY_BUFFER;
+            break;
+        case 1:
+            b = ResponseBodyPart.class.cast(bodyParts.get(0)).getChannelBuffer();
+            break;
+        default:
+            ChannelBuffer[] channelBuffers = new ChannelBuffer[bodyParts.size()];
+            for (int i = 0; i < bodyParts.size(); i++) {
+                channelBuffers[i] = ResponseBodyPart.class.cast(bodyParts.get(i)).getChannelBuffer();
+            }
+            b = ChannelBuffers.wrappedBuffer(channelBuffers);
+        }
+
+        return b;
+    }
 }

providers/netty/src/main/java/com/ning/http/client/providers/netty/ResponseBodyPart.java

@@ -33,8 +33,6 @@
  * A callback class used when an HTTP response body is received.
  */
 public class ResponseBodyPart extends HttpResponseBodyPart {
-    // Empty arrays are immutable, can freely reuse
-    private final static byte[] NO_BYTES = new byte[0];
 
     private final HttpChunk chunk;
     private final HttpResponse response;
@@ -68,11 +66,9 @@ public byte[] getBodyPartBytes() {
             return bp;
         }
 
-        ChannelBuffer b = (chunk != null) ? chunk.getContent() : response.getContent();
-        int available = b.readableBytes();
-
-        final byte[] rb = (available == 0) ? NO_BYTES : new byte[available];
-        b.getBytes(b.readerIndex(), rb, 0, available);
+        ChannelBuffer b = getChannelBuffer();
+        byte[] rb = b.toByteBuffer().array();
+        bytes.set(rb);
         return rb;
     }
 
@@ -89,7 +85,7 @@ public int length() {
 
     @Override
     public int writeTo(OutputStream outputStream) throws IOException {
-        ChannelBuffer b = (chunk != null) ? chunk.getContent() : response.getContent();
+        ChannelBuffer b = getChannelBuffer();
         int available = b.readableBytes();
         if (available > 0) {
             b.getBytes(b.readerIndex(), outputStream, available);
@@ -102,6 +98,10 @@ public ByteBuffer getBodyByteBuffer() {
         return ByteBuffer.wrap(getBodyPartBytes());
     }
 
+    public ChannelBuffer getChannelBuffer() {
+        return chunk != null ? chunk.getContent() : response.getContent();
+    }
+
     /**
      * {@inheritDoc}
      */