diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/RedisConnectionFailureException.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/RedisConnectionFailureException.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/RedisConnectionFailureException.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/RedisConnectionFailureException.java index 3de6f8dca..a710640a2 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/RedisConnectionFailureException.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/RedisConnectionFailureException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis; +package org.springframework.data.keyvalue.redis; import org.springframework.dao.DataAccessResourceFailureException; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/UncategorizedRedisException.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/UncategorizedRedisException.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/UncategorizedRedisException.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/UncategorizedRedisException.java index 8908b067b..f0f3339f9 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/UncategorizedRedisException.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/UncategorizedRedisException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis; +package org.springframework.data.keyvalue.redis; import org.springframework.datastore.keyvalue.UncategorizedKeyvalueStoreException; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/DataType.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DataType.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/DataType.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DataType.java index c2ae95046..a09aa52dd 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/DataType.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DataType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.EnumSet; import java.util.Map; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/DefaultTuple.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultTuple.java similarity index 88% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/DefaultTuple.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultTuple.java index 11d8d68e4..7669cff97 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/DefaultTuple.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultTuple.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; -import org.springframework.datastore.redis.connection.RedisZSetCommands.Tuple; +import org.springframework.data.keyvalue.redis.connection.RedisZSetCommands.Tuple; /** * Default implementation for {@link Tuple} interface. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisCommands.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisCommands.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisCommands.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisCommands.java index 70e1cd397..c802332d0 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisCommands.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisCommands.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.Collection; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisConnection.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisConnection.java similarity index 91% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisConnection.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisConnection.java index 46de8ffd7..fe198f016 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisConnection.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisConnection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; -import org.springframework.datastore.redis.UncategorizedRedisException; +import org.springframework.data.keyvalue.redis.UncategorizedRedisException; /** * A connection (session) to a Redis server. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisConnectionFactory.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisConnectionFactory.java similarity index 94% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisConnectionFactory.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisConnectionFactory.java index 6eec34038..e6bc5724e 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisConnectionFactory.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisConnectionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import org.springframework.dao.support.PersistenceExceptionTranslator; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisHashCommands.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisHashCommands.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisHashCommands.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisHashCommands.java index aac379edb..13a15de10 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisHashCommands.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisHashCommands.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.List; import java.util.Map; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisListCommands.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisListCommands.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisListCommands.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisListCommands.java index 0fdc343bf..31094e9a9 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisListCommands.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisListCommands.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.List; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisSetCommands.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisSetCommands.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisSetCommands.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisSetCommands.java index 244d0f3d8..f2a28da88 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisSetCommands.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisSetCommands.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisStringCommands.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisStringCommands.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisStringCommands.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisStringCommands.java index b5c56f1a2..53391a170 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisStringCommands.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisStringCommands.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.List; import java.util.Map; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisTxCommands.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java similarity index 93% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisTxCommands.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java index db2592817..82aec4fc6 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisTxCommands.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.List; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisZSetCommands.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisZSetCommands.java similarity index 97% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisZSetCommands.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisZSetCommands.java index 93a11200d..76eb7ea43 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/RedisZSetCommands.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisZSetCommands.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisConnection.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java similarity index 98% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisConnection.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java index 6a3c7c53e..172fb05ff 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisConnection.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.connection.jedis; +package org.springframework.data.keyvalue.redis.connection.jedis; import java.io.IOException; import java.lang.reflect.Field; @@ -24,10 +24,10 @@ import java.util.Map; import java.util.Set; import org.springframework.dao.DataAccessException; +import org.springframework.data.keyvalue.redis.UncategorizedRedisException; +import org.springframework.data.keyvalue.redis.connection.DataType; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; import org.springframework.datastore.keyvalue.UncategorizedKeyvalueStoreException; -import org.springframework.datastore.redis.UncategorizedRedisException; -import org.springframework.datastore.redis.connection.DataType; -import org.springframework.datastore.redis.connection.RedisConnection; import org.springframework.util.ReflectionUtils; import redis.clients.jedis.BinaryJedis; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisConnectionFactory.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisConnectionFactory.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java index 1eb782033..33e8e6d82 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisConnectionFactory.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection.jedis; +package org.springframework.data.keyvalue.redis.connection.jedis; import java.util.concurrent.TimeoutException; @@ -23,8 +23,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; -import org.springframework.datastore.redis.connection.RedisConnection; -import org.springframework.datastore.redis.connection.RedisConnectionFactory; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; +import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisUtils.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisUtils.java similarity index 90% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisUtils.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisUtils.java index 0306d72c5..fd20c36f8 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisUtils.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection.jedis; +package org.springframework.data.keyvalue.redis.connection.jedis; import java.io.IOException; import java.net.UnknownHostException; @@ -26,10 +26,10 @@ import java.util.concurrent.TimeoutException; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.redis.RedisConnectionFailureException; -import org.springframework.datastore.redis.UncategorizedRedisException; -import org.springframework.datastore.redis.connection.DefaultTuple; -import org.springframework.datastore.redis.connection.RedisZSetCommands.Tuple; +import org.springframework.data.keyvalue.redis.RedisConnectionFailureException; +import org.springframework.data.keyvalue.redis.UncategorizedRedisException; +import org.springframework.data.keyvalue.redis.connection.DefaultTuple; +import org.springframework.data.keyvalue.redis.connection.RedisZSetCommands.Tuple; import redis.clients.jedis.JedisException; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisConnection.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java similarity index 98% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisConnection.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java index 52ea0341f..504b8c715 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisConnection.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.connection.jredis; +package org.springframework.data.keyvalue.redis.connection.jredis; import java.nio.charset.Charset; import java.util.Arrays; @@ -26,10 +26,10 @@ import java.util.Set; import org.jredis.JRedis; import org.jredis.RedisException; import org.springframework.dao.DataAccessException; +import org.springframework.data.keyvalue.redis.UncategorizedRedisException; +import org.springframework.data.keyvalue.redis.connection.DataType; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; import org.springframework.datastore.keyvalue.UncategorizedKeyvalueStoreException; -import org.springframework.datastore.redis.UncategorizedRedisException; -import org.springframework.datastore.redis.connection.DataType; -import org.springframework.datastore.redis.connection.RedisConnection; /** * JRedis based implementation. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisConnectionFactory.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisConnectionFactory.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java index 4037c0783..48fe18a24 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisConnectionFactory.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnectionFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.connection.jredis; +package org.springframework.data.keyvalue.redis.connection.jredis; import java.nio.charset.Charset; @@ -26,8 +26,8 @@ import org.jredis.ri.alphazero.connection.DefaultConnectionSpec; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; -import org.springframework.datastore.redis.connection.RedisConnection; -import org.springframework.datastore.redis.connection.RedisConnectionFactory; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; +import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisUtils.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisUtils.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisUtils.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisUtils.java index 38a5e73b6..df1c8a2af 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jredis/JredisUtils.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection.jredis; +package org.springframework.data.keyvalue.redis.connection.jredis; import java.nio.charset.Charset; import java.util.ArrayList; @@ -27,7 +27,7 @@ import org.jredis.RedisException; import org.jredis.RedisType; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.redis.connection.DataType; +import org.springframework.data.keyvalue.redis.connection.DataType; /** * Helper class featuring methods for JRedis connection handling, providing support for exception translation. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundListOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundListOperations.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundListOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundListOperations.java index 1c1e330c3..f003e29e4 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundListOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundListOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.List; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundSetOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundSetOperations.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundSetOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundSetOperations.java index c1afe7f4a..f643e32d8 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundSetOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundSetOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundZSetOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundZSetOperations.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundZSetOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundZSetOperations.java index 72d1e2dcd..4e784aa82 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/BoundZSetOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundZSetOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundListOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundListOperations.java similarity index 97% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundListOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundListOperations.java index 82ebaf363..a2c576305 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundListOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundListOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.List; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundSetOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundSetOperations.java similarity index 97% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundSetOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundSetOperations.java index ff9a529ef..3354a626d 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundSetOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundSetOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundZSetOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundZSetOperations.java similarity index 97% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundZSetOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundZSetOperations.java index 8b3fe5c6f..c9fd0e03d 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultBoundZSetOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundZSetOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultKeyBound.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultKeyBound.java similarity index 94% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultKeyBound.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultKeyBound.java index 6c2dd57cc..3ffb5477b 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/DefaultKeyBound.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultKeyBound.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; /** diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/KeyBound.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/KeyBound.java similarity index 94% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/KeyBound.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/KeyBound.java index 29f336b7d..38c58ec6d 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/KeyBound.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/KeyBound.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; /** * Redis store for a certain key. Useful for creating views into Redis 'collection' types. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/KeyValueOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/KeyValueOperations.java similarity index 94% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/KeyValueOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/KeyValueOperations.java index c5033c2af..a4ee00cc7 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/KeyValueOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/KeyValueOperations.java @@ -1,126 +1,126 @@ -/* - * 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.datastore.redis.core; - -import java.util.List; -import java.util.Map; - -/** - * Key value operations with 'friendly' names instead of using command names for methods. - * Additional helper methods for working with keys and values - * - * @author Mark Pollack - * - */ -public interface KeyValueOperations { - - // Set and Set with expiry operations - - void set(String key, String value); - - void set(String key, String value, long expiryInMillis); - - void setAsBytes(String key, byte[] value); - - void setAsBytes(String key, byte[] value, long expiryInMillis); - - void convertAndSet(String key, Object value); - - void convertAndSet(String key, Object value, long expiryInMillis); - - // Get operations - - String get(String key); - - byte[] getAsBytes(String key); - - T getAndConvert(String key, Class requiredType); - - // Get and Set operations - - String getAndSet(String key, String value); - - byte[] getAndSetBytes(String key, byte[] value); - - T getAndSetObject(String key, T value, Class requiredType); - - // Multi-get operations - - List getValues(List keys); - - List getAndConvertValues(List keys, Class requiredType); - - - // Set if non-existent operations - - void setIfKeyNonExistent(String key, String value); - - void setIfKeyNonExistent(String key, byte[] value); - - void convertAndSetIfKeyNonExistent(String key, Object value); - - // Multiple key-value set - - void setMultiple(Map keysAndValues); - - void setMultipleAsBytes(Map keysAndValues); - - void convertAndSetMultiple(Map keysAndValues); - - // Multiple key-value set if non-existent - - void setMultipleIfKeysNonExistent(Map keysAndValues); - - void setMultipleAsBytesIfKeysNonExistent(Map keysAndValues); - - void convertAndSetMultipleIfKeysNonExistent(Map keysAndValues); - - - - // Append - - int append(String key, String value); - - - - // Increment - - int increment(String key); - - int incrementBy(String key, int value); - - // Decrement - - int decrement(String key); - - int decrementBy(String key, int value); - - - // Substring - - String getSubString(String key, int fromIndex, int toIndex); - - boolean containsKey(String key); - - boolean deleteKeys(String... keys); - - - - - - - -} +/* + * 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.core; + +import java.util.List; +import java.util.Map; + +/** + * Key value operations with 'friendly' names instead of using command names for methods. + * Additional helper methods for working with keys and values + * + * @author Mark Pollack + * + */ +public interface KeyValueOperations { + + // Set and Set with expiry operations + + void set(String key, String value); + + void set(String key, String value, long expiryInMillis); + + void setAsBytes(String key, byte[] value); + + void setAsBytes(String key, byte[] value, long expiryInMillis); + + void convertAndSet(String key, Object value); + + void convertAndSet(String key, Object value, long expiryInMillis); + + // Get operations + + String get(String key); + + byte[] getAsBytes(String key); + + T getAndConvert(String key, Class requiredType); + + // Get and Set operations + + String getAndSet(String key, String value); + + byte[] getAndSetBytes(String key, byte[] value); + + T getAndSetObject(String key, T value, Class requiredType); + + // Multi-get operations + + List getValues(List keys); + + List getAndConvertValues(List keys, Class requiredType); + + + // Set if non-existent operations + + void setIfKeyNonExistent(String key, String value); + + void setIfKeyNonExistent(String key, byte[] value); + + void convertAndSetIfKeyNonExistent(String key, Object value); + + // Multiple key-value set + + void setMultiple(Map keysAndValues); + + void setMultipleAsBytes(Map keysAndValues); + + void convertAndSetMultiple(Map keysAndValues); + + // Multiple key-value set if non-existent + + void setMultipleIfKeysNonExistent(Map keysAndValues); + + void setMultipleAsBytesIfKeysNonExistent(Map keysAndValues); + + void convertAndSetMultipleIfKeysNonExistent(Map keysAndValues); + + + + // Append + + int append(String key, String value); + + + + // Increment + + int increment(String key); + + int incrementBy(String key, int value); + + // Decrement + + int decrement(String key); + + int decrementBy(String key, int value); + + + // Substring + + String getSubString(String key, int fromIndex, int toIndex); + + boolean containsKey(String key); + + boolean deleteKeys(String... keys); + + + + + + + +} diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/ListOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/ListOperations.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/ListOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/ListOperations.java index 930466d6b..29f0fd9b3 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/ListOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/ListOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.List; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisAccessor.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisAccessor.java similarity index 92% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisAccessor.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisAccessor.java index 042e5eb06..76803929f 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisAccessor.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisAccessor.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.datastore.redis.connection.RedisConnectionFactory; +import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; import org.springframework.util.Assert; /** diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisCallback.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisCallback.java similarity index 90% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisCallback.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisCallback.java index 2d124850f..2aa0bb2b7 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisCallback.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisCallback.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; -import org.springframework.datastore.redis.connection.RedisConnection; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; /** * Callback interface for Redis code. To be used with {@link RedisTemplate} execution methods, often as anonymous diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisConnectionUtils.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisConnectionUtils.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisConnectionUtils.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisConnectionUtils.java index f5344e3f8..1044c7ab2 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisConnectionUtils.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisConnectionUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.datastore.redis.connection.RedisConnection; -import org.springframework.datastore.redis.connection.RedisConnectionFactory; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; +import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; import org.springframework.transaction.support.ResourceHolder; import org.springframework.transaction.support.ResourceHolderSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisOperations.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisOperations.java index 52a4d5a89..4aaa99039 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; /** diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisTemplate.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java similarity index 98% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisTemplate.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java index 97db2af7e..2a6dcec6a 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/RedisTemplate.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -25,11 +25,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.springframework.datastore.redis.connection.RedisConnection; -import org.springframework.datastore.redis.connection.RedisConnectionFactory; -import org.springframework.datastore.redis.serializer.RedisSerializer; -import org.springframework.datastore.redis.serializer.SimpleRedisSerializer; -import org.springframework.datastore.redis.serializer.StringRedisSerializer; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; +import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; +import org.springframework.data.keyvalue.redis.serializer.RedisSerializer; +import org.springframework.data.keyvalue.redis.serializer.SimpleRedisSerializer; +import org.springframework.data.keyvalue.redis.serializer.StringRedisSerializer; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/SetOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SetOperations.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/SetOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SetOperations.java index 34dc6e7d4..5f55f7e30 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/SetOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SetOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/ZSetOperations.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/ZSetOperations.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/ZSetOperations.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/ZSetOperations.java index 0dc9d01c4..87b3fff21 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/ZSetOperations.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/core/ZSetOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/RedisSerializer.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/RedisSerializer.java similarity index 93% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/RedisSerializer.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/RedisSerializer.java index 5b10e4f16..61c0c16e0 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/RedisSerializer.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/RedisSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.serializer; +package org.springframework.data.keyvalue.redis.serializer; /** * Basic interface serialization and deserialization of Objects to byte arrays. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializer.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java similarity index 92% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializer.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java index 143cc7f90..1741e38e5 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializer.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.serializer; +package org.springframework.data.keyvalue.redis.serializer; import org.springframework.core.convert.converter.Converter; import org.springframework.core.serializer.support.DeserializingConverter; import org.springframework.core.serializer.support.SerializingConverter; -import org.springframework.datastore.redis.UncategorizedRedisException; +import org.springframework.data.keyvalue.redis.UncategorizedRedisException; /** * Simple Redis serializer delegating to the default serializer in Spring 3. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/StringRedisSerializer.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/StringRedisSerializer.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/StringRedisSerializer.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/StringRedisSerializer.java index 2caaf6899..20e142be2 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/serializer/StringRedisSerializer.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/StringRedisSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.serializer; +package org.springframework.data.keyvalue.redis.serializer; import java.nio.charset.Charset; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/AbstractRedisCollection.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollection.java similarity index 91% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/AbstractRedisCollection.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollection.java index b765048d9..a360a5d1a 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/AbstractRedisCollection.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollection.java @@ -1,118 +1,118 @@ -/* - * 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.datastore.redis.util; - -import java.util.AbstractCollection; -import java.util.Collection; - -import org.springframework.datastore.redis.core.RedisOperations; - -/** - * Base implementation for Redis collections. - * - * @author Costin Leau - */ -public abstract class AbstractRedisCollection extends AbstractCollection implements RedisStore { - - public static final String ENCODING = "UTF-8"; - - protected final String key; - protected final RedisOperations operations; - - public AbstractRedisCollection(String key, RedisOperations operations) { - this.key = key; - this.operations = operations; - } - - @Override - public String getKey() { - return key; - } - - @Override - public RedisOperations getOperations() { - return operations; - } - - @Override - public boolean addAll(Collection c) { - boolean modified = false; - for (E e : c) { - modified |= add(e); - } - return modified; - } - - public abstract boolean add(E e); - - public abstract void clear(); - - @Override - public boolean containsAll(Collection c) { - boolean contains = true; - for (Object object : c) { - contains &= contains(object); - } - return contains; - } - - public abstract boolean remove(Object o); - - - @Override - public boolean removeAll(Collection c) { - boolean modified = false; - for (Object object : c) { - modified |= remove(object); - } - return modified; - } - - public boolean retainAll(Collection c) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean equals(Object o) { - if (o == this) - return true; - - if (o instanceof RedisStore) { - return key.equals(((RedisStore) o).getKey()); - } - if (o instanceof AbstractRedisCollection) { - return o.hashCode() == hashCode(); - } - - return false; - } - - @Override - public int hashCode() { - int result = 17 + getClass().hashCode(); - result = result * 31 + key.hashCode(); - return result; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("RedisStore for key:"); - sb.append(getKey()); - return sb.toString(); - } +/* + * 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.AbstractCollection; +import java.util.Collection; + +import org.springframework.data.keyvalue.redis.core.RedisOperations; + +/** + * Base implementation for Redis collections. + * + * @author Costin Leau + */ +public abstract class AbstractRedisCollection extends AbstractCollection implements RedisStore { + + public static final String ENCODING = "UTF-8"; + + protected final String key; + protected final RedisOperations operations; + + public AbstractRedisCollection(String key, RedisOperations operations) { + this.key = key; + this.operations = operations; + } + + @Override + public String getKey() { + return key; + } + + @Override + public RedisOperations getOperations() { + return operations; + } + + @Override + public boolean addAll(Collection c) { + boolean modified = false; + for (E e : c) { + modified |= add(e); + } + return modified; + } + + public abstract boolean add(E e); + + public abstract void clear(); + + @Override + public boolean containsAll(Collection c) { + boolean contains = true; + for (Object object : c) { + contains &= contains(object); + } + return contains; + } + + public abstract boolean remove(Object o); + + + @Override + public boolean removeAll(Collection c) { + boolean modified = false; + for (Object object : c) { + modified |= remove(object); + } + return modified; + } + + public boolean retainAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean equals(Object o) { + if (o == this) + return true; + + if (o instanceof RedisStore) { + return key.equals(((RedisStore) o).getKey()); + } + if (o instanceof AbstractRedisCollection) { + return o.hashCode() == hashCode(); + } + + return false; + } + + @Override + public int hashCode() { + int result = 17 + getClass().hashCode(); + result = result * 31 + key.hashCode(); + return result; + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("RedisStore for key:"); + sb.append(getKey()); + return sb.toString(); + } } \ No newline at end of file diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/CollectionUtils.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/CollectionUtils.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/CollectionUtils.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/CollectionUtils.java index 9bc9815e8..6869cf626 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/CollectionUtils.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/CollectionUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Arrays; import java.util.Collection; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisList.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisList.java similarity index 96% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisList.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisList.java index bb4c58542..8a453d62b 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisList.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Collection; import java.util.Iterator; @@ -21,8 +21,8 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.springframework.datastore.redis.core.ListOperations; -import org.springframework.datastore.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.core.ListOperations; +import org.springframework.data.keyvalue.redis.core.RedisOperations; /** * Default implementation for {@link RedisList}. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisMap b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap similarity index 88% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisMap rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap index 2cb9c6bed..87fdbb69d 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisMap +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisMap @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +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.datastore.redis.connection.RedisCommands; -import org.springframework.datastore.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.connection.RedisCommands; +import org.springframework.data.keyvalue.redis.core.RedisOperations; /** * Default {@link RedisMap} implementation. @@ -39,7 +39,7 @@ public class DefaultRedisMap implements RedisMap { * * @param entry */ - public DefaultRedisMapEntry(org.springframework.datastore.redis.connection.RedisHashCommands.Entry entry) { + public DefaultRedisMapEntry(org.springframework.data.keyvalue.redis.connection.RedisHashCommands.Entry entry) { this.key = entry.getField(); this.value = entry.getValue(); } @@ -122,11 +122,11 @@ public class DefaultRedisMap implements RedisMap { return createEntrySet(commands.hGetAll(redisKey)); } - private Set> createEntrySet(Set entries) { + private Set> createEntrySet(Set entries) { Set> result = new LinkedHashSet>( entries.size()); - for (org.springframework.datastore.redis.connection.RedisHashCommands.Entry entry : entries) { + for (org.springframework.data.keyvalue.redis.connection.RedisHashCommands.Entry entry : entries) { result.add(new DefaultRedisMapEntry(entry)); } return result; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisSet.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSet.java similarity index 94% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisSet.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSet.java index cb5c9a75a..9e85f062f 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisSet.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSet.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Iterator; import java.util.Set; -import org.springframework.datastore.redis.core.BoundSetOperations; -import org.springframework.datastore.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.core.BoundSetOperations; +import org.springframework.data.keyvalue.redis.core.RedisOperations; /** * Default implementation for {@link RedisSet}. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisSortedSet.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSortedSet.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisSortedSet.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSortedSet.java index 2f937f942..c975d82f4 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/DefaultRedisSortedSet.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/DefaultRedisSortedSet.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Comparator; import java.util.Iterator; import java.util.Set; import java.util.SortedSet; -import org.springframework.datastore.redis.core.BoundZSetOperations; -import org.springframework.datastore.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.core.BoundZSetOperations; +import org.springframework.data.keyvalue.redis.core.RedisOperations; /** * Default implementation for {@link RedisSortedSet}. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisAtomicInteger.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicInteger.java similarity index 97% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisAtomicInteger.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicInteger.java index fc2153ebc..7fbd1ee00 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisAtomicInteger.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicInteger.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.io.Serializable; -import org.springframework.datastore.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.core.RedisOperations; /** * Atomic integer backed by Redis. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisAtomicLong.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicLong.java similarity index 97% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisAtomicLong.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicLong.java index 8b736681b..d7d32f56b 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisAtomicLong.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisAtomicLong.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.io.Serializable; -import org.springframework.datastore.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.core.RedisOperations; /** * Atomic long backed by Redis. diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisIterator.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisIterator.java similarity index 96% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisIterator.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisIterator.java index a65a4fa8c..1e63e66e5 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisIterator.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Iterator; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisList.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisList.java similarity index 94% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisList.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisList.java index c49ec8ad2..7512550ae 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisList.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.List; import java.util.Queue; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisMap.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisMap.java similarity index 94% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisMap.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisMap.java index 48d70a9e5..cdbf4fd82 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisMap.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Map; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisSet.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSet.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisSet.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSet.java index 76ecf3fa4..ff35435eb 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisSet.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Set; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisSortedSet.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSortedSet.java similarity index 95% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisSortedSet.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSortedSet.java index 480f3f4a5..7875ceec4 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisSortedSet.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisSortedSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.Set; import java.util.SortedSet; diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisStore.java b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisStore.java similarity index 89% rename from spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisStore.java rename to spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisStore.java index 384b31e74..a4804747a 100644 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/util/RedisStore.java +++ b/spring-datastore-redis/src/main/java/org/springframework/data/keyvalue/redis/util/RedisStore.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; -import org.springframework.datastore.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.core.RedisOperations; /** diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/keyvalue/redis/PlaceHolder.java b/spring-datastore-redis/src/main/java/org/springframework/datastore/keyvalue/redis/PlaceHolder.java deleted file mode 100644 index 1ffcfad09..000000000 --- a/spring-datastore-redis/src/main/java/org/springframework/datastore/keyvalue/redis/PlaceHolder.java +++ /dev/null @@ -1,20 +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.datastore.keyvalue.redis; - -public class PlaceHolder { - -} diff --git a/spring-datastore-redis/src/main/resources/META-INF/spring/app-context.xml b/spring-datastore-redis/src/main/resources/META-INF/spring/app-context.xml index ca51b1a69..fefa52446 100644 --- a/spring-datastore-redis/src/main/resources/META-INF/spring/app-context.xml +++ b/spring-datastore-redis/src/main/resources/META-INF/spring/app-context.xml @@ -5,6 +5,6 @@ Example configuration to get you started. - + diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/Address.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/Address.java similarity index 97% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/Address.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/Address.java index 81bbd685a..d1bf5fb86 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/Address.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/Address.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis; +package org.springframework.data.keyvalue.redis; import java.io.Serializable; diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/Person.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/Person.java similarity index 98% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/Person.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/Person.java index c071ff183..b6bfa08b7 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/Person.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/Person.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis; +package org.springframework.data.keyvalue.redis; import java.io.Serializable; diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/AbstractConnectionIntegrationTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/AbstractConnectionIntegrationTests.java similarity index 86% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/AbstractConnectionIntegrationTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/AbstractConnectionIntegrationTests.java index 2410a0cd6..3292d160c 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/AbstractConnectionIntegrationTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/AbstractConnectionIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection; +package org.springframework.data.keyvalue.redis.connection; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -22,7 +22,9 @@ import static org.junit.Assume.*; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.datastore.redis.Person; +import org.springframework.data.keyvalue.redis.Person; +import org.springframework.data.keyvalue.redis.connection.RedisConnection; +import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; public abstract class AbstractConnectionIntegrationTests { diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/jedis/JedisConnectionIntegrationTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java similarity index 83% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/jedis/JedisConnectionIntegrationTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java index 42d4c0910..c5c2ec171 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/jedis/JedisConnectionIntegrationTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection.jedis; +package org.springframework.data.keyvalue.redis.connection.jedis; -import org.springframework.datastore.redis.connection.AbstractConnectionIntegrationTests; -import org.springframework.datastore.redis.connection.RedisConnectionFactory; +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 { diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/jredis/JRedisConnectionIntegrationTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jredis/JRedisConnectionIntegrationTests.java similarity index 74% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/jredis/JRedisConnectionIntegrationTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jredis/JRedisConnectionIntegrationTests.java index 4db4655cd..7bb730b90 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/connection/jredis/JRedisConnectionIntegrationTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jredis/JRedisConnectionIntegrationTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.datastore.redis.connection.jredis; +package org.springframework.data.keyvalue.redis.connection.jredis; -import org.springframework.datastore.redis.connection.AbstractConnectionIntegrationTests; -import org.springframework.datastore.redis.connection.RedisConnectionFactory; +import org.springframework.data.keyvalue.redis.connection.AbstractConnectionIntegrationTests; +import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory; +import org.springframework.data.keyvalue.redis.connection.jredis.JredisConnectionFactory; public class JRedisConnectionIntegrationTests extends AbstractConnectionIntegrationTests { diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/core/RedisTemplateIntegrationTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/core/RedisTemplateIntegrationTests.java similarity index 86% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/core/RedisTemplateIntegrationTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/core/RedisTemplateIntegrationTests.java index a3c9ce377..64a0b2218 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/core/RedisTemplateIntegrationTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/core/RedisTemplateIntegrationTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.datastore.redis.core; +package org.springframework.data.keyvalue.redis.core; import org.junit.Before; import org.junit.Test; -import org.springframework.datastore.redis.Person; +import org.springframework.data.keyvalue.redis.Person; +import org.springframework.data.keyvalue.redis.core.RedisTemplate; public class RedisTemplateIntegrationTests { diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializerTests.java similarity index 91% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializerTests.java index cbe1f2538..7b436f6e5 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.serializer; +package org.springframework.data.keyvalue.redis.serializer; import static org.junit.Assert.*; @@ -23,8 +23,10 @@ import java.util.UUID; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.datastore.redis.Address; -import org.springframework.datastore.redis.Person; +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.SimpleRedisSerializer; public class SimpleRedisSerializerTests { diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java similarity index 97% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java index 1365996f2..52e30cbe9 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisCollectionTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import static org.hamcrest.CoreMatchers.equalTo; @@ -34,6 +34,8 @@ import java.util.List; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.data.keyvalue.redis.util.AbstractRedisCollection; +import org.springframework.data.keyvalue.redis.util.RedisStore; /** diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisListTests.java similarity index 97% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisListTests.java index 9f4f135ac..0f26cdbb8 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisListTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import static org.junit.Assert.*; @@ -23,6 +23,7 @@ import java.util.NoSuchElementException; import org.junit.Before; import org.junit.Test; +import org.springframework.data.keyvalue.redis.util.RedisList; /** * Integration test for RedisList diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/PersonRedisListTests.java similarity index 75% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/PersonRedisListTests.java index 4feeffdb5..c00b591d2 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/PersonRedisListTests.java @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.UUID; -import org.springframework.datastore.redis.Address; -import org.springframework.datastore.redis.Person; -import org.springframework.datastore.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.datastore.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.Address; +import org.springframework.data.keyvalue.redis.Person; +import org.springframework.data.keyvalue.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.util.AbstractRedisCollection; +import org.springframework.data.keyvalue.redis.util.DefaultRedisList; +import org.springframework.data.keyvalue.redis.util.RedisStore; /** diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTests.java b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/StringRedisListTests.java similarity index 75% rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTests.java rename to spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/StringRedisListTests.java index b0a907c41..9b157fb9c 100644 --- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTests.java +++ b/spring-datastore-redis/src/test/java/org/springframework/data/keyvalue/redis/util/StringRedisListTests.java @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.redis.util; +package org.springframework.data.keyvalue.redis.util; import java.util.UUID; -import org.springframework.datastore.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.datastore.redis.core.RedisOperations; -import org.springframework.datastore.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.connection.jedis.JedisConnectionFactory; +import org.springframework.data.keyvalue.redis.core.RedisOperations; +import org.springframework.data.keyvalue.redis.core.RedisTemplate; +import org.springframework.data.keyvalue.redis.util.AbstractRedisCollection; +import org.springframework.data.keyvalue.redis.util.DefaultRedisList; +import org.springframework.data.keyvalue.redis.util.RedisStore; /**