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

Author: slandelle

api/src/main/java/org/asynchttpclient/util/AsyncHttpProviderUtils.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.List;
 
@@ -155,8 +156,8 @@ private 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) {

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/NettyRequestFactory.java

@@ -45,13 +45,15 @@
 import org.asynchttpclient.providers.netty3.request.body.NettyBody;
 import org.asynchttpclient.providers.netty3.request.body.NettyBodyBody;
 import org.asynchttpclient.providers.netty3.request.body.NettyByteArrayBody;
+import org.asynchttpclient.providers.netty3.request.body.NettyByteBufferBody;
 import org.asynchttpclient.providers.netty3.request.body.NettyCompositeByteArrayBody;
 import org.asynchttpclient.providers.netty3.request.body.NettyDirectBody;
 import org.asynchttpclient.providers.netty3.request.body.NettyFileBody;
 import org.asynchttpclient.providers.netty3.request.body.NettyInputStreamBody;
 import org.asynchttpclient.providers.netty3.request.body.NettyMultipartBody;
 import org.asynchttpclient.spnego.SpnegoEngine;
 import org.asynchttpclient.uri.Uri;
+import org.asynchttpclient.util.StringUtils;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
 import org.jboss.netty.handler.codec.http.HttpHeaders;
@@ -218,7 +220,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());
@@ -229,8 +231,7 @@ else if (isNonEmpty(request.getFormParams())) {
  if (!request.getHeaders().containsKey(HttpHeaders.Names.CONTENT_TYPE))
  contentType = HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
 
- // FIXME could this be done with Netty's ByteBuf?
- 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);

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/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 org.asynchttpclient.providers.netty3.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);
+ }
+}

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyRequestFactory.java

@@ -52,13 +52,15 @@
 import org.asynchttpclient.providers.netty4.request.body.NettyBody;
 import org.asynchttpclient.providers.netty4.request.body.NettyBodyBody;
 import org.asynchttpclient.providers.netty4.request.body.NettyByteArrayBody;
+import org.asynchttpclient.providers.netty4.request.body.NettyByteBufferBody;
 import org.asynchttpclient.providers.netty4.request.body.NettyCompositeByteArrayBody;
 import org.asynchttpclient.providers.netty4.request.body.NettyDirectBody;
 import org.asynchttpclient.providers.netty4.request.body.NettyFileBody;
 import org.asynchttpclient.providers.netty4.request.body.NettyInputStreamBody;
 import org.asynchttpclient.providers.netty4.request.body.NettyMultipartBody;
 import org.asynchttpclient.spnego.SpnegoEngine;
 import org.asynchttpclient.uri.Uri;
+import org.asynchttpclient.util.StringUtils;
 
 public final class NettyRequestFactory {
 
@@ -218,7 +220,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());
@@ -229,8 +231,7 @@ else if (isNonEmpty(request.getFormParams())) {
  if (!request.getHeaders().containsKey(HttpHeaders.Names.CONTENT_TYPE))
  contentType = HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED;
 
- // FIXME could this be done with Netty's ByteBuf?
- 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);

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/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 org.asynchttpclient.providers.netty4.request.body;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+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 ByteBuf byteBuf() {
+ // for retry
+ bb.reset();
+ return Unpooled.wrappedBuffer(bb);
+ }
+}