Upgrade to SslContextManager/SslContextProvider changes

Author: vietj

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

@@ -17,6 +17,7 @@
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.internal.net.NetSocketInternal;
+import io.vertx.core.internal.tls.ClientSslContextManager;
 import io.vertx.core.internal.tls.SslContextManager;
 import io.vertx.core.net.HostAndPort;
 import io.vertx.core.net.NetClientOptions;
@@ -34,15 +35,15 @@
 
 public class MSSQLConnectionFactory extends ConnectionFactoryBase<MSSQLConnectOptions> {
 
-  private final SslContextManager sslContextManager;
+  private final ClientSslContextManager sslContextManager;
 
   public MSSQLConnectionFactory(VertxInternal vertx) {
     this(vertx, new NetClientOptions());
   }
 
   public MSSQLConnectionFactory(VertxInternal vertx, NetClientOptions transportOptions) {
     super(vertx, transportOptions);
-    sslContextManager = new SslContextManager(SslContextManager.resolveEngineOptions(tcpOptions.getSslEngineOptions(), tcpOptions.isUseAlpn()));
+    sslContextManager = new ClientSslContextManager(SslContextManager.resolveEngineOptions(tcpOptions.getSslEngineOptions(), tcpOptions.isUseAlpn()));
   }
 
   @Override

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

@@ -21,6 +21,7 @@
 import io.vertx.core.internal.net.NetSocketInternal;
 import io.vertx.core.internal.net.SslChannelProvider;
 import io.vertx.core.internal.net.SslHandshakeCompletionHandler;
+import io.vertx.core.internal.tls.ClientSslContextManager;
 import io.vertx.core.internal.tls.SslContextManager;
 import io.vertx.core.net.ClientSSLOptions;
 import io.vertx.core.net.HostAndPort;
@@ -47,13 +48,13 @@
 public class MSSQLSocketConnection extends SocketConnectionBase {
 
   private final MSSQLConnectOptions connectOptions;
-  private final SslContextManager SslContextManager;
+  private final ClientSslContextManager sslContextManager;
 
   private MSSQLDatabaseMetadata databaseMetadata;
   private HostAndPort alternateServer;
 
   MSSQLSocketConnection(NetSocketInternal socket,
-                        SslContextManager SslContextManager,
+                        ClientSslContextManager SslContextManager,
                         ClientMetrics clientMetrics,
                         MSSQLConnectOptions connectOptions,
                         boolean cachePreparedStatements,
@@ -63,7 +64,7 @@ public class MSSQLSocketConnection extends SocketConnectionBase {
                         ContextInternal context) {
     super(socket, clientMetrics, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
     this.connectOptions = connectOptions;
-    this.SslContextManager = SslContextManager;
+    this.sslContextManager = SslContextManager;
   }
 
   @Override
@@ -110,8 +111,8 @@ Future<Void> enableSsl(boolean clientConfigSsl, byte encryptionLevel, MSSQLConne
 
     // 2. Create and set up an SSLHelper and SSLHandler
     // options.getApplicationLayerProtocols()
-    Future<SslChannelProvider> f = SslContextManager
-      .resolveSslContextProvider(sslOptions, "", null, context)
+    Future<SslChannelProvider> f = sslContextManager
+      .resolveSslContextProvider(sslOptions, context)
       .map(provider -> new SslChannelProvider(context.owner(), provider, false));
     return f.compose(provider -> {
       SocketAddress socketAddress = socket.remoteAddress();