|
18 | 18 | import io.vertx.core.Future; |
19 | 19 | import io.vertx.core.internal.ContextInternal; |
20 | 20 | import io.vertx.core.internal.PromiseInternal; |
21 | | -import io.vertx.core.internal.tls.SslContextManager; |
22 | | -import io.vertx.core.net.ClientSSLOptions; |
23 | | -import io.vertx.core.net.HostAndPort; |
24 | 21 | import io.vertx.core.internal.net.NetSocketInternal; |
25 | 22 | import io.vertx.core.internal.net.SslChannelProvider; |
26 | 23 | import io.vertx.core.internal.net.SslHandshakeCompletionHandler; |
| 24 | +import io.vertx.core.internal.tls.SslContextManager; |
| 25 | +import io.vertx.core.net.ClientSSLOptions; |
| 26 | +import io.vertx.core.net.HostAndPort; |
27 | 27 | import io.vertx.core.spi.metrics.ClientMetrics; |
28 | 28 | import io.vertx.mssqlclient.MSSQLConnectOptions; |
29 | 29 | import io.vertx.mssqlclient.MSSQLInfo; |
30 | | -import io.vertx.mssqlclient.impl.codec.ExtendedQueryMSSQLCommandBaseMessage; |
31 | | -import io.vertx.mssqlclient.impl.codec.MSSQLCommandMessage; |
32 | | -import io.vertx.mssqlclient.impl.codec.MSSQLPreparedStatement; |
33 | | -import io.vertx.mssqlclient.impl.codec.TdsLoginSentCompletionHandler; |
34 | | -import io.vertx.mssqlclient.impl.codec.TdsMessageCodec; |
35 | | -import io.vertx.mssqlclient.impl.codec.TdsPacketDecoder; |
36 | | -import io.vertx.mssqlclient.impl.codec.TdsSslHandshakeCodec; |
| 30 | +import io.vertx.mssqlclient.impl.codec.*; |
37 | 31 | import io.vertx.mssqlclient.impl.command.PreLoginCommand; |
38 | 32 | import io.vertx.sqlclient.SqlConnectOptions; |
39 | 33 | import io.vertx.sqlclient.codec.CommandMessage; |
40 | | -import io.vertx.sqlclient.spi.connection.Connection; |
| 34 | +import io.vertx.sqlclient.codec.SocketConnectionBase; |
41 | 35 | import io.vertx.sqlclient.internal.PreparedStatement; |
42 | 36 | import io.vertx.sqlclient.internal.QueryResultHandler; |
43 | | -import io.vertx.sqlclient.codec.SocketConnectionBase; |
44 | 37 | import io.vertx.sqlclient.spi.DatabaseMetadata; |
45 | | -import io.vertx.sqlclient.spi.protocol.CommandBase; |
46 | | -import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand; |
47 | | -import io.vertx.sqlclient.spi.protocol.InitCommand; |
48 | | -import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand; |
49 | | -import io.vertx.sqlclient.spi.protocol.TxCommand; |
| 38 | +import io.vertx.sqlclient.spi.connection.Connection; |
| 39 | +import io.vertx.sqlclient.spi.protocol.*; |
50 | 40 |
|
51 | 41 | import java.util.Map; |
52 | 42 | import java.util.function.Predicate; |
@@ -123,7 +113,7 @@ Future<Void> enableSsl(boolean clientConfigSsl, byte encryptionLevel, MSSQLConne |
123 | 113 | .resolveSslContextProvider(sslOptions, "", null, context) |
124 | 114 | .map(provider -> new SslChannelProvider(context.owner(), provider, false)); |
125 | 115 | return f.compose(provider -> { |
126 | | - SslHandler sslHandler = provider.createClientSslHandler(socket.remoteAddress(), null, sslOptions.isUseAlpn(), sslOptions.getSslHandshakeTimeout(), sslOptions.getSslHandshakeTimeoutUnit()); |
| 116 | + SslHandler sslHandler = provider.createClientSslHandler(socket.remoteAddress(), null, sslOptions.getApplicationLayerProtocols(), sslOptions.getSslHandshakeTimeout(), sslOptions.getSslHandshakeTimeoutUnit()); |
127 | 117 |
|
128 | 118 | // 3. TdsSslHandshakeCodec manages SSL payload encapsulated in TDS packets |
129 | 119 | TdsSslHandshakeCodec tdsSslHandshakeCodec = new TdsSslHandshakeCodec(); |
|
0 commit comments