useCache is always true, see NoConnectionsPool

Author: Stephane Landelle

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Channels.java

@@ -1,8 +1,6 @@
 package org.asynchttpclient.providers.netty4;
 
-import static org.asynchttpclient.providers.netty4.util.HttpUtil.HTTP;
-import static org.asynchttpclient.providers.netty4.util.HttpUtil.WEBSOCKET;
-import static org.asynchttpclient.providers.netty4.util.HttpUtil.isSecure;
+import static org.asynchttpclient.providers.netty4.util.HttpUtil.*;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -45,6 +43,7 @@
 import org.asynchttpclient.ConnectionsPool;
 import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
 import org.asynchttpclient.providers.netty4.pool.NettyConnectionsPool;
+import org.asynchttpclient.providers.netty4.pool.NonConnectionsPool;
 import org.asynchttpclient.providers.netty4.util.CleanupChannelGroup;
 import org.asynchttpclient.util.SslUtils;
 import org.slf4j.Logger;
@@ -91,8 +90,6 @@ public boolean remove(Object o) {
         }
     };
 
-    private NettyChannelHandler httpProcessor;
-
     public Channels(final AsyncHttpClientConfig config, NettyAsyncHttpProviderConfig asyncHttpProviderConfig) {
 
         this.config = config;
@@ -177,21 +174,23 @@ public Channels(final AsyncHttpClientConfig config, NettyAsyncHttpProviderConfig
         webSocketBootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.getConnectionTimeoutInMs());
         secureBootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.getConnectionTimeoutInMs());
         secureWebSocketBootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.getConnectionTimeoutInMs());
+    }
 
