From 0523430a454f1135383f061afceffeaf51990d03 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 15 Mar 2011 23:42:31 +0200 Subject: [PATCH] + change exec return type to List --- .../redis/connection/DefaultStringRedisConnection.java | 2 +- .../data/keyvalue/redis/connection/RedisTxCommands.java | 2 +- .../keyvalue/redis/connection/jedis/JedisConnection.java | 9 ++------- .../redis/connection/jredis/JredisConnection.java | 2 +- .../data/keyvalue/redis/core/RedisOperations.java | 2 +- .../data/keyvalue/redis/core/RedisTemplate.java | 6 +++--- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java index f966bbee8..3d857e3df 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java @@ -116,7 +116,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection { return delegate.echo(message); } - public List exec() { + public List exec() { return delegate.exec(); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java index 79f14bec4..73f82f600 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java @@ -27,7 +27,7 @@ public interface RedisTxCommands { void multi(); - List exec(); + List exec(); void discard(); diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java index 6f4286615..d3f898769 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java @@ -511,19 +511,14 @@ public class JedisConnection implements RedisConnection { } } - @SuppressWarnings("unchecked") @Override - public List exec() { + public List exec() { try { if (isPipelined()) { pipeline.exec(); return null; } - List execute = transaction.exec(); - if (execute != null && !execute.isEmpty()) { - return (List) execute; - } - return Collections.emptyList(); + return transaction.exec(); } catch (Exception ex) { throw convertJedisAccessException(ex); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java index 92f5ebc34..dca7e829d 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java @@ -267,7 +267,7 @@ public class JredisConnection implements RedisConnection { } @Override - public List exec() { + public List exec() { throw new UnsupportedOperationException(); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisOperations.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisOperations.java index 836277f63..dbae2dbba 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisOperations.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisOperations.java @@ -112,7 +112,7 @@ public interface RedisOperations { void discard(); - Object exec(); + List exec(); // pubsub functionality on the template void convertAndSend(String destination, Object message); diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java index c541cd39b..6358593c5 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java @@ -419,11 +419,11 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation // RedisOperations // @Override - public Object exec() { - return execute(new RedisCallback() { + public List exec() { + return execute(new RedisCallback>() { @Override - public Object doInRedis(RedisConnection connection) throws DataAccessException { + public List doInRedis(RedisConnection connection) throws DataAccessException { return connection.exec(); } });