Skip to content

Commit f0a6cb7

Browse files
artembilangaryrussell
authored andcommitted
Upgrade to Reactor-3.1.4, Reactor-Netty-0.7.4
* Fix `StompServerIntegrationTests` for disabling connection pool to workaround the regression in the Reactor-Netty-0.7.4 Related to reactor/reactor-netty#290
1 parent 10120cd commit f0a6cb7

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ subprojects { subproject ->
125125
mysqlVersion = '6.0.6'
126126
pahoMqttClientVersion = '1.2.0'
127127
postgresVersion = '42.0.0'
128-
reactorNettyVersion = '0.7.3.RELEASE'
129-
reactorVersion = '3.1.3.RELEASE'
128+
reactorNettyVersion = '0.7.4.RELEASE'
129+
reactorVersion = '3.1.4.RELEASE'
130130
romeToolsVersion = '1.8.0'
131131
servletApiVersion = '4.0.0'
132132
smackVersion = '4.2.2'

spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@
6060
import org.springframework.messaging.PollableChannel;
6161
import org.springframework.messaging.simp.stomp.ReactorNettyTcpStompClient;
6262
import org.springframework.messaging.simp.stomp.StompCommand;
63+
import org.springframework.messaging.simp.stomp.StompReactorNettyCodec;
6364
import org.springframework.messaging.support.GenericMessage;
65+
import org.springframework.messaging.tcp.reactor.ReactorNettyTcpClient;
6466
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
6567
import org.springframework.util.SocketUtils;
6668

@@ -96,7 +98,12 @@ public static void setup() throws Exception {
9698
activeMQBroker.getSystemUsage().getTempUsage().setLimit(1024 * 1024 * 5);
9799
activeMQBroker.start();
98100

99-
stompClient = new ReactorNettyTcpStompClient("127.0.0.1", port);
101+
102+
// TODO until Reactor Bismuth-SR7 stompClient = new ReactorNettyTcpStompClient("127.0.0.1", port);
103+
stompClient = new ReactorNettyTcpStompClient(
104+
new ReactorNettyTcpClient<>(options -> options.disablePool().host("127.0.0.1").port(port),
105+
new StompReactorNettyCodec()));
106+
100107
stompClient.setMessageConverter(new PassThruMessageConverter());
101108
ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
102109
taskScheduler.afterPropertiesSet();

0 commit comments

Comments
 (0)