default behavior should target Netty 4, see #948

api/src/main/java/org/asynchttpclient/request/body/generator/FeedableBodyGenerator.java

@@ -32,7 +32,8 @@ public final class FeedableBodyGenerator implements BodyGenerator {
     private final Queue<BodyPart> queue = new ConcurrentLinkedQueue<>();
     private FeedListener listener;
 
-    private boolean writeChunkBoundaries = true;
+    // must be set to true when using Netty 3 where native chunking is broken
+    private boolean writeChunkBoundaries = false;
 
     @Override
     public Body createBody() {
@@ -54,8 +55,8 @@ public void setListener(FeedListener listener) {
         this.listener = listener;
     }
 
-    public void setWriteChunkBoundaries(boolean writeChunkBoundaries) {
-        this.writeChunkBoundaries = writeChunkBoundaries;
+    public void writeChunkBoundaries() {
+        this.writeChunkBoundaries = true;
     }
 
     private static enum PushBodyState {
@@ -89,7 +90,7 @@ public long read(final ByteBuffer buffer) throws IOException {
                     return -1;
                 }
             }
-            if(nextPart.buffer.remaining() == 0) {
+            if (nextPart.buffer.remaining() == 0) {
                 // skip empty buffers
                 // if we return 0 here it would suspend the stream - we don't want that
                 queue.remove();

api/src/test/java/org/asynchttpclient/request/body/generator/FeedableBodyGeneratorTest.java

@@ -1,3 +1,16 @@
+/*
+ * 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 org.asynchttpclient.request.body.generator;
 
 import org.asynchttpclient.request.body.Body;
@@ -12,76 +25,77 @@
 
 public class FeedableBodyGeneratorTest {
 
-  private FeedableBodyGenerator feedableBodyGenerator;
-  private TestFeedListener listener;
-
-  @BeforeMethod
-  public void setUp() throws Exception {
-    feedableBodyGenerator = new FeedableBodyGenerator();
-    listener = new TestFeedListener();
-    feedableBodyGenerator.setListener(listener);
-  }
-
-  @Test(groups = "standalone")
-  public void feedNotifiesListener() throws Exception {
-    feedableBodyGenerator.feed(ByteBuffer.allocate(0), false);
-    feedableBodyGenerator.feed(ByteBuffer.allocate(0), true);
-    assertEquals(listener.getCalls(), 2);
-  }
-
-  @Test(groups = "standalone")
-  public void readingBytesReturnsFedContentWithEmptyLastBuffer() throws Exception {
-    byte[] content = "Test123".getBytes(StandardCharsets.US_ASCII);
-    feedableBodyGenerator.feed(ByteBuffer.wrap(content), false);
-    feedableBodyGenerator.feed(ByteBuffer.allocate(0), true);
-    Body body = feedableBodyGenerator.createBody();
-    assertEquals(readFromBody(body), "7\r\nTest123\r\n".getBytes(StandardCharsets.US_ASCII));
-    assertEquals(readFromBody(body), "0\r\n\r\n".getBytes(StandardCharsets.US_ASCII));
-    assertEquals(body.read(ByteBuffer.allocate(1)), -1);
-
-  }
-
-  @Test(groups = "standalone")
-  public void readingBytesReturnsFedContentWithFilledLastBuffer() throws Exception {
-    byte[] content = "Test123".getBytes(StandardCharsets.US_ASCII);
-    feedableBodyGenerator.feed(ByteBuffer.wrap(content), true);
-    Body body = feedableBodyGenerator.createBody();
-    assertEquals(readFromBody(body), "7\r\nTest123\r\n".getBytes(StandardCharsets.US_ASCII));
-    assertEquals(readFromBody(body), "0\r\n\r\n".getBytes(StandardCharsets.US_ASCII));
-    assertEquals(body.read(ByteBuffer.allocate(1)), -1);
-
-  }
-
-  @Test(groups = "standalone")
-  public void readingBytesReturnsFedContentWithoutChunkBoundariesWhenDisabled() throws Exception {
-    byte[] content = "Test123".getBytes(StandardCharsets.US_ASCII);
-    feedableBodyGenerator.setWriteChunkBoundaries(false);
-    feedableBodyGenerator.feed(ByteBuffer.wrap(content), true);
-    Body body = feedableBodyGenerator.createBody();
-    assertEquals(readFromBody(body), "Test123".getBytes(StandardCharsets.US_ASCII));
-    assertEquals(body.read(ByteBuffer.allocate(1)), -1);
-
-  }
-
-  private byte[] readFromBody(Body body) throws IOException {
-    ByteBuffer byteBuffer = ByteBuffer.allocate(512);
-    body.read(byteBuffer);
-    byteBuffer.flip();
-    byte[] readBytes = new byte[byteBuffer.remaining()];
-    byteBuffer.get(readBytes);
-    return readBytes;
-  }
-
-  private static class TestFeedListener implements FeedableBodyGenerator.FeedListener {
-
-    private int calls;
-    @Override
-    public void onContentAdded() {
-      calls++;
+    private FeedableBodyGenerator feedableBodyGenerator;
+    private TestFeedListener listener;
+
+    @BeforeMethod
+    public void setUp() throws Exception {
+        feedableBodyGenerator = new FeedableBodyGenerator();
+        listener = new TestFeedListener();
+        feedableBodyGenerator.setListener(listener);
+    }
+
+    @Test(groups = "standalone")
+    public void feedNotifiesListener() throws Exception {
+        feedableBodyGenerator.feed(ByteBuffer.allocate(0), false);
+        feedableBodyGenerator.feed(ByteBuffer.allocate(0), true);
+        assertEquals(listener.getCalls(), 2);
+    }
+
+    @Test(groups = "standalone")
+    public void readingBytesReturnsFedContentWithEmptyLastBufferWhenChunkBoundariesEnabled() throws Exception {
+        feedableBodyGenerator.writeChunkBoundaries();
+        byte[] content = "Test123".getBytes(StandardCharsets.US_ASCII);
+        feedableBodyGenerator.feed(ByteBuffer.wrap(content), false);
+        feedableBodyGenerator.feed(ByteBuffer.allocate(0), true);
+        Body body = feedableBodyGenerator.createBody();
+        assertEquals(readFromBody(body), "7\r\nTest123\r\n".getBytes(StandardCharsets.US_ASCII));
+        assertEquals(readFromBody(body), "0\r\n\r\n".getBytes(StandardCharsets.US_ASCII));
+        assertEquals(body.read(ByteBuffer.allocate(1)), -1);
+
+    }
+
+    @Test(groups = "standalone")
+    public void readingBytesReturnsFedContentWithFilledLastBufferWhenChunkBoundariesEnabled() throws Exception {
+        feedableBodyGenerator.writeChunkBoundaries();
+        byte[] content = "Test123".getBytes(StandardCharsets.US_ASCII);
+        feedableBodyGenerator.feed(ByteBuffer.wrap(content), true);
+        Body body = feedableBodyGenerator.createBody();
+        assertEquals(readFromBody(body), "7\r\nTest123\r\n".getBytes(StandardCharsets.US_ASCII));
+        assertEquals(readFromBody(body), "0\r\n\r\n".getBytes(StandardCharsets.US_ASCII));
+        assertEquals(body.read(ByteBuffer.allocate(1)), -1);
+
+    }
+
+    @Test(groups = "standalone")
+    public void readingBytesReturnsFedContentWithoutChunkBoundariesWhenNotEnabled() throws Exception {
+        byte[] content = "Test123".getBytes(StandardCharsets.US_ASCII);
+        feedableBodyGenerator.feed(ByteBuffer.wrap(content), true);
+        Body body = feedableBodyGenerator.createBody();
+        assertEquals(readFromBody(body), "Test123".getBytes(StandardCharsets.US_ASCII));
+        assertEquals(body.read(ByteBuffer.allocate(1)), -1);
+    }
+
+    private byte[] readFromBody(Body body) throws IOException {
+        ByteBuffer byteBuffer = ByteBuffer.allocate(512);
+        body.read(byteBuffer);
+        byteBuffer.flip();
+        byte[] readBytes = new byte[byteBuffer.remaining()];
+        byteBuffer.get(readBytes);
+        return readBytes;
     }
 
-    public int getCalls() {
-      return calls;
+    private static class TestFeedListener implements FeedableBodyGenerator.FeedListener {
+
+        private int calls;
+
+        @Override
+        public void onContentAdded() {
+            calls++;
+        }
+
+        public int getCalls() {
+            return calls;
+        }
     }
-  }
 }

providers/netty3/src/main/java/org/asynchttpclient/netty/request/body/NettyBodyBody.java

@@ -66,7 +66,9 @@ public void write(final Channel channel, NettyResponseFuture<?> future) throws I
 
             BodyGenerator bg = future.getRequest().getBodyGenerator();
             if (bg instanceof FeedableBodyGenerator) {
-                FeedableBodyGenerator.class.cast(bg).setListener(new FeedListener() {
+                final FeedableBodyGenerator feedableBodyGenerator = (FeedableBodyGenerator) bg;
+                feedableBodyGenerator.writeChunkBoundaries();
+                feedableBodyGenerator.setListener(new FeedListener() {
                     @Override
                     public void onContentAdded() {
                         channel.getPipeline().get(ChunkedWriteHandler.class).resumeTransfer();

providers/netty4/src/main/java/org/asynchttpclient/netty/request/body/NettyBodyBody.java

@@ -68,9 +68,7 @@ public void write(final Channel channel, NettyResponseFuture<?> future) throws I
 
             BodyGenerator bg = future.getRequest().getBodyGenerator();
             if (bg instanceof FeedableBodyGenerator) {
-                final FeedableBodyGenerator feedableBodyGenerator = (FeedableBodyGenerator) bg;
-                feedableBodyGenerator.setWriteChunkBoundaries(false);
-                feedableBodyGenerator.setListener(new FeedListener() {
+                FeedableBodyGenerator.class.cast(bg).setListener(new FeedListener() {
                     @Override
                     public void onContentAdded() {
                         channel.pipeline().get(ChunkedWriteHandler.class).resumeTransfer();