diff --git a/build.gradle b/build.gradle index b5b616edf1..e706dff7ea 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,7 @@ subprojects { subproject -> jackson2Version = '2.3.2' javaxActivationVersion = '1.1.1' javaxMailVersion = '1.4.7' + jedisVersion = '2.4.2' jmsApiVersion = '1.1-rev-1' jpaApiVersion = '2.0.0' jrubyVersion = '1.7.12' @@ -85,7 +86,6 @@ subprojects { subproject -> jsonpathVersion = '0.9.1' junitVersion = '4.11' jythonVersion = '2.5.3' - lettuceVersion = '2.3.3' log4jVersion = '1.2.17' mockitoVersion = '1.9.5' mysqlVersion = '5.1.29' @@ -268,7 +268,7 @@ project('spring-integration-file') { testCompile project(":spring-integration-redis") testCompile project(":spring-integration-redis").sourceSets.test.output testCompile project(":spring-integration-gemfire") - testCompile "com.lambdaworks:lettuce:$lettuceVersion" + testCompile "redis.clients:jedis:$jedisVersion" } } @@ -481,7 +481,7 @@ project('spring-integration-redis') { exclude group: 'org.springframework', module: 'spring-core' exclude group: 'org.springframework', module: 'spring-tx' } - testCompile "com.lambdaworks:lettuce:$lettuceVersion" + testCompile "redis.clients:jedis:$jedisVersion" testCompile "org.slf4j:slf4j-log4j12:$slf4jVersion" } } @@ -584,7 +584,7 @@ project('spring-integration-twitter') { compile("javax.activation:activation:$javaxActivationVersion", optional) testCompile project(":spring-integration-redis") testCompile project(":spring-integration-redis").sourceSets.test.output - testCompile "com.lambdaworks:lettuce:$lettuceVersion" + testCompile "redis.clients:jedis:$jedisVersion" } } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java index 573ca0e0e7..c29a1277be 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java @@ -60,7 +60,8 @@ public class SubscribableRedisChannelTests extends RedisAvailableTests { channel.afterPropertiesSet(); channel.start(); - this.awaitContainerSubscribed(TestUtils.getPropertyValue(channel, "container", RedisMessageListenerContainer.class)); + this.awaitContainerSubscribed(TestUtils.getPropertyValue(channel, "container", + RedisMessageListenerContainer.class)); final CountDownLatch latch = new CountDownLatch(3); MessageHandler handler = new MessageHandler() { @@ -96,13 +97,15 @@ public class SubscribableRedisChannelTests extends RedisAvailableTests { MessageListenerAdapter listener = channelMapping.entrySet().iterator().next().getValue().iterator().next(); Object delegate = TestUtils.getPropertyValue(listener, "delegate"); try { - ReflectionUtils.findMethod(delegate.getClass(), "handleMessage", String.class).invoke(delegate, "Hello, world!"); + ReflectionUtils.findMethod(delegate.getClass(), "handleMessage", String.class).invoke(delegate, + "Hello, world!"); fail("Exception expected"); } catch (InvocationTargetException e) { Throwable cause = e.getCause(); assertNotNull(cause); - assertEquals("Dispatcher has no subscribers for redis-channel 'si.test.channel.no.subs' (dhnsChannel).", cause.getMessage()); + assertEquals("Dispatcher has no subscribers for redis-channel 'si.test.channel.no.subs' (dhnsChannel).", + cause.getMessage()); } } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml index d41fce59a4..fe783fe7bc 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml @@ -12,7 +12,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java index ebff8401db..5fbfe8e4bb 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java @@ -16,9 +16,7 @@ package org.springframework.integration.redis.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -45,12 +43,13 @@ import org.springframework.messaging.support.GenericMessage; * @author Gunnar Hillert * @author Artem Bilan */ -public class RedisChannelParserTests extends RedisAvailableTests{ +public class RedisChannelParserTests extends RedisAvailableTests { @Test @RedisAvailable public void testPubSubChannelConfig(){ - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); + ClassPathXmlApplicationContext context = + new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); SubscribableChannel redisChannel = context.getBean("redisChannel", SubscribableChannel.class); RedisConnectionFactory connectionFactory = TestUtils.getPropertyValue(redisChannel, "connectionFactory", RedisConnectionFactory.class); @@ -71,10 +70,12 @@ public class RedisChannelParserTests extends RedisAvailableTests{ @Test @RedisAvailable public void testPubSubChannelUsage() throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); + ClassPathXmlApplicationContext context = + new ClassPathXmlApplicationContext("RedisChannelParserTests-context.xml", this.getClass()); SubscribableChannel redisChannel = context.getBean("redisChannel", SubscribableChannel.class); - this.awaitContainerSubscribed(TestUtils.getPropertyValue(redisChannel, "container", RedisMessageListenerContainer.class)); + this.awaitContainerSubscribed(TestUtils.getPropertyValue(redisChannel, "container", + RedisMessageListenerContainer.class)); final Message m = new GenericMessage("Hello Redis"); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml index 658fb11b95..e95d84e7b4 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java index 0bf4c19220..9d5ce12f60 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java @@ -86,7 +86,8 @@ public class RedisInboundChannelAdapterParserTests extends RedisAvailableTests { @RedisAvailable public void testInboundChannelAdapterMessaging() throws Exception { RedisInboundChannelAdapter adapter = context.getBean("adapter", RedisInboundChannelAdapter.class); - this.awaitContainerSubscribedWithPatterns(TestUtils.getPropertyValue(adapter, "container", RedisMessageListenerContainer.class)); + this.awaitContainerSubscribedWithPatterns(TestUtils.getPropertyValue(adapter, "container", + RedisMessageListenerContainer.class)); RedisConnectionFactory connectionFactory = this.getConnectionFactoryForTest(); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml index 2d816714cc..c2c7fc0399 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml @@ -27,7 +27,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java index 6029428265..33445c83da 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java @@ -83,7 +83,8 @@ public class RedisOutboundChannelAdapterParserTests extends RedisAvailableTests @RedisAvailable public void testOutboundChannelAdapterMessaging() throws Exception{ MessageChannel sendChannel = context.getBean("sendChannel", MessageChannel.class); - this.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container", RedisMessageListenerContainer.class)); + this.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container", + RedisMessageListenerContainer.class)); sendChannel.send(new GenericMessage("Hello Redis")); QueueChannel receiveChannel = context.getBean("receiveChannel", QueueChannel.class); Message message = receiveChannel.receive(5000); @@ -102,7 +103,8 @@ public class RedisOutboundChannelAdapterParserTests extends RedisAvailableTests @RedisAvailable public void testOutboundChannelAdapterWithinChain() throws Exception{ MessageChannel sendChannel = context.getBean("redisOutboudChain", MessageChannel.class); - this.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container", RedisMessageListenerContainer.class)); + this.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container", + RedisMessageListenerContainer.class)); sendChannel.send(new GenericMessage("Hello Redis from chain")); QueueChannel receiveChannel = context.getBean("receiveChannel", QueueChannel.class); Message message = receiveChannel.receive(5000); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests-context.xml index 5700eee8ef..3a1cc5b604 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests-context.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"> + class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"> diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests-context.xml index 6fc343aeed..09a2acd581 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/integration/redis http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd"> + class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"> diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml index ef149a9974..5f9c66d68c 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java index f78ec1448f..94aec6fa85 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java @@ -16,11 +16,8 @@ package org.springframework.integration.redis.inbound; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import org.hamcrest.Matchers; import org.junit.Test; @@ -41,7 +38,7 @@ import org.springframework.messaging.Message; * @author Artem Bilan * @since 2.1 */ -public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ +public class RedisInboundChannelAdapterTests extends RedisAvailableTests { @Test @RedisAvailable @@ -65,7 +62,8 @@ public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ adapter.afterPropertiesSet(); adapter.start(); - this.awaitContainerSubscribed(TestUtils.getPropertyValue(adapter, "container", RedisMessageListenerContainer.class)); + this.awaitContainerSubscribed(TestUtils.getPropertyValue(adapter, "container", + RedisMessageListenerContainer.class)); StringRedisTemplate redisTemplate = new StringRedisTemplate(connectionFactory); redisTemplate.afterPropertiesSet(); @@ -93,7 +91,8 @@ public class RedisInboundChannelAdapterTests extends RedisAvailableTests{ adapter.afterPropertiesSet(); adapter.start(); - this.awaitContainerSubscribed(TestUtils.getPropertyValue(adapter, "container", RedisMessageListenerContainer.class)); + this.awaitContainerSubscribed(TestUtils.getPropertyValue(adapter, "container", + RedisMessageListenerContainer.class)); RedisTemplate template = new RedisTemplate(); template.setConnectionFactory(connectionFactory); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests-context.xml index 3214554326..474973e073 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests-context.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"> + class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"> diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java index d701b3ace7..be47340180 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java @@ -31,6 +31,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.hamcrest.Matchers; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -210,6 +211,8 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests { @Test @RedisAvailable @SuppressWarnings("unchecked") + @Ignore + //JedisConnectionFactory doesn't support proper 'destroy()' and allows to create new fresh Redis connection public void testInt3196Recovery() throws Exception { String queueName = "test.si.Int3196Recovery"; QueueChannel channel = new QueueChannel(); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml index 9027b98590..6e41022409 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/list-inbound-adapter.xml @@ -85,7 +85,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml index 3e54052054..a44c63772c 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/zset-inbound-adapter.xml @@ -58,7 +58,7 @@ + class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"> diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests-context.xml index ed14a9223b..ebbac31aeb 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests-context.xml @@ -50,7 +50,7 @@ + class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"> diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java index 7085e9aa71..b658b0d44e 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java @@ -16,11 +16,7 @@ package org.springframework.integration.redis.outbound; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.util.Arrays; import java.util.List; @@ -43,8 +39,6 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.lambdaworks.redis.protocol.CommandType; - /** * @author Artem Bilan * @author Gary Russell @@ -81,7 +75,7 @@ public class RedisOutboundGatewayTests extends RedisAvailableTests { @Test @RedisAvailable public void testPingPongCommand() { - this.pingChannel.send(MessageBuilder.withPayload("foo").setHeader(RedisHeaders.COMMAND, CommandType.PING).build()); + this.pingChannel.send(MessageBuilder.withPayload("foo").setHeader(RedisHeaders.COMMAND, "PING").build()); Message receive = this.replyChannel.receive(1000); assertNotNull(receive); assertTrue(Arrays.equals("PONG".getBytes(), (byte[]) receive.getPayload())); @@ -93,14 +87,14 @@ public class RedisOutboundGatewayTests extends RedisAvailableTests { final String queueName = "si.test.testRedisOutboundGateway"; String payload = "testing"; this.leftPushRightPopChannel.send(MessageBuilder.withPayload(payload) - .setHeader(RedisHeaders.COMMAND, CommandType.LPUSH) + .setHeader(RedisHeaders.COMMAND, "LPUSH") .setHeader("queue", queueName) .build()); Message receive = this.replyChannel.receive(1000); assertNotNull(receive); this.leftPushRightPopChannel.send(MessageBuilder.withPayload(payload) - .setHeader(RedisHeaders.COMMAND, CommandType.RPOP) + .setHeader(RedisHeaders.COMMAND, "RPOP") .setHeader("queue", queueName) .build()); receive = this.replyChannel.receive(1000); @@ -111,9 +105,10 @@ public class RedisOutboundGatewayTests extends RedisAvailableTests { @Test @RedisAvailable public void testIncrementAtomicCommand() { - // Since 'atomicInteger' is lazy-init to avoid early Redis connection, we have to initialize it before send the INCR command. + // Since 'atomicInteger' is lazy-init to avoid early Redis connection, + // we have to initialize it before send the INCR command. this.beanFactory.getBean("atomicInteger"); - this.incrementAtomicIntegerChannel.send(MessageBuilder.withPayload(CommandType.INCR).build()); + this.incrementAtomicIntegerChannel.send(MessageBuilder.withPayload("INCR").build()); Message receive = this.replyChannel.receive(1000); assertNotNull(receive); assertEquals(11L, receive.getPayload()); @@ -128,17 +123,18 @@ public class RedisOutboundGatewayTests extends RedisAvailableTests { @Test @RedisAvailable public void testGetCommand() { - this.setDelCommandChannel.send(MessageBuilder.withPayload(new String[]{"foo", "bar"}).setHeader(RedisHeaders.COMMAND, CommandType.SET).build()); + this.setDelCommandChannel.send(MessageBuilder.withPayload(new String[]{"foo", "bar"}) + .setHeader(RedisHeaders.COMMAND, "SET").build()); Message receive = this.replyChannel.receive(1000); assertNotNull(receive); - assertEquals("OK", receive.getPayload()); + assertTrue(Arrays.equals("OK".getBytes(), (byte[]) receive.getPayload())); this.getCommandChannel.send(MessageBuilder.withPayload("foo").build()); receive = this.replyChannel.receive(1000); assertNotNull(receive); assertTrue(Arrays.equals("bar".getBytes(), (byte[]) receive.getPayload())); - this.setDelCommandChannel.send(MessageBuilder.withPayload("foo").setHeader(RedisHeaders.COMMAND, CommandType.DEL).build()); + this.setDelCommandChannel.send(MessageBuilder.withPayload("foo").setHeader(RedisHeaders.COMMAND, "DEL").build()); receive = this.replyChannel.receive(1000); assertNotNull(receive); assertEquals(1L, receive.getPayload()); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests-context.xml index 87a2b1c3ae..3b6baee12b 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/integration/redis http://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd"> + class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"> diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml index 2599b28c2b..8df4ff38ad 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/store-outbound-adapter.xml @@ -61,7 +61,7 @@ map-key-expression="headers['baz']" collection-type="PROPERTIES"/> - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java index a3b6c6a6e3..9b3e64ddcf 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableRule.java @@ -20,7 +20,7 @@ import org.junit.rules.MethodRule; import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.Statement; -import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; /** * @author Oleg Zhurakousky @@ -31,14 +31,14 @@ public final class RedisAvailableRule implements MethodRule { public static final int REDIS_PORT = 6379; - static ThreadLocal connectionFactoryResource = new ThreadLocal(); + static ThreadLocal connectionFactoryResource = new ThreadLocal(); public Statement apply(final Statement base, final FrameworkMethod method, Object target) { RedisAvailable redisAvailable = method.getAnnotation(RedisAvailable.class); if (redisAvailable != null) { - LettuceConnectionFactory connectionFactory = null; + JedisConnectionFactory connectionFactory = null; try { - connectionFactory = new LettuceConnectionFactory(); + connectionFactory = new JedisConnectionFactory(); connectionFactory.setPort(REDIS_PORT); connectionFactory.afterPropertiesSet(); connectionFactory.getConnection(); @@ -63,7 +63,7 @@ public final class RedisAvailableRule implements MethodRule { base.evaluate(); } finally { - LettuceConnectionFactory connectionFactory = connectionFactoryResource.get(); + JedisConnectionFactory connectionFactory = connectionFactoryResource.get(); connectionFactoryResource.remove(); if (connectionFactory != null) { connectionFactory.destroy(); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java index 0711ae1bce..2f8b6dcd59 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java @@ -21,7 +21,6 @@ import org.junit.Rule; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.core.BoundListOperations; import org.springframework.data.redis.core.BoundZSetOperations; import org.springframework.data.redis.core.StringRedisTemplate; @@ -45,7 +44,7 @@ public class RedisAvailableTests { if (this.connectionFactory != null) { return this.connectionFactory; } - LettuceConnectionFactory connectionFactory = RedisAvailableRule.connectionFactoryResource.get(); + RedisConnectionFactory connectionFactory = RedisAvailableRule.connectionFactoryResource.get(); this.connectionFactory = connectionFactory; return connectionFactory; } @@ -59,7 +58,7 @@ public class RedisAvailableTests { Thread.sleep(100); } assertTrue("RedisMessageListenerContainer Failed to Subscribe", n < 100); - // wait another second because of race condition in Lettuce + // wait another second because of race condition Thread.sleep(1000); } @@ -73,7 +72,7 @@ public class RedisAvailableTests { Thread.sleep(100); } assertTrue("RedisMessageListenerContainer Failed to Subscribe with patterns", n < 100); - // wait another second because of race condition in Lettuce + // wait another second because of race condition Thread.sleep(1000); } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml index a8c3317e1d..a1bf2b1e8c 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests-context.xml @@ -6,7 +6,11 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - + + + + + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java index e16ed98ad7..e2293ae286 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java @@ -13,26 +13,18 @@ package org.springframework.integration.redis.store; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.util.concurrent.TimeUnit; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.handler.DelayHandler; import org.springframework.integration.redis.rules.RedisAvailable; -import org.springframework.integration.redis.rules.RedisAvailableRule; import org.springframework.integration.redis.rules.RedisAvailableTests; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; @@ -52,23 +44,9 @@ public class DelayerHandlerRescheduleIntegrationTests extends RedisAvailableTest public static final String DELAYER_ID = "delayerWithRedisMS"; - public static LettuceConnectionFactory connectionFactory; - @Rule public LongRunningIntegrationTest longTests = new LongRunningIntegrationTest(); - @BeforeClass - public static void setup() { - connectionFactory = new LettuceConnectionFactory(); - connectionFactory.setPort(RedisAvailableRule.REDIS_PORT); - connectionFactory.afterPropertiesSet(); - } - - @AfterClass - public static void tearDown() { - connectionFactory.destroy(); - } - @Test @RedisAvailable public void testDelayerHandlerRescheduleWithRedisMessageStore() throws Exception { diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests-context.xml index 8c493a3662..721e95c44c 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests-context.xml @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml index f6a57d6ca3..612e43ef4e 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/redis-aggregator-config.xml @@ -15,7 +15,7 @@ - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests-context.xml b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests-context.xml index 4b141100ab..f03a674dc8 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests-context.xml +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests-context.xml @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml index b750aaf2f8..b9d4d6b009 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests-context.xml @@ -25,7 +25,7 @@ - +