Skip to content

Commit 808e25c

Browse files
authored
Fix MSSQLSocketConnection (#1604)
Follows-up on eclipse-vertx/vert.x#5841 io.vertx.core.internal.net.SslChannelProvider.createClientSslHandler changed signature Signed-off-by: Thomas Segismont <tsegismont@gmail.com>
1 parent 2d032a1 commit 808e25c

1 file changed

Lines changed: 8 additions & 18 deletions

File tree

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

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,25 @@
1818
import io.vertx.core.Future;
1919
import io.vertx.core.internal.ContextInternal;
2020
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;
2421
import io.vertx.core.internal.net.NetSocketInternal;
2522
import io.vertx.core.internal.net.SslChannelProvider;
2623
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;
2727
import io.vertx.core.spi.metrics.ClientMetrics;
2828
import io.vertx.mssqlclient.MSSQLConnectOptions;
2929
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.*;
3731
import io.vertx.mssqlclient.impl.command.PreLoginCommand;
3832
import io.vertx.sqlclient.SqlConnectOptions;
3933
import io.vertx.sqlclient.codec.CommandMessage;
40-
import io.vertx.sqlclient.spi.connection.Connection;
34+
import io.vertx.sqlclient.codec.SocketConnectionBase;
4135
import io.vertx.sqlclient.internal.PreparedStatement;
4236
import io.vertx.sqlclient.internal.QueryResultHandler;
43-
import io.vertx.sqlclient.codec.SocketConnectionBase;
4437
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.*;
5040

5141
import java.util.Map;
5242
import java.util.function.Predicate;
@@ -123,7 +113,7 @@ Future<Void> enableSsl(boolean clientConfigSsl, byte encryptionLevel, MSSQLConne
123113
.resolveSslContextProvider(sslOptions, "", null, context)
124114
.map(provider -> new SslChannelProvider(context.owner(), provider, false));
125115
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());
127117

128118
// 3. TdsSslHandshakeCodec manages SSL payload encapsulated in TDS packets
129119
TdsSslHandshakeCodec tdsSslHandshakeCodec = new TdsSslHandshakeCodec();

0 commit comments

Comments
 (0)