diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index cf24500..479f0c2 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -1631,15 +1631,14 @@ public class BinaryJedis implements BinaryJedisCommands { public Transaction multi() { client.multi(); - client.getStatusCodeReply(); return new Transaction(client); } public List multi(final TransactionBlock jedisTransaction) { List results = null; try { + client.multi(); jedisTransaction.setClient(client); - multi(); jedisTransaction.execute(); results = jedisTransaction.exec(); } catch (Exception ex) { diff --git a/src/main/java/redis/clients/jedis/BinaryTransaction.java b/src/main/java/redis/clients/jedis/BinaryTransaction.java index b0e4c66..3ae9656 100644 --- a/src/main/java/redis/clients/jedis/BinaryTransaction.java +++ b/src/main/java/redis/clients/jedis/BinaryTransaction.java @@ -16,447 +16,363 @@ public class BinaryTransaction { this.client = client; } - public String ping() { + public void ping() { client.ping(); - return client.getStatusCodeReply(); } - public String set(final byte[] key, final byte[] value) { + public void set(final byte[] key, final byte[] value) { client.set(key, value); - return client.getStatusCodeReply(); } - public String get(final byte[] key) { + public void get(final byte[] key) { client.get(key); - return client.getStatusCodeReply(); } - public String exists(final byte[] key) { + public void exists(final byte[] key) { client.exists(key); - return client.getStatusCodeReply(); } - public String del(final byte[]... keys) { + public void del(final byte[]... keys) { client.del(keys); - return client.getStatusCodeReply(); } - public String type(final byte[] key) { + public void type(final byte[] key) { client.type(key); - return client.getStatusCodeReply(); } - public String flushDB() { + public void flushDB() { client.flushDB(); - return client.getStatusCodeReply(); } - public String keys(final byte[] pattern) { + public void keys(final byte[] pattern) { client.keys(pattern); - return client.getStatusCodeReply(); } - public byte[] randomBinaryKey() { + public void randomBinaryKey() { client.randomKey(); - return client.getBinaryBulkReply(); } - public String rename(final byte[] oldkey, final byte[] newkey) { + public void rename(final byte[] oldkey, final byte[] newkey) { client.rename(oldkey, newkey); - return client.getStatusCodeReply(); } - public String renamenx(final byte[] oldkey, final byte[] newkey) { + public void renamenx(final byte[] oldkey, final byte[] newkey) { client.renamenx(oldkey, newkey); - return client.getStatusCodeReply(); } - public String dbSize() { + public void dbSize() { client.dbSize(); - return client.getStatusCodeReply(); } - public String expire(final byte[] key, final int seconds) { + public void expire(final byte[] key, final int seconds) { client.expire(key, seconds); - return client.getStatusCodeReply(); } - public String expireAt(final byte[] key, final long unixTime) { + public void expireAt(final byte[] key, final long unixTime) { client.expireAt(key, unixTime); - return client.getStatusCodeReply(); } - public String ttl(final byte[] key) { + public void ttl(final byte[] key) { client.ttl(key); - return client.getStatusCodeReply(); } - public String select(final int index) { + public void select(final int index) { client.select(index); - return client.getStatusCodeReply(); } - public String move(final byte[] key, final int dbIndex) { + public void move(final byte[] key, final int dbIndex) { client.move(key, dbIndex); - return client.getStatusCodeReply(); } - public String flushAll() { + public void flushAll() { client.flushAll(); - return client.getStatusCodeReply(); } - public String getSet(final byte[] key, final byte[] value) { + public void getSet(final byte[] key, final byte[] value) { client.getSet(key, value); - return client.getStatusCodeReply(); } - public String mget(final byte[]... keys) { + public void mget(final byte[]... keys) { client.mget(keys); - return client.getStatusCodeReply(); } - public String setnx(final byte[] key, final byte[] value) { + public void setnx(final byte[] key, final byte[] value) { client.setnx(key, value); - return client.getStatusCodeReply(); } - public String setex(final byte[] key, final int seconds, final byte[] value) { + public void setex(final byte[] key, final int seconds, final byte[] value) { client.setex(key, seconds, value); - return client.getStatusCodeReply(); } - public String mset(final byte[]... keysvalues) { + public void mset(final byte[]... keysvalues) { client.mset(keysvalues); - return client.getStatusCodeReply(); } - public String msetnx(final byte[]... keysvalues) { + public void msetnx(final byte[]... keysvalues) { client.msetnx(keysvalues); - return client.getStatusCodeReply(); } - public String decrBy(final byte[] key, final int integer) { + public void decrBy(final byte[] key, final int integer) { client.decrBy(key, integer); - return client.getStatusCodeReply(); } - public String decr(final byte[] key) { + public void decr(final byte[] key) { client.decr(key); - return client.getStatusCodeReply(); } - public String incrBy(final byte[] key, final int integer) { + public void incrBy(final byte[] key, final int integer) { client.incrBy(key, integer); - return client.getStatusCodeReply(); } - public String incr(final byte[] key) { + public void incr(final byte[] key) { client.incr(key); - return client.getStatusCodeReply(); } - public String append(final byte[] key, final byte[] value) { + public void append(final byte[] key, final byte[] value) { client.append(key, value); - return client.getStatusCodeReply(); } - public String substr(final byte[] key, final int start, final int end) { + public void substr(final byte[] key, final int start, final int end) { client.substr(key, start, end); - return client.getStatusCodeReply(); } - public String hset(final byte[] key, final byte[] field, final byte[] value) { + public void hset(final byte[] key, final byte[] field, final byte[] value) { client.hset(key, field, value); - return client.getStatusCodeReply(); } - public String hget(final byte[] key, final byte[] field) { + public void hget(final byte[] key, final byte[] field) { client.hget(key, field); - return client.getStatusCodeReply(); } - public String hsetnx(final byte[] key, final byte[] field, + public void hsetnx(final byte[] key, final byte[] field, final byte[] value) { client.hsetnx(key, field, value); - return client.getStatusCodeReply(); } - public String hmset(final byte[] key, final Map hash) { + public void hmset(final byte[] key, final Map hash) { client.hmset(key, hash); - return client.getStatusCodeReply(); } - public String hmget(final byte[] key, final byte[]... fields) { + public void hmget(final byte[] key, final byte[]... fields) { client.hmget(key, fields); - return client.getStatusCodeReply(); } - public String hincrBy(final byte[] key, final byte[] field, final int value) { + public void hincrBy(final byte[] key, final byte[] field, final int value) { client.hincrBy(key, field, value); - return client.getStatusCodeReply(); } - public String hexists(final byte[] key, final byte[] field) { + public void hexists(final byte[] key, final byte[] field) { client.hexists(key, field); - return client.getStatusCodeReply(); } - public String hdel(final byte[] key, final byte[] field) { + public void hdel(final byte[] key, final byte[] field) { client.hdel(key, field); - return client.getStatusCodeReply(); } - public String hlen(final byte[] key) { + public void hlen(final byte[] key) { client.hlen(key); - return client.getStatusCodeReply(); } - public String hkeys(final byte[] key) { + public void hkeys(final byte[] key) { client.hkeys(key); - return client.getStatusCodeReply(); } - public String hvals(final byte[] key) { + public void hvals(final byte[] key) { client.hvals(key); - return client.getStatusCodeReply(); } - public String hgetAll(final byte[] key) { + public void hgetAll(final byte[] key) { client.hgetAll(key); - return client.getStatusCodeReply(); } - public String rpush(final byte[] key, final byte[] string) { + public void rpush(final byte[] key, final byte[] string) { client.rpush(key, string); - return client.getStatusCodeReply(); } - public String lpush(final byte[] key, final byte[] string) { + public void lpush(final byte[] key, final byte[] string) { client.lpush(key, string); - return client.getStatusCodeReply(); } - public String llen(final byte[] key) { + public void llen(final byte[] key) { client.llen(key); - return client.getStatusCodeReply(); } - public String lrange(final byte[] key, final int start, final int end) { + public void lrange(final byte[] key, final int start, final int end) { client.lrange(key, start, end); - return client.getStatusCodeReply(); } - public String ltrim(final byte[] key, final int start, final int end) { + public void ltrim(final byte[] key, final int start, final int end) { client.ltrim(key, start, end); - return client.getStatusCodeReply(); } - public String lindex(final byte[] key, final int index) { + public void lindex(final byte[] key, final int index) { client.lindex(key, index); - return client.getStatusCodeReply(); } - public String lset(final byte[] key, final int index, final byte[] value) { + public void lset(final byte[] key, final int index, final byte[] value) { client.lset(key, index, value); - return client.getStatusCodeReply(); } - public String lrem(final byte[] key, final int count, final byte[] value) { + public void lrem(final byte[] key, final int count, final byte[] value) { client.lrem(key, count, value); - return client.getStatusCodeReply(); } - public String lpop(final byte[] key) { + public void lpop(final byte[] key) { client.lpop(key); - return client.getStatusCodeReply(); } - public String rpop(final byte[] key) { + public void rpop(final byte[] key) { client.rpop(key); - return client.getStatusCodeReply(); } - public String rpoplpush(final byte[] srckey, final byte[] dstkey) { + public void rpoplpush(final byte[] srckey, final byte[] dstkey) { client.rpoplpush(srckey, dstkey); - return client.getStatusCodeReply(); } - public String sadd(final byte[] key, final byte[] member) { + public void sadd(final byte[] key, final byte[] member) { client.sadd(key, member); - return client.getStatusCodeReply(); } - public String smembers(final byte[] key) { + public void smembers(final byte[] key) { client.smembers(key); - return client.getStatusCodeReply(); } - public String srem(final byte[] key, final byte[] member) { + public void srem(final byte[] key, final byte[] member) { client.srem(key, member); - return client.getStatusCodeReply(); } - public String spop(final byte[] key) { + public void spop(final byte[] key) { client.spop(key); - return client.getStatusCodeReply(); } - public String smove(final byte[] srckey, final byte[] dstkey, + public void smove(final byte[] srckey, final byte[] dstkey, final byte[] member) { client.smove(srckey, dstkey, member); - return client.getStatusCodeReply(); } - public String scard(final byte[] key) { + public void scard(final byte[] key) { client.scard(key); - return client.getStatusCodeReply(); } - public String sismember(final byte[] key, final byte[] member) { + public void sismember(final byte[] key, final byte[] member) { client.sismember(key, member); - return client.getStatusCodeReply(); } - public String sinter(final byte[]... keys) { + public void sinter(final byte[]... keys) { client.sinter(keys); - return client.getStatusCodeReply(); } - public String sinterstore(final byte[] dstkey, final byte[]... keys) { + public void sinterstore(final byte[] dstkey, final byte[]... keys) { client.sinterstore(dstkey, keys); - return client.getStatusCodeReply(); } - public String sunion(final byte[]... keys) { + public void sunion(final byte[]... keys) { client.sunion(keys); - return client.getStatusCodeReply(); } - public String sunionstore(final byte[] dstkey, final byte[]... keys) { + public void sunionstore(final byte[] dstkey, final byte[]... keys) { client.sunionstore(dstkey, keys); - return client.getStatusCodeReply(); } - public String sdiff(final byte[]... keys) { + public void sdiff(final byte[]... keys) { client.sdiff(keys); - return client.getStatusCodeReply(); } - public String sdiffstore(final byte[] dstkey, final byte[]... keys) { + public void sdiffstore(final byte[] dstkey, final byte[]... keys) { client.sdiffstore(dstkey, keys); - return client.getStatusCodeReply(); } - public String srandmember(final byte[] key) { + public void srandmember(final byte[] key) { client.srandmember(key); - return client.getStatusCodeReply(); } - public String zadd(final byte[] key, final double score, final byte[] member) { + public void zadd(final byte[] key, final double score, final byte[] member) { client.zadd(key, score, member); - return client.getStatusCodeReply(); } - public String zrange(final byte[] key, final int start, final int end) { + public void zrange(final byte[] key, final int start, final int end) { client.zrange(key, start, end); - return client.getStatusCodeReply(); } - public String zrem(final byte[] key, final byte[] member) { + public void zrem(final byte[] key, final byte[] member) { client.zrem(key, member); - return client.getStatusCodeReply(); } - public String zincrby(final byte[] key, final double score, + public void zincrby(final byte[] key, final double score, final byte[] member) { client.zincrby(key, score, member); - return client.getStatusCodeReply(); } - public String zrank(final byte[] key, final byte[] member) { + public void zrank(final byte[] key, final byte[] member) { client.zrank(key, member); - return client.getStatusCodeReply(); } - public String zrevrank(final byte[] key, final byte[] member) { + public void zrevrank(final byte[] key, final byte[] member) { client.zrevrank(key, member); - return client.getStatusCodeReply(); } - public String zrevrange(final byte[] key, final int start, final int end) { + public void zrevrange(final byte[] key, final int start, final int end) { client.zrevrange(key, start, end); - return client.getStatusCodeReply(); } - public String zrangeWithScores(final byte[] key, final int start, + public void zrangeWithScores(final byte[] key, final int start, final int end) { client.zrangeWithScores(key, start, end); - return client.getStatusCodeReply(); } - public String zrevrangeWithScores(final byte[] key, final int start, + public void zrevrangeWithScores(final byte[] key, final int start, final int end) { client.zrevrangeWithScores(key, start, end); - return client.getStatusCodeReply(); } - public String zcard(final byte[] key) { + public void zcard(final byte[] key) { client.zcard(key); - return client.getStatusCodeReply(); } - public String zscore(final byte[] key, final byte[] member) { + public void zscore(final byte[] key, final byte[] member) { client.zscore(key, member); - return client.getStatusCodeReply(); } public List exec() { client.exec(); - + client.getAll(1); // Discard all but the last reply return client.getObjectMultiBulkReply(); } - public String sort(final byte[] key) { - client.sort(key); - return client.getStatusCodeReply(); - } - - public String sort(final byte[] key, final SortingParams sortingParameters) { - client.sort(key, sortingParameters); - return client.getStatusCodeReply(); - } - - public String sort(final byte[] key, final SortingParams sortingParameters, - final byte[] dstkey) { - client.sort(key, sortingParameters, dstkey); - return client.getStatusCodeReply(); - } - - public String sort(final byte[] key, final byte[] dstkey) { - client.sort(key, dstkey); - return client.getStatusCodeReply(); - } - public String discard() { client.discard(); + client.getAll(1); // Discard all but the last reply inTransaction = false; return client.getStatusCodeReply(); } - public String setbit(byte[] key, long offset, byte[] value) { + public void sort(final byte[] key) { + client.sort(key); + } + + public void sort(final byte[] key, final SortingParams sortingParameters) { + client.sort(key, sortingParameters); + } + + public void sort(final byte[] key, final SortingParams sortingParameters, + final byte[] dstkey) { + client.sort(key, sortingParameters, dstkey); + } + + public void sort(final byte[] key, final byte[] dstkey) { + client.sort(key, dstkey); + } + + public void setbit(byte[] key, long offset, byte[] value) { client.setbit(key, offset, value); - return client.getStatusCodeReply(); } - public String getbit(byte[] key, long offset) { + public void getbit(byte[] key, long offset) { client.getbit(key, offset); - return client.getStatusCodeReply(); } - public String linsert(final byte[] key, final LIST_POSITION where, + public void linsert(final byte[] key, final LIST_POSITION where, final byte[] pivot, final byte[] value) { client.linsert(key, where, pivot, value); - return client.getStatusCodeReply(); } } \ No newline at end of file diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java index 4136fd3..1ed6acb 100644 --- a/src/main/java/redis/clients/jedis/Connection.java +++ b/src/main/java/redis/clients/jedis/Connection.java @@ -192,8 +192,12 @@ public class Connection { } public List getAll() { + return getAll(0); + } + + public List getAll(int except) { List all = new ArrayList(); - while (pipelinedCommands > 0) { + while (pipelinedCommands > except) { all.add(protocol.read(inputStream)); pipelinedCommands--; } diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index d57b443..2c63263 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -1627,15 +1627,14 @@ public class Jedis extends BinaryJedis implements JedisCommands { public Transaction multi() { client.multi(); - client.getStatusCodeReply(); return new Transaction(client); } - public List multi(TransactionBlock jedisTransaction) { + public List multi(final TransactionBlock jedisTransaction) { List results = null; try { + client.multi(); jedisTransaction.setClient(client); - multi(); jedisTransaction.execute(); results = jedisTransaction.exec(); } catch (Exception ex) { diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java index d792d8e..438d8e0 100644 --- a/src/main/java/redis/clients/jedis/Transaction.java +++ b/src/main/java/redis/clients/jedis/Transaction.java @@ -12,410 +12,330 @@ public class Transaction extends BinaryTransaction { super(client); } - public String set(final String key, final String value) { + public void set(final String key, final String value) { client.set(key, value); - return client.getStatusCodeReply(); } - public String get(final String key) { + public void get(final String key) { client.get(key); - return client.getStatusCodeReply(); } - public String exists(final String key) { + public void exists(final String key) { client.exists(key); - return client.getStatusCodeReply(); } - public String del(final String... keys) { + public void del(final String... keys) { client.del(keys); - return client.getStatusCodeReply(); } - public String type(final String key) { + public void type(final String key) { client.type(key); - return client.getStatusCodeReply(); } - public String keys(final String pattern) { + public void keys(final String pattern) { client.keys(pattern); - return client.getStatusCodeReply(); } - public String randomKey() { + public void randomKey() { client.randomKey(); - return client.getBulkReply(); } - public String rename(final String oldkey, final String newkey) { + public void rename(final String oldkey, final String newkey) { client.rename(oldkey, newkey); - return client.getStatusCodeReply(); } - public String renamenx(final String oldkey, final String newkey) { + public void renamenx(final String oldkey, final String newkey) { client.renamenx(oldkey, newkey); - return client.getStatusCodeReply(); } - public String expire(final String key, final int seconds) { + public void expire(final String key, final int seconds) { client.expire(key, seconds); - return client.getStatusCodeReply(); } - public String expireAt(final String key, final long unixTime) { + public void expireAt(final String key, final long unixTime) { client.expireAt(key, unixTime); - return client.getStatusCodeReply(); } - public String ttl(final String key) { + public void ttl(final String key) { client.ttl(key); - return client.getStatusCodeReply(); } - public String move(final String key, final int dbIndex) { + public void move(final String key, final int dbIndex) { client.move(key, dbIndex); - return client.getStatusCodeReply(); } - public String getSet(final String key, final String value) { + public void getSet(final String key, final String value) { client.getSet(key, value); - return client.getStatusCodeReply(); } - public String mget(final String... keys) { + public void mget(final String... keys) { client.mget(keys); - return client.getStatusCodeReply(); } - public String setnx(final String key, final String value) { + public void setnx(final String key, final String value) { client.setnx(key, value); - return client.getStatusCodeReply(); } - public String setex(final String key, final int seconds, final String value) { + public void setex(final String key, final int seconds, final String value) { client.setex(key, seconds, value); - return client.getStatusCodeReply(); } - public String mset(final String... keysvalues) { + public void mset(final String... keysvalues) { client.mset(keysvalues); - return client.getStatusCodeReply(); } - public String msetnx(final String... keysvalues) { + public void msetnx(final String... keysvalues) { client.msetnx(keysvalues); - return client.getStatusCodeReply(); } - public String decrBy(final String key, final int integer) { + public void decrBy(final String key, final int integer) { client.decrBy(key, integer); - return client.getStatusCodeReply(); } - public String decr(final String key) { + public void decr(final String key) { client.decr(key); - return client.getStatusCodeReply(); } - public String incrBy(final String key, final int integer) { + public void incrBy(final String key, final int integer) { client.incrBy(key, integer); - return client.getStatusCodeReply(); } - public String incr(final String key) { + public void incr(final String key) { client.incr(key); - return client.getStatusCodeReply(); } - public String append(final String key, final String value) { + public void append(final String key, final String value) { client.append(key, value); - return client.getStatusCodeReply(); } - public String substr(final String key, final int start, final int end) { + public void substr(final String key, final int start, final int end) { client.substr(key, start, end); - return client.getStatusCodeReply(); } - public String hset(final String key, final String field, final String value) { + public void hset(final String key, final String field, final String value) { client.hset(key, field, value); - return client.getStatusCodeReply(); } - public String hget(final String key, final String field) { + public void hget(final String key, final String field) { client.hget(key, field); - return client.getStatusCodeReply(); } - public String hsetnx(final String key, final String field, + public void hsetnx(final String key, final String field, final String value) { client.hsetnx(key, field, value); - return client.getStatusCodeReply(); } - public String hmset(final String key, final Map hash) { + public void hmset(final String key, final Map hash) { client.hmset(key, hash); - return client.getStatusCodeReply(); } - public String hmget(final String key, final String... fields) { + public void hmget(final String key, final String... fields) { client.hmget(key, fields); - return client.getStatusCodeReply(); } - public String hincrBy(final String key, final String field, final int value) { + public void hincrBy(final String key, final String field, final int value) { client.hincrBy(key, field, value); - return client.getStatusCodeReply(); } - public String hexists(final String key, final String field) { + public void hexists(final String key, final String field) { client.hexists(key, field); - return client.getStatusCodeReply(); } - public String hdel(final String key, final String field) { + public void hdel(final String key, final String field) { client.hdel(key, field); - return client.getStatusCodeReply(); } - public String hlen(final String key) { + public void hlen(final String key) { client.hlen(key); - return client.getStatusCodeReply(); } - public String hkeys(final String key) { + public void hkeys(final String key) { client.hkeys(key); - return client.getStatusCodeReply(); } - public String hvals(final String key) { + public void hvals(final String key) { client.hvals(key); - return client.getStatusCodeReply(); } - public String hgetAll(final String key) { + public void hgetAll(final String key) { client.hgetAll(key); - return client.getStatusCodeReply(); } - public String rpush(final String key, final String string) { + public void rpush(final String key, final String string) { client.rpush(key, string); - return client.getStatusCodeReply(); } - public String lpush(final String key, final String string) { + public void lpush(final String key, final String string) { client.lpush(key, string); - return client.getStatusCodeReply(); } - public String llen(final String key) { + public void llen(final String key) { client.llen(key); - return client.getStatusCodeReply(); } - public String lrange(final String key, final int start, final int end) { + public void lrange(final String key, final int start, final int end) { client.lrange(key, start, end); - return client.getStatusCodeReply(); } - public String ltrim(String key, final int start, final int end) { + public void ltrim(String key, final int start, final int end) { client.ltrim(key, start, end); - return client.getStatusCodeReply(); } - public String lindex(final String key, final int index) { + public void lindex(final String key, final int index) { client.lindex(key, index); - return client.getStatusCodeReply(); } - public String lset(final String key, final int index, final String value) { + public void lset(final String key, final int index, final String value) { client.lset(key, index, value); - return client.getStatusCodeReply(); } - public String lrem(final String key, final int count, final String value) { + public void lrem(final String key, final int count, final String value) { client.lrem(key, count, value); - return client.getStatusCodeReply(); } - public String lpop(final String key) { + public void lpop(final String key) { client.lpop(key); - return client.getStatusCodeReply(); } - public String rpop(final String key) { + public void rpop(final String key) { client.rpop(key); - return client.getStatusCodeReply(); } - public String rpoplpush(final String srckey, final String dstkey) { + public void rpoplpush(final String srckey, final String dstkey) { client.rpoplpush(srckey, dstkey); - return client.getStatusCodeReply(); } - public String sadd(final String key, final String member) { + public void sadd(final String key, final String member) { client.sadd(key, member); - return client.getStatusCodeReply(); } - public String smembers(final String key) { + public void smembers(final String key) { client.smembers(key); - return client.getStatusCodeReply(); } - public String srem(final String key, final String member) { + public void srem(final String key, final String member) { client.srem(key, member); - return client.getStatusCodeReply(); } - public String spop(final String key) { + public void spop(final String key) { client.spop(key); - return client.getStatusCodeReply(); } - public String smove(final String srckey, final String dstkey, + public void smove(final String srckey, final String dstkey, final String member) { client.smove(srckey, dstkey, member); - return client.getStatusCodeReply(); } - public String scard(final String key) { + public void scard(final String key) { client.scard(key); - return client.getStatusCodeReply(); } - public String sismember(final String key, final String member) { + public void sismember(final String key, final String member) { client.sismember(key, member); - return client.getStatusCodeReply(); } - public String sinter(final String... keys) { + public void sinter(final String... keys) { client.sinter(keys); - return client.getStatusCodeReply(); } - public String sinterstore(final String dstkey, final String... keys) { + public void sinterstore(final String dstkey, final String... keys) { client.sinterstore(dstkey, keys); - return client.getStatusCodeReply(); } - public String sunion(final String... keys) { + public void sunion(final String... keys) { client.sunion(keys); - return client.getStatusCodeReply(); } - public String sunionstore(final String dstkey, final String... keys) { + public void sunionstore(final String dstkey, final String... keys) { client.sunionstore(dstkey, keys); - return client.getStatusCodeReply(); } - public String sdiff(final String... keys) { + public void sdiff(final String... keys) { client.sdiff(keys); - return client.getStatusCodeReply(); } - public String sdiffstore(final String dstkey, final String... keys) { + public void sdiffstore(final String dstkey, final String... keys) { client.sdiffstore(dstkey, keys); - return client.getStatusCodeReply(); } - public String srandmember(final String key) { + public void srandmember(final String key) { client.srandmember(key); - return client.getStatusCodeReply(); } - public String zadd(final String key, final double score, final String member) { + public void zadd(final String key, final double score, final String member) { client.zadd(key, score, member); - return client.getStatusCodeReply(); } - public String zrange(final String key, final int start, final int end) { + public void zrange(final String key, final int start, final int end) { client.zrange(key, start, end); - return client.getStatusCodeReply(); } - public String zrem(final String key, final String member) { + public void zrem(final String key, final String member) { client.zrem(key, member); - return client.getStatusCodeReply(); } - public String zincrby(final String key, final double score, + public void zincrby(final String key, final double score, final String member) { client.zincrby(key, score, member); - return client.getStatusCodeReply(); } - public String zrank(final String key, final String member) { + public void zrank(final String key, final String member) { client.zrank(key, member); - return client.getStatusCodeReply(); } - public String zrevrank(final String key, final String member) { + public void zrevrank(final String key, final String member) { client.zrevrank(key, member); - return client.getStatusCodeReply(); } - public String zrevrange(final String key, final int start, final int end) { + public void zrevrange(final String key, final int start, final int end) { client.zrevrange(key, start, end); - return client.getStatusCodeReply(); } - public String zrangeWithScores(final String key, final int start, + public void zrangeWithScores(final String key, final int start, final int end) { client.zrangeWithScores(key, start, end); - return client.getStatusCodeReply(); } - public String zrevrangeWithScores(final String key, final int start, + public void zrevrangeWithScores(final String key, final int start, final int end) { client.zrevrangeWithScores(key, start, end); - return client.getStatusCodeReply(); } - public String zcard(final String key) { + public void zcard(final String key) { client.zcard(key); - return client.getStatusCodeReply(); } - public String zscore(final String key, final String member) { + public void zscore(final String key, final String member) { client.zscore(key, member); - return client.getStatusCodeReply(); } - public String sort(final String key) { + public void sort(final String key) { client.sort(key); - return client.getStatusCodeReply(); } - public String sort(final String key, final SortingParams sortingParameters) { + public void sort(final String key, final SortingParams sortingParameters) { client.sort(key, sortingParameters); - return client.getStatusCodeReply(); } - public String sort(final String key, final String dstkey) { + public void sort(final String key, final String dstkey) { client.sort(key, dstkey); - return client.getStatusCodeReply(); } - public String sort(final String key, final SortingParams sortingParameters, + public void sort(final String key, final SortingParams sortingParameters, final String dstkey) { client.sort(key, sortingParameters, dstkey); - return client.getStatusCodeReply(); } - public String setbit(String key, long offset, String value) { + public void setbit(String key, long offset, String value) { client.setbit(key, offset, value); - return client.getStatusCodeReply(); } - public String getbit(String key, long offset) { + public void getbit(String key, long offset) { client.getbit(key, offset); - return client.getStatusCodeReply(); } - public String linsert(final String key, final LIST_POSITION where, + public void linsert(final String key, final LIST_POSITION where, final String pivot, final String value) { client.linsert(key, where, pivot, value); - return client.getStatusCodeReply(); } } \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java index 379167f..2897942 100644 --- a/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java +++ b/src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java @@ -41,14 +41,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase { public void multi() { Transaction trans = jedis.multi(); - String status = trans.sadd("foo", "a"); - assertEquals(Keyword.QUEUED.name(), status); - - status = trans.sadd("foo", "b"); - assertEquals(Keyword.QUEUED.name(), status); - - status = trans.scard("foo"); - assertEquals(Keyword.QUEUED.name(), status); + trans.sadd("foo", "a"); + trans.sadd("foo", "b"); + trans.scard("foo"); List response = trans.exec(); @@ -61,14 +56,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase { // Binary trans = jedis.multi(); - status = trans.sadd(bfoo, ba); - assertEquals(Keyword.QUEUED.name(), status); - - status = trans.sadd(bfoo, bb); - assertEquals(Keyword.QUEUED.name(), status); - - status = trans.scard(bfoo); - assertEquals(Keyword.QUEUED.name(), status); + trans.sadd(bfoo, ba); + trans.sadd(bfoo, bb); + trans.scard(bfoo); response = trans.exec(); @@ -85,14 +75,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase { List response = jedis.multi(new TransactionBlock() { @Override public void execute() { - String status = sadd("foo", "a"); - assertEquals(Keyword.QUEUED.name(), status); - - status = sadd("foo", "b"); - assertEquals(Keyword.QUEUED.name(), status); - - status = scard("foo"); - assertEquals(Keyword.QUEUED.name(), status); + sadd("foo", "a"); + sadd("foo", "b"); + scard("foo"); } }); @@ -106,14 +91,9 @@ public class TransactionCommandsTest extends JedisCommandTestBase { response = jedis.multi(new TransactionBlock() { @Override public void execute() { - String status = sadd(bfoo, ba); - assertEquals(Keyword.QUEUED.name(), status); - - status = sadd(bfoo, bb); - assertEquals(Keyword.QUEUED.name(), status); - - status = scard(bfoo); - assertEquals(Keyword.QUEUED.name(), status); + sadd(bfoo, ba); + sadd(bfoo, bb); + scard(bfoo); } });