-        // FIXME What was the meaning of this and what is it still a matter with
-        // Netty4
-        // DefaultChannelFuture.setUseDeadLockChecker(false);
+    private SSLEngine createSSLEngine() throws IOException, GeneralSecurityException {
+        SSLEngine sslEngine = config.getSSLEngineFactory().newSSLEngine();
+        if (sslEngine == null) {
+            sslEngine = SslUtils.getSSLEngine();
+        }
+        return sslEngine;
     }
 
     public void configure(final NettyChannelHandler httpProcessor) {
-        this.httpProcessor = httpProcessor;
-
-        ChannelInitializer<Channel> httpChannelInitializer = new ChannelInitializer<Channel>() {
 
+        plainBootstrap.handler(new ChannelInitializer<Channel>() {
             @Override
             protected void initChannel(Channel ch) throws Exception {
                 ChannelPipeline pipeline = ch.pipeline()//
-                .addLast(HTTP_HANDLER, newHttpClientCodec());
+                        .addLast(HTTP_HANDLER, newHttpClientCodec());
 
                 if (config.getRequestCompressionLevel() > 0) {
                     pipeline.addLast(DEFLATER_HANDLER, new HttpContentCompressor(config.getRequestCompressionLevel()));
@@ -201,75 +200,41 @@ protected void initChannel(Channel ch) throws Exception {
                     pipeline.addLast(INFLATER_HANDLER, new HttpContentDecompressor());
                 }
                 pipeline.addLast(CHUNKED_WRITER_HANDLER, new ChunkedWriteHandler())//
-                .addLast(AHC_HANDLER, httpProcessor);
+                        .addLast(AHC_HANDLER, httpProcessor);
 
                 if (asyncHttpProviderConfig.getHttpAdditionalChannelInitializer() != null) {
                     asyncHttpProviderConfig.getHttpAdditionalChannelInitializer().initChannel(ch);
                 }
             }
-        };
+        });
 
-        ChannelInitializer<Channel> webSocketChannelInitializer = new ChannelInitializer<Channel>() {
+        webSocketBootstrap.handler(new ChannelInitializer<Channel>() {
             @Override
             protected void initChannel(Channel ch) throws Exception {
                 ch.pipeline()//
-                .addLast(HTTP_DECODER_HANDLER, new HttpResponseDecoder())//
-                .addLast(HTTP_ENCODER_HANDLER, new HttpRequestEncoder())//
-                .addLast(AHC_HANDLER, httpProcessor);
+                        .addLast(HTTP_DECODER_HANDLER, new HttpResponseDecoder())//
+                        .addLast(HTTP_ENCODER_HANDLER, new HttpRequestEncoder())//
+                        .addLast(AHC_HANDLER, httpProcessor);
 
                 if (asyncHttpProviderConfig.getWsAdditionalChannelInitializer() != null) {
                     asyncHttpProviderConfig.getWsAdditionalChannelInitializer().initChannel(ch);
                 }
             }
-        };
-
-        plainBootstrap.handler(httpChannelInitializer);
-        webSocketBootstrap.handler(webSocketChannelInitializer);
-    }
-
-    public Bootstrap getBootstrap(String url, boolean useSSl) {
-        Bootstrap bootstrap = url.startsWith(WEBSOCKET) ? (useSSl ? secureWebSocketBootstrap : webSocketBootstrap) : (useSSl ? secureBootstrap : plainBootstrap);
-
-        return bootstrap;
-    }
-
-    public void close() {
-        connectionsPool.destroy();
-        for (Channel channel : openChannels) {
-            Object attribute = getDefaultAttribute(channel);
-            if (attribute instanceof NettyResponseFuture<?>) {
-                NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
-                future.setReaperFuture(null);
-            }
-        }
-        openChannels.close();
-        if (allowReleaseEventLoopGroup) {
-            eventLoopGroup.shutdownGracefully();
-        }
-    }
-
-    void constructSSLPipeline(final NettyResponseFuture<?> future) {
+        });
 
         secureBootstrap.handler(new ChannelInitializer<Channel>() {
 
             @Override
             protected void initChannel(Channel ch) throws Exception {
-                ChannelPipeline pipeline = ch.pipeline();
-
-                try {
-                    pipeline.addLast(SSL_HANDLER, new SslHandler(createSSLEngine()));
-                } catch (Throwable ex) {
-                    LOGGER.error("Channel {} could not add SslHandler {}", ch, ex);
-                    abort(future, ex);
-                }
-
-                pipeline.addLast(HTTP_HANDLER, newHttpClientCodec());
+                ChannelPipeline pipeline = ch.pipeline()//
+                        .addLast(SSL_HANDLER, new SslHandler(createSSLEngine()))//
+                        .addLast(HTTP_HANDLER, newHttpClientCodec());
 
                 if (config.isCompressionEnabled()) {
                     pipeline.addLast(INFLATER_HANDLER, new HttpContentDecompressor());
                 }
                 pipeline.addLast(CHUNKED_WRITER_HANDLER, new ChunkedWriteHandler())//
-                .addLast(AHC_HANDLER, httpProcessor);
+                        .addLast(AHC_HANDLER, httpProcessor);
 
                 if (asyncHttpProviderConfig.getHttpsAdditionalChannelInitializer() != null) {
                     asyncHttpProviderConfig.getHttpsAdditionalChannelInitializer().initChannel(ch);
@@ -281,18 +246,11 @@ protected void initChannel(Channel ch) throws Exception {
 
             @Override
             protected void initChannel(Channel ch) throws Exception {
-                ChannelPipeline pipeline = ch.pipeline();
-
-                try {
-                    pipeline.addLast(SSL_HANDLER, new SslHandler(createSSLEngine()));
-                } catch (Throwable ex) {
-                    LOGGER.error("Channel {} could not add SslHandler {}", ch, ex);
-                    abort(future, ex);
-                }
-
-                pipeline.addLast(HTTP_DECODER_HANDLER, new HttpResponseDecoder())//
-                .addLast(HTTP_ENCODER_HANDLER, new HttpRequestEncoder())//
-                .addLast(AHC_HANDLER, httpProcessor);
+                ch.pipeline()//
+                        .addLast(SSL_HANDLER, new SslHandler(createSSLEngine()))//
+                        .addLast(HTTP_DECODER_HANDLER, new HttpResponseDecoder())//
+                        .addLast(HTTP_ENCODER_HANDLER, new HttpRequestEncoder())//
+                        .addLast(AHC_HANDLER, httpProcessor);
 
                 if (asyncHttpProviderConfig.getWssAdditionalChannelInitializer() != null) {
                     asyncHttpProviderConfig.getWssAdditionalChannelInitializer().initChannel(ch);
@@ -301,15 +259,26 @@ protected void initChannel(Channel ch) throws Exception {
         });
     }
 
-    private SSLEngine createSSLEngine() throws IOException, GeneralSecurityException {
-        SSLEngine sslEngine = config.getSSLEngineFactory().newSSLEngine();
-        if (sslEngine == null) {
-            sslEngine = SslUtils.getSSLEngine();
+    public Bootstrap getBootstrap(String url, boolean useSSl) {
+        return url.startsWith(WEBSOCKET) ? (useSSl ? secureWebSocketBootstrap : webSocketBootstrap) : (useSSl ? secureBootstrap : plainBootstrap);
+    }
+
+    public void close() {
+        connectionsPool.destroy();
+        for (Channel channel : openChannels) {
+            Object attribute = getDefaultAttribute(channel);
+            if (attribute instanceof NettyResponseFuture<?>) {
+                NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
+                future.setReaperFuture(null);
+            }
+        }
+        openChannels.close();
+        if (allowReleaseEventLoopGroup) {
+            eventLoopGroup.shutdownGracefully();
         }
-        return sslEngine;
     }
 
-    // FIXME what for?
+    // some servers can use the same port for HTTP and HTTPS
     public Channel verifyChannelPipeline(Channel channel, String scheme) throws IOException, GeneralSecurityException {
 
         if (channel.pipeline().get(SSL_HANDLER) != null && HTTP.equalsIgnoreCase(scheme)) {
@@ -509,26 +478,4 @@ public static void setDefaultAttribute(Channel channel, Object o) {
     public static void setDefaultAttribute(ChannelHandlerContext ctx, Object o) {
         ctx.attr(DEFAULT_ATTRIBUTE).set(o);
     }
-
-    private static class NonConnectionsPool implements ConnectionsPool<String, Channel> {
-
-        public boolean offer(String uri, Channel connection) {
-            return false;
-        }
-
-        public Channel poll(String uri) {
-            return null;
-        }
-
-        public boolean removeAll(Channel connection) {
-            return false;
-        }
-
-        public boolean canCacheConnection() {
-            return true;
-        }
-
-        public void destroy() {
-        }
-    }
 }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyAsyncHttpProvider.java

@@ -41,7 +41,6 @@ public class NettyAsyncHttpProvider implements AsyncHttpProvider {
     private final Channels channels;
     private final NettyRequestSender requestSender;
     private final NettyChannelHandler channelHandler;
-    private final boolean executeConnectAsync;
 
     public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
 
@@ -54,8 +53,6 @@ public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
         requestSender = new NettyRequestSender(closed, config, channels);
         channelHandler = new NettyChannelHandler(config, requestSender, channels, closed);
         channels.configure(channelHandler);
-
-        executeConnectAsync = asyncHttpProviderConfig.isAsyncConnect();
     }
 
     @Override
@@ -82,6 +79,6 @@ public Response prepareResponse(final HttpResponseStatus status, final HttpRespo
 
     @Override
     public <T> ListenableFuture<T> execute(Request request, final AsyncHandler<T> asyncHandler) throws IOException {
-        return requestSender.doConnect(request, asyncHandler, null, true, executeConnectAsync, false);
+        return requestSender.sendRequest(request, asyncHandler, null, asyncHttpProviderConfig.isAsyncConnect(), false);
     }
 }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyChannelHandler.java

@@ -312,7 +312,7 @@ public void call() throws Exception {
 
                     Request target = nBuilder.setUrl(newUrl).build();
                     future.setRequest(target);
-                    requestSender.execute(target, future);
+                    requestSender.sendRequest(target, future);
                     return true;
                 }
             } else {
@@ -544,7 +544,7 @@ private boolean handleResponseAndExit(final ChannelHandlerContext ctx, final Net
                     Callback callback = new Callback(future) {
                         public void call() throws Exception {
                             channels.drainChannel(ctx, future);
-                            requestSender.execute(builder.setHeaders(headers).setRealm(nr).build(), future);
+                            requestSender.sendRequest(builder.setHeaders(headers).setRealm(nr).build(), future);
                         }
                     };
 
@@ -589,7 +589,7 @@ public void call() throws Exception {
 
                     future.setReuseChannel(true);
                     future.setConnectAllowed(true);
-                    requestSender.execute(builder.setHeaders(headers).setRealm(newRealm).build(), future);
+                    requestSender.sendRequest(builder.setHeaders(headers).setRealm(newRealm).build(), future);
                     return true;
                 }
 
@@ -609,7 +609,7 @@ public void call() throws Exception {
                 }
                 future.setReuseChannel(true);
                 future.setConnectAllowed(false);
-                requestSender.execute(builder.build(), future);
+                requestSender.sendRequest(builder.build(), future);
                 return true;
 
             }