root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt to the changes in Reactor Netty ClientOptions 

ClientOptions/HttpClientOptions are now created via Builder
This commit is contained in:
Violeta Georgieva 2017-07-04 14:05:17 +03:00 committed by Brian Clozel
parent f7478446b7
commit fd1859c34c
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java
View File

@ -88,22 +88,22 @@ public class ReactorNettyTcpClient<P> implements TcpOperations<P> {
* Basic constructor with a host and a port. * Basic constructor with a host and a port.
*/ */
public ReactorNettyTcpClient(String host, int port, ReactorNettyCodec<P> codec) { public ReactorNettyTcpClient(String host, int port, ReactorNettyCodec<P> codec) {
this(opts -> opts.connect(host, port), codec); this(opts -> opts.host(host).port(port), codec);
} }
/** /**
* Alternate constructor with a {@link ClientOptions} consumer providing * Alternate constructor with a {@link ClientOptions.Builder<?>} consumer
* additional control beyond a host and a port. * providing additional control beyond a host and a port.
*/ */
public ReactorNettyTcpClient(Consumer<ClientOptions> optionsConsumer, ReactorNettyCodec<P> codec) { public ReactorNettyTcpClient(Consumer<ClientOptions.Builder<?>> optionsConsumer, ReactorNettyCodec<P> codec) {
Assert.notNull(optionsConsumer, "Consumer<ClientOptions> is required"); Assert.notNull(optionsConsumer, "Consumer<ClientOptions.Builder<?> is required");
Assert.notNull(codec, "ReactorNettyCodec is required"); Assert.notNull(codec, "ReactorNettyCodec is required");
this.channelGroup = new DefaultChannelGroup(ImmediateEventExecutor.INSTANCE); this.channelGroup = new DefaultChannelGroup(ImmediateEventExecutor.INSTANCE);
this.loopResources = LoopResources.create("reactor-netty-tcp-client"); this.loopResources = LoopResources.create("reactor-netty-tcp-client");
this.poolResources = PoolResources.fixed("reactor-netty-tcp-pool"); this.poolResources = PoolResources.fixed("reactor-netty-tcp-pool");
Consumer<ClientOptions> builtInConsumer = opts -> opts Consumer<ClientOptions.Builder<?>> builtInConsumer = opts -> opts
.channelGroup(this.channelGroup) .channelGroup(this.channelGroup)
.loopResources(this.loopResources) .loopResources(this.loopResources)
.poolResources(this.poolResources) .poolResources(this.poolResources)

5
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
View File

@ -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<? super HttpClientOptions> clientOptions) { public ReactorClientHttpConnector(Consumer<? super HttpClientOptions.Builder> clientOptions) {
this.httpClient = HttpClient.create(clientOptions); this.httpClient = HttpClient.create(clientOptions);
} }

6
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java
View File

@ -52,10 +52,10 @@ public class ReactorNettyWebSocketClient extends WebSocketClientSupport implemen
} }
/** /**
* Constructor that accepts an {@link HttpClientOptions} consumer to supply * Constructor that accepts an {@link HttpClientOptions.Builder} consumer
* to {@link HttpClient#create(Consumer)}. * to supply to {@link HttpClient#create(Consumer)}.
*/ */
public ReactorNettyWebSocketClient(Consumer<? super HttpClientOptions> clientOptions) { public ReactorNettyWebSocketClient(Consumer<? super HttpClientOptions.Builder> clientOptions) {
this.httpClient = HttpClient.create(clientOptions); this.httpClient = HttpClient.create(clientOptions);
} }