Merge pull request AsyncHttpClient#103 from cowtowncoder/master

Cleaning up

Author: cowtowncoder

src/main/java/com/ning/http/client/AsyncHttpProvider.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Interface to be used when implementing custom asynchronous I/O HTTP client.
@@ -48,6 +49,5 @@ public interface AsyncHttpProvider {
      */
     public Response prepareResponse(HttpResponseStatus status,
                                     HttpResponseHeaders headers,
-                                    Collection<HttpResponseBodyPart> bodyParts);
-
+                                    List<HttpResponseBodyPart> bodyParts);
 }

src/main/java/com/ning/http/client/HttpResponseBodyPart.java

@@ -16,6 +16,7 @@
 package com.ning.http.client;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -29,13 +30,27 @@ public HttpResponseBodyPart(URI uri, AsyncHttpProvider provider) {
         super(uri, provider);
     }
 
+    /**
+     * Return length of this part in bytes.
+     * 
+     * @since 1.8.0
+     */
+    abstract public int length();
+    
     /**
      * Return the response body's part bytes received.
      *
      * @return the response body's part bytes received.
      */
     abstract public byte[] getBodyPartBytes();
 
+    /**
+     * Method for accessing contents of this part via stream.
+     * 
+     * @since 1.8.0
+     */
+    abstract public InputStream readBodyPartBytes();
+    
     /**
      * Write the available bytes to the {@link java.io.OutputStream}
      *

src/main/java/com/ning/http/client/HttpResponseBodyPartsInputStream.java

@@ -178,8 +178,8 @@ public interface Response {
 
 
     public static class ResponseBuilder {
-        private final Collection<HttpResponseBodyPart> bodies =
-                Collections.synchronizedCollection(new ArrayList<HttpResponseBodyPart>());
+        private final List<HttpResponseBodyPart> bodies =
+                Collections.synchronizedList(new ArrayList<HttpResponseBodyPart>());
         private HttpResponseStatus status;
         private HttpResponseHeaders headers;
 

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

@@ -202,7 +202,7 @@ public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler)
         }
 
         HttpMethodBase method = createMethod(httpClient, request);
-        ApacheResponseFuture f = new ApacheResponseFuture<T>(handler, requestTimeout, request, method);
+        ApacheResponseFuture<T> f = new ApacheResponseFuture<T>(handler, requestTimeout, request, method);
         f.touch();
 
         f.setInnerFuture(config.executorService().submit(new ApacheClientRunnable(request, handler, method, f, httpClient)));
@@ -224,7 +224,7 @@ public void close() {
         }
     }
 
-    public Response prepareResponse(HttpResponseStatus status, HttpResponseHeaders headers, Collection<HttpResponseBodyPart> bodyParts) {
+    public Response prepareResponse(HttpResponseStatus status, HttpResponseHeaders headers, List<HttpResponseBodyPart> bodyParts) {
         return new ApacheResponse(status, headers, bodyParts);
     }
 

src/main/java/com/ning/http/client/providers/apache/ApacheAsyncHttpProvider.java

@@ -15,7 +15,6 @@
 import com.ning.http.client.Cookie;
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
 import com.ning.http.client.HttpResponseBodyPart;
-import com.ning.http.client.HttpResponseBodyPartsInputStream;
 import com.ning.http.client.HttpResponseHeaders;
 import com.ning.http.client.HttpResponseStatus;
 import com.ning.http.client.Response;
@@ -24,28 +23,28 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.SequenceInputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
+import java.util.Vector;
 
 public class ApacheResponse implements Response {
     private final static String DEFAULT_CHARSET = "ISO-8859-1";
     private final static String HEADERS_NOT_COMPUTED = "Response's headers hasn't been computed by your AsyncHandler.";
 
     private final URI uri;
-    private final Collection<HttpResponseBodyPart> bodyParts;
+    private final List<HttpResponseBodyPart> bodyParts;
     private final HttpResponseHeaders headers;
     private final HttpResponseStatus status;
     private final List<Cookie> cookies = new ArrayList<Cookie>();
 
     public ApacheResponse(HttpResponseStatus status,
                           HttpResponseHeaders headers,
-                          Collection<HttpResponseBodyPart> bodyParts) {
+                          List<HttpResponseBodyPart> bodyParts) {
 
         this.bodyParts = bodyParts;
         this.headers = headers;
@@ -91,11 +90,17 @@ public String getResponseBody(String charset) throws IOException {
 
     /* @Override */
     public InputStream getResponseBodyAsStream() throws IOException {
-        if (bodyParts.size() > 0) {
-            return new HttpResponseBodyPartsInputStream(bodyParts.toArray(new HttpResponseBodyPart[bodyParts.size()]));
-        } else {
-            return new ByteArrayInputStream("".getBytes());
+        switch (bodyParts.size()) {
+        case 0:
+            return new ByteArrayInputStream(new byte[0]);
+        case 1:
+            return bodyParts.get(0).readBodyPartBytes();
+        }
+        Vector<InputStream> streams = new Vector<InputStream>(bodyParts.size());
+        for (HttpResponseBodyPart part : bodyParts) {
+            streams.add(part.readBodyPartBytes());
         }
+        return new SequenceInputStream(streams.elements());
     }
 
     /* @Override */

src/main/java/com/ning/http/client/providers/apache/ApacheResponse.java

@@ -15,7 +15,9 @@
 import com.ning.http.client.AsyncHttpProvider;
 import com.ning.http.client.HttpResponseBodyPart;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -40,10 +42,21 @@ public ApacheResponseBodyPart(URI uri, byte[] chunk, AsyncHttpProvider provider,
      *
      * @return the response body's part bytes received.
      */
+    @Override
     public byte[] getBodyPartBytes() {
         return chunk;
     }
 
+    @Override
+    public InputStream readBodyPartBytes() {
+        return new ByteArrayInputStream(chunk);
+    }
+
+    @Override
+    public int length() {
+        return chunk.length;
+    }
+    
     @Override
     public int writeTo(OutputStream outputStream) throws IOException {
         outputStream.write(chunk);

src/main/java/com/ning/http/client/providers/apache/ApacheResponseBodyPart.java

@@ -142,6 +142,7 @@
  * @author The Grizzly Team
  * @since 1.7.0
  */
+@SuppressWarnings("rawtypes")
 public class GrizzlyAsyncHttpProvider implements AsyncHttpProvider {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(GrizzlyAsyncHttpProvider.class);
@@ -270,7 +271,7 @@ public void close() {
      */
     public Response prepareResponse(HttpResponseStatus status,
                                     HttpResponseHeaders headers,
-                                    Collection<HttpResponseBodyPart> bodyParts) {
+                                    List<HttpResponseBodyPart> bodyParts) {
 
         return new GrizzlyResponse(status, headers, bodyParts);
 
@@ -469,7 +470,6 @@ private void doDefaultTransportConfig() {
         }
     }
 
-
     private <T> CompletionHandler<WriteResult> createWriteCompletionHandler(final GrizzlyResponseFuture<T> future) {
         return new CompletionHandler<WriteResult>() {
 

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -49,7 +49,7 @@ public class GrizzlyResponse implements Response {
 
     private final HttpResponseStatus status;
     private final HttpResponseHeaders headers;
-    private final Collection<HttpResponseBodyPart> bodyParts;
+    private final List<HttpResponseBodyPart> bodyParts;
     private final Buffer responseBody;
 
     private List<Cookie> cookies;
@@ -60,7 +60,7 @@ public class GrizzlyResponse implements Response {
 
     public GrizzlyResponse(final HttpResponseStatus status,
                            final HttpResponseHeaders headers,
-                           final Collection<HttpResponseBodyPart> bodyParts) {
+                           final List<HttpResponseBodyPart> bodyParts) {
 
         this.status = status;
         this.headers = headers;
@@ -170,7 +170,7 @@ public String getResponseBody() throws IOException {
      * {@inheritDoc}
      */
     public byte[] getResponseBodyAsBytes() throws IOException {
-
+        // !!! TODO: wrong, very wasteful
         return getResponseBody().getBytes(Charsets.DEFAULT_CHARACTER_ENCODING);
 
     }
@@ -191,7 +191,7 @@ public URI getUri() throws MalformedURLException {
      */
     public String getContentType() {
 
-        return headers.getHeaders().getFirstValue("Content-Type");
+        return getHeader("Content-Type");
 
     }
 
@@ -328,7 +328,7 @@ private Charset getCharset(final String charset) {
     }
 
 
-    private boolean between(final int value,
+    private static boolean between(final int value,
                             final int lowerBound,
                             final int upperBound) {
 

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyResponse.java

@@ -20,7 +20,9 @@
 import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.http.HttpContent;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -38,7 +40,7 @@
 public class GrizzlyResponseBodyPart extends HttpResponseBodyPart {
 
     private final HttpContent content;
-    private final Connection connection;
+    private final Connection<?> connection;
     private final AtomicReference<byte[]> contentBytes =
             new AtomicReference<byte[]>();
 
@@ -48,7 +50,7 @@ public class GrizzlyResponseBodyPart extends HttpResponseBodyPart {
 
     public GrizzlyResponseBodyPart(final HttpContent content,
                                    final URI uri,
-                                   final Connection connection,
+                                   final Connection<?> connection,
                                    final AsyncHttpProvider provider) {
         super(uri, provider);
         this.content = content;
@@ -65,7 +67,6 @@ public GrizzlyResponseBodyPart(final HttpContent content,
      */
     @Override
     public byte[] getBodyPartBytes() {
-
         byte[] bytes = contentBytes.get();
         if (bytes != null) {
             return bytes;
@@ -81,7 +82,17 @@ public byte[] getBodyPartBytes() {
 
     }
 
+    @Override
+    public InputStream readBodyPartBytes() {
+        return new ByteArrayInputStream(getBodyPartBytes());
+    }
 
+    @Override
+    public int length() {
+        // this is ugly but...
+        return getBodyPartBytes().length;
+    }
+    
     /**
      * {@inheritDoc}
      */