diff --git a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java index 459aff3f7..b70438bb3 100644 --- a/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java @@ -15,8 +15,17 @@ */ package org.springframework.data.redis.connection; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Properties; +import java.util.Queue; +import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; @@ -299,7 +308,12 @@ public class DefaultStringRedisConnection implements StringRedisConnection, Deco return result; } + /* + * (non-Javadoc) + * @see org.springframework.data.redis.connection.RedisServerCommands#getConfig(java.lang.String) + */ public Properties getConfig(String pattern) { + Properties results = delegate.getConfig(pattern); if (isFutureConversion()) { addResultConverter(identityConverter); diff --git a/src/main/java/org/springframework/data/redis/connection/RedisServerCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisServerCommands.java index 082c33773..d5a3d9af7 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisServerCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisServerCommands.java @@ -144,8 +144,8 @@ public interface RedisServerCommands { /** * Load configuration parameters for given {@code pattern} from server. * - * @param pattern - * @return + * @param pattern must not be {@literal null}. + * @return never {@literal null}. * @see Redis Documentation: CONFIG GET */ Properties getConfig(String pattern); diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTests.java index e39efb904..01d956233 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTests.java +++ b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTests.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import org.apache.commons.collections.MapUtils; import org.junit.Before; import org.junit.Test; import org.springframework.data.geo.Distance; @@ -221,7 +220,10 @@ public class DefaultStringRedisConnectionPipelineTests extends DefaultStringRedi @Test // DATAREDIS-661 public void testGetConfig() { - Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar")); + + Properties results = new Properties(); + results.put("foo", "bar"); + doReturn(Arrays.asList(new Object[] { results })).when(nativeConnection).closePipeline(); super.testGetConfig(); } diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java index 822120703..ffaec2062 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java +++ b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionPipelineTxTests.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import org.apache.commons.collections.MapUtils; import org.junit.Before; import org.junit.Test; import org.springframework.data.geo.Distance; @@ -223,9 +222,12 @@ public class DefaultStringRedisConnectionPipelineTxTests extends DefaultStringRe super.testGetBit(); } - @Test + @Test // DATAREDIS-661 public void testGetConfig() { - Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar")); + + Properties results = new Properties(); + results.put("foo", "bar"); + doReturn(Arrays.asList(new Object[] { Arrays.asList(new Object[] { results }) })).when(nativeConnection) .closePipeline(); super.testGetConfig(); diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java index 5e39173b2..d1b1ed85a 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTests.java @@ -18,10 +18,18 @@ package org.springframework.data.redis.connection; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.commons.collections.MapUtils; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -297,7 +305,10 @@ public class DefaultStringRedisConnectionTests { @Test // DATAREDIS-661 public void testGetConfig() { - Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar")); + + Properties results = new Properties(); + results.put("foo", "bar"); + doReturn(results).when(nativeConnection).getConfig("foo"); actual.add(connection.getConfig("foo")); verifyResults(Arrays.asList(new Object[] { results })); diff --git a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTxTests.java b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTxTests.java index f62a24010..e9d910dbc 100644 --- a/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTxTests.java +++ b/src/test/java/org/springframework/data/redis/connection/DefaultStringRedisConnectionTxTests.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import org.apache.commons.collections.MapUtils; import org.junit.Before; import org.junit.Test; import org.springframework.data.geo.Distance; @@ -204,9 +203,12 @@ public class DefaultStringRedisConnectionTxTests extends DefaultStringRedisConne super.testGetBit(); } - @Test + @Test // DATAREDIS-661 public void testGetConfig() { - Properties results = MapUtils.toProperties(Collections.singletonMap("foo", "bar")); + + Properties results = new Properties(); + results.put("foo", "bar"); + doReturn(Arrays.asList(new Object[] { results })).when(nativeConnection).exec(); super.testGetConfig(); } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java index 5d0fec692..dbd836241 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java @@ -1807,10 +1807,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests { // @link https://github.com/spring-projects/spring-data-redis/pull/187 assertThat(result.size() % 3, is(0)); - for (Object o : result.keySet()) { + for (Object key : result.keySet()) { - assertThat(o.toString(), startsWith(CLUSTER_HOST)); - assertThat(result.getProperty(o.toString()), not(startsWith(CLUSTER_HOST))); + assertThat(key.toString(), startsWith(CLUSTER_HOST)); + assertThat(result.getProperty(key.toString()), not(startsWith(CLUSTER_HOST))); } } diff --git a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java index 27fe95852..2c4f800c0 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisKeyValueAdapterUnitTests.java @@ -25,9 +25,9 @@ import static org.springframework.test.util.ReflectionTestUtils.*; import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; +import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; -import org.apache.commons.collections.MapUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -71,8 +71,11 @@ public class RedisKeyValueAdapterUnitTests { template.afterPropertiesSet(); when(jedisConnectionFactoryMock.getConnection()).thenReturn(redisConnectionMock); - when(redisConnectionMock.getConfig("notify-keyspace-events")) - .thenReturn(MapUtils.toProperties(Collections.singletonMap("notify-keyspace-events", "KEA"))); + + Properties keyspaceEventsConfig = new Properties(); + keyspaceEventsConfig.put("notify-keyspace-events", "KEA"); + + when(redisConnectionMock.getConfig("notify-keyspace-events")).thenReturn(keyspaceEventsConfig); context = new RedisMappingContext(new MappingConfiguration(new IndexConfiguration(), new KeyspaceConfiguration())); context.afterPropertiesSet(); @@ -106,8 +109,7 @@ public class RedisKeyValueAdapterUnitTests { adapter.put("1", rd, "persons"); - verify(redisConnectionMock, times(1)).sRem(Mockito.any(byte[].class), - Mockito.any(byte[].class)); + verify(redisConnectionMock, times(1)).sRem(Mockito.any(byte[].class), Mockito.any(byte[].class)); } @Test // DATAREDIS-512