Drop NettyResponseBodyPart, remove one hierarchy level

Author: slandelle

client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -15,9 +15,8 @@
 import org.asynchttpclient.filter.IOExceptionFilter;
 import org.asynchttpclient.filter.RequestFilter;
 import org.asynchttpclient.filter.ResponseFilter;
-import org.asynchttpclient.netty.EagerNettyResponseBodyPart;
-import org.asynchttpclient.netty.LazyNettyResponseBodyPart;
-import org.asynchttpclient.netty.NettyResponseBodyPart;
+import org.asynchttpclient.netty.EagerResponseBodyPart;
+import org.asynchttpclient.netty.LazyResponseBodyPart;
 import org.asynchttpclient.netty.channel.pool.ChannelPool;
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.proxy.ProxyServerSelector;
@@ -289,19 +288,19 @@ enum ResponseBodyPartFactory {
 
         EAGER {
             @Override
-            public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
-                return new EagerNettyResponseBodyPart(buf, last);
+            public HttpResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
+                return new EagerResponseBodyPart(buf, last);
             }
         },
 
         LAZY {
 
             @Override
-            public NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
-                return new LazyNettyResponseBodyPart(buf, last);
+            public HttpResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last) {
+                return new LazyResponseBodyPart(buf, last);
             }
         };
 
-        public abstract NettyResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last);
+        public abstract HttpResponseBodyPart newResponseBodyPart(ByteBuf buf, boolean last);
     }
 }

client/src/main/java/org/asynchttpclient/HttpResponseBodyPart.java

@@ -20,26 +20,34 @@
 /**
  * A callback class used when an HTTP response body is received.
  */
