minor clean up

Author: Stephane Landelle

providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/NettyConnectListener.java

@@ -40,8 +40,6 @@
 /**
  * Non Blocking connect.
  */
-// FIXME Netty 3: NettyConnectListener don't need to be passed the request as
-// the future has it too
 final class NettyConnectListener<T> implements ChannelFutureListener {
     private final static Logger LOGGER = LoggerFactory.getLogger(NettyConnectListener.class);
     private final AsyncHttpClientConfig config;
@@ -79,7 +77,6 @@ public void onFutureFailure(Channel channel, Throwable cause) {
                 && (NettyResponseFutures.abortOnDisconnectException(cause) || cause instanceof ClosedChannelException || future.getState() != NettyResponseFuture.STATE.NEW)) {
 
             LOGGER.debug("Retrying {} ", future.getNettyRequest());
-            // FIXME Netty 3 use the wrong statement
             if (requestSender.retry(channel, future)) {
                 return;
             }
@@ -111,7 +108,6 @@ public static class Builder<T> {
         private final AsyncHandler<T> asyncHandler;
         private NettyResponseFuture<T> future;
 
-        // FIXME Netty3 useless constructor
         public Builder(AsyncHttpClientConfig config, NettyRequestSender requestSender, Request request, AsyncHandler<T> asyncHandler, NettyResponseFuture<T> future) {
 
             this.config = config;

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

@@ -186,15 +186,19 @@ private <T> ListenableFuture<T> sendRequestWithCachedChannel(Channel channel, Re
         return future;
     }
 
+    private InetSocketAddress remoteAddress(Request request, URI uri, ProxyServer proxy) {
+        if (request.getInetAddress() != null)
+            return new InetSocketAddress(request.getInetAddress(), AsyncHttpProviderUtils.getPort(uri));
+
+        else if (proxy == null || ProxyUtils.avoidProxy(proxy, uri.getHost()))
+            return new InetSocketAddress(AsyncHttpProviderUtils.getHost(uri), AsyncHttpProviderUtils.getPort(uri));
+
+        else
+            return new InetSocketAddress(proxy.getHost(), proxy.getPort());
+    }
+
     private ChannelFuture connect(Request request, URI uri, ProxyServer proxy, Bootstrap bootstrap) {
-        InetSocketAddress remoteAddress;
-        if (request.getInetAddress() != null) {
-            remoteAddress = new InetSocketAddress(request.getInetAddress(), AsyncHttpProviderUtils.getPort(uri));
-        } else if (proxy == null || ProxyUtils.avoidProxy(proxy, uri.getHost())) {
-            remoteAddress = new InetSocketAddress(AsyncHttpProviderUtils.getHost(uri), AsyncHttpProviderUtils.getPort(uri));
-        } else {
-            remoteAddress = new InetSocketAddress(proxy.getHost(), proxy.getPort());
-        }
+        InetSocketAddress remoteAddress = remoteAddress(request, uri, proxy);
 
         if (request.getLocalAddress() != null) {
             return bootstrap.connect(remoteAddress, new InetSocketAddress(request.getLocalAddress(), 0));