From f0a6cb7d412315d3b91e816ecc3cb3c22072002c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 20 Feb 2018 09:37:12 -0500 Subject: [PATCH] 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 https://github.com/reactor/reactor-netty/pull/290 --- build.gradle | 4 ++-- .../stomp/client/StompServerIntegrationTests.java | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b32309283c..1a675e757f 100644 --- a/build.gradle +++ b/build.gradle @@ -125,8 +125,8 @@ subprojects { subproject -> mysqlVersion = '6.0.6' pahoMqttClientVersion = '1.2.0' postgresVersion = '42.0.0' - reactorNettyVersion = '0.7.3.RELEASE' - reactorVersion = '3.1.3.RELEASE' + reactorNettyVersion = '0.7.4.RELEASE' + reactorVersion = '3.1.4.RELEASE' romeToolsVersion = '1.8.0' servletApiVersion = '4.0.0' smackVersion = '4.2.2' diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java index 118c3819f9..9b64056cc3 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java @@ -60,7 +60,9 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.simp.stomp.ReactorNettyTcpStompClient; import org.springframework.messaging.simp.stomp.StompCommand; +import org.springframework.messaging.simp.stomp.StompReactorNettyCodec; import org.springframework.messaging.support.GenericMessage; +import org.springframework.messaging.tcp.reactor.ReactorNettyTcpClient; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.SocketUtils; @@ -96,7 +98,12 @@ public class StompServerIntegrationTests { activeMQBroker.getSystemUsage().getTempUsage().setLimit(1024 * 1024 * 5); activeMQBroker.start(); - stompClient = new ReactorNettyTcpStompClient("127.0.0.1", port); + +// TODO until Reactor Bismuth-SR7 stompClient = new ReactorNettyTcpStompClient("127.0.0.1", port); + stompClient = new ReactorNettyTcpStompClient( + new ReactorNettyTcpClient<>(options -> options.disablePool().host("127.0.0.1").port(port), + new StompReactorNettyCodec())); + stompClient.setMessageConverter(new PassThruMessageConverter()); ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler(); taskScheduler.afterPropertiesSet();