-public interface HttpResponseBodyPart {
+public abstract class HttpResponseBodyPart {
+
+    private final boolean last;
+
+    public HttpResponseBodyPart(boolean last) {
+        this.last = last;
+    }
 
     /**
      * @return length of this part in bytes
      */
-    int length();
+    public abstract int length();
 
     /**
      * @return  the response body's part bytes received.
      */
-    byte[] getBodyPartBytes();
+    public abstract byte[] getBodyPartBytes();
 
     /**
      * @return a {@link ByteBuffer} that wraps the actual bytes read from the response's chunk.
      * The {@link ByteBuffer}'s capacity is equal to the number of bytes available.
      */
-    ByteBuffer getBodyByteBuffer();
+    public abstract ByteBuffer getBodyByteBuffer();
 
     /**
      * @return true if this is the last part.
      */
-    boolean isLast();
+    public boolean isLast() {
+        return last;
+    }
 }

client/src/main/java/org/asynchttpclient/netty/EagerNettyResponseBodyPart.java renamed to client/src/main/java/org/asynchttpclient/netty/EagerResponseBodyPart.java

@@ -17,15 +17,17 @@
 
 import java.nio.ByteBuffer;
 
+import org.asynchttpclient.HttpResponseBodyPart;
+
 /**
  * A callback class used when an HTTP response body is received.
  * Bytes are eagerly fetched from the ByteBuf
  */
-public class EagerNettyResponseBodyPart extends NettyResponseBodyPart {
+public class EagerResponseBodyPart extends HttpResponseBodyPart {
 
     private final byte[] bytes;
 
-    public EagerNettyResponseBodyPart(ByteBuf buf, boolean last) {
+    public EagerResponseBodyPart(ByteBuf buf, boolean last) {
         super(last);
         bytes = byteBuf2Bytes(buf);
     }

client/src/main/java/org/asynchttpclient/netty/LazyNettyResponseBodyPart.java renamed to client/src/main/java/org/asynchttpclient/netty/LazyResponseBodyPart.java

@@ -16,16 +16,17 @@
 
 import java.nio.ByteBuffer;
 
+import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.netty.util.ByteBufUtils;
 
 /**
  * A callback class used when an HTTP response body is received.
  */
-public class LazyNettyResponseBodyPart extends NettyResponseBodyPart {
+public class LazyResponseBodyPart extends HttpResponseBodyPart {
 
     private final ByteBuf buf;
 
-    public LazyNettyResponseBodyPart(ByteBuf buf, boolean last) {
+    public LazyResponseBodyPart(ByteBuf buf, boolean last) {
         super(last);
         this.buf = buf;
     }

client/src/main/java/org/asynchttpclient/netty/NettyResponseBodyPart.java

@@ -29,9 +29,9 @@
 import java.nio.channels.ClosedChannelException;
 
 import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.netty.Callback;
 import org.asynchttpclient.netty.DiscardEvent;
-import org.asynchttpclient.netty.NettyResponseBodyPart;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.channel.ChannelManager;
 import org.asynchttpclient.netty.channel.Channels;
@@ -89,7 +89,7 @@ public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exce
                     ByteBuf content = ((HttpContent) msg).content();
                     // Republish as a HttpResponseBodyPart
                     if (content.readableBytes() > 0) {
-                        NettyResponseBodyPart part = config.getResponseBodyPartFactory().newResponseBodyPart(content, false);
+                        HttpResponseBodyPart part = config.getResponseBodyPartFactory().newResponseBodyPart(content, false);
                         ctx.fireChannelRead(part);
                     }
                     if (msg instanceof LastHttpContent) {

client/src/main/java/org/asynchttpclient/netty/handler/AsyncHttpClientHandler.java

@@ -32,14 +32,14 @@
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHandler.State;
 import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.HttpResponseHeaders;
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.Realm.AuthScheme;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.RequestBuilder;
 import org.asynchttpclient.handler.StreamedAsyncHandler;
 import org.asynchttpclient.netty.Callback;
-import org.asynchttpclient.netty.NettyResponseBodyPart;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.NettyResponseStatus;
 import org.asynchttpclient.netty.channel.ChannelManager;
@@ -148,7 +148,7 @@ private void finishUpdate(final NettyResponseFuture<?> future, Channel channel,
         }
     }
 
-    private boolean updateBodyAndInterrupt(NettyResponseFuture<?> future, AsyncHandler<?> handler, NettyResponseBodyPart bodyPart) throws Exception {
+    private boolean updateBodyAndInterrupt(NettyResponseFuture<?> future, AsyncHandler<?> handler, HttpResponseBodyPart bodyPart) throws Exception {
         boolean interrupt = handler.onBodyPartReceived(bodyPart) != State.CONTINUE;
         if (interrupt)
             future.setKeepAlive(false);
@@ -550,7 +550,7 @@ private void handleChunk(HttpContent chunk,//
 
         ByteBuf buf = chunk.content();
         if (!interrupt && !(handler instanceof StreamedAsyncHandler) && (buf.readableBytes() > 0 || last)) {
-            NettyResponseBodyPart part = config.getResponseBodyPartFactory().newResponseBodyPart(buf, last);
+            HttpResponseBodyPart part = config.getResponseBodyPartFactory().newResponseBodyPart(buf, last);
             interrupt = updateBodyAndInterrupt(future, handler, part);
         }
 

client/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java

@@ -31,12 +31,12 @@
 
 import org.asynchttpclient.AsyncHandler.State;
 import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.HttpResponseHeaders;
 import org.asynchttpclient.HttpResponseStatus;
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.netty.Callback;
-import org.asynchttpclient.netty.NettyResponseBodyPart;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.NettyResponseStatus;
 import org.asynchttpclient.netty.channel.ChannelManager;
@@ -154,7 +154,7 @@ public void handle(Channel channel, NettyResponseFuture<?> future, Object e) thr
                 } else {
                     ByteBuf buf = frame.content();
                     if (buf != null && buf.readableBytes() > 0) {
-                        NettyResponseBodyPart part = config.getResponseBodyPartFactory().newResponseBodyPart(buf, frame.isFinalFragment());
+                        HttpResponseBodyPart part = config.getResponseBodyPartFactory().newResponseBodyPart(buf, frame.isFinalFragment());
                         handler.onBodyPartReceived(part);
 
                         if (frame instanceof BinaryWebSocketFrame) {