Adapt to SSLHelper rework

Author: vietj

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java

@@ -16,11 +16,12 @@
 import io.vertx.core.Promise;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.VertxInternal;
+import io.vertx.core.internal.tls.SslContextManager;
 import io.vertx.core.net.HostAndPort;
 import io.vertx.core.net.NetSocket;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.core.internal.net.NetSocketInternal;
-import io.vertx.core.net.impl.SSLHelper;
+import io.vertx.core.net.impl.NetServerImpl;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.core.spi.metrics.VertxMetrics;
 import io.vertx.mssqlclient.MSSQLConnectOptions;
@@ -34,11 +35,11 @@
 
 public class MSSQLConnectionFactory extends ConnectionFactoryBase<MSSQLConnectOptions> {
 
-  private final SSLHelper sslHelper;
+  private final SslContextManager sslContextManager;
 
   public MSSQLConnectionFactory(VertxInternal vertx) {
     super(vertx);
-    sslHelper = new SSLHelper(SSLHelper.resolveEngineOptions(tcpOptions.getSslEngineOptions(), tcpOptions.isUseAlpn()));
+    sslContextManager = new SslContextManager(NetServerImpl.resolveEngineOptions(tcpOptions.getSslEngineOptions(), tcpOptions.isUseAlpn()));
   }
 
   @Override
@@ -78,7 +79,7 @@ private Future<Connection> connectOrRedirect(MSSQLConnectOptions options, Contex
   private MSSQLSocketConnection createSocketConnection(NetSocket so, MSSQLConnectOptions options, ContextInternal context) {
     VertxMetrics vertxMetrics = vertx.metricsSPI();
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", tcpOptions.getMetricsName()) : null;
-    MSSQLSocketConnection conn = new MSSQLSocketConnection((NetSocketInternal) so, sslHelper, metrics, options, false, 0, sql -> true, 1, context);
+    MSSQLSocketConnection conn = new MSSQLSocketConnection((NetSocketInternal) so, sslContextManager, metrics, options, false, 0, sql -> true, 1, context);
     conn.init();
     return conn;
   }

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java

@@ -19,12 +19,12 @@
 import io.vertx.core.Handler;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
+import io.vertx.core.internal.tls.SslContextManager;
 import io.vertx.core.net.ClientSSLOptions;
 import io.vertx.core.net.HostAndPort;
 import io.vertx.core.internal.net.NetSocketInternal;
-import io.vertx.core.net.impl.SSLHelper;
-import io.vertx.core.net.impl.SslChannelProvider;
-import io.vertx.core.net.impl.SslHandshakeCompletionHandler;
+import io.vertx.core.internal.net.SslChannelProvider;
+import io.vertx.core.internal.net.SslHandshakeCompletionHandler;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.mssqlclient.MSSQLConnectOptions;
 import io.vertx.mssqlclient.MSSQLInfo;
@@ -48,13 +48,13 @@
 public class MSSQLSocketConnection extends SocketConnectionBase {
 
   private final MSSQLConnectOptions connectOptions;
-  private final SSLHelper sslHelper;
+  private final SslContextManager SslContextManager;
 
   private MSSQLDatabaseMetadata databaseMetadata;
   private HostAndPort alternateServer;
 
   MSSQLSocketConnection(NetSocketInternal socket,
-                        SSLHelper sslHelper,
+                        SslContextManager SslContextManager,
                         ClientMetrics clientMetrics,
                         MSSQLConnectOptions connectOptions,
                         boolean cachePreparedStatements,
@@ -64,7 +64,7 @@ public class MSSQLSocketConnection extends SocketConnectionBase {
                         ContextInternal context) {
     super(socket, clientMetrics, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
     this.connectOptions = connectOptions;
-    this.sslHelper = sslHelper;
+    this.SslContextManager = SslContextManager;
   }
 
   @Override
@@ -111,7 +111,9 @@ Future<Void> enableSsl(boolean clientConfigSsl, byte encryptionLevel, MSSQLConne
 
     // 2. Create and set up an SSLHelper and SSLHandler
     // options.getApplicationLayerProtocols()
-    Future<SslChannelProvider> f = sslHelper.resolveSslChannelProvider(sslOptions, "", false, null, null, context);
+    Future<SslChannelProvider> f = SslContextManager
+      .resolveSslContextProvider(sslOptions, "", null, null, context)
+      .map(provider -> new SslChannelProvider(context.owner(), provider, false));
     return f.compose(provider -> {
       SslHandler sslHandler = provider.createClientSslHandler(socket.remoteAddress(), null, sslOptions.isUseAlpn(), sslOptions.getSslHandshakeTimeout(), sslOptions.getSslHandshakeTimeoutUnit());