diff --git a/src/main/asciidoc/reference/redis.adoc b/src/main/asciidoc/reference/redis.adoc index 8f3b4e8fc..ec93bb711 100644 --- a/src/main/asciidoc/reference/redis.adoc +++ b/src/main/asciidoc/reference/redis.adoc @@ -12,7 +12,7 @@ Spring Data Redis provides easy configuration and access to Redis from Spring ap [[redis:requirements]] == Redis Requirements -Spring Redis requires Redis 2.6 or above and Java SE 6.0 or above . In terms of language bindings (or connectors), Spring Redis integrates with http://github.com/xetorthio/jedis[Jedis], http://github.com/alphazero/jredis[JRedis], http://github.com/spullara/redis-protocol[SRP] and http://github.com/wg/lettuce[Lettuce], four popular open source Java libraries for Redis. If you are aware of any other connector that we should be integrating with please send us feedback. +Spring Redis requires Redis 2.6 or above and Java SE 6.0 or above . In terms of language bindings (or connectors), Spring Redis integrates with http://github.com/xetorthio/jedis[Jedis], http://github.com/alphazero/jredis[JRedis] (Deprecated since 1.7), http://github.com/spullara/redis-protocol[SRP] (Deprecated since 1.7) and http://github.com/wg/lettuce[Lettuce], four popular open source Java libraries for Redis. If you are aware of any other connector that we should be integrating with please send us feedback. [[redis:architecture]] == Redis Support High Level View @@ -76,7 +76,7 @@ For production use however, one might want to tweak the settings such as the hos ---- [[redis:connectors:jredis]] -=== Configuring JRedis connector +=== Configuring JRedis connector (Deprecated since 1.7) http://github.com/alphazero/jredis[JRedis] is another popular, open-source connector supported by Spring Data Redis through the `org.springframework.data.redis.connection.jredis` package. @@ -117,7 +117,7 @@ The configuration is quite similar to Jedis, with one notable exception. By defa ---- [[redis:connectors:srp]] -=== Configuring SRP connector +=== Configuring SRP connector (Deprecated since 1.7) https://github.com/spullara/redis-protocol[SRP] (an acronym for Sam's Redis Protocol) is the third open-source connector supported by Spring Data Redis through the `org.springframework.data.redis.connection.srp` package. diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java index fc3908bc0..21f96b1dd 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2015 the original author or authors. + * Copyright 2011-2016 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. @@ -59,7 +59,9 @@ import org.springframework.util.ReflectionUtils; * @author Christoph Strobl * @author Thomas Darimont * @author David Liu + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated public class JredisConnection extends AbstractRedisConnection { private static final Method SERVICE_REQUEST; diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java index ba7ce0039..0682a5108 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 the original author or authors. + * Copyright 2011-2016 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. @@ -37,7 +37,9 @@ import org.springframework.util.StringUtils; * * @author Costin Leau * @author Jennifer Hickey + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated public class JredisConnectionFactory implements InitializingBean, DisposableBean, RedisConnectionFactory { private ConnectionSpec connectionSpec; diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java index 24ea13d82..7f7ddd1b8 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2014 the original author or authors. + * Copyright 2011-2016 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. @@ -35,7 +35,9 @@ import org.springframework.util.StringUtils; * * @author Jennifer Hickey * @author Christoph Strobl + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated public class JredisPool implements Pool { private final GenericObjectPool internalPool; diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisUtils.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisUtils.java index 42523585b..28e82df99 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 the original author or authors. + * Copyright 2011-2016 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. @@ -38,7 +38,9 @@ import org.springframework.data.redis.connection.SortParameters.Range; * * @author Costin Leau * @author Jennifer Hickey + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated public abstract class JredisUtils { /** diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/package-info.java b/src/main/java/org/springframework/data/redis/connection/jredis/package-info.java index b90c9520c..a52db9646 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/package-info.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/package-info.java @@ -1,5 +1,6 @@ /** * Connection package for JRedis library. + * @deprecated since 1.7. Will be removed in subsequent version. */ package org.springframework.data.redis.connection.jredis; diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java index 8ca5e02a7..e689b8fbf 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2015 the original author or authors. + * Copyright 2011-2016 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. @@ -69,7 +69,9 @@ import com.google.common.util.concurrent.ListenableFuture; * @author Christoph Strobl * @author Thomas Darimont * @author David Liu + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated public class SrpConnection extends AbstractRedisConnection { private static final ExceptionTranslationStrategy EXCEPTION_TRANSLATION = new FallbackExceptionTranslationStrategy( diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java index ceece540d..0841da240 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2014 the original author or authors. + * Copyright 2011-2016 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. @@ -33,7 +33,9 @@ import org.springframework.data.redis.connection.RedisSentinelConnection; * * @author Costin Leau * @author Thomas Darimont + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated public class SrpConnectionFactory implements InitializingBean, DisposableBean, RedisConnectionFactory { private static final ExceptionTranslationStrategy EXCEPTION_TRANSLATION = new PassThroughExceptionTranslationStrategy( diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java index 27314cefd..dc33953f0 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java @@ -53,7 +53,9 @@ import com.google.common.base.Charsets; * @author Jennifer Hickey * @author Christoph Strobl * @author Thomas Darimont + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated @SuppressWarnings("rawtypes") abstract public class SrpConverters extends Converters { diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpMessageListener.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpMessageListener.java index 687b2d1af..072659cdc 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpMessageListener.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpMessageListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 the original author or authors. + * Copyright 2011-2016 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. @@ -26,7 +26,9 @@ import redis.client.ReplyListener; * MessageListener wrapper around SRP {@link ReplyListener}. * * @author Costin Leau + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated class SrpMessageListener implements ReplyListener { private final MessageListener listener; diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpScriptReturnConverter.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpScriptReturnConverter.java index ca629f861..edb850ba6 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpScriptReturnConverter.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpScriptReturnConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2016 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. @@ -27,7 +27,9 @@ import redis.reply.Reply; * Converts the value returned by SRP script eval to the expected {@link ReturnType} * * @author Jennifer Hickey + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated public class SrpScriptReturnConverter implements Converter { private ReturnType returnType; diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpSubscription.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpSubscription.java index d804ff052..a303fd8ee 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpSubscription.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpSubscription.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 the original author or authors. + * Copyright 2011-2016 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. @@ -26,7 +26,9 @@ import redis.client.ReplyListener; * Message subscription on top of SRP. * * @author Costin Leau + * @deprecated since 1.7. Will be removed in subsequent version. */ +@Deprecated class SrpSubscription extends AbstractSubscription { private final RedisClient client; diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java index 4eb609727..19512b8d8 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 the original author or authors. + * Copyright 2011-2016 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. @@ -49,6 +49,7 @@ import java.util.Set; * * @author Costin Leau * @author Jennifer Hickey + * @deprecated since 1.7. Will be removed in subsequent version. */ @Deprecated abstract class SrpUtils { diff --git a/src/main/java/org/springframework/data/redis/connection/srp/package-info.java b/src/main/java/org/springframework/data/redis/connection/srp/package-info.java index d3b6d524f..1ef195d58 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/package-info.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/package-info.java @@ -1,5 +1,6 @@ /** * Connection package for spullara Redis Protocol library. + * @deprecated since 1.7. Will be removed in subsequent version. */ package org.springframework.data.redis.connection.srp;