diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClientConnect.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClientConnect.java index 615374ed6a..244d95eb32 100644 --- a/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClientConnect.java +++ b/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClientConnect.java @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Map; import java.time.Duration; import java.util.Objects; import java.util.function.BiConsumer; @@ -43,7 +42,6 @@ import io.netty.handler.ssl.SslClosedEngineException; import io.netty.resolver.AddressResolverGroup; import io.netty.util.AsciiString; -import io.netty.util.AttributeKey; import io.netty.util.NetUtil; import org.reactivestreams.Publisher; import org.reactivestreams.Subscription; @@ -58,7 +56,6 @@ import reactor.netty.http.HttpOperations; import reactor.netty.http.HttpProtocol; import reactor.netty.resources.ConnectionProvider; -import reactor.netty.tcp.TcpClientConfig; import reactor.netty.transport.AddressUtils; import reactor.netty.transport.ProxyProvider; import reactor.netty.tcp.SslProvider; @@ -140,61 +137,6 @@ protected HttpClient duplicate() { return new HttpClientConnect(new HttpClientConfig(config)); } - @SuppressWarnings("unchecked") - static HttpClient applyTcpClientConfig(TcpClientConfig config) { - HttpClient httpClient = - create(config.connectionProvider()).doOnChannelInit(config.doOnChannelInit()) - .observe(config.connectionObserver()) - .remoteAddress(config.remoteAddress()) - .runOn(config.loopResources(), config.isPreferNative()); - - if (config.resolver() != null) { - httpClient = httpClient.resolver(config.resolver()); - } - - for (Map.Entry, ?> entry : config.attributes().entrySet()) { - httpClient = httpClient.attr((AttributeKey) entry.getKey(), entry.getValue()); - } - - if (config.bindAddress() != null) { - httpClient = httpClient.bindAddress(config.bindAddress()); - } - - if (config.channelGroup() != null) { - httpClient = httpClient.channelGroup(config.channelGroup()); - } - - if (config.doOnConnected() != null) { - httpClient = httpClient.doOnConnected(config.doOnConnected()); - } - - if (config.doOnDisconnected() != null) { - httpClient = httpClient.doOnDisconnected(config.doOnDisconnected()); - } - - if (config.loggingHandler() != null) { - httpClient.configuration().loggingHandler(config.loggingHandler()); - } - - if (config.metricsRecorder() != null) { - httpClient = httpClient.metrics(true, config.metricsRecorder()); - } - - for (Map.Entry, ?> entry : config.options().entrySet()) { - httpClient = httpClient.option((ChannelOption) entry.getKey(), entry.getValue()); - } - - if (config.proxyProvider() != null) { - httpClient.configuration().proxyProvider(config.proxyProvider()); - } - - if (config.sslProvider() != null) { - httpClient = httpClient.secure(config.sslProvider()); - } - - return httpClient; - } - static final class MonoHttpConnect extends Mono { final HttpClientConfig config; diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerBind.java b/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerBind.java index 3b90d1ed27..6a099b3169 100644 --- a/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerBind.java +++ b/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerBind.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 VMware, Inc. or its affiliates, All Rights Reserved. + * Copyright (c) 2017-2022 VMware, Inc. or its affiliates, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,9 @@ package reactor.netty.http.server; import io.netty.channel.ChannelOption; -import io.netty.util.AttributeKey; import reactor.core.publisher.Mono; import reactor.netty.DisposableServer; import reactor.netty.tcp.SslProvider; -import reactor.netty.tcp.TcpServerConfig; import java.net.InetSocketAddress; import java.util.Arrays; @@ -107,64 +105,5 @@ protected HttpServer duplicate() { return new HttpServerBind(new HttpServerConfig(config)); } - @SuppressWarnings("unchecked") - static HttpServer applyTcpServerConfig(TcpServerConfig config) { - HttpServer httpServer = - create().childObserve(config.childObserver()) - .doOnChannelInit(config.doOnChannelInit()) - .observe(config.connectionObserver()) - .runOn(config.loopResources(), config.isPreferNative()); - - for (Map.Entry, ?> entry : config.attributes().entrySet()) { - httpServer = httpServer.attr((AttributeKey) entry.getKey(), entry.getValue()); - } - - if (config.bindAddress() != null) { - httpServer = httpServer.bindAddress(config.bindAddress()); - } - - if (config.channelGroup() != null) { - httpServer = httpServer.channelGroup(config.channelGroup()); - } - - for (Map.Entry, ?> entry : config.childAttributes().entrySet()) { - httpServer = httpServer.childAttr((AttributeKey) entry.getKey(), entry.getValue()); - } - - for (Map.Entry, ?> entry : config.childOptions().entrySet()) { - httpServer = httpServer.childOption((ChannelOption) entry.getKey(), entry.getValue()); - } - - if (config.doOnBound() != null) { - httpServer = httpServer.doOnBound(config.doOnBound()); - } - - if (config.doOnConnection() != null) { - httpServer = httpServer.doOnConnection(config.doOnConnection()); - } - - if (config.doOnUnbound() != null) { - httpServer = httpServer.doOnUnbound(config.doOnUnbound()); - } - - if (config.loggingHandler() != null) { - httpServer.configuration().loggingHandler(config.loggingHandler()); - } - - if (config.metricsRecorder() != null) { - httpServer = httpServer.metrics(true, config.metricsRecorder()); - } - - for (Map.Entry, ?> entry : config.options().entrySet()) { - httpServer = httpServer.option((ChannelOption) entry.getKey(), entry.getValue()); - } - - if (config.sslProvider() != null) { - httpServer.secure(config.sslProvider()); - } - - return httpServer; - } - static final int DEFAULT_PORT = 0; } diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java b/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java index edb2edf16b..61ac3b35a6 100644 --- a/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java +++ b/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java @@ -112,7 +112,6 @@ import reactor.netty.resources.ConnectionProvider; import reactor.netty.resources.LoopResources; import reactor.netty.tcp.SslProvider; -import reactor.netty.tcp.TcpClient; import reactor.netty.tcp.TcpServer; import reactor.test.StepVerifier; import reactor.util.Logger; @@ -2373,15 +2372,6 @@ void testHttpClientWithDomainSocketsWithPort() { .block(Duration.ofSeconds(30))); } - @Test - void testApplyTcpClientSSLConfig() throws Exception { - SslContext sslContext = SslContextBuilder.forClient().build(); - TcpClient tcpClient = TcpClient.create().secure(sslProviderBuilder -> sslProviderBuilder.sslContext(sslContext)); - HttpClient httpClient = HttpClientConnect.applyTcpClientConfig(tcpClient.configuration()); - - assertThat(tcpClient.configuration().sslProvider()).isEqualTo(httpClient.configuration().sslProvider()); - } - @Test void testUriNotAbsolute_1() { assertThatExceptionOfType(IllegalArgumentException.class)