From 470dd4654dedd4e12468f5b52756b0084cfaed30 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Tue, 16 Jul 2013 10:44:32 -0700 Subject: [PATCH] Deprecate connection Utils in favor of Converters DATAREDIS-200 --- .../jedis/JedisConnectionFactory.java | 2 +- .../redis/connection/jedis/JedisUtils.java | 41 ++++++++++++++++++- .../lettuce/DefaultLettucePool.java | 2 +- .../lettuce/LettuceConnectionFactory.java | 4 +- .../connection/lettuce/LettuceUtils.java | 2 + .../connection/srp/SrpConnectionFactory.java | 2 +- .../data/redis/connection/srp/SrpUtils.java | 3 ++ 7 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java index 77caf3f58..54ff66a78 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java @@ -153,7 +153,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean, public DataAccessException translateExceptionIfPossible(RuntimeException ex) { - return JedisUtils.convertJedisAccessException(ex); + return JedisConverters.toDataAccessException(ex); } /** diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java index 4ce9075bd..5c3389d31 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisUtils.java @@ -52,11 +52,14 @@ import redis.clients.jedis.exceptions.JedisException; import redis.clients.util.SafeEncoder; /** - * Helper class featuring methods for Jedis connection handling, providing support for exception translation. + * Helper class featuring methods for Jedis connection handling, providing support for exception translation. + * + * Deprecated in favor of {@link JedisConverters} * * @author Costin Leau * @author Jennifer Hickey */ +@Deprecated public abstract class JedisUtils { private static final String OK_CODE = "OK"; @@ -111,10 +114,18 @@ public abstract class JedisUtils { return status != null && (OK_CODE.equals(status) || OK_MULTI_CODE.equals(status)); } + /** + * Deprecated. Use #{@link JedisConverters#toBoolean(Long)} + */ + @Deprecated static Boolean convertCodeReply(Number code) { return (code != null ? code.intValue() == 1 : null); } + /** + * Deprecated. Use #{@link JedisConverters#toTupleSet(Set)} + */ + @Deprecated static Set convertJedisTuple(Set tuples) { Set value = new LinkedHashSet(tuples.size()); for (redis.clients.jedis.Tuple tuple : tuples) { @@ -135,6 +146,10 @@ public abstract class JedisUtils { return result; } + /** + * Deprecated. Implement a method in {@link JedisConverters} instead + */ + @Deprecated static Map convert(String[] fields, String[] values) { Map result = new LinkedHashMap(fields.length); @@ -144,6 +159,10 @@ public abstract class JedisUtils { return result; } + /** + * Deprecated. Implement a method in {@link JedisConverters} instead + */ + @Deprecated static String[] arrange(String[] keys, String[] values) { String[] result = new String[keys.length * 2]; @@ -189,6 +208,10 @@ public abstract class JedisUtils { return jedisParams; } + /** + * Deprecated. Use #{@link JedisConverters#toBit(Boolean)} + */ + @Deprecated static byte[] asBit(boolean value) { return (value ? ONE : ZERO); } @@ -198,6 +221,10 @@ public abstract class JedisUtils { return (Position.AFTER.equals(where) ? LIST_POSITION.AFTER : LIST_POSITION.BEFORE); } + /** + * Deprecated. Use #{@link JedisConverters#toProperties(String)} + */ + @Deprecated static Properties info(String string) { Properties info = new Properties(); StringReader stringReader = new StringReader(string); @@ -215,6 +242,10 @@ public abstract class JedisUtils { return new JedisMessageListener(listener); } + /** + * Deprecated. Use #{@link JedisConverters#toStrings(byte[][])} + */ + @Deprecated static String[] convert(byte[]... raw) { String[] result = new String[raw.length]; @@ -234,10 +265,18 @@ public abstract class JedisUtils { return args.toArray(new byte[args.size()][]); } + /** + * Deprecated. Use #{@link JedisConverters#toBytes(Integer)} + */ + @Deprecated static byte[] asBytes(int number) { return String.valueOf(number).getBytes(); } + /** + * Deprecated. Use #{@link JedisConverters#toString(byte[])} + */ + @Deprecated static String asString(byte[] raw) { return SafeEncoder.encode(raw); } diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java index 0cc02f8b1..f303dbc6b 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePool.java @@ -249,7 +249,7 @@ public class DefaultLettucePool implements LettucePool, InitializingBean { } public Object makeObject() throws Exception { - return client.connectAsync(LettuceUtils.CODEC); + return client.connectAsync(LettuceConnection.CODEC); } @SuppressWarnings("rawtypes") diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java index 5b3e531d4..afd9e179c 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java @@ -149,7 +149,7 @@ public class LettuceConnectionFactory implements InitializingBean, DisposableBea } public DataAccessException translateExceptionIfPossible(RuntimeException ex) { - return LettuceUtils.convertRedisAccessException(ex); + return LettuceConverters.toDataAccessException(ex); } /** @@ -340,7 +340,7 @@ public class LettuceConnectionFactory implements InitializingBean, DisposableBea protected RedisAsyncConnection createLettuceConnector() { try { - RedisAsyncConnection connection = client.connectAsync(LettuceUtils.CODEC); + RedisAsyncConnection connection = client.connectAsync(LettuceConnection.CODEC); if(dbIndex > 0) { connection.select(dbIndex); } diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceUtils.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceUtils.java index 20f744977..31a8adab7 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceUtils.java @@ -49,8 +49,10 @@ import com.lambdaworks.redis.protocol.Charsets; * Helper class featuring methods for Lettuce connection handling, providing * support for exception translation. * + * Deprecated in favor of {@link LettuceConverters} * @author Costin Leau */ +@Deprecated abstract class LettuceUtils { static final RedisCodec CODEC = new BytesRedisCodec(); 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 3f87b817f..637409431 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 @@ -78,7 +78,7 @@ public class SrpConnectionFactory implements InitializingBean, DisposableBean, R } public DataAccessException translateExceptionIfPossible(RuntimeException ex) { - return SrpUtils.convertSRedisAccessException(ex); + return SrpConverters.toDataAccessException(ex); } /** 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 fdab3d64d..137ef53fa 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 @@ -49,9 +49,12 @@ import com.google.common.base.Charsets; /** * Helper class featuring methods for SRedis connection handling, providing support for exception translation. * + * Deprecated. Use {@link SrpConverters} instead. + * * @author Costin Leau * @author Jennifer Hickey */ +@Deprecated abstract class SrpUtils { private static final byte[] ONE = new byte[] { '1' };