From b4f5f884e554adfca679e8d49f1bb43228a12b9d Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 15 Dec 2010 12:07:32 +0200 Subject: [PATCH] + changed pooling to usePool for Jedis and JRedis connections --- .../redis/connection/jedis/JedisConnectionFactory.java | 4 ++-- .../redis/connection/jredis/JredisConnectionFactory.java | 4 ++-- .../connection/jedis/JedisConnectionIntegrationTests.java | 2 +- .../connection/jredis/JRedisConnectionIntegrationTests.java | 2 +- .../redis/support/collections/CollectionTestParams.java | 4 ++-- .../keyvalue/redis/support/collections/RedisMapTests.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java index fdc011c8e..074c14104 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java @@ -217,7 +217,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean, * * @return Returns the use of connection pooling. */ - public boolean isPooling() { + public boolean getUsePool() { return usePool; } @@ -226,7 +226,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean, * * @param usePool The usePool to set. */ - public void setPooling(boolean usePool) { + public void setUsePool(boolean usePool) { this.usePool = usePool; } } \ No newline at end of file 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 79e3ec205..936981bd5 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 @@ -178,7 +178,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean * * @return Returns the use of connection pooling. */ - public boolean isPooling() { + public boolean getUsePool() { return usePool; } @@ -187,7 +187,7 @@ public class JredisConnectionFactory implements InitializingBean, DisposableBean * * @param usePool The usePool to set. */ - public void setPooling(boolean usePool) { + public void setUsePool(boolean usePool) { this.usePool = usePool; } 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 c5c2ec171..f407dc1c7 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 @@ -26,7 +26,7 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati public JedisConnectionIntegrationTests() { factory = new JedisConnectionFactory(); - factory.setPooling(false); + factory.setUsePool(false); 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 f6ea2489c..9537d548e 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 @@ -27,7 +27,7 @@ public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrat public JRedisConnectionIntegrationTests() { factory = new JredisConnectionFactory(); - factory.setPooling(false); + 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 51fadfeb1..4585c6492 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 @@ -34,14 +34,14 @@ public abstract class CollectionTestParams { ObjectFactory personFactory = new PersonObjectFactory(); JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setPooling(false); + jedisConnFactory.setUsePool(false); jedisConnFactory.afterPropertiesSet(); RedisTemplate stringTemplate = new RedisTemplate(jedisConnFactory); RedisTemplate personTemplate = new RedisTemplate(jedisConnFactory); JredisConnectionFactory jredisConnFactory = new JredisConnectionFactory(); - jredisConnFactory.setPooling(false); + jredisConnFactory.setUsePool(false); 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 88325727b..c1e868fe8 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 @@ -50,14 +50,14 @@ public class RedisMapTests extends AbstractRedisMapTests { ObjectFactory personFactory = new PersonObjectFactory(); JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setPooling(false); + jedisConnFactory.setUsePool(false); jedisConnFactory.afterPropertiesSet(); RedisTemplate genericTemplate = new RedisTemplate(jedisConnFactory); JredisConnectionFactory jredisConnFactory = new JredisConnectionFactory(); - jredisConnFactory.setPooling(false); + jredisConnFactory.setUsePool(false); jredisConnFactory.afterPropertiesSet(); RedisTemplate genericTemplateJR = new RedisTemplate(jredisConnFactory);