Extract types to own files

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/request/body/BodyChunkedInput.java

@@ -48,7 +48,6 @@ public ByteBuf readChunk(ChannelHandlerContext ctx) throws Exception {
             return null;
 
         ByteBuf buffer = ctx.alloc().buffer(chunkSize);
-
         Body.BodyState state = body.transferTo(buffer);
         switch (state) {
         case STOP:

client/src/main/java/org/asynchttpclient/netty/request/body/NettyBodyBody.java

@@ -29,8 +29,8 @@
 import org.asynchttpclient.request.body.Body;
 import org.asynchttpclient.request.body.RandomAccessBody;
 import org.asynchttpclient.request.body.generator.BodyGenerator;
+import org.asynchttpclient.request.body.generator.FeedListener;
 import org.asynchttpclient.request.body.generator.FeedableBodyGenerator;
-import org.asynchttpclient.request.body.generator.FeedableBodyGenerator.FeedListener;
 import org.asynchttpclient.request.body.generator.ReactiveStreamsBodyGenerator;
 
 public class NettyBodyBody implements NettyBody {

client/src/main/java/org/asynchttpclient/request/body/generator/BlockingFeedableBodyGenerator.java

@@ -17,8 +17,6 @@
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
-import org.asynchttpclient.request.body.generator.QueueBasedFeedableBodyGenerator.BodyChunk;
-
 public final class BlockingFeedableBodyGenerator extends QueueBasedFeedableBodyGenerator<BlockingQueue<BodyChunk>> {
     private final BlockingQueue<BodyChunk> queue;
 
@@ -33,7 +31,7 @@ protected boolean offer(BodyChunk chunk) throws InterruptedException {
     }
 
     @Override
-    protected Queue<org.asynchttpclient.request.body.generator.QueueBasedFeedableBodyGenerator.BodyChunk> queue() {
+    protected Queue<org.asynchttpclient.request.body.generator.BodyChunk> queue() {
         return queue;
     }
 }

client/src/main/java/org/asynchttpclient/request/body/generator/BodyChunk.java

@@ -0,0 +1,26 @@
+/*
+ * 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.request.body.generator;
+
+import java.nio.ByteBuffer;
+
+public final class BodyChunk {
+    final boolean isLast;
+    final ByteBuffer buffer;
+
+    public BodyChunk(final ByteBuffer buffer, final boolean isLast) {
+        this.buffer = buffer;
+        this.isLast = isLast;
+    }
+}

client/src/main/java/org/asynchttpclient/request/body/generator/FeedListener.java

@@ -0,0 +1,20 @@
+/*
+ * 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.request.body.generator;
+
+public interface FeedListener {
+    void onContentAdded();
+
+    void onError(Throwable t);
+}

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

@@ -24,10 +24,4 @@ public interface FeedableBodyGenerator extends BodyGenerator {
     boolean feed(ByteBuffer buffer, boolean isLast) throws Exception;
 
     void setListener(FeedListener listener);
-
-    interface FeedListener {
-        void onContentAdded();
-
-        void onError(Throwable t);
-    }
 }

client/src/main/java/org/asynchttpclient/request/body/generator/PushBody.java

@@ -0,0 +1,92 @@
+/*
+ * 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.request.body.generator;
+
+import io.netty.buffer.ByteBuf;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Queue;
+
+import org.asynchttpclient.request.body.Body;
+
+public final class PushBody implements Body {
+
+    private final Queue<BodyChunk> queue;
+    private BodyState state = BodyState.CONTINUE;
+
+    public PushBody(Queue<BodyChunk> queue) {
+        this.queue = queue;
+    }
+
+    @Override
+    public long getContentLength() {
+        return -1;
+    }
+
+    @Override
+    public BodyState transferTo(final ByteBuf target) throws IOException {
+        switch (state) {
+        case CONTINUE:
+            return readNextChunk(target);
+        case STOP:
+            return BodyState.STOP;
+        default:
+            throw new IllegalStateException("Illegal process state.");
+        }
+    }
+
+    private BodyState readNextChunk(ByteBuf target) throws IOException {
+        BodyState res = BodyState.SUSPEND;
+        while (target.isWritable() && state != BodyState.STOP) {
+            BodyChunk nextChunk = queue.peek();
+            if (nextChunk == null) {
+                // Nothing in the queue. suspend stream if nothing was read. (reads == 0)
+                return res;
+            } else if (!nextChunk.buffer.hasRemaining() && !nextChunk.isLast) {
+                // skip empty buffers
+                queue.remove();
+            } else {
+                res = BodyState.CONTINUE;
+                readChunk(target, nextChunk);
+            }
+        }
+        return res;
+    }
+
+    private void readChunk(ByteBuf target, BodyChunk part) {
+        move(target, part.buffer);
+
+        if (!part.buffer.hasRemaining()) {
+            if (part.isLast) {
+                state = BodyState.STOP;
+            }
+            queue.remove();
+        }
+    }
+
+    private void move(ByteBuf target, ByteBuffer source) {
+        int size = Math.min(target.writableBytes(), source.remaining());
+        if (size > 0) {
+            ByteBuffer slice = source.slice();
+            slice.limit(size);
+            target.writeBytes(slice);
+            source.position(source.position() + size);
+        }
+    }
+
+    @Override
+    public void close() {
+    }
+}

client/src/main/java/org/asynchttpclient/request/body/generator/QueueBasedFeedableBodyGenerator.java

@@ -13,16 +13,12 @@
  */
 package org.asynchttpclient.request.body.generator;
 
-import io.netty.buffer.ByteBuf;
-
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Queue;
 
 import org.asynchttpclient.request.body.Body;
-import org.asynchttpclient.request.body.generator.QueueBasedFeedableBodyGenerator.BodyChunk;
 
-public abstract class QueueBasedFeedableBodyGenerator<T extends Queue<BodyChunk>> implements FeedableBodyGenerator, BodyGenerator {
+public abstract class QueueBasedFeedableBodyGenerator<T extends Queue<BodyChunk>> implements FeedableBodyGenerator {
 
     private FeedListener listener;
 
@@ -48,84 +44,4 @@ public boolean feed(final ByteBuffer buffer, final boolean isLast) throws Except
     public void setListener(FeedListener listener) {
         this.listener = listener;
     }
-
-    public static final class PushBody implements Body {
-
-        private final Queue<BodyChunk> queue;
-        private BodyState state = BodyState.CONTINUE;
-
-        public PushBody(Queue<BodyChunk> queue) {
-            this.queue = queue;
-        }
-
-        @Override
-        public long getContentLength() {
-            return -1;
-        }
-
-        @Override
-        public BodyState transferTo(final ByteBuf target) throws IOException {
-            switch (state) {
-            case CONTINUE:
-                return readNextChunk(target);
-            case STOP:
-                return BodyState.STOP;
-            default:
-                throw new IllegalStateException("Illegal process state.");
-            }
-        }
-
-        private BodyState readNextChunk(ByteBuf target) throws IOException {
-            BodyState res = BodyState.SUSPEND;
-            while (target.isWritable() && state != BodyState.STOP) {
-                BodyChunk nextChunk = queue.peek();
-                if (nextChunk == null) {
-                    // Nothing in the queue. suspend stream if nothing was read. (reads == 0)
-                    return res;
-                } else if (!nextChunk.buffer.hasRemaining() && !nextChunk.isLast) {
-                    // skip empty buffers
-                    queue.remove();
-                } else {
-                    res = BodyState.CONTINUE;
-                    readChunk(target, nextChunk);
-                }
-            }
-            return res;
-        }
-
-        private void readChunk(ByteBuf target, BodyChunk part) {
-            move(target, part.buffer);
-
-            if (!part.buffer.hasRemaining()) {
-                if (part.isLast) {
-                    state = BodyState.STOP;
-                }
-                queue.remove();
-            }
-        }
-
-        private void move(ByteBuf target, ByteBuffer source) {
-            int size = Math.min(target.writableBytes(), source.remaining());
-            if (size > 0) {
-                ByteBuffer slice = source.slice();
-                slice.limit(size);
-                target.writeBytes(slice);
-                source.position(source.position() + size);
-            }
-        }
-
-        @Override
-        public void close() {
-        }
-    }
-
-    public static final class BodyChunk {
-        private final boolean isLast;
-        private final ByteBuffer buffer;
-
-        public BodyChunk(final ByteBuffer buffer, final boolean isLast) {
-            this.buffer = buffer;
-            this.isLast = isLast;
-        }
-    }
 }

client/src/main/java/org/asynchttpclient/request/body/generator/UnboundedFeedableBodyGenerator.java

@@ -16,8 +16,6 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.asynchttpclient.request.body.generator.QueueBasedFeedableBodyGenerator.BodyChunk;
-
 public final class UnboundedFeedableBodyGenerator extends QueueBasedFeedableBodyGenerator<ConcurrentLinkedQueue<BodyChunk>> {
     private final Queue<BodyChunk> queue = new ConcurrentLinkedQueue<>();
 
@@ -27,7 +25,7 @@ protected boolean offer(BodyChunk chunk) throws Exception {
     }
 
     @Override
-    protected Queue<org.asynchttpclient.request.body.generator.QueueBasedFeedableBodyGenerator.BodyChunk> queue() {
+    protected Queue<org.asynchttpclient.request.body.generator.BodyChunk> queue() {
         return queue;
     }
 }

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

@@ -73,7 +73,7 @@ private byte[] readFromBody(Body body) throws IOException {
         return readBytes;
     }
 
-    private static class TestFeedListener implements UnboundedFeedableBodyGenerator.FeedListener {
+    private static class TestFeedListener implements FeedListener {
 
         private int calls;