amend AsyncHttpClient#763

Author: Stephane Landelle

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

@@ -79,6 +79,11 @@ public interface Request {
      */
     byte[] getByteData();
 
+    /**
+     * @return the current request's body as a composite of byte arrays
+     */
+    List<byte[]> getCompositeByteData();
+    
     /**
      * Return the current request's body as a string
      *

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

@@ -53,6 +53,7 @@ private static final class RequestImpl implements Request {
         private FluentCaseInsensitiveStringsMap headers = new FluentCaseInsensitiveStringsMap();
         private ArrayList<Cookie> cookies;
         private byte[] byteData;
+        private List<byte[]> compositeByteData;
         private String stringData;
         private InputStream streamData;
         private BodyGenerator bodyGenerator;
@@ -82,6 +83,7 @@ public RequestImpl(Request prototype) {
                 this.headers = new FluentCaseInsensitiveStringsMap(prototype.getHeaders());
                 this.cookies = new ArrayList<Cookie>(prototype.getCookies());
                 this.byteData = prototype.getByteData();
+                this.compositeByteData = prototype.getCompositeByteData();
                 this.stringData = prototype.getStringData();
                 this.streamData = prototype.getStreamData();
                 this.bodyGenerator = prototype.getBodyGenerator();
@@ -132,6 +134,10 @@ public byte[] getByteData() {
             return byteData;
         }
 
+        public List<byte[]> getCompositeByteData() {
+            return compositeByteData;
+        }
+
         public String getStringData() {
             return stringData;
         }
@@ -372,6 +378,7 @@ public void resetFormParams() {
 
     public void resetNonMultipartData() {
         request.byteData = null;
+        request.compositeByteData = null;
         request.stringData = null;
         request.streamData = null;
         request.bodyGenerator = null;
@@ -395,6 +402,14 @@ public T setBody(byte[] data) {
         return derived.cast(this);
     }
 
+    public T setBody(List<byte[]> data) {
+        resetFormParams();
+        resetNonMultipartData();
+        resetMultipartData();
+        request.compositeByteData = data;
+        return derived.cast(this);
+    }
+    
     public T setBody(String data) {
         resetFormParams();
         resetNonMultipartData();

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestFactory.java

@@ -46,6 +46,7 @@
 import com.ning.http.client.providers.netty.request.body.NettyBody;
 import com.ning.http.client.providers.netty.request.body.NettyBodyBody;
 import com.ning.http.client.providers.netty.request.body.NettyByteArrayBody;
+import com.ning.http.client.providers.netty.request.body.NettyCompositeByteArrayBody;
 import com.ning.http.client.providers.netty.request.body.NettyDirectBody;
 import com.ning.http.client.providers.netty.request.body.NettyFileBody;
 import com.ning.http.client.providers.netty.request.body.NettyInputStreamBody;
@@ -207,6 +208,9 @@ private NettyBody body(Request request, HttpMethod method) throws IOException {
             if (request.getByteData() != null)
                 nettyBody = new NettyByteArrayBody(request.getByteData());
 
+            else if (request.getCompositeByteData() != null)
+                nettyBody = new NettyCompositeByteArrayBody(request.getCompositeByteData());
+
             else if (request.getStringData() != null)
                 nettyBody = new NettyByteArrayBody(request.getStringData().getBytes(bodyCharset));