diff --git a/spring-data-redis/pom.xml b/spring-data-redis/pom.xml index fdb2d7185..997cfc986 100644 --- a/spring-data-redis/pom.xml +++ b/spring-data-redis/pom.xml @@ -14,7 +14,7 @@ 03122010 - 1.5.0 + 1.5.1 diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java index 936981bd5..c12e884f5 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java @@ -58,9 +58,6 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean * Constructs a new JredisConnectionFactory instance. */ public JredisConnectionFactory() { - ConnectionSpec newSpec = DefaultConnectionSpec.newSpec(); - newSpec.setConnectionFlag(Connection.Flag.RELIABLE, false); - this.connectionSpec = newSpec; } /** @@ -77,7 +74,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean public void afterPropertiesSet() { if (connectionSpec == null) { Assert.hasText(hostName); - connectionSpec = DefaultConnectionSpec.newSpec(hostName, DEFAULT_REDIS_PORT, DEFAULT_REDIS_DB, + connectionSpec = DefaultConnectionSpec.newSpec(hostName, port, DEFAULT_REDIS_DB, DEFAULT_REDIS_PASSWORD); connectionSpec.setConnectionFlag(Connection.Flag.RELIABLE, false); diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/SettingsUtils.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/SettingsUtils.java new file mode 100644 index 000000000..70a9f23fd --- /dev/null +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/SettingsUtils.java @@ -0,0 +1,47 @@ +/* + * Copyright 2010 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.keyvalue.redis; + +import java.util.Properties; + +/** + * @author Costin Leau + */ +public abstract class SettingsUtils { + private final static Properties DEFAULTS = new Properties(); + private static final Properties SETTINGS; + + static { + DEFAULTS.put("host", "localhost"); + DEFAULTS.put("port", "6379"); + + SETTINGS = new Properties(DEFAULTS); + + try { + SETTINGS.load(SettingsUtils.class.getResourceAsStream("/org/springframework/data/keyvalue/redis/test.properties")); + } catch (Exception e) { + throw new IllegalArgumentException("Cannot read settings"); + } + } + + public static String getHost() { + return SETTINGS.getProperty("host"); + } + + public static int getPort() { + return Integer.valueOf(SETTINGS.getProperty("port")); + } +} diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/AbstractConnectionIntegrationTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/AbstractConnectionIntegrationTests.java index a2efefdac..600abb062 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/AbstractConnectionIntegrationTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/AbstractConnectionIntegrationTests.java @@ -25,8 +25,8 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.keyvalue.redis.Address; import org.springframework.data.keyvalue.redis.Person; -import org.springframework.data.keyvalue.redis.serializer.RedisSerializer; import org.springframework.data.keyvalue.redis.serializer.JdkSerializationRedisSerializer; +import org.springframework.data.keyvalue.redis.serializer.RedisSerializer; import org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer; public abstract class AbstractConnectionIntegrationTests { @@ -81,4 +81,4 @@ public abstract class AbstractConnectionIntegrationTests { assertNotNull(rawValue); assertEquals(person, serializer.deserialize(rawValue)); } -} +} \ No newline at end of file diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java index f407dc1c7..e9f01b5fa 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java @@ -16,9 +16,9 @@ package org.springframework.data.keyvalue.redis.connection.jedis; +import org.springframework.data.keyvalue.redis.SettingsUtils; import org.springframework.data.keyvalue.redis.connection.AbstractConnectionIntegrationTests; import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; -import org.springframework.data.keyvalue.redis.connection.jedis.JedisConnectionFactory; public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrationTests { @@ -27,6 +27,10 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati public JedisConnectionIntegrationTests() { factory = new JedisConnectionFactory(); factory.setUsePool(false); + + factory.setPort(SettingsUtils.getPort()); + factory.setHostName(SettingsUtils.getHost()); + factory.afterPropertiesSet(); } diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jredis/JRedisConnectionIntegrationTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jredis/JRedisConnectionIntegrationTests.java index 9537d548e..2e9c56c72 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jredis/JRedisConnectionIntegrationTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jredis/JRedisConnectionIntegrationTests.java @@ -18,6 +18,7 @@ package org.springframework.data.keyvalue.redis.connection.jredis; import org.jredis.JRedis; import org.junit.Test; +import org.springframework.data.keyvalue.redis.SettingsUtils; import org.springframework.data.keyvalue.redis.connection.AbstractConnectionIntegrationTests; import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; @@ -27,6 +28,9 @@ public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrat public JRedisConnectionIntegrationTests() { factory = new JredisConnectionFactory(); + factory.setPort(SettingsUtils.getPort()); + factory.setHostName(SettingsUtils.getHost()); + factory.setUsePool(false); factory.afterPropertiesSet(); } diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java index 4585c6492..506a167da 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.Collection; import org.springframework.data.keyvalue.redis.Person; +import org.springframework.data.keyvalue.redis.SettingsUtils; import org.springframework.data.keyvalue.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.keyvalue.redis.connection.jredis.JredisConnectionFactory; import org.springframework.data.keyvalue.redis.core.RedisTemplate; @@ -35,6 +36,10 @@ public abstract class CollectionTestParams { JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); jedisConnFactory.setUsePool(false); + + jedisConnFactory.setPort(SettingsUtils.getPort()); + jedisConnFactory.setHostName(SettingsUtils.getHost()); + jedisConnFactory.afterPropertiesSet(); RedisTemplate stringTemplate = new RedisTemplate(jedisConnFactory); @@ -42,6 +47,10 @@ public abstract class CollectionTestParams { JredisConnectionFactory jredisConnFactory = new JredisConnectionFactory(); jredisConnFactory.setUsePool(false); + + jredisConnFactory.setPort(SettingsUtils.getPort()); + jredisConnFactory.setHostName(SettingsUtils.getHost()); + jredisConnFactory.afterPropertiesSet(); RedisTemplate stringTemplateJR = new RedisTemplate(jredisConnFactory); diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java index c1e868fe8..d3e908ef1 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java @@ -20,11 +20,10 @@ import java.util.Collection; import org.junit.runners.Parameterized.Parameters; import org.springframework.data.keyvalue.redis.Person; +import org.springframework.data.keyvalue.redis.SettingsUtils; import org.springframework.data.keyvalue.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.keyvalue.redis.connection.jredis.JredisConnectionFactory; import org.springframework.data.keyvalue.redis.core.RedisTemplate; -import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisMap; -import org.springframework.data.keyvalue.redis.support.collections.RedisMap; /** * Integration test for RedisMap. @@ -51,6 +50,10 @@ public class RedisMapTests extends AbstractRedisMapTests { JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); jedisConnFactory.setUsePool(false); + + jedisConnFactory.setPort(SettingsUtils.getPort()); + jedisConnFactory.setHostName(SettingsUtils.getHost()); + jedisConnFactory.afterPropertiesSet(); RedisTemplate genericTemplate = new RedisTemplate(jedisConnFactory); @@ -58,6 +61,11 @@ public class RedisMapTests extends AbstractRedisMapTests { JredisConnectionFactory jredisConnFactory = new JredisConnectionFactory(); jredisConnFactory.setUsePool(false); + + jredisConnFactory.setPort(SettingsUtils.getPort()); + jredisConnFactory.setHostName(SettingsUtils.getHost()); + + jredisConnFactory.afterPropertiesSet(); RedisTemplate genericTemplateJR = new RedisTemplate(jredisConnFactory);