diff --git a/build.gradle b/build.gradle index 8cd608370e..2fd6598fbd 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ subprojects { subproject -> aspectjVersion = '1.8.4' apacheSshdVersion = '0.13.0' boonVersion = '0.31' - chronicleVersion = '3.3.4' + chronicleVersion = '3.4.3' commonsDbcpVersion = '1.4' commonsIoVersion = '2.4' commonsNetVersion = '3.3' @@ -113,8 +113,8 @@ subprojects { subproject -> openJpaVersion = '2.3.0' pahoMqttClientVersion = '0.4.0' postgresVersion = '9.1-901-1.jdbc4' - reactorVersion = '2.0.0.RC1' - reactorSpringVersion = '2.0.0.RC1' + reactorVersion = '2.0.1.BUILD-SNAPSHOT' + reactorSpringVersion = '2.0.1.BUILD-SNAPSHOT' romeToolsVersion = '1.5.0' saajApiVersion = '1.3.5' saajImplVersion = '1.3.23' @@ -263,7 +263,7 @@ project('spring-integration-core') { compile "org.springframework:spring-messaging:$springVersion" compile "org.springframework:spring-tx:$springVersion" compile "org.springframework.retry:spring-retry:$springRetryVersion" - compile ("io.projectreactor:reactor-core:$reactorVersion", optional) + compile ("io.projectreactor:reactor-stream:$reactorVersion", optional) compile("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional) compile("com.jayway.jsonpath:json-path:$jsonpathVersion", optional) compile("io.fastjson:boon:$boonVersion", optional) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java index c9cd4a95be..7e4ba31fcf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.io.IOException; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; @@ -35,7 +36,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -133,7 +133,7 @@ public class QueueChannelTests { } @Test - public void testBlockingReceiveWithNoTimeout() throws Exception{ + public void testBlockingReceiveWithNoTimeout() throws Exception { final QueueChannel channel = new QueueChannel(); final AtomicBoolean receiveInterrupted = new AtomicBoolean(false); final CountDownLatch latch = new CountDownLatch(1); @@ -154,7 +154,7 @@ public class QueueChannelTests { } @Test - public void testBlockingReceiveWithTimeout() throws Exception{ + public void testBlockingReceiveWithTimeout() throws Exception { final QueueChannel channel = new QueueChannel(); final AtomicBoolean receiveInterrupted = new AtomicBoolean(false); final CountDownLatch latch = new CountDownLatch(1); @@ -188,7 +188,7 @@ public class QueueChannelTests { } @Test - public void testBlockingSendWithNoTimeout() throws Exception{ + public void testBlockingSendWithNoTimeout() throws Exception { final QueueChannel channel = new QueueChannel(1); boolean result1 = channel.send(new GenericMessage("test-1")); assertTrue(result1); @@ -210,7 +210,7 @@ public class QueueChannelTests { } @Test - public void testBlockingSendWithTimeout() throws Exception{ + public void testBlockingSendWithTimeout() throws Exception { final QueueChannel channel = new QueueChannel(1); boolean result1 = channel.send(new GenericMessage("test-1")); assertTrue(result1); @@ -278,14 +278,14 @@ public class QueueChannelTests { public final TemporaryFolder tempFolder = new TemporaryFolder(); @Test - @Ignore //INT-3644 - public void testReactorPersistentQueue() throws InterruptedException { + public void testReactorPersistentQueue() throws InterruptedException, IOException { final AtomicBoolean messageReceived = new AtomicBoolean(false); final CountDownLatch latch = new CountDownLatch(1); PersistentQueue> queue = new PersistentQueueSpec>() .codec(new JavaSerializationCodec>()) .basePath(this.tempFolder.getRoot().getAbsolutePath()) .get(); + final QueueChannel channel = new QueueChannel(queue); new Thread(new Runnable() { @Override