minor clean up

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/SimpleGenericFutureListener.java renamed to client/src/main/java/org/asynchttpclient/netty/SimpleFutureListener.java

@@ -14,9 +14,9 @@
 package org.asynchttpclient.netty;
 
 import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.FutureListener;
 
-public abstract class SimpleGenericFutureListener<V> implements GenericFutureListener<Future<V>> {
+public abstract class SimpleFutureListener<V> implements FutureListener<V> {
 
     @Override
     public final void operationComplete(Future<V> future) throws Exception {

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

@@ -24,7 +24,7 @@
 import org.asynchttpclient.handler.AsyncHandlerExtensions;
 import org.asynchttpclient.netty.NettyResponseFuture;
 import org.asynchttpclient.netty.SimpleChannelFutureListener;
-import org.asynchttpclient.netty.SimpleGenericFutureListener;
+import org.asynchttpclient.netty.SimpleFutureListener;
 import org.asynchttpclient.netty.future.StackTraceInspector;
 import org.asynchttpclient.netty.request.NettyRequestSender;
 import org.asynchttpclient.uri.Uri;
@@ -92,7 +92,7 @@ public void onSuccess(Channel channel) throws Exception {
             if (asyncHandlerExtensions != null)
                 asyncHandlerExtensions.onTlsHandshakeAttempt();
 
-            sslHandler.handshakeFuture().addListener(new SimpleGenericFutureListener<Channel>() {
+            sslHandler.handshakeFuture().addListener(new SimpleFutureListener<Channel>() {
 
                 @Override
                 protected void onSuccess(Channel value) throws Exception {

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

@@ -85,8 +85,6 @@ public UpgradeCallback(NettyResponseFuture<?> future, Channel channel, HttpRespo
 
         @Override
         public void call() throws Exception {
-            
-
             boolean validStatus = response.status().equals(SWITCHING_PROTOCOLS);
             boolean validUpgrade = response.headers().get(HttpHeaderNames.UPGRADE) != null;
             String connection = response.headers().get(HttpHeaderNames.CONNECTION);

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

@@ -53,7 +53,7 @@
 import org.asynchttpclient.handler.TransferCompletionHandler;
 import org.asynchttpclient.netty.Callback;
 import org.asynchttpclient.netty.NettyResponseFuture;
-import org.asynchttpclient.netty.SimpleGenericFutureListener;
+import org.asynchttpclient.netty.SimpleFutureListener;
 import org.asynchttpclient.netty.channel.ChannelManager;
 import org.asynchttpclient.netty.channel.ChannelState;
 import org.asynchttpclient.netty.channel.Channels;
@@ -277,7 +277,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
         }
 
         RequestNameResolver.INSTANCE.resolve(request, proxy, asyncHandler)//
-                .addListener(new SimpleGenericFutureListener<List<InetSocketAddress>>() {
+                .addListener(new SimpleFutureListener<List<InetSocketAddress>>() {
 
                     @Override
                     protected void onSuccess(List<InetSocketAddress> addresses) {

client/src/main/java/org/asynchttpclient/resolver/RequestNameResolver.java

@@ -25,7 +25,7 @@
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.handler.AsyncHandlerExtensions;
-import org.asynchttpclient.netty.SimpleGenericFutureListener;
+import org.asynchttpclient.netty.SimpleFutureListener;
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.uri.Uri;
 
@@ -68,7 +68,7 @@ public Future<List<InetSocketAddress>> resolve(Request request, ProxyServer prox
         else {
             Promise<List<InetSocketAddress>> promise = ImmediateEventExecutor.INSTANCE.newPromise();
 
-            whenResolved.addListener(new SimpleGenericFutureListener<List<InetSocketAddress>>() {
+            whenResolved.addListener(new SimpleFutureListener<List<InetSocketAddress>>() {
 
                 @Override
                 protected void onSuccess(List<InetSocketAddress> addresses) throws Exception {