Move HTTP client connection handler to transport

Author: vietj

vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientBuilderInternal.java

@@ -104,6 +104,7 @@ private HttpClientImpl createHttpClientImpl(EndpointResolver resolver,
     HttpChannelConnector channelConnector = new Http1xOrH2ChannelConnector(tcpClient, co, metrics);
     HttpClientImpl.Transport transport = new HttpClientImpl.Transport(
       resolver,
+      connectionHandler,
       channelConnector,
       co.isVerifyHost(),
       co.isSsl(),
@@ -113,7 +114,7 @@ private HttpClientImpl createHttpClientImpl(EndpointResolver resolver,
       co.getProtocolVersion(),
       co.getSslOptions()
     );
-    return new HttpClientImpl(vertx, connectionHandler, redirectHandler, metrics, po,
+    return new HttpClientImpl(vertx, redirectHandler, metrics, po,
       co.getProxyOptions(), co.getNonProxyHosts(), transport);
   }
 

vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientImpl.java

@@ -53,13 +53,11 @@ public class HttpClientImpl extends HttpClientBase implements HttpClientInternal
   private final ResourceManager<EndpointKey, SharedHttpClientConnectionGroup> resourceManager;
   private final Function<HttpClientResponse, Future<RequestOptions>> redirectHandler;
   private long timerID;
-  private final Handler<HttpConnection> connectHandler;
   private final Function<ContextInternal, ContextInternal> contextProvider;
   private final long maxLifetime;
   private final Transport transport;
 
   HttpClientImpl(VertxInternal vertx,
-                 Handler<HttpConnection> connectHandler,
                  Function<HttpClientResponse, Future<RequestOptions>> redirectHandler,
                  HttpClientMetrics<?, ?, ?> metrics,
                  PoolOptions poolOptions,
@@ -69,7 +67,6 @@ public class HttpClientImpl extends HttpClientBase implements HttpClientInternal
     super(vertx, metrics, defaultProxyOptions, nonProxyHosts);
 
     this.transport = transport;
-    this.connectHandler = connectHandler;
     this.poolOptions = poolOptions;
     this.resourceManager = new ResourceManager<>();
     this.maxLifetime = MILLISECONDS.convert(poolOptions.getMaxLifetime(), poolOptions.getMaxLifetimeUnit());
@@ -153,7 +150,7 @@ private Function<EndpointKey, SharedHttpClientConnectionGroup> httpEndpointProvi
       };
       return new SharedHttpClientConnectionGroup(
         clientMetrics,
-        connectHandler,
+        transport.connectHandler,
         p,
         poolMetrics,
         key.authority,
@@ -440,6 +437,7 @@ HttpClientRequestImpl createRequest(HttpConnection connection, HttpClientStream
   static class Transport {
 
     private final EndpointResolverInternal resolver;
+    private final Handler<HttpConnection> connectHandler;
     private final HttpChannelConnector connector;
     private final boolean verifyHost;
     private final boolean defaultSsl;
@@ -449,14 +447,16 @@ static class Transport {
     private final HttpVersion protocol;
     private volatile ClientSSLOptions sslOptions;
 
-    Transport(EndpointResolver resolver, HttpChannelConnector connector, boolean verifyHost, boolean defaultSsl,
-              String defaultHost, int defaultPort, int maxRedirects, HttpVersion protocol, ClientSSLOptions sslOptions) {
+    Transport(EndpointResolver resolver, Handler<HttpConnection> connectHandler, HttpChannelConnector connector,
+              boolean verifyHost, boolean defaultSsl, String defaultHost, int defaultPort, int maxRedirects,
+              HttpVersion protocol, ClientSSLOptions sslOptions) {
 
       if (sslOptions != null) {
         configureSSLOptions(verifyHost, sslOptions);
       }
 
       this.resolver = (EndpointResolverInternal)resolver;
+      this.connectHandler = connectHandler;
       this.connector = connector;
       this.verifyHost = verifyHost;
       this.defaultSsl = defaultSsl;