Pass ByteBuffer bodies instead of byte[], close AsyncHttpClient#827

Author: slandelle

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

@@ -47,13 +47,15 @@
 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.NettyByteBufferBody;
 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;
 import com.ning.http.client.providers.netty.request.body.NettyMultipartBody;
 import com.ning.http.client.providers.netty.spnego.SpnegoEngine;
 import com.ning.http.client.uri.Uri;
+import com.ning.http.util.StringUtils;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -220,7 +222,7 @@ else if (request.getCompositeByteData() != null)
                 nettyBody = new NettyCompositeByteArrayBody(request.getCompositeByteData());
 
             else if (request.getStringData() != null)
-                nettyBody = new NettyByteArrayBody(request.getStringData().getBytes(bodyCharset));
+                nettyBody = new NettyByteBufferBody(StringUtils.charSequence2ByteBuffer(request.getStringData(), bodyCharset));
 
             else if (request.getStreamData() != null)
                 nettyBody = new NettyInputStreamBody(request.getStreamData());
@@ -231,8 +233,7 @@ else if (isNonEmpty(request.getFormParams())) {
                 if (!request.getHeaders().containsKey(HttpHeaders.Names.CONTENT_TYPE))
                     contentType = HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
 
-                // FIXME use a ByteBuffer
-                nettyBody = new NettyByteArrayBody(urlEncodeFormParams(request.getFormParams(), bodyCharset), contentType);
+                nettyBody = new NettyByteBufferBody(urlEncodeFormParams(request.getFormParams(), bodyCharset), contentType);
 
             } else if (isNonEmpty(request.getParts()))
                 nettyBody = new NettyMultipartBody(request.getParts(), request.getHeaders(), nettyConfig);

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015 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.nio.ByteBuffer;
+
+public class NettyByteBufferBody extends NettyDirectBody {
+
+    private final ByteBuffer bb;
+    private final String contentType;
+    private final long length;
+
+    public NettyByteBufferBody(ByteBuffer bb) {
+        this(bb, null);
+    }
+
+    public NettyByteBufferBody(ByteBuffer bb, String contentType) {
+        this.bb = bb;
+        length = bb.remaining();
+        bb.mark();
+        this.contentType = contentType;
+    }
+
+    @Override
+    public long getContentLength() {
+        return length;
+    }
+
+    @Override
+    public String getContentType() {
+        return contentType;
+    }
+
+    @Override
+    public ChannelBuffer channelBuffer() {
+        // for retry
+        bb.reset();
+        return ChannelBuffers.wrappedBuffer(bb);
+    }
+}

src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

@@ -12,8 +12,8 @@
  */
 package com.ning.http.util;
 
-import static java.nio.charset.StandardCharsets.*;
 import static com.ning.http.util.MiscUtils.isNonEmpty;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.HttpResponseBodyPart;
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.List;
 
@@ -177,8 +178,8 @@ public static StringBuilder urlEncodeFormParams0(List<Param> params) {
         return sb;
     }
 
-    public static byte[] urlEncodeFormParams(List<Param> params, Charset charset) {
-        return StringUtils.charSequence2Bytes(urlEncodeFormParams0(params), charset);
+    public static ByteBuffer urlEncodeFormParams(List<Param> params, Charset charset) {
+        return StringUtils.charSequence2ByteBuffer(urlEncodeFormParams0(params), charset);
     }
 
     private static void encodeAndAppendFormParam(final StringBuilder sb, final CharSequence name, final CharSequence value) {