diff --git a/.classpath b/.classpath index bbf9837aa..a316b6684 100644 --- a/.classpath +++ b/.classpath @@ -12,7 +12,6 @@ - @@ -20,8 +19,9 @@ - + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index b69a99a38..9377866ca 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Fri Mar 30 10:10:50 EEST 2012 +#Sun Apr 01 10:03:27 EEST 2012 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/gradle.properties b/gradle.properties index 9faebb341..07999da81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ mockitoVersion = 1.8.5 jedisVersion = 2.0.0 jredisVersion = 03122010 rjcVersion = 0.6.4 -sredisVersion = 0.1 +sredisVersion = 0.2-SNAPSHOT # Manifest properties diff --git a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisConnection.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java similarity index 77% rename from src/main/java/org/springframework/data/redis/connection/sredis/SRedisConnection.java rename to src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java index dace9c2ce..bd07a475d 100644 --- a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.redis.connection.sredis; +package org.springframework.data.redis.connection.srp; import java.io.IOException; import java.util.Collections; @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.concurrent.BlockingQueue; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.RedisConnectionFailureException; @@ -35,27 +36,28 @@ import org.springframework.data.redis.connection.Subscription; import redis.client.RedisClient; import redis.client.RedisClient.Pipeline; import redis.client.RedisException; -import redis.client.SocketPool; -import redis.reply.MultiBulkReply; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.base.Charsets; /** * {@code RedisConnection} implementation on top of spullara Redis Protocol library. * * @author Costin Leau */ -public class SRedisConnection implements RedisConnection { +public class SrpConnection implements RedisConnection { + + private final RedisClient client; + private final BlockingQueue queue; private boolean isClosed = false; private boolean isMulti = false; - private final RedisClient client; private Pipeline pipeline; - private volatile SRedisSubscription subscription; + private volatile SrpSubscription subscription; - public SRedisConnection(SocketPool pool) { + public SrpConnection(String host, int port, BlockingQueue queue) { try { - this.client = new RedisClient(pool); + this.client = new RedisClient(host, port); + this.queue = queue; } catch (IOException e) { throw new RedisConnectionFailureException("Could not connect", e); } @@ -63,7 +65,7 @@ public class SRedisConnection implements RedisConnection { protected DataAccessException convertSRAccessException(Exception ex) { if (ex instanceof RedisException) { - return SRedisUtils.convertSRedisAccessException((RedisException) ex); + return SrpUtils.convertSRedisAccessException((RedisException) ex); } if (ex instanceof IOException) { return new RedisConnectionFailureException("Redis connection failed", (IOException) ex); @@ -75,6 +77,7 @@ public class SRedisConnection implements RedisConnection { public void close() throws DataAccessException { isClosed = true; + queue.remove(this); try { client.close(); @@ -108,31 +111,32 @@ public class SRedisConnection implements RedisConnection { } public List closePipeline() { - if (pipeline != null) { - ListenableFuture reply = pipeline.exec(); - pipeline = null; - if (reply != null) { - try { - return SRedisUtils.toList(reply.get().byteArrays); - } catch (Exception ex) { - throw convertSRAccessException(ex); - } - } - } - return Collections.emptyList(); + // if (pipeline != null) { + // //ListenableFuture reply = pipeline.exec(); + // pipeline = null; + // if (reply != null) { + // try { + // return SrpUtils.toList(reply.get().data()); + // } catch (Exception ex) { + // throw convertSRAccessException(ex); + // } + // } + // } + throw new UnsupportedOperationException(); + //return Collections.emptyList(); } public List sort(byte[] key, SortParameters params) { - byte[] sort = SRedisUtils.sort(params); + byte[] sort = SrpUtils.sort(params); try { if (isPipelined()) { pipeline.sort(key, sort, null, (Object[]) null); return null; } - return SRedisUtils.toBytesList(client.sort(key, sort, null, (Object[]) null).byteArrays); + return SrpUtils.toBytesList(client.sort(key, sort, null, (Object[]) null).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -140,14 +144,14 @@ public class SRedisConnection implements RedisConnection { public Long sort(byte[] key, SortParameters params, byte[] sortKey) { - byte[] sort = SRedisUtils.sort(params, sortKey); + byte[] sort = SrpUtils.sort(params, sortKey); try { if (isPipelined()) { pipeline.sort(key, sort, null, (Object[]) null); return null; } - return SRedisUtils.toLong(client.sort(key, sort, null, (Object[]) null).byteArrays); + return SrpUtils.toLong(client.sort(key, sort, null, (Object[]) null).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -159,7 +163,7 @@ public class SRedisConnection implements RedisConnection { pipeline.dbsize(); return null; } - return client.dbsize().integer; + return client.dbsize().data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -251,7 +255,7 @@ public class SRedisConnection implements RedisConnection { pipeline.info(); return null; } - return SRedisUtils.info(client.info()); + return SrpUtils.info(client.info()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -264,7 +268,7 @@ public class SRedisConnection implements RedisConnection { pipeline.lastsave(); return null; } - return client.lastsave().integer; + return client.lastsave().data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -299,12 +303,13 @@ public class SRedisConnection implements RedisConnection { public void shutdown() { + byte[] save = "SAVE".getBytes(Charsets.UTF_8); try { if (isPipelined()) { - pipeline.shutdown(); + pipeline.shutdown(save, null); return; } - client.shutdown(); + client.shutdown(save, null); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -317,7 +322,7 @@ public class SRedisConnection implements RedisConnection { pipeline.echo(message); return null; } - return client.echo(message).bytes; + return client.echo(message).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -329,7 +334,7 @@ public class SRedisConnection implements RedisConnection { if (isPipelined()) { pipeline.ping(); } - return client.ping().status; + return client.ping().data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -342,7 +347,7 @@ public class SRedisConnection implements RedisConnection { pipeline.del((Object[]) keys); return null; } - return client.del((Object[]) keys).integer; + return client.del((Object[]) keys).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -353,8 +358,9 @@ public class SRedisConnection implements RedisConnection { isMulti = false; try { if (isPipelined()) { - pipeline.discard(); - return; + //pipeline.discard(); + //return; + throw new UnsupportedOperationException(); } client.discard(); @@ -368,10 +374,12 @@ public class SRedisConnection implements RedisConnection { isMulti = false; try { if (isPipelined()) { - pipeline.exec(); - return null; + // pipeline.exec(); + // return null; + throw new UnsupportedOperationException(); } - return SRedisUtils.toList(client.exec().byteArrays); + // return SrpUtils.toList(client.exec()); + throw new UnsupportedOperationException(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -384,7 +392,7 @@ public class SRedisConnection implements RedisConnection { pipeline.exists(key); return null; } - return client.exists(key).integer == 1; + return client.exists(key).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -397,7 +405,7 @@ public class SRedisConnection implements RedisConnection { pipeline.expire(key, seconds); return null; } - return client.expire(key, seconds).integer == 1; + return client.expire(key, seconds).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -410,7 +418,7 @@ public class SRedisConnection implements RedisConnection { pipeline.expireat(key, unixTime); return null; } - return client.expireat(key, unixTime).integer == 1; + return client.expireat(key, unixTime).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -423,7 +431,7 @@ public class SRedisConnection implements RedisConnection { pipeline.keys(pattern); return null; } - return SRedisUtils.toSet(client.keys(pattern).byteArrays); + return SrpUtils.toSet(client.keys(pattern).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -437,8 +445,9 @@ public class SRedisConnection implements RedisConnection { isMulti = true; try { if (isPipelined()) { - pipeline.multi(); - return; + // pipeline.multi(); + // return; + throw new UnsupportedOperationException(); } client.multi(); } catch (Exception ex) { @@ -453,7 +462,7 @@ public class SRedisConnection implements RedisConnection { pipeline.persist(key); return null; } - return client.persist(key).integer == 1; + return client.persist(key).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -466,7 +475,7 @@ public class SRedisConnection implements RedisConnection { pipeline.move(key, dbIndex); return null; } - return client.move(key, dbIndex).integer == 1; + return client.move(key, dbIndex).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -479,7 +488,7 @@ public class SRedisConnection implements RedisConnection { pipeline.randomkey(); return null; } - return client.randomkey().bytes; + return client.randomkey().data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -505,7 +514,7 @@ public class SRedisConnection implements RedisConnection { pipeline.renamenx(oldName, newName); return null; } - return (client.renamenx(oldName, newName).integer == 1); + return (client.renamenx(oldName, newName).data() == 1); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -530,7 +539,7 @@ public class SRedisConnection implements RedisConnection { pipeline.ttl(key); return null; } - return client.ttl(key).integer; + return client.ttl(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -543,7 +552,7 @@ public class SRedisConnection implements RedisConnection { pipeline.type(key); return null; } - return DataType.fromCode(client.type(key).status); + return DataType.fromCode(client.type(key).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -564,13 +573,11 @@ public class SRedisConnection implements RedisConnection { throw new UnsupportedOperationException(); } try { - for (byte[] key : keys) { - if (isPipelined()) { - pipeline.watch(key); - } - else { - client.watch(key); - } + if (isPipelined()) { + pipeline.watch((Object[]) keys); + } + else { + client.watch((Object[]) keys); } } catch (Exception ex) { throw convertSRAccessException(ex); @@ -589,7 +596,7 @@ public class SRedisConnection implements RedisConnection { return null; } - return client.get(key).bytes; + return client.get(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -616,7 +623,7 @@ public class SRedisConnection implements RedisConnection { pipeline.getset(key, value); return null; } - return client.getset(key, value).bytes; + return client.getset(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -629,7 +636,7 @@ public class SRedisConnection implements RedisConnection { pipeline.append(key, value); return null; } - return client.append(key, value).integer; + return client.append(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -642,7 +649,7 @@ public class SRedisConnection implements RedisConnection { pipeline.mget((Object[]) keys); return null; } - return SRedisUtils.toBytesList(client.mget((Object) keys).byteArrays); + return SrpUtils.toBytesList(client.mget((Object[]) keys).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -652,10 +659,10 @@ public class SRedisConnection implements RedisConnection { public void mSet(Map tuples) { try { if (isPipelined()) { - pipeline.mset((Object[]) SRedisUtils.convert(tuples)); + pipeline.mset((Object[]) SrpUtils.convert(tuples)); return; } - client.mset((Object[]) SRedisUtils.convert(tuples)); + client.mset((Object[]) SrpUtils.convert(tuples)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -665,10 +672,10 @@ public class SRedisConnection implements RedisConnection { public void mSetNX(Map tuples) { try { if (isPipelined()) { - pipeline.msetnx((Object[]) SRedisUtils.convert(tuples)); + pipeline.msetnx((Object[]) SrpUtils.convert(tuples)); return; } - client.msetnx((Object[]) SRedisUtils.convert(tuples)); + client.msetnx((Object[]) SrpUtils.convert(tuples)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -694,7 +701,7 @@ public class SRedisConnection implements RedisConnection { pipeline.setnx(key, value); return null; } - return client.setnx(key, value).integer == 1; + return client.setnx(key, value).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -707,7 +714,7 @@ public class SRedisConnection implements RedisConnection { pipeline.getrange(key, start, end); return null; } - return client.getrange(key, start, end).bytes; + return client.getrange(key, start, end).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -720,7 +727,7 @@ public class SRedisConnection implements RedisConnection { pipeline.decr(key); return null; } - return client.decr(key).integer; + return client.decr(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -733,7 +740,7 @@ public class SRedisConnection implements RedisConnection { pipeline.decrby(key, value); return null; } - return client.decrby(key, value).integer; + return client.decrby(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -746,7 +753,7 @@ public class SRedisConnection implements RedisConnection { pipeline.incr(key); return null; } - return client.incr(key).integer; + return client.incr(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -759,7 +766,7 @@ public class SRedisConnection implements RedisConnection { pipeline.incrby(key, value); return null; } - return client.incrby(key, value).integer; + return client.incrby(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -774,7 +781,7 @@ public class SRedisConnection implements RedisConnection { if (isPipelined()) { throw new UnsupportedOperationException(); } - return (client.getbit(key, offset).integer == 1); + return (client.getbit(key, offset).data() == 1); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -789,7 +796,7 @@ public class SRedisConnection implements RedisConnection { if (isPipelined()) { throw new UnsupportedOperationException(); } - client.setbit(key, offset, SRedisUtils.asBit(value)); + client.setbit(key, offset, SrpUtils.asBit(value)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -817,7 +824,7 @@ public class SRedisConnection implements RedisConnection { pipeline.strlen(key); return null; } - return client.strlen(key).integer; + return client.strlen(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -831,10 +838,10 @@ public class SRedisConnection implements RedisConnection { public Long lPush(byte[] key, byte[] value) { try { if (isPipelined()) { - pipeline.lpush(key, value); + pipeline.lpush(key, new Object[] { value }); return null; } - return client.lpush(key, value).integer; + return client.lpush(key, new Object[] { value }).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -844,10 +851,10 @@ public class SRedisConnection implements RedisConnection { public Long rPush(byte[] key, byte[] value) { try { if (isPipelined()) { - pipeline.rpush(key, value); + pipeline.rpush(key, new Object[] { value }); return null; } - return client.rpush(key, value).integer; + return client.rpush(key, new Object[] { value }).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -857,10 +864,11 @@ public class SRedisConnection implements RedisConnection { public List bLPop(int timeout, byte[]... keys) { try { if (isPipelined()) { - pipeline.blpop(timeout, keys); + // pipeline.blpop(timeout, keys); return null; } - return SRedisUtils.toBytesList(client.blpop(timeout, keys).byteArrays); + // return SrpUtils.toBytesList(client.blpop(timeout, keys).data()); + throw new UnsupportedOperationException(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -870,10 +878,11 @@ public class SRedisConnection implements RedisConnection { public List bRPop(int timeout, byte[]... keys) { try { if (isPipelined()) { - pipeline.brpop(timeout, keys); + // pipeline.brpop(timeout, keys); return null; } - return SRedisUtils.toBytesList(client.brpop(timeout, keys).byteArrays); + // return SrpUtils.toBytesList(client.brpop(timeout, keys).data()); + throw new UnsupportedOperationException(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -886,7 +895,7 @@ public class SRedisConnection implements RedisConnection { pipeline.lindex(key, index); return null; } - return client.lindex(key, index).bytes; + return client.lindex(key, index).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -896,10 +905,10 @@ public class SRedisConnection implements RedisConnection { public Long lInsert(byte[] key, Position where, byte[] pivot, byte[] value) { try { if (isPipelined()) { - pipeline.linsert(key, SRedisUtils.convertPosition(where), pivot, value); + pipeline.linsert(key, SrpUtils.convertPosition(where), pivot, value); return null; } - return client.linsert(key, SRedisUtils.convertPosition(where), pivot, value).integer; + return client.linsert(key, SrpUtils.convertPosition(where), pivot, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -912,7 +921,7 @@ public class SRedisConnection implements RedisConnection { pipeline.llen(key); return null; } - return client.llen(key).integer; + return client.llen(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -925,7 +934,7 @@ public class SRedisConnection implements RedisConnection { pipeline.lpop(key); return null; } - return client.lpop(key).bytes; + return client.lpop(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -938,7 +947,7 @@ public class SRedisConnection implements RedisConnection { pipeline.lrange(key, start, end); return null; } - return SRedisUtils.toBytesList(client.lrange(key, start, end).byteArrays); + return SrpUtils.toBytesList(client.lrange(key, start, end).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -951,7 +960,7 @@ public class SRedisConnection implements RedisConnection { pipeline.lrem(key, count, value); return null; } - return client.lrem(key, count, value).integer; + return client.lrem(key, count, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -990,7 +999,7 @@ public class SRedisConnection implements RedisConnection { pipeline.rpop(key); return null; } - return client.rpop(key).bytes; + return client.rpop(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1003,7 +1012,7 @@ public class SRedisConnection implements RedisConnection { pipeline.rpoplpush(srcKey, dstKey); return null; } - return client.rpoplpush(srcKey, dstKey).bytes; + return client.rpoplpush(srcKey, dstKey).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1016,7 +1025,7 @@ public class SRedisConnection implements RedisConnection { pipeline.brpoplpush(srcKey, dstKey, timeout); return null; } - return client.brpoplpush(srcKey, dstKey, timeout).bytes; + return client.brpoplpush(srcKey, dstKey, timeout).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1029,7 +1038,7 @@ public class SRedisConnection implements RedisConnection { pipeline.lpushx(key, value); return null; } - return client.lpushx(key, value).integer; + return client.lpushx(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1042,7 +1051,7 @@ public class SRedisConnection implements RedisConnection { pipeline.rpushx(key, value); return null; } - return client.rpushx(key, value).integer; + return client.rpushx(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1057,10 +1066,10 @@ public class SRedisConnection implements RedisConnection { public Boolean sAdd(byte[] key, byte[] value) { try { if (isPipelined()) { - pipeline.sadd(key, value); + pipeline.sadd(key, new Object[] { value }); return null; } - return (client.sadd(key, value).integer == 1); + return (client.sadd(key, new Object[] { value }).data() == 1); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1073,7 +1082,7 @@ public class SRedisConnection implements RedisConnection { pipeline.scard(key); return null; } - return client.scard(key).integer; + return client.scard(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1086,7 +1095,7 @@ public class SRedisConnection implements RedisConnection { pipeline.sdiff((Object[]) keys); return null; } - return SRedisUtils.toSet(client.sdiff((Object[]) keys).byteArrays); + return SrpUtils.toSet(client.sdiff((Object[]) keys).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1112,7 +1121,7 @@ public class SRedisConnection implements RedisConnection { pipeline.sinter((Object[]) keys); return null; } - return SRedisUtils.toSet(client.sinter((Object[]) keys).byteArrays); + return SrpUtils.toSet(client.sinter((Object[]) keys).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1138,7 +1147,7 @@ public class SRedisConnection implements RedisConnection { pipeline.sismember(key, value); return null; } - return client.sismember(key, value).integer == 1; + return client.sismember(key, value).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1151,7 +1160,7 @@ public class SRedisConnection implements RedisConnection { pipeline.smembers(key); return null; } - return SRedisUtils.toSet(client.smembers(key).byteArrays); + return SrpUtils.toSet(client.smembers(key).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1164,7 +1173,7 @@ public class SRedisConnection implements RedisConnection { pipeline.smove(srcKey, destKey, value); return null; } - return client.smove(srcKey, destKey, value).integer == 1; + return client.smove(srcKey, destKey, value).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1177,7 +1186,7 @@ public class SRedisConnection implements RedisConnection { pipeline.spop(key); return null; } - return client.spop(key).bytes; + return client.spop(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1190,7 +1199,7 @@ public class SRedisConnection implements RedisConnection { pipeline.srandmember(key); return null; } - return client.srandmember(key).bytes; + return client.srandmember(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1200,10 +1209,10 @@ public class SRedisConnection implements RedisConnection { public Boolean sRem(byte[] key, byte[] value) { try { if (isPipelined()) { - pipeline.srem(key, value); + pipeline.srem(key, new Object[] { value }); return null; } - return client.srem(key, value).integer == 1; + return client.srem(key, new Object[] { value }).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1216,7 +1225,7 @@ public class SRedisConnection implements RedisConnection { pipeline.sunion((Object[]) keys); return null; } - return SRedisUtils.toSet(client.sunion((Object[]) keys).byteArrays); + return SrpUtils.toSet(client.sunion((Object[]) keys).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1246,7 +1255,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zadd(key, score, value, null, null); return null; } - return client.zadd(key, score, value, null, null).integer == 1; + return client.zadd(key, score, value, null, null).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1259,7 +1268,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zcard(key); return null; } - return client.zcard(key).integer; + return client.zcard(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1272,7 +1281,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zcount(key, min, max); return null; } - return client.zcount(key, min, max).integer; + return client.zcount(key, min, max).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1285,7 +1294,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zincrby(key, increment, value); return null; } - return SRedisUtils.toDouble(client.zincrby(key, increment, value).bytes); + return SrpUtils.toDouble(client.zincrby(key, increment, value).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1300,10 +1309,10 @@ public class SRedisConnection implements RedisConnection { public Long zInterStore(byte[] destKey, byte[]... sets) { try { if (isQueueing()) { - pipeline.zinterstore(destKey, sets); + pipeline.zinterstore(destKey, sets.length, (Object[]) sets); return null; } - return client.zinterstore(destKey, sets).integer; + return client.zinterstore(destKey, sets.length, (Object[]) sets).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1316,7 +1325,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zrange(key, start, end, null); return null; } - return SRedisUtils.toSet(client.zrange(key, start, end, null).byteArrays); + return SrpUtils.toSet(client.zrange(key, start, end, null).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1326,10 +1335,10 @@ public class SRedisConnection implements RedisConnection { public Set zRangeWithScores(byte[] key, long start, long end) { try { if (isPipelined()) { - pipeline.zrange(key, start, end, SRedisUtils.WITHSCORES); + pipeline.zrange(key, start, end, SrpUtils.WITHSCORES); return null; } - return SRedisUtils.convertTuple(client.zrange(key, start, end, SRedisUtils.WITHSCORES)); + return SrpUtils.convertTuple(client.zrange(key, start, end, SrpUtils.WITHSCORES)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1342,7 +1351,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zrangebyscore(key, min, max, null, null); return null; } - return SRedisUtils.toSet(client.zrangebyscore(key, min, max, null, null).byteArrays); + return SrpUtils.toSet(client.zrangebyscore(key, min, max, null, null).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1352,10 +1361,10 @@ public class SRedisConnection implements RedisConnection { public Set zRangeByScoreWithScores(byte[] key, double min, double max) { try { if (isPipelined()) { - pipeline.zrangebyscore(key, min, max, SRedisUtils.WITHSCORES, null); + pipeline.zrangebyscore(key, min, max, SrpUtils.WITHSCORES, null); return null; } - return SRedisUtils.convertTuple(client.zrangebyscore(key, min, max, SRedisUtils.WITHSCORES, null)); + return SrpUtils.convertTuple(client.zrangebyscore(key, min, max, SrpUtils.WITHSCORES, null)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1365,10 +1374,10 @@ public class SRedisConnection implements RedisConnection { public Set zRevRangeWithScores(byte[] key, long start, long end) { try { if (isPipelined()) { - pipeline.zrevrange(key, start, end, SRedisUtils.WITHSCORES); + pipeline.zrevrange(key, start, end, SrpUtils.WITHSCORES); return null; } - return SRedisUtils.convertTuple(client.zrevrange(key, start, end, SRedisUtils.WITHSCORES)); + return SrpUtils.convertTuple(client.zrevrange(key, start, end, SrpUtils.WITHSCORES)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1377,12 +1386,12 @@ public class SRedisConnection implements RedisConnection { public Set zRangeByScore(byte[] key, double min, double max, long offset, long count) { try { - byte[] limit = SRedisUtils.limit(offset, count); + byte[] limit = SrpUtils.limit(offset, count); if (isPipelined()) { pipeline.zrangebyscore(key, min, max, null, limit); return null; } - return SRedisUtils.toSet(client.zrangebyscore(key, min, max, null, limit).byteArrays); + return SrpUtils.toSet(client.zrangebyscore(key, min, max, null, limit).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1391,12 +1400,12 @@ public class SRedisConnection implements RedisConnection { public Set zRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { try { - byte[] limit = SRedisUtils.limit(offset, count); + byte[] limit = SrpUtils.limit(offset, count); if (isPipelined()) { - pipeline.zrangebyscore(key, min, max, SRedisUtils.WITHSCORES, limit); + pipeline.zrangebyscore(key, min, max, SrpUtils.WITHSCORES, limit); return null; } - return SRedisUtils.convertTuple(client.zrangebyscore(key, min, max, SRedisUtils.WITHSCORES, limit)); + return SrpUtils.convertTuple(client.zrangebyscore(key, min, max, SrpUtils.WITHSCORES, limit)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1405,11 +1414,11 @@ public class SRedisConnection implements RedisConnection { public Set zRevRangeByScore(byte[] key, double min, double max, long offset, long count) { try { - byte[] limit = SRedisUtils.limit(offset, count); + byte[] limit = SrpUtils.limit(offset, count); if (isPipelined()) { client.zrevrangebyscore(key, min, max, null, limit); } - return SRedisUtils.toSet(client.zrevrangebyscore(key, min, max, null, limit).byteArrays); + return SrpUtils.toSet(client.zrevrangebyscore(key, min, max, null, limit).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1421,7 +1430,7 @@ public class SRedisConnection implements RedisConnection { if (isPipelined()) { client.zrevrangebyscore(key, min, max, null, null); } - return SRedisUtils.toSet(client.zrevrangebyscore(key, min, max, null, null).byteArrays); + return SrpUtils.toSet(client.zrevrangebyscore(key, min, max, null, null).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1430,11 +1439,11 @@ public class SRedisConnection implements RedisConnection { public Set zRevRangeByScoreWithScores(byte[] key, double min, double max, long offset, long count) { try { - byte[] limit = SRedisUtils.limit(offset, count); + byte[] limit = SrpUtils.limit(offset, count); if (isPipelined()) { - client.zrevrangebyscore(key, min, max, SRedisUtils.WITHSCORES, limit); + client.zrevrangebyscore(key, min, max, SrpUtils.WITHSCORES, limit); } - return SRedisUtils.convertTuple(client.zrevrangebyscore(key, min, max, SRedisUtils.WITHSCORES, limit)); + return SrpUtils.convertTuple(client.zrevrangebyscore(key, min, max, SrpUtils.WITHSCORES, limit)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1444,9 +1453,9 @@ public class SRedisConnection implements RedisConnection { public Set zRevRangeByScoreWithScores(byte[] key, double min, double max) { try { if (isPipelined()) { - client.zrevrangebyscore(key, min, max, SRedisUtils.WITHSCORES, null); + client.zrevrangebyscore(key, min, max, SrpUtils.WITHSCORES, null); } - return SRedisUtils.convertTuple(client.zrevrangebyscore(key, min, max, SRedisUtils.WITHSCORES, null)); + return SrpUtils.convertTuple(client.zrevrangebyscore(key, min, max, SrpUtils.WITHSCORES, null)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1459,7 +1468,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zrank(key, value); return null; } - return client.zrank(key, value).integer; + return client.zrank(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1469,10 +1478,10 @@ public class SRedisConnection implements RedisConnection { public Boolean zRem(byte[] key, byte[] value) { try { if (isPipelined()) { - pipeline.zrem(key, value); + pipeline.zrem(key, new Object[] { value }); return null; } - return client.zrem(key, value).integer == 1; + return client.zrem(key, new Object[] { value }).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1485,7 +1494,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zremrangebyrank(key, start, end); return null; } - return client.zremrangebyrank(key, start, end).integer; + return client.zremrangebyrank(key, start, end).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1498,7 +1507,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zremrangebyscore(key, min, max); return null; } - return client.zremrangebyscore(key, min, max).integer; + return client.zremrangebyscore(key, min, max).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1511,7 +1520,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zrevrange(key, start, end, null); return null; } - return SRedisUtils.toSet(client.zrevrange(key, start, end, null).byteArrays); + return SrpUtils.toSet(client.zrevrange(key, start, end, null).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1524,7 +1533,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zrevrank(key, value); return null; } - return client.zrevrank(key, value).integer; + return client.zrevrank(key, value).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1537,7 +1546,7 @@ public class SRedisConnection implements RedisConnection { pipeline.zscore(key, value); return null; } - return SRedisUtils.toDouble(client.zscore(key, value).bytes); + return SrpUtils.toDouble(client.zscore(key, value).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1552,10 +1561,10 @@ public class SRedisConnection implements RedisConnection { public Long zUnionStore(byte[] destKey, byte[]... sets) { try { if (isPipelined()) { - pipeline.zunionstore(destKey, sets); + pipeline.zunionstore(destKey, sets.length, (Object[]) sets); return null; } - return client.zunionstore(destKey, sets).integer; + return client.zunionstore(destKey, sets.length, (Object[]) sets).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1572,7 +1581,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hset(key, field, value); return null; } - return client.hset(key, field, value).integer == 1; + return client.hset(key, field, value).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1585,7 +1594,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hsetnx(key, field, value); return null; } - return client.hsetnx(key, field, value).integer == 1; + return client.hsetnx(key, field, value).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1595,10 +1604,10 @@ public class SRedisConnection implements RedisConnection { public Boolean hDel(byte[] key, byte[] field) { try { if (isPipelined()) { - pipeline.hdel(key, field); + pipeline.hdel(key, new Object[] { field }); return null; } - return client.hdel(key, field).integer == 1; + return client.hdel(key, new Object[] { field }).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1611,7 +1620,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hexists(key, field); return null; } - return client.hexists(key, field).integer == 1; + return client.hexists(key, field).data() == 1; } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1624,7 +1633,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hget(key, field); return null; } - return client.hget(key, field).bytes; + return client.hget(key, field).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1637,7 +1646,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hgetall(key); return null; } - return SRedisUtils.toMap(client.hgetall(key).byteArrays); + return SrpUtils.toMap(client.hgetall(key).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1650,7 +1659,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hincrby(key, field, delta); return null; } - return client.hincrby(key, field, delta).integer; + return client.hincrby(key, field, delta).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1663,7 +1672,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hkeys(key); return null; } - return SRedisUtils.toSet(client.hkeys(key).byteArrays); + return SrpUtils.toSet(client.hkeys(key).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1676,7 +1685,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hlen(key); return null; } - return client.hlen(key).integer; + return client.hlen(key).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1689,7 +1698,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hmget(key, (Object[]) fields); return null; } - return SRedisUtils.toBytesList(client.hmget(key, (Object[]) fields).byteArrays); + return SrpUtils.toBytesList(client.hmget(key, (Object[]) fields).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1699,10 +1708,10 @@ public class SRedisConnection implements RedisConnection { public void hMSet(byte[] key, Map tuple) { try { if (isPipelined()) { - pipeline.hmset(key, tuple); + pipeline.hmset(key, SrpUtils.convert(tuple)); return; } - client.hmset(key, tuple); + client.hmset(key, SrpUtils.convert(tuple)); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1715,7 +1724,7 @@ public class SRedisConnection implements RedisConnection { pipeline.hvals(key); return null; } - return SRedisUtils.toBytesList(client.hvals(key).byteArrays); + return SrpUtils.toBytesList(client.hvals(key).data()); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1735,7 +1744,7 @@ public class SRedisConnection implements RedisConnection { pipeline.publish(channel, message); return null; } - return client.publish(channel, message).integer; + return client.publish(channel, message).data(); } catch (Exception ex) { throw convertSRAccessException(ex); } @@ -1763,7 +1772,7 @@ public class SRedisConnection implements RedisConnection { throw new UnsupportedOperationException(); } - subscription = new SRedisSubscription(listener, client); + subscription = new SrpSubscription(listener, client); subscription.pSubscribe(patterns); } catch (Exception ex) { throw convertSRAccessException(ex); @@ -1779,7 +1788,7 @@ public class SRedisConnection implements RedisConnection { throw new UnsupportedOperationException(); } - subscription = new SRedisSubscription(listener, client); + subscription = new SrpSubscription(listener, client); subscription.subscribe(channels); } catch (Exception ex) { diff --git a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java similarity index 71% rename from src/main/java/org/springframework/data/redis/connection/sredis/SRedisConnectionFactory.java rename to src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java index 09f6935c9..edd0d0879 100644 --- a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnectionFactory.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.springframework.data.redis.connection.sredis; +package org.springframework.data.redis.connection.srp; -import java.io.IOException; -import java.lang.reflect.Field; -import java.net.Socket; -import java.util.Queue; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,67 +27,60 @@ import org.springframework.dao.DataAccessException; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.util.ReflectionUtils; - -import redis.client.SocketPool; /** * Connection factory creating Redis Protocol based connections. * * @author Costin Leau */ -public class SRedisConnectionFactory implements InitializingBean, DisposableBean, RedisConnectionFactory { +public class SrpConnectionFactory implements InitializingBean, DisposableBean, RedisConnectionFactory { private final static Log log = LogFactory.getLog(JedisConnectionFactory.class); private String hostName = "localhost"; private int port = 6379; - private SocketPool pool; + private BlockingQueue trackedConnections = new ArrayBlockingQueue(50); + /** * Constructs a new SRedisConnectionFactory instance * with default settings. */ - public SRedisConnectionFactory() { + public SrpConnectionFactory() { } /** * Constructs a new SRedisConnectionFactory instance * with default settings. */ - public SRedisConnectionFactory(String host, int port) { + public SrpConnectionFactory(String host, int port) { this.hostName = host; this.port = port; } public void afterPropertiesSet() { - pool = new SocketPool(hostName, port); } public void destroy() { - Field f = ReflectionUtils.findField(SocketPool.class, "queue"); - ReflectionUtils.makeAccessible(f); - Queue queue = (Queue) ReflectionUtils.getField(f, pool); - Socket s = null; + SrpConnection con; do { - s = queue.poll(); - if (s != null) { + con = trackedConnections.poll(); + if (con != null && !con.isClosed()) { try { - s.close(); - } catch (IOException ex) { + con.close(); + } catch (Exception ex) { // ignore } } - } while (s != null); - pool = null; + } while (con != null); } public RedisConnection getConnection() { - return new SRedisConnection(pool); + return new SrpConnection(hostName, port, trackedConnections); } public DataAccessException translateExceptionIfPossible(RuntimeException ex) { - return SRedisUtils.convertSRedisAccessException(ex); + return SrpUtils.convertSRedisAccessException(ex); } /** diff --git a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisSubscription.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpSubscription.java similarity index 89% rename from src/main/java/org/springframework/data/redis/connection/sredis/SRedisSubscription.java rename to src/main/java/org/springframework/data/redis/connection/srp/SrpSubscription.java index fd7ce5977..2ac193382 100644 --- a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisSubscription.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.redis.connection.sredis; +package org.springframework.data.redis.connection.srp; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.connection.util.AbstractSubscription; @@ -26,11 +26,11 @@ import redis.client.RedisClient; * * @author Costin Leau */ -class SRedisSubscription extends AbstractSubscription { +class SrpSubscription extends AbstractSubscription { private final RedisClient client; - SRedisSubscription(MessageListener listener, RedisClient client) { + SrpSubscription(MessageListener listener, RedisClient client) { super(listener); this.client = client; } diff --git a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisUtils.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java similarity index 85% rename from src/main/java/org/springframework/data/redis/connection/sredis/SRedisUtils.java rename to src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java index 5019a7a89..946f3cefb 100644 --- a/src/main/java/org/springframework/data/redis/connection/sredis/SRedisUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.springframework.data.redis.connection.sredis; +package org.springframework.data.redis.connection.srp; import java.io.StringReader; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -38,6 +37,7 @@ import org.springframework.util.Assert; import redis.client.RedisException; import redis.reply.BulkReply; import redis.reply.MultiBulkReply; +import redis.reply.Reply; import com.google.common.base.Charsets; @@ -46,7 +46,7 @@ import com.google.common.base.Charsets; * * @author Costin Leau */ -abstract class SRedisUtils { +abstract class SrpUtils { private static final byte[] ONE = new byte[] { 1 }; private static final byte[] ZERO = new byte[] { 0 }; @@ -70,7 +70,7 @@ abstract class SRedisUtils { static Properties info(BulkReply reply) { Properties info = new Properties(); // use the same charset as the library - StringReader stringReader = new StringReader(new String(reply.bytes, Charsets.UTF_8)); + StringReader stringReader = new StringReader(new String(reply.data(), Charsets.UTF_8)); try { info.load(stringReader); } catch (Exception ex) { @@ -81,17 +81,17 @@ abstract class SRedisUtils { return info; } - static List toBytesList(Object[] byteArrays) { - List list = new ArrayList(byteArrays.length); - if (byteArrays.length == 1 && byteArrays[0] == null) { - return Collections.emptyList(); - } - - for (Object obj : byteArrays) { - if (obj instanceof byte[]) - list.add((byte[]) obj); + static List toBytesList(Reply[] replies) { + List list = new ArrayList(replies.length); + for (Reply reply : replies) { + Object data = reply.data(); + if (data == null) { + list.add(null); + } + else if (data instanceof byte[]) + list.add((byte[]) data); else - throw new IllegalArgumentException("array contains more then just bytes" + obj); + throw new IllegalArgumentException("array contains more then just nulls and bytes -> " + data); } return list; @@ -101,7 +101,7 @@ abstract class SRedisUtils { return Arrays.asList(byteArrays); } - static Set toSet(Object[] byteArrays) { + static Set toSet(Reply[] byteArrays) { return new LinkedHashSet(toBytesList(byteArrays)); } @@ -126,21 +126,21 @@ abstract class SRedisUtils { } static Double toDouble(byte[] bytes) { - return Double.valueOf(new String(bytes, Charsets.UTF_8)); + return (bytes == null || bytes.length == 0 ? null : Double.valueOf(new String(bytes, Charsets.UTF_8))); } - static Long toLong(Object[] byteArrays) { - return Long.valueOf(new String((byte[]) byteArrays[0], Charsets.UTF_8)); + static Long toLong(Object[] bytes) { + return (bytes == null || bytes.length == 0 ? null : Long.valueOf(new String((byte[]) bytes[0], Charsets.UTF_8))); } static Set convertTuple(MultiBulkReply zrange) { - Object[] byteArrays = zrange.byteArrays; + Reply[] byteArrays = zrange.data(); Set tuples = new LinkedHashSet(byteArrays.length / 2 + 1); for (int i = 0; i < byteArrays.length; i++) { - byte[] value = (byte[]) byteArrays[i]; + byte[] value = (byte[]) byteArrays[i].data(); i++; - Double score = toDouble((byte[]) byteArrays[i]); + Double score = toDouble((byte[]) byteArrays[i].data()); tuples.add(new DefaultTuple(value, score)); } diff --git a/src/main/java/org/springframework/data/redis/connection/sredis/package-info.java b/src/main/java/org/springframework/data/redis/connection/srp/package-info.java similarity index 68% rename from src/main/java/org/springframework/data/redis/connection/sredis/package-info.java rename to src/main/java/org/springframework/data/redis/connection/srp/package-info.java index e151a4393..d3b6d524f 100644 --- a/src/main/java/org/springframework/data/redis/connection/sredis/package-info.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/package-info.java @@ -1,5 +1,5 @@ /** * Connection package for spullara Redis Protocol library. */ -package org.springframework.data.redis.connection.sredis; +package org.springframework.data.redis.connection.srp; diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java index 216be63be..972c00c8a 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java @@ -16,7 +16,12 @@ package org.springframework.data.redis.connection; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; @@ -34,12 +39,6 @@ import org.springframework.dao.DataAccessException; import org.springframework.data.redis.Address; import org.springframework.data.redis.ConnectionFactoryTracker; import org.springframework.data.redis.Person; -import org.springframework.data.redis.connection.DefaultStringRedisConnection; -import org.springframework.data.redis.connection.Message; -import org.springframework.data.redis.connection.MessageListener; -import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.connection.StringRedisConnection; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer; import org.springframework.data.redis.serializer.RedisSerializer; diff --git a/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionIntegrationTests.java index 0bf3a8414..b6fc07350 100644 --- a/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/srp/SrpConnectionIntegrationTests.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.AbstractConnectionIntegrationTests; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.connection.sredis.SRedisConnectionFactory; import redis.client.RedisClient; @@ -28,10 +27,10 @@ import redis.client.RedisClient; * @author Costin Leau */ public class SrpConnectionIntegrationTests extends AbstractConnectionIntegrationTests { - SRedisConnectionFactory factory; + SrpConnectionFactory factory; public SrpConnectionIntegrationTests() { - factory = new SRedisConnectionFactory(); + factory = new SrpConnectionFactory(); factory.setPort(SettingsUtils.getPort()); factory.setHostName(SettingsUtils.getHost()); @@ -52,4 +51,7 @@ public class SrpConnectionIntegrationTests extends AbstractConnectionIntegration rc.set("foobar", "barfoo"); System.out.println(rc.get("foobar")); } + + public void testNullCollections() throws Exception { + } } diff --git a/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java b/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java index c35cc0e55..16839b639 100644 --- a/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java +++ b/src/test/java/org/springframework/data/redis/support/collections/CollectionTestParams.java @@ -23,7 +23,7 @@ import org.springframework.data.redis.SettingsUtils; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.connection.jredis.JredisConnectionFactory; import org.springframework.data.redis.connection.rjc.RjcConnectionFactory; -import org.springframework.data.redis.connection.sredis.SRedisConnectionFactory; +import org.springframework.data.redis.connection.srp.SrpConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer; @@ -137,7 +137,7 @@ public abstract class CollectionTestParams { jsonPersonTemplateRJC.afterPropertiesSet(); // SRP - SRedisConnectionFactory srConnFactory = new SRedisConnectionFactory(); + SrpConnectionFactory srConnFactory = new SrpConnectionFactory(); srConnFactory.setPort(SettingsUtils.getPort()); srConnFactory.setHostName(SettingsUtils.getHost()); srConnFactory.afterPropertiesSet();