Let one pass a List<byte[]> request body, close AsyncHttpClient#763

Author: Stephane Landelle

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

@@ -26,7 +26,7 @@
 import static com.ning.http.util.AuthenticatorUtils.computeDigestAuthentication;
 import static com.ning.http.util.MiscUtils.isNonEmpty;
 
-import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
 import org.jboss.netty.handler.codec.http.HttpHeaders;
 import org.jboss.netty.handler.codec.http.HttpMethod;
@@ -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.NettyDirectBody;
 import com.ning.http.client.providers.netty.request.body.NettyFileBody;
 import com.ning.http.client.providers.netty.request.body.NettyInputStreamBody;
 import com.ning.http.client.providers.netty.request.body.NettyMultipartBody;
@@ -263,11 +264,11 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
 
         HttpRequest httpRequest;
         NettyRequest nettyRequest;
-        if (body instanceof NettyByteArrayBody) {
-            byte[] bytes = NettyByteArrayBody.class.cast(body).getBytes();
+        if (body instanceof NettyDirectBody) {
+            ChannelBuffer buffer = NettyDirectBody.class.cast(body).channelBuffer();
             httpRequest = new DefaultHttpRequest(httpVersion, method, requestUri);
             // body is passed as null as it's written directly with the request
-            httpRequest.setContent(ChannelBuffers.wrappedBuffer(bytes));
+            httpRequest.setContent(buffer);
             nettyRequest = new NettyRequest(httpRequest, null);
 
         } else {

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

@@ -13,14 +13,10 @@
  */
 package com.ning.http.client.providers.netty.request.body;
 
-import org.jboss.netty.channel.Channel;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
 
-import com.ning.http.client.AsyncHttpClientConfig;
-import com.ning.http.client.providers.netty.future.NettyResponseFuture;
-
-import java.io.IOException;
-
-public class NettyByteArrayBody implements NettyBody {
+public class NettyByteArrayBody extends NettyDirectBody {
 
     private final byte[] bytes;
     private final String contentType;
@@ -34,10 +30,6 @@ public NettyByteArrayBody(byte[] bytes, String contentType) {
         this.contentType = contentType;
     }
 
-    public byte[] getBytes() {
-        return bytes;
-    }
-
     @Override
     public long getContentLength() {
         return bytes.length;
@@ -49,7 +41,7 @@ public String getContentType() {
     }
 
     @Override
-    public void write(Channel channel, NettyResponseFuture<?> future, AsyncHttpClientConfig config) throws IOException {
-        throw new UnsupportedOperationException("This kind of body is supposed to be writen directly");
+    public ChannelBuffer channelBuffer() {
+        return ChannelBuffers.wrappedBuffer(bytes);
     }
 }

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

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package com.ning.http.client.providers.netty.request.body;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+
+import java.util.List;
+
+public class NettyCompositeByteArrayBody extends NettyDirectBody {
+
+    private final byte[][] bytes;
+    private final String contentType;
+    private final long contentLength;
+
+    public NettyCompositeByteArrayBody(List<byte[]> bytes) {
+        this(bytes, null);
+    }
+
+    public NettyCompositeByteArrayBody(List<byte[]> bytes, String contentType) {
+        this.bytes = new byte[bytes.size()][];
+        bytes.toArray(this.bytes);
+        this.contentType = contentType;
+        long l = 0;
+        for (byte[] b : bytes)
+            l += b.length;
+        contentLength = l;
+    }
+
+    @Override
+    public long getContentLength() {
+        return contentLength;
+    }
+
+    @Override
+    public String getContentType() {
+        return contentType;
+    }
+
+    @Override
+    public ChannelBuffer channelBuffer() {
+        return ChannelBuffers.wrappedBuffer(bytes);
+    }
+}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package com.ning.http.client.providers.netty.request.body;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+
+import com.ning.http.client.AsyncHttpClientConfig;
+import com.ning.http.client.providers.netty.future.NettyResponseFuture;
+
+import java.io.IOException;
+
+public abstract class NettyDirectBody implements NettyBody {
+
+    public abstract ChannelBuffer channelBuffer();
+
+    @Override
+    public void write(Channel channel, NettyResponseFuture<?> future, AsyncHttpClientConfig config) throws IOException {
+        throw new UnsupportedOperationException("This kind of body is supposed to be writen directly");
+    }
+}