Rename Callback into OnLastHttpContentCallback

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/Callback.java renamed to client/src/main/java/org/asynchttpclient/netty/OnLastHttpContentCallback.java

@@ -12,11 +12,11 @@
  */
 package org.asynchttpclient.netty;
 
-public abstract class Callback {
+public abstract class OnLastHttpContentCallback {
 
     protected final NettyResponseFuture<?> future;
 
-    public Callback(NettyResponseFuture<?> future) {
+    public OnLastHttpContentCallback(NettyResponseFuture<?> future) {
         this.future = future;
     }
 

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -59,7 +59,7 @@
 import org.asynchttpclient.exception.TooManyConnectionsException;
 import org.asynchttpclient.exception.TooManyConnectionsPerHostException;
 import org.asynchttpclient.handler.AsyncHandlerExtensions;
-import org.asynchttpclient.netty.Callback;
+import org.asynchttpclient.netty.OnLastHttpContentCallback;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.handler.AsyncHttpClientHandler;
 import org.asynchttpclient.netty.handler.HttpHandler;
@@ -465,9 +465,9 @@ public void upgradePipelineForWebSockets(ChannelPipeline pipeline) {
         pipeline.remove(HTTP_CLIENT_CODEC);
     }
 
-    public final Callback newDrainCallback(final NettyResponseFuture<?> future, final Channel channel, final boolean keepAlive, final Object partitionKey) {
+    public final OnLastHttpContentCallback newDrainCallback(final NettyResponseFuture<?> future, final Channel channel, final boolean keepAlive, final Object partitionKey) {
 
-        return new Callback(future) {
+        return new OnLastHttpContentCallback(future) {
             public void call() {
                 tryToOfferChannelToPool(channel, future.getAsyncHandler(), keepAlive, partitionKey);
             }

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

@@ -29,7 +29,7 @@
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.exception.ChannelClosedException;
-import org.asynchttpclient.netty.Callback;
+import org.asynchttpclient.netty.OnLastHttpContentCallback;
 import org.asynchttpclient.netty.DiscardEvent;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.channel.ChannelManager;
@@ -67,8 +67,8 @@ public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exce
         Object attribute = Channels.getAttribute(channel);
 
         try {
-            if (attribute instanceof Callback && msg instanceof LastHttpContent) {
-                ((Callback) attribute).call();
+            if (attribute instanceof OnLastHttpContentCallback && msg instanceof LastHttpContent) {
+                ((OnLastHttpContentCallback) attribute).call();
 
             } else if (attribute instanceof NettyResponseFuture) {
                 NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
@@ -127,8 +127,8 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
             // logic can kick-in
             attribute = ((StreamedResponsePublisher) attribute).future();
         }
-        if (attribute instanceof Callback) {
-            Callback callback = (Callback) attribute;
+        if (attribute instanceof OnLastHttpContentCallback) {
+            OnLastHttpContentCallback callback = (OnLastHttpContentCallback) attribute;
             Channels.setAttribute(channel, callback.future());
             callback.call();
 
@@ -186,8 +186,8 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable e) throws Excep
                     future.pendingException = cause;
                     return;
                 }
-            } else if (attribute instanceof Callback) {
-                future = Callback.class.cast(attribute).future();
+            } else if (attribute instanceof OnLastHttpContentCallback) {
+                future = OnLastHttpContentCallback.class.cast(attribute).future();
             }
         } catch (Throwable t) {
             cause = t;

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

@@ -34,7 +34,7 @@
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.HttpResponseHeaders;
 import org.asynchttpclient.HttpResponseStatus;
-import org.asynchttpclient.netty.Callback;
+import org.asynchttpclient.netty.OnLastHttpContentCallback;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.NettyResponseStatus;
 import org.asynchttpclient.netty.channel.ChannelManager;
@@ -52,7 +52,7 @@ public WebSocketHandler(AsyncHttpClientConfig config,//
         super(config, channelManager, requestSender);
     }
 
-    private class UpgradeCallback extends Callback {
+    private class UpgradeCallback extends OnLastHttpContentCallback {
 
         private final Channel channel;
         private final HttpResponse response;

client/src/main/java/org/asynchttpclient/netty/handler/intercept/Continue100Interceptor.java

@@ -17,7 +17,7 @@
 
 import java.io.IOException;
 
-import org.asynchttpclient.netty.Callback;
+import org.asynchttpclient.netty.OnLastHttpContentCallback;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.channel.Channels;
 import org.asynchttpclient.netty.request.NettyRequestSender;
@@ -34,7 +34,7 @@ public boolean exitAfterHandling100(final Channel channel, final NettyResponseFu
         future.setHeadersAlreadyWrittenOnContinue(true);
         future.setDontWriteBodyBecauseExpectContinue(false);
         // directly send the body
-        Channels.setAttribute(channel, new Callback(future) {
+        Channels.setAttribute(channel, new OnLastHttpContentCallback(future) {
             @Override
             public void call() throws IOException {
                 Channels.setAttribute(channel, future);

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -46,7 +46,7 @@
 import org.asynchttpclient.filter.IOExceptionFilter;
 import org.asynchttpclient.handler.AsyncHandlerExtensions;
 import org.asynchttpclient.handler.TransferCompletionHandler;
-import org.asynchttpclient.netty.Callback;
+import org.asynchttpclient.netty.OnLastHttpContentCallback;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.SimpleFutureListener;
 import org.asynchttpclient.netty.channel.ChannelManager;
@@ -526,7 +526,7 @@ public boolean isClosed() {
     }
 
     public void drainChannelAndExecuteNextRequest(final Channel channel, final NettyResponseFuture<?> future, Request nextRequest) {
-        Channels.setAttribute(channel, new Callback(future) {
+        Channels.setAttribute(channel, new OnLastHttpContentCallback(future) {
             @Override
             public void call() {
                 sendNextRequest(nextRequest, future);