diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 34fe202..032a2c1 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -677,16 +677,16 @@ public class BinaryClient extends Connection { sendCommand(SYNC); } - public void lpushx(final byte[] key, final byte[] string) { - sendCommand(LPUSHX, key, string); + public void lpushx(final byte[] key, final byte[]... string) { + sendCommand(LPUSHX, joinParameters(key, string)); } public void persist(final byte[] key) { sendCommand(PERSIST, key); } - public void rpushx(final byte[] key, final byte[] string) { - sendCommand(RPUSHX, key, string); + public void rpushx(final byte[] key, final byte[]... string) { + sendCommand(RPUSHX, joinParameters(key, string)); } public void echo(final byte[] string) { diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index 06a83de..d4d0a08 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -2979,7 +2979,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey client.sync(); } - public Long lpushx(final byte[] key, final byte[] string) { + public Long lpushx(final byte[] key, final byte[]... string) { client.lpushx(key, string); return client.getIntegerReply(); } @@ -2999,7 +2999,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey return client.getIntegerReply(); } - public Long rpushx(final byte[] key, final byte[] string) { + public Long rpushx(final byte[] key, final byte[]... string) { client.rpushx(key, string); return client.getIntegerReply(); } diff --git a/src/main/java/redis/clients/jedis/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/BinaryJedisCommands.java index a6da912..35e1879 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedisCommands.java +++ b/src/main/java/redis/clients/jedis/BinaryJedisCommands.java @@ -196,9 +196,9 @@ public interface BinaryJedisCommands { Long linsert(byte[] key, Client.LIST_POSITION where, byte[] pivot, byte[] value); - Long lpushx(byte[] key, byte[] arg); + Long lpushx(byte[] key, byte[]... arg); - Long rpushx(byte[] key, byte[] arg); + Long rpushx(byte[] key, byte[]... arg); List blpop(byte[] arg); diff --git a/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java index 5c04491..6f4fd90 100644 --- a/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/BinaryRedisPipeline.java @@ -73,9 +73,9 @@ public interface BinaryRedisPipeline { Response lpop(byte[] key); - Response lpush(byte[] key, byte[] string); + Response lpush(byte[] key, byte[]... string); - Response lpushx(byte[] key, byte[] bytes); + Response lpushx(byte[] key, byte[]... bytes); Response> lrange(byte[] key, long start, long end); @@ -91,11 +91,11 @@ public interface BinaryRedisPipeline { Response rpop(byte[] key); - Response rpush(byte[] key, byte[] string); + Response rpush(byte[] key, byte[]... string); - Response rpushx(byte[] key, byte[] string); + Response rpushx(byte[] key, byte[]... string); - Response sadd(byte[] key, byte[] member); + Response sadd(byte[] key, byte[]... member); Response scard(byte[] key); diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java index 20065d7..2723aa1 100644 --- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java @@ -201,7 +201,7 @@ public class BinaryShardedJedis extends Sharded return j.strlen(key); } - public Long lpushx(byte[] key, byte[] string) { + public Long lpushx(byte[] key, byte[]... string) { Jedis j = getShard(key); return j.lpushx(key, string); } @@ -211,7 +211,7 @@ public class BinaryShardedJedis extends Sharded return j.persist(key); } - public Long rpushx(byte[] key, byte[] string) { + public Long rpushx(byte[] key, byte[]... string) { Jedis j = getShard(key); return j.rpushx(key, string); } diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java index 9e17202..f331f5e 100644 --- a/src/main/java/redis/clients/jedis/Client.java +++ b/src/main/java/redis/clients/jedis/Client.java @@ -564,16 +564,16 @@ public class Client extends BinaryClient implements Commands { strlen(SafeEncoder.encode(key)); } - public void lpushx(final String key, final String string) { - lpushx(SafeEncoder.encode(key), SafeEncoder.encode(string)); + public void lpushx(final String key, final String... string) { + lpushx(SafeEncoder.encode(key), getByteParams(string)); } public void persist(final String key) { persist(SafeEncoder.encode(key)); } - public void rpushx(final String key, final String string) { - rpushx(SafeEncoder.encode(key), SafeEncoder.encode(string)); + public void rpushx(final String key, final String... string) { + rpushx(SafeEncoder.encode(key), getByteParams(string)); } public void echo(final String string) { diff --git a/src/main/java/redis/clients/jedis/Commands.java b/src/main/java/redis/clients/jedis/Commands.java index a5df878..7d0e60d 100644 --- a/src/main/java/redis/clients/jedis/Commands.java +++ b/src/main/java/redis/clients/jedis/Commands.java @@ -251,11 +251,11 @@ public interface Commands { public void strlen(final String key); - public void lpushx(final String key, final String string); + public void lpushx(final String key, final String... string); public void persist(final String key); - public void rpushx(final String key, final String string); + public void rpushx(final String key, final String... string); public void echo(final String string); diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java index d8dbb56..39f26d2 100644 --- a/src/main/java/redis/clients/jedis/Jedis.java +++ b/src/main/java/redis/clients/jedis/Jedis.java @@ -2535,7 +2535,7 @@ public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommand return client.getIntegerReply(); } - public Long lpushx(final String key, final String string) { + public Long lpushx(final String key, final String... string) { client.lpushx(key, string); return client.getIntegerReply(); } @@ -2555,7 +2555,7 @@ public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommand return client.getIntegerReply(); } - public Long rpushx(final String key, final String string) { + public Long rpushx(final String key, final String... string) { client.rpushx(key, string); return client.getIntegerReply(); } diff --git a/src/main/java/redis/clients/jedis/JedisCommands.java b/src/main/java/redis/clients/jedis/JedisCommands.java index 2dab095..ea5016b 100644 --- a/src/main/java/redis/clients/jedis/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/JedisCommands.java @@ -193,9 +193,9 @@ public interface JedisCommands { Long linsert(String key, Client.LIST_POSITION where, String pivot, String value); - Long lpushx(String key, String string); + Long lpushx(String key, String... string); - Long rpushx(String key, String string); + Long rpushx(String key, String... string); List blpop(String arg); diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java index 2af0899..2ceeeec 100644 --- a/src/main/java/redis/clients/jedis/PipelineBase.java +++ b/src/main/java/redis/clients/jedis/PipelineBase.java @@ -305,16 +305,6 @@ abstract class PipelineBase extends Queable implements return getResponse(BuilderFactory.LONG); } - public Response> keys(String pattern) { - getClient(pattern).keys(pattern); - return getResponse(BuilderFactory.STRING_SET); - } - - public Response> keys(byte[] pattern) { - getClient(pattern).keys(pattern); - return getResponse(BuilderFactory.BYTE_ARRAY_ZSET); - } - public Response lindex(String key, int index) { getClient(key).lindex(key, index); return getResponse(BuilderFactory.STRING); @@ -357,22 +347,22 @@ abstract class PipelineBase extends Queable implements return getResponse(BuilderFactory.BYTE_ARRAY); } - public Response lpush(String key, String string) { + public Response lpush(String key, String... string) { getClient(key).lpush(key, string); return getResponse(BuilderFactory.LONG); } - public Response lpush(byte[] key, byte[] string) { + public Response lpush(byte[] key, byte[]... string) { getClient(key).lpush(key, string); return getResponse(BuilderFactory.LONG); } - public Response lpushx(String key, String string) { + public Response lpushx(String key, String... string) { getClient(key).lpushx(key, string); return getResponse(BuilderFactory.LONG); } - public Response lpushx(byte[] key, byte[] bytes) { + public Response lpushx(byte[] key, byte[]... bytes) { getClient(key).lpushx(key, bytes); return getResponse(BuilderFactory.LONG); } @@ -447,32 +437,32 @@ abstract class PipelineBase extends Queable implements return getResponse(BuilderFactory.BYTE_ARRAY); } - public Response rpush(String key, String string) { + public Response rpush(String key, String... string) { getClient(key).rpush(key, string); return getResponse(BuilderFactory.LONG); } - public Response rpush(byte[] key, byte[] string) { + public Response rpush(byte[] key, byte[]... string) { getClient(key).rpush(key, string); return getResponse(BuilderFactory.LONG); } - public Response rpushx(String key, String string) { + public Response rpushx(String key, String... string) { getClient(key).rpushx(key, string); return getResponse(BuilderFactory.LONG); } - public Response rpushx(byte[] key, byte[] string) { + public Response rpushx(byte[] key, byte[]... string) { getClient(key).rpushx(key, string); return getResponse(BuilderFactory.LONG); } - public Response sadd(String key, String member) { + public Response sadd(String key, String... member) { getClient(key).sadd(key, member); return getResponse(BuilderFactory.LONG); } - public Response sadd(byte[] key, byte[] member) { + public Response sadd(byte[] key, byte[]... member) { getClient(key).sadd(key, member); return getResponse(BuilderFactory.LONG); } diff --git a/src/main/java/redis/clients/jedis/RedisPipeline.java b/src/main/java/redis/clients/jedis/RedisPipeline.java index b1c8461..43b7516 100644 --- a/src/main/java/redis/clients/jedis/RedisPipeline.java +++ b/src/main/java/redis/clients/jedis/RedisPipeline.java @@ -76,9 +76,9 @@ public interface RedisPipeline { Response lpop(String key); - Response lpush(String key, String string); + Response lpush(String key, String... string); - Response lpushx(String key, String string); + Response lpushx(String key, String... string); Response> lrange(String key, long start, long end); @@ -94,11 +94,11 @@ public interface RedisPipeline { Response rpop(String key); - Response rpush(String key, String string); + Response rpush(String key, String... string); - Response rpushx(String key, String string); + Response rpushx(String key, String... string); - Response sadd(String key, String member); + Response sadd(String key, String... member); Response scard(String key); diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java index 948718c..485f83a 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedis.java +++ b/src/main/java/redis/clients/jedis/ShardedJedis.java @@ -221,7 +221,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands { return j.lpush(key, strings); } - public Long lpushx(String key, String string) { + public Long lpushx(String key, String... string) { Jedis j = getShard(key); return j.lpushx(key, string); } @@ -236,7 +236,7 @@ public class ShardedJedis extends BinaryShardedJedis implements JedisCommands { return j.move(key, dbIndex); } - public Long rpushx(String key, String string) { + public Long rpushx(String key, String... string) { Jedis j = getShard(key); return j.rpushx(key, string); }