From 3d2e2cb3aed05ff0e299a6351cb79476805e52d5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 17 Aug 2015 13:00:29 +0200 Subject: [PATCH] Upgrade to Reactor 2.0.5 --- build.gradle | 2 +- .../messaging/tcp/reactor/Reactor2TcpConnection.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5bf6555c566..36168746d0a 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ configure(allprojects) { project -> ext.openjpaVersion = "2.4.0" ext.poiVersion = "3.12" ext.protobufVersion = "2.6.1" - ext.reactorVersion = "2.0.4.RELEASE" + ext.reactorVersion = "2.0.5.RELEASE" ext.romeVersion = "1.5.1" ext.seleniumVersion = "2.47.1" ext.slf4jVersion = "1.7.12" diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor2TcpConnection.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor2TcpConnection.java index ff2f8ba585e..6770aabf97f 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor2TcpConnection.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor2TcpConnection.java @@ -16,7 +16,6 @@ package org.springframework.messaging.tcp.reactor; -import reactor.fn.Functions; import reactor.io.net.ChannelStream; import reactor.rx.Promise; import reactor.rx.Promises; @@ -58,13 +57,15 @@ public class Reactor2TcpConnection

implements TcpConnection

{ } @Override + @SuppressWarnings("deprecation") public void onReadInactivity(Runnable runnable, long inactivityDuration) { - this.channelStream.on().readIdle(inactivityDuration, Functions.consumer(runnable)); + this.channelStream.on().readIdle(inactivityDuration, reactor.fn.Functions.consumer(runnable)); } @Override + @SuppressWarnings("deprecation") public void onWriteInactivity(Runnable runnable, long inactivityDuration) { - this.channelStream.on().writeIdle(inactivityDuration, Functions.consumer(runnable)); + this.channelStream.on().writeIdle(inactivityDuration, reactor.fn.Functions.consumer(runnable)); } @Override