From 3e66dcdd201e50ae228116bae5dc102d775bfd56 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Mon, 6 Dec 2010 19:32:48 +0200 Subject: [PATCH] + refactored util package into support collections and atomic --- .../atomic}/RedisAtomicInteger.java | 2 +- .../atomic}/RedisAtomicLong.java | 2 +- .../collections}/AbstractRedisCollection.java | 2 +- .../collections}/CollectionUtils.java | 2 +- .../collections}/DefaultRedisList.java | 2 +- .../collections}/DefaultRedisMap.java | 2 +- .../collections}/DefaultRedisSet.java | 2 +- .../collections}/DefaultRedisZSet.java | 2 +- .../collections}/RedisIterator.java | 2 +- .../collections}/RedisList.java | 2 +- .../collections}/RedisMap.java | 2 +- .../collections}/RedisSet.java | 2 +- .../collections}/RedisStore.java | 2 +- .../collections}/RedisZSet.java | 2 +- .../data/keyvalue/redis/util/DefaultRedisMap | 186 ------------------ .../AbstractRedisCollectionTests.java | 4 +- .../collections}/AbstractRedisListTests.java | 4 +- .../collections}/AbstractRedisMapTests.java | 5 +- .../collections}/AbstractRedisSetTests.java | 4 +- .../collections}/AbstractRedisZSetTest.java | 4 +- .../collections}/CollectionTestParams.java | 2 +- .../collections}/ObjectFactory.java | 2 +- .../collections}/PersonObjectFactory.java | 2 +- .../collections}/RedisListTests.java | 5 +- .../collections}/RedisMapTests.java | 4 +- .../collections}/RedisSetTests.java | 5 +- .../collections}/RedisZSetTests.java | 5 +- .../collections}/StringObjectFactory.java | 2 +- 28 files changed, 49 insertions(+), 213 deletions(-) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/atomic}/RedisAtomicInteger.java (98%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/atomic}/RedisAtomicLong.java (98%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/AbstractRedisCollection.java (97%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/CollectionUtils.java (94%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/DefaultRedisList.java (99%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/DefaultRedisMap.java (98%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/DefaultRedisSet.java (98%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/DefaultRedisZSet.java (98%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisIterator.java (95%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisList.java (93%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisMap.java (92%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisSet.java (94%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisStore.java (94%) rename spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisZSet.java (97%) delete mode 100644 spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/AbstractRedisCollectionTests.java (97%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/AbstractRedisListTests.java (97%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/AbstractRedisMapTests.java (97%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/AbstractRedisSetTests.java (96%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/AbstractRedisZSetTest.java (97%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/CollectionTestParams.java (96%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/ObjectFactory.java (91%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/PersonObjectFactory.java (93%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisListTests.java (80%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisMapTests.java (92%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisSetTests.java (80%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/RedisZSetTests.java (81%) rename spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/{util => support/collections}/StringObjectFactory.java (92%) diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicInteger.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java similarity index 98% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicInteger.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java index fd922dbc0..9f1735c4d 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicInteger.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.atomic; import java.io.Serializable; import java.util.Collections; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicLong.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java similarity index 98% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicLong.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java index aced40361..e24089dfd 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicLong.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.atomic; import java.io.Serializable; import java.util.Collections; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisCollection.java similarity index 97% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollection.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisCollection.java index a360a5d1a..1cd34f7ca 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollection.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisCollection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.AbstractCollection; import java.util.Collection; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/CollectionUtils.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/CollectionUtils.java similarity index 94% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/CollectionUtils.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/CollectionUtils.java index 6869cf626..cbe210164 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/CollectionUtils.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/CollectionUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Arrays; import java.util.Collection; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisList.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisList.java similarity index 99% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisList.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisList.java index 767c65bd4..9dbd855da 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisList.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Collection; import java.util.Collections; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisMap.java similarity index 98% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisMap.java index eef36ac7c..649b6d198 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Collection; import java.util.Collections; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisSet.java similarity index 98% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSet.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisSet.java index 8cdef359d..074469437 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Iterator; import java.util.Set; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisZSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisZSet.java similarity index 98% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisZSet.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisZSet.java index 56a7316f1..81a809e78 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisZSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisZSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisIterator.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisIterator.java similarity index 95% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisIterator.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisIterator.java index 1e63e66e5..36e488298 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisIterator.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Iterator; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisList.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisList.java similarity index 93% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisList.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisList.java index 41393fdcc..da490e2c7 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisList.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.List; import java.util.Queue; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisMap.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisMap.java similarity index 92% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisMap.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisMap.java index a4ad7e0ef..c7ac10130 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisMap.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.concurrent.ConcurrentMap; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisSet.java similarity index 94% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSet.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisSet.java index ff35435eb..1fdbc544c 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Set; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisStore.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisStore.java similarity index 94% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisStore.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisStore.java index a4804747a..ac1438106 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisStore.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import org.springframework.data.keyvalue.redis.core.RedisOperations; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisZSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSet.java similarity index 97% rename from spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisZSet.java rename to spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSet.java index eaa4d84a4..5dbfc9e7e 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisZSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Comparator; import java.util.NoSuchElementException; diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap deleted file mode 100644 index 87fdbb69d..000000000 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap +++ /dev/null @@ -1,186 +0,0 @@ -/* - * 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.util; - -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; - -import org.springframework.data.keyvalue.redis.connection.RedisCommands; -import org.springframework.data.keyvalue.redis.core.RedisOperations; - -/** - * Default {@link RedisMap} implementation. - * - * @author Costin Leau - */ -public class DefaultRedisMap implements RedisMap { - - private class DefaultRedisMapEntry implements Map.Entry { - - private String key, value; - - /** - * Constructs a new DefaultRedisMapEntry instance. - * - * @param entry - */ - public DefaultRedisMapEntry(org.springframework.data.keyvalue.redis.connection.RedisHashCommands.Entry entry) { - this.key = entry.getField(); - this.value = entry.getValue(); - } - - @Override - public String getKey() { - return key; - } - - @Override - public String getValue() { - return value; - } - - @Override - public String setValue(String value) { - throw new UnsupportedOperationException(); - } - } - - protected final String redisKey; - protected final RedisOperations operations; - private final MapOperations mapOps; - - - /** - * Constructs a new DefaultRedisMap instance. - * - * @param key - * @param operations - */ - public DefaultRedisMap(String key, RedisOperations operations) { - this.redisKey = key; - this.operations = operations; - this.maps = operations.forMap(key); - } - - public DefaultRedisList(String key, RedisOperations operations) { - super(key, operations); - listOps = operations.listOps(); - } - - @Override - public Integer increment(String key, int delta) { - return commands.hIncrBy(redisKey, key, delta); - } - - @Override - public boolean putIfAbsent(String key, String value) { - return commands.hSetNX(redisKey, key, value); - } - - @Override - public String getKey() { - return redisKey; - } - - @Override - public RedisCommands getOperations() { - return commands; - } - - @Override - public void clear() { - throw new UnsupportedOperationException(); - } - - @Override - public boolean containsKey(Object key) { - return commands.hExists(redisKey, key.toString()); - } - - @Override - public boolean containsValue(Object value) { - throw new UnsupportedOperationException(); - } - - @Override - public Set> entrySet() { - return createEntrySet(commands.hGetAll(redisKey)); - } - - private Set> createEntrySet(Set entries) { - Set> result = new LinkedHashSet>( - entries.size()); - - for (org.springframework.data.keyvalue.redis.connection.RedisHashCommands.Entry entry : entries) { - result.add(new DefaultRedisMapEntry(entry)); - } - return result; - } - - @Override - public String get(Object key) { - return commands.hGet(redisKey, key.toString()); - } - - @Override - public boolean isEmpty() { - return size() == 0; - } - - @Override - public Set keySet() { - return commands.hKeys(redisKey); - - } - - @Override - public String put(String key, String value) { - String previous = commands.hGet(redisKey, key); - if (commands.hSet(redisKey, key, value)) { - return null; - } - return previous; - } - - @Override - public void putAll(Map m) { - String[] keys = m.keySet().toArray(new String[m.size()]); - String[] values = m.values().toArray(new String[m.size()]); - - commands.hMSet(redisKey, keys, values); - } - - @Override - public String remove(Object key) { - String previous = commands.hGet(redisKey, key.toString()); - if (commands.hDel(redisKey, key.toString())) { - return previous; - } - return null; - } - - @Override - public int size() { - return commands.hLen(redisKey); - } - - @Override - public Collection values() { - return commands.hVals(redisKey); - } -} \ No newline at end of file diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisCollectionTests.java similarity index 97% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisCollectionTests.java index 551094204..519a5fbff 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisCollectionTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import static org.hamcrest.CoreMatchers.*; @@ -40,6 +40,8 @@ import org.springframework.data.keyvalue.redis.connection.RedisConnection; import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; import org.springframework.data.keyvalue.redis.core.RedisCallback; import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.support.collections.AbstractRedisCollection; +import org.springframework.data.keyvalue.redis.support.collections.RedisStore; /** diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisListTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisListTests.java similarity index 97% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisListTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisListTests.java index 20968b629..542502325 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisListTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisListTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import static org.junit.Assert.*; import static org.junit.matchers.JUnitMatchers.*; @@ -27,6 +27,8 @@ import java.util.NoSuchElementException; import org.junit.Before; import org.junit.Test; import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisList; +import org.springframework.data.keyvalue.redis.support.collections.RedisList; /** * Integration test for RedisList diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisMapTests.java similarity index 97% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisMapTests.java index c566e0802..f60dbed16 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisMapTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -43,6 +43,9 @@ import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory import org.springframework.data.keyvalue.redis.core.RedisCallback; import org.springframework.data.keyvalue.redis.core.RedisOperations; 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; +import org.springframework.data.keyvalue.redis.support.collections.RedisStore; /** * Integration test for Redis Map. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisSetTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisSetTests.java similarity index 96% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisSetTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisSetTests.java index 948c2c7c0..483a846d3 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisSetTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisSetTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -29,6 +29,8 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.keyvalue.redis.core.BoundSetOperations; import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisSet; +import org.springframework.data.keyvalue.redis.support.collections.RedisSet; /** * Integration test for Redis set. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisZSetTest.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisZSetTest.java similarity index 97% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisZSetTest.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisZSetTest.java index 81118ca5c..e0756199f 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisZSetTest.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisZSetTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -27,6 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.keyvalue.redis.core.BoundZSetOperations; import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisZSet; +import org.springframework.data.keyvalue.redis.support.collections.RedisZSet; /** * Integration test for Redis ZSet. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/CollectionTestParams.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java similarity index 96% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/CollectionTestParams.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java index 5fd4ad0d5..51fadfeb1 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/CollectionTestParams.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Arrays; import java.util.Collection; diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/ObjectFactory.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/ObjectFactory.java similarity index 91% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/ObjectFactory.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/ObjectFactory.java index 882111a55..062fce2d3 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/ObjectFactory.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/ObjectFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; /** * Simple object factory. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/PersonObjectFactory.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/PersonObjectFactory.java similarity index 93% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/PersonObjectFactory.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/PersonObjectFactory.java index 9ca4f63b1..6c7344e55 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/PersonObjectFactory.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/PersonObjectFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.UUID; diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisListTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisListTests.java similarity index 80% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisListTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisListTests.java index 9860e9b37..e4588a33d 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisListTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisListTests.java @@ -13,9 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.support.collections.AbstractRedisCollection; +import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisList; +import org.springframework.data.keyvalue.redis.support.collections.RedisStore; /** * Parameterized instance of Redis tests. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisMapTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java similarity index 92% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisMapTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java index 45405ba49..88325727b 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisMapTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.Arrays; import java.util.Collection; @@ -23,6 +23,8 @@ import org.springframework.data.keyvalue.redis.Person; 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. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisSetTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisSetTests.java similarity index 80% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisSetTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisSetTests.java index 9e61a09fb..e20a46464 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisSetTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisSetTests.java @@ -13,9 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.support.collections.AbstractRedisCollection; +import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisSet; +import org.springframework.data.keyvalue.redis.support.collections.RedisStore; /** * Parameterized instance of Redis tests. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisZSetTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSetTests.java similarity index 81% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisZSetTests.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSetTests.java index 26bc67e30..cffd80f2c 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/RedisZSetTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSetTests.java @@ -13,9 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.support.collections.AbstractRedisCollection; +import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisZSet; +import org.springframework.data.keyvalue.redis.support.collections.RedisStore; /** * Parameterized instance of Redis sorted set tests. diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/StringObjectFactory.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/StringObjectFactory.java similarity index 92% rename from spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/StringObjectFactory.java rename to spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/StringObjectFactory.java index 4e3d21e79..9b534e1fb 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/StringObjectFactory.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/StringObjectFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.keyvalue.redis.util; +package org.springframework.data.keyvalue.redis.support.collections; import java.util.UUID;