diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java index fa1704a353..da496eed34 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java @@ -88,22 +88,22 @@ public class ReactorNettyTcpClient

implements TcpOperations

{ * Basic constructor with a host and a port. */ public ReactorNettyTcpClient(String host, int port, ReactorNettyCodec

codec) { - this(opts -> opts.connect(host, port), codec); + this(opts -> opts.host(host).port(port), codec); } /** - * Alternate constructor with a {@link ClientOptions} consumer providing - * additional control beyond a host and a port. + * Alternate constructor with a {@link ClientOptions.Builder} consumer + * providing additional control beyond a host and a port. */ - public ReactorNettyTcpClient(Consumer optionsConsumer, ReactorNettyCodec

codec) { - Assert.notNull(optionsConsumer, "Consumer is required"); + public ReactorNettyTcpClient(Consumer> optionsConsumer, ReactorNettyCodec

codec) { + Assert.notNull(optionsConsumer, "Consumer is required"); Assert.notNull(codec, "ReactorNettyCodec is required"); this.channelGroup = new DefaultChannelGroup(ImmediateEventExecutor.INSTANCE); this.loopResources = LoopResources.create("reactor-netty-tcp-client"); this.poolResources = PoolResources.fixed("reactor-netty-tcp-pool"); - Consumer builtInConsumer = opts -> opts + Consumer> builtInConsumer = opts -> opts .channelGroup(this.channelGroup) .loopResources(this.loopResources) .poolResources(this.poolResources) diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java index 75eef4c721..e13fa1c831 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java @@ -48,9 +48,10 @@ public class ReactorClientHttpConnector implements ClientHttpConnector { } /** - * Create a Reactor Netty {@link ClientHttpConnector} with the given {@link ClientOptions} + * Create a Reactor Netty {@link ClientHttpConnector} with the given + * {@link HttpClientOptions.Builder} */ - public ReactorClientHttpConnector(Consumer clientOptions) { + public ReactorClientHttpConnector(Consumer clientOptions) { this.httpClient = HttpClient.create(clientOptions); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java index e60cfc6cf6..42fa2ec8d1 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java @@ -52,10 +52,10 @@ public class ReactorNettyWebSocketClient extends WebSocketClientSupport implemen } /** - * Constructor that accepts an {@link HttpClientOptions} consumer to supply - * to {@link HttpClient#create(Consumer)}. + * Constructor that accepts an {@link HttpClientOptions.Builder} consumer + * to supply to {@link HttpClient#create(Consumer)}. */ - public ReactorNettyWebSocketClient(Consumer clientOptions) { + public ReactorNettyWebSocketClient(Consumer clientOptions) { this.httpClient = HttpClient.create(clientOptions); }