Fixes after rebase

apple · Sep 28, 2023 · a180235 · a180235
1 parent 94c95d8
commit a180235
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/AlpnChannelSingle.java b/servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/AlpnChannelSingle.java
@@ -45,11 +45,6 @@
 final class AlpnChannelSingle extends ChannelInitSingle<String> {
     private final Consumer<ChannelHandlerContext> onHandlerAdded;
 
-    AlpnChannelSingle(final Channel channel,
-                      final ChannelInitializer channelInitializer) {
-        this(channel, channelInitializer, __ -> { });
-    }
-
     AlpnChannelSingle(final Channel channel,
                       final ChannelInitializer channelInitializer,
                       final Consumer<ChannelHandlerContext> onHandlerAdded) {

diff --git a/...etalk-http-netty/src/main/java/io/servicetalk/http/netty/AlpnLBHttpConnectionFactory.java b/...etalk-http-netty/src/main/java/io/servicetalk/http/netty/AlpnLBHttpConnectionFactory.java
@@ -70,7 +70,7 @@ private Single<FilterableStreamingHttpConnection> createConnection(
             final Channel channel, final ConnectionObserver connectionObserver,
             final ReadOnlyTcpClientConfig tcpConfig) {
         return new AlpnChannelSingle(channel, new TcpClientChannelInitializer(tcpConfig, connectionObserver),
-                connectionObserver).flatMap(protocol -> {
+                ctx -> { /* SslHandler will automatically start handshake on channelActive */ }).flatMap(protocol -> {
             switch (protocol) {
                 case HTTP_1_1:
                     final H1ProtocolConfig h1Config = config.h1Config();

diff --git a/...etalk-http-netty/src/main/java/io/servicetalk/http/netty/DeferredServerChannelBinder.java b/...etalk-http-netty/src/main/java/io/servicetalk/http/netty/DeferredServerChannelBinder.java
@@ -91,7 +91,7 @@ private static Single<NettyConnectionContext> alpnInitChannel(final SocketAddres
                                                                   final StreamingHttpService service,
                                                                   final boolean drainRequestPayloadBody,
                                                                   final ConnectionObserver observer) {
-        return new AlpnChannelSingle(channel, new TcpServerChannelInitializer(config.tcpConfig(), observer), observer,
+        return new AlpnChannelSingle(channel, new TcpServerChannelInitializer(config.tcpConfig(), observer),
                 // Force a read to get the SSL handshake started. We initialize pipeline before
                 // SslHandshakeCompletionEvent will complete, therefore, no data will be propagated before we finish
                 // initialization.

diff --git a/...tp-netty/src/main/java/io/servicetalk/http/netty/ProxyConnectLBHttpConnectionFactory.java b/...tp-netty/src/main/java/io/servicetalk/http/netty/ProxyConnectLBHttpConnectionFactory.java
@@ -129,8 +129,7 @@ private static Single<String> handshake(final Channel channel, final ConnectionO
                         " in the channel pipeline."));
             }
         } else {
-            result = new AlpnChannelSingle(channel, NoopChannelInitializer.INSTANCE, connectionObserver,
-                    __ -> deferSslHandler.ready());
+            result = new AlpnChannelSingle(channel, NoopChannelInitializer.INSTANCE, ctx -> deferSslHandler.ready());
         }
         return result.shareContextOnSubscribe();
     }