From c3c33776dc8e7aaa95df74833d1f83939bb52fcc Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Tue, 2 Mar 2021 12:34:48 +0600 Subject: [PATCH 1/4] Fix parameter types and return types --- pom.xml | 4 +- .../redis/clients/jedis/BinaryClient.java | 33 ++++++++-- .../java/redis/clients/jedis/BinaryJedis.java | 47 +++++++++----- .../clients/jedis/BinaryJedisCluster.java | 20 ++++-- .../clients/jedis/BinaryShardedJedis.java | 35 ++++++++--- .../redis/clients/jedis/BuilderFactory.java | 44 ++++++++----- src/main/java/redis/clients/jedis/Client.java | 8 +-- src/main/java/redis/clients/jedis/Jedis.java | 8 +-- .../redis/clients/jedis/JedisCluster.java | 6 +- .../redis/clients/jedis/PipelineBase.java | 21 +++---- .../redis/clients/jedis/ShardedJedis.java | 8 +-- .../commands/BinaryJedisClusterCommands.java | 21 +++++-- .../jedis/commands/BinaryJedisCommands.java | 62 ++++++++++++++----- .../jedis/commands/BinaryRedisPipeline.java | 32 ++++++++-- .../clients/jedis/commands/Commands.java | 28 +++++++-- .../jedis/commands/JedisClusterCommands.java | 27 +++++--- .../clients/jedis/commands/JedisCommands.java | 28 +++++++-- .../clients/jedis/commands/RedisPipeline.java | 28 +++++++-- 18 files changed, 340 insertions(+), 120 deletions(-) diff --git a/pom.xml b/pom.xml index 1f0d73253d..b063505409 100644 --- a/pom.xml +++ b/pom.xml @@ -129,8 +129,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 7c2b99c82e..4f57575793 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -193,10 +193,15 @@ public void dbSize() { sendCommand(DBSIZE); } + @Deprecated public void expire(final byte[] key, final int seconds) { sendCommand(EXPIRE, key, toByteArray(seconds)); } + public void expire(final byte[] key, final long seconds) { + sendCommand(EXPIRE, key, toByteArray(seconds)); + } + public void expireAt(final byte[] key, final long unixTime) { sendCommand(EXPIREAT, key, toByteArray(unixTime)); } @@ -237,10 +242,15 @@ public void setnx(final byte[] key, final byte[] value) { sendCommand(SETNX, key, value); } + @Deprecated public void setex(final byte[] key, final int seconds, final byte[] value) { sendCommand(SETEX, key, toByteArray(seconds), value); } + public void setex(final byte[] key, final long seconds, final byte[] value) { + sendCommand(SETEX, key, toByteArray(seconds), value); + } + public void mset(final byte[]... keysvalues) { sendCommand(MSET, keysvalues); } @@ -1068,14 +1078,24 @@ public void dump(final byte[] key) { sendCommand(DUMP, key); } + @Deprecated public void restore(final byte[] key, final int ttl, final byte[] serializedValue) { sendCommand(RESTORE, key, toByteArray(ttl), serializedValue); } + public void restore(final byte[] key, final long ttl, final byte[] serializedValue) { + sendCommand(RESTORE, key, toByteArray(ttl), serializedValue); + } + + @Deprecated public void restoreReplace(final byte[] key, final int ttl, final byte[] serializedValue) { sendCommand(RESTORE, key, toByteArray(ttl), serializedValue, Keyword.REPLACE.getRaw()); } + public void restoreReplace(final byte[] key, final long ttl, final byte[] serializedValue) { + sendCommand(RESTORE, key, toByteArray(ttl), serializedValue, Keyword.REPLACE.getRaw()); + } + public void pexpire(final byte[] key, final long milliseconds) { sendCommand(PEXPIRE, key, toByteArray(milliseconds)); } @@ -1441,11 +1461,16 @@ public void xadd(final byte[] key, final byte[] id, final Map ha public void xlen(final byte[] key) { sendCommand(XLEN, key); } - - public void xrange(final byte[] key, final byte[] start, final byte[] end, final long count) { - sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count)); + + @Deprecated + public void xrange(final byte[] key, final byte[] start, final byte[] end, final long count) { + sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count)); } - + + public void xrange(final byte[] key, final byte[] start, final byte[] end, final int count) { + sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count)); + } + public void xrevrange(final byte[] key, final byte[] end, final byte[] start, final int count) { sendCommand(XREVRANGE, key, end, start, Keyword.COUNT.getRaw(), toByteArray(count)); } diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index 1e5427ccb0..28197129cb 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -539,7 +539,7 @@ public Long dbSize() { * 2.1.3, Redis >= 2.1.3 will happily update the timeout), or the key does not exist. */ @Override - public Long expire(final byte[] key, final int seconds) { + public Long expire(final byte[] key, final long seconds) { checkIsInMultiOrPipeline(); client.expire(key, seconds); return client.getIntegerReply(); @@ -724,7 +724,7 @@ public Long setnx(final byte[] key, final byte[] value) { * @return Status code reply */ @Override - public String setex(final byte[] key, final int seconds, final byte[] value) { + public String setex(final byte[] key, final long seconds, final byte[] value) { checkIsInMultiOrPipeline(); client.setex(key, seconds, value); return client.getStatusCodeReply(); @@ -3680,14 +3680,14 @@ public byte[] dump(final byte[] key) { } @Override - public String restore(final byte[] key, final int ttl, final byte[] serializedValue) { + public String restore(final byte[] key, final long ttl, final byte[] serializedValue) { checkIsInMultiOrPipeline(); client.restore(key, ttl, serializedValue); return client.getStatusCodeReply(); } @Override - public String restoreReplace(final byte[] key, final int ttl, final byte[] serializedValue) { + public String restoreReplace(final byte[] key, final long ttl, final byte[] serializedValue) { checkIsInMultiOrPipeline(); client.restoreReplace(key, ttl, serializedValue); return client.getStatusCodeReply(); @@ -4337,7 +4337,7 @@ public Long xlen(byte[] key) { } @Override - public List xrange(byte[] key, byte[] start, byte[] end, long count) { + public List xrange(byte[] key, byte[] start, byte[] end, int count) { checkIsInMultiOrPipeline(); client.xrange(key, start, end, count); return client.getBinaryMultiBulkReply(); @@ -4400,42 +4400,61 @@ public Long xtrim(byte[] key, long maxLen, boolean approximateLength) { } @Override - public List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername) { + public List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername) { checkIsInMultiOrPipeline(); client.xpending(key, groupname, start, end, count, consumername); - return client.getBinaryMultiBulkReply(); } + return client.getObjectMultiBulkReply(); + } @Override - public List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[][] ids){ + public List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[]... ids) { checkIsInMultiOrPipeline(); client.xclaim(key, groupname, consumername, minIdleTime, newIdleTime, retries, force, ids); - return client.getBinaryMultiBulkReply(); + return client.getBinaryMultiBulkReply(); } @Override public StreamInfo xinfoStream(byte[] key) { checkIsInMultiOrPipeline(); client.xinfoStream(key); - return BuilderFactory.STREAM_INFO.build(client.getOne()); + } + @Override + public Object xinfoStreamBinary(byte[] key) { + checkIsInMultiOrPipeline(); + client.xinfoStream(key); + return client.getOne(); } @Override - public List xinfoGroup (byte[] key) { + public List xinfoGroup(byte[] key) { checkIsInMultiOrPipeline(); client.xinfoGroup(key); - return BuilderFactory.STREAM_GROUP_INFO_LIST.build(client.getBinaryMultiBulkReply()); } + @Override - public List xinfoConsumers (byte[] key, byte[] group) { + public List xinfoGroupBinary(byte[] key) { checkIsInMultiOrPipeline(); - client.xinfoConsumers(key,group); + client.xinfoGroup(key); + return client.getObjectMultiBulkReply(); + } + @Override + public List xinfoConsumers(byte[] key, byte[] group) { + checkIsInMultiOrPipeline(); + client.xinfoConsumers(key, group); return BuilderFactory.STREAM_CONSUMERS_INFO_LIST.build(client.getBinaryMultiBulkReply()); } + @Override + public List xinfoConsumersBinary(byte[] key, byte[] group) { + checkIsInMultiOrPipeline(); + client.xinfoConsumers(key, group); + return client.getObjectMultiBulkReply(); + } + public Object sendCommand(ProtocolCommand cmd, byte[]... args) { checkIsInMultiOrPipeline(); client.sendCommand(cmd, args); diff --git a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java index 1f36beb2bd..e48188ef1a 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedisCluster.java +++ b/src/main/java/redis/clients/jedis/BinaryJedisCluster.java @@ -213,7 +213,7 @@ public byte[] execute(Jedis connection) { } @Override - public String restore(final byte[] key, final int ttl, final byte[] serializedValue) { + public String restore(final byte[] key, final long ttl, final byte[] serializedValue) { return new JedisClusterCommand(connectionHandler, maxAttempts) { @Override public String execute(Jedis connection) { @@ -383,7 +383,7 @@ public String execute(Jedis connection) { } @Override - public String setex(final byte[] key, final int seconds, final byte[] value) { + public String setex(final byte[] key, final long seconds, final byte[] value) { return new JedisClusterCommand(connectionHandler, maxAttempts) { @Override public String execute(Jedis connection) { @@ -2266,6 +2266,16 @@ public List execute(Jedis connection) { }.runBinary(key); } + @Override + public List xrange(final byte[] key, final byte[] start, final byte[] end, final int count) { + return new JedisClusterCommand>(connectionHandler, maxAttempts) { + @Override + public List execute(Jedis connection) { + return connection.xrange(key, start, end, count); + } + }.runBinary(key); + } + @Override public List xrevrange(final byte[] key, final byte[] end, final byte[] start, final int count) { return new JedisClusterCommand>(connectionHandler, maxAttempts) { @@ -2373,11 +2383,11 @@ public Long execute(Jedis connection) { } @Override - public List xpending(final byte[] key, final byte[] groupname, final byte[] start, final byte[] end, + public List xpending(final byte[] key, final byte[] groupname, final byte[] start, final byte[] end, final int count, final byte[] consumername) { - return new JedisClusterCommand>(connectionHandler, maxAttempts) { + return new JedisClusterCommand>(connectionHandler, maxAttempts) { @Override - public List execute(Jedis connection) { + public List execute(Jedis connection) { return connection.xpending(key, groupname, start, end, count, consumername); } }.runBinary(key); diff --git a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java index 7e32382c98..aedc646fda 100644 --- a/src/main/java/redis/clients/jedis/BinaryShardedJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryShardedJedis.java @@ -110,19 +110,19 @@ public byte[] dump(final byte[] key) { } @Override - public String restore(final byte[] key, final int ttl, final byte[] serializedValue) { + public String restore(final byte[] key, final long ttl, final byte[] serializedValue) { Jedis j = getShard(key); return j.restore(key, ttl, serializedValue); } @Override - public String restoreReplace(final byte[] key, final int ttl, final byte[] serializedValue) { + public String restoreReplace(final byte[] key, final long ttl, final byte[] serializedValue) { Jedis j = getShard(key); return j.restoreReplace(key, ttl, serializedValue); } @Override - public Long expire(final byte[] key, final int seconds) { + public Long expire(final byte[] key, final long seconds) { Jedis j = getShard(key); return j.expire(key, seconds); } @@ -176,7 +176,7 @@ public Long setnx(final byte[] key, final byte[] value) { } @Override - public String setex(final byte[] key, final int seconds, final byte[] value) { + public String setex(final byte[] key, final long seconds, final byte[] value) { Jedis j = getShard(key); return j.setex(key, seconds, value); } @@ -1070,7 +1070,7 @@ public Long xlen(byte[] key) { } @Override - public List xrange(byte[] key, byte[] start, byte[] end, long count) { + public List xrange(byte[] key, byte[] start, byte[] end, int count) { Jedis j = getShard(key); return j.xrange(key, start, end, count); } @@ -1124,14 +1124,15 @@ public Long xtrim(byte[] key, long maxLen, boolean approximateLength) { } @Override - public List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername) { + public List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, + byte[] consumername) { Jedis j = getShard(key); return j.xpending(key, groupname, start, end, count, consumername); } @Override - public List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, - int retries, boolean force, byte[][] ids) { + public List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, + long newIdleTime, int retries, boolean force, byte[]... ids) { Jedis j = getShard(key); return j.xclaim(key, groupname, consumername, minIdleTime, newIdleTime, retries, force, ids); } @@ -1142,18 +1143,36 @@ public StreamInfo xinfoStream(byte[] key) { return j.xinfoStream(key); } + @Override + public Object xinfoStreamBinary(byte[] key) { + Jedis j = getShard(key); + return j.xinfoStreamBinary(key); + } + @Override public List xinfoGroup(byte[] key) { Jedis j = getShard(key); return j.xinfoGroup(key); } + @Override + public List xinfoGroupBinary(byte[] key) { + Jedis j = getShard(key); + return j.xinfoGroupBinary(key); + } + @Override public List xinfoConsumers(byte[] key, byte[] group) { Jedis j = getShard(key); return j.xinfoConsumers(key, group); } + @Override + public List xinfoConsumersBinary(byte[] key, byte[] group) { + Jedis j = getShard(key); + return j.xinfoConsumersBinary(key, group); + } + public Object sendCommand(ProtocolCommand cmd, byte[]... args) { // default since no sample key provided in JedisCommands interface byte[] sampleKey = args.length > 0 ? args[0] : cmd.getRaw(); diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java index 23cc7b8aac..de45c28f5a 100644 --- a/src/main/java/redis/clients/jedis/BuilderFactory.java +++ b/src/main/java/redis/clients/jedis/BuilderFactory.java @@ -13,6 +13,29 @@ import redis.clients.jedis.util.SafeEncoder; public final class BuilderFactory { + + public static final Builder OBJECT = new Builder() { + @Override + public Object build(Object data) { + return data; + } + @Override + public String toString() { + return "Object"; + } + }; + + public static final Builder> OBJECT_LIST = new Builder>() { + @Override + public List build(Object data) { + return (List) data; + } + @Override + public String toString() { + return "List"; + } + }; + public static final Builder DOUBLE = new Builder() { @Override public Double build(Object data) { @@ -875,23 +898,6 @@ public String toString() { } }; - public static final Builder OBJECT = new Builder() { - @Override - public Object build(Object data) { - return data; - } - @Override - public String toString() { - return "Object"; - } - }; - - - - private BuilderFactory() { - throw new InstantiationError( "Must not instantiate this class" ); - } - private static Map createMapFromDecodingFunctions( Iterator iterator, Map mappingFunctions) { Map resultMap = new HashMap<>(); @@ -916,4 +922,8 @@ private static Map createMapFromDecodingFunctions( Iterator(connectionHandler, maxAttempts) { @Override public String execute(Jedis connection) { @@ -294,7 +294,7 @@ public String execute(Jedis connection) { } @Override - public Long expire(final String key, final int seconds) { + public Long expire(final String key, final long seconds) { return new JedisClusterCommand(connectionHandler, maxAttempts) { @Override public Long execute(Jedis connection) { @@ -444,7 +444,7 @@ public Long execute(Jedis connection) { } @Override - public String setex(final String key, final int seconds, final String value) { + public String setex(final String key, final long seconds, final String value) { return new JedisClusterCommand(connectionHandler, maxAttempts) { @Override public String execute(Jedis connection) { diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java index 3e4f69763f..f823d3fc60 100644 --- a/src/main/java/redis/clients/jedis/PipelineBase.java +++ b/src/main/java/redis/clients/jedis/PipelineBase.java @@ -136,13 +136,13 @@ public Response exists(final byte[] key) { } @Override - public Response expire(final String key, final int seconds) { + public Response expire(final String key, final long seconds) { getClient(key).expire(key, seconds); return getResponse(BuilderFactory.LONG); } @Override - public Response expire(final byte[] key, final int seconds) { + public Response expire(final byte[] key, final long seconds) { getClient(key).expire(key, seconds); return getResponse(BuilderFactory.LONG); } @@ -722,13 +722,13 @@ public Response setbit(final byte[] key, final long offset, final byte[ } @Override - public Response setex(final String key, final int seconds, final String value) { + public Response setex(final String key, final long seconds, final String value) { getClient(key).setex(key, seconds, value); return getResponse(BuilderFactory.STRING); } @Override - public Response setex(final byte[] key, final int seconds, final byte[] value) { + public Response setex(final byte[] key, final long seconds, final byte[] value) { getClient(key).setex(key, seconds, value); return getResponse(BuilderFactory.STRING); } @@ -1656,25 +1656,25 @@ public Response pttl(final byte[] key) { } @Override - public Response restore(final String key, final int ttl, final byte[] serializedValue) { + public Response restore(final String key, final long ttl, final byte[] serializedValue) { getClient(key).restore(key, ttl, serializedValue); return getResponse(BuilderFactory.STRING); } @Override - public Response restore(final byte[] key, final int ttl, final byte[] serializedValue) { + public Response restore(final byte[] key, final long ttl, final byte[] serializedValue) { getClient(key).restore(key, ttl, serializedValue); return getResponse(BuilderFactory.STRING); } @Override - public Response restoreReplace(final String key, final int ttl, final byte[] serializedValue) { + public Response restoreReplace(final String key, final long ttl, final byte[] serializedValue) { getClient(key).restoreReplace(key, ttl, serializedValue); return getResponse(BuilderFactory.STRING); } @Override - public Response restoreReplace(final byte[] key, final int ttl, final byte[] serializedValue) { + public Response restoreReplace(final byte[] key, final long ttl, final byte[] serializedValue) { getClient(key).restoreReplace(key, ttl, serializedValue); return getResponse(BuilderFactory.STRING); } @@ -2088,11 +2088,10 @@ public Response> xpending(String key, String groupname, } @Override - public Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername){ + public Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername){ getClient(key).xpending(key, groupname, start, end, count, consumername); - return getResponse(BuilderFactory.STREAM_PENDING_ENTRY_LIST); + return getResponse(BuilderFactory.OBJECT_LIST); } - @Override public Response xdel( String key, StreamEntryID... ids){ diff --git a/src/main/java/redis/clients/jedis/ShardedJedis.java b/src/main/java/redis/clients/jedis/ShardedJedis.java index a950c9ebe9..3a407cc36d 100644 --- a/src/main/java/redis/clients/jedis/ShardedJedis.java +++ b/src/main/java/redis/clients/jedis/ShardedJedis.java @@ -85,19 +85,19 @@ public byte[] dump(final String key) { } @Override - public String restore(final String key, final int ttl, final byte[] serializedValue) { + public String restore(final String key, final long ttl, final byte[] serializedValue) { Jedis j = getShard(key); return j.restore(key, ttl, serializedValue); } @Override - public String restoreReplace(final String key, final int ttl, final byte[] serializedValue) { + public String restoreReplace(final String key, final long ttl, final byte[] serializedValue) { Jedis j = getShard(key); return j.restoreReplace(key, ttl, serializedValue); } @Override - public Long expire(final String key, final int seconds) { + public Long expire(final String key, final long seconds) { Jedis j = getShard(key); return j.expire(key, seconds); } @@ -175,7 +175,7 @@ public Long setnx(final String key, final String value) { } @Override - public String setex(final String key, final int seconds, final String value) { + public String setex(final String key, final long seconds, final String value) { Jedis j = getShard(key); return j.setex(key, seconds, value); } diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java index ab05382540..539ea58132 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java @@ -35,7 +35,12 @@ public interface BinaryJedisClusterCommands { byte[] dump(byte[] key); - String restore(byte[] key, int ttl, byte[] serializedValue); + @Deprecated + default String restore(byte[] key, int ttl, byte[] serializedValue) { + return restore(key, (long) ttl, serializedValue); + } + + String restore(byte[] key, long ttl, byte[] serializedValue); Long expire(byte[] key, int seconds); @@ -65,7 +70,12 @@ public interface BinaryJedisClusterCommands { Long setnx(byte[] key, byte[] value); - String setex(byte[] key, int seconds, byte[] value); + @Deprecated + default String setex(byte[] key, int seconds, byte[] value) { + return setex(key, (long) seconds, value); + } + + String setex(byte[] key, long seconds, byte[] value); String psetex(byte[] key, long milliseconds, byte[] value); @@ -352,9 +362,12 @@ List georadiusByMemberReadonly(byte[] key, byte[] member, dou byte[] xadd(final byte[] key, final byte[] id, final Map hash, long maxLen, boolean approximateLength); Long xlen(final byte[] key); - + + @Deprecated List xrange(final byte[] key, final byte[] start, final byte[] end, final long count); + List xrange(final byte[] key, final byte[] start, final byte[] end, final int count); + List xrevrange(final byte[] key, final byte[] end, final byte[] start, final int count); Long xack(final byte[] key, final byte[] group, final byte[]... ids); @@ -371,7 +384,7 @@ List georadiusByMemberReadonly(byte[] key, byte[] member, dou Long xtrim(byte[] key, long maxLen, boolean approximateLength); - List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); + List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[][] ids); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java index 0d48304400..db34b3dda4 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java @@ -41,11 +41,26 @@ public interface BinaryJedisCommands { byte[] dump(byte[] key); - String restore(byte[] key, int ttl, byte[] serializedValue); + @Deprecated + default String restore(byte[] key, int ttl, byte[] serializedValue) { + return restore(key, (long) ttl, serializedValue); + } - String restoreReplace(byte[] key, int ttl, byte[] serializedValue); + String restore(byte[] key, long ttl, byte[] serializedValue); - Long expire(byte[] key, int seconds); + @Deprecated + default String restoreReplace(byte[] key, int ttl, byte[] serializedValue) { + return restoreReplace(key, (long) ttl, serializedValue); + } + + String restoreReplace(byte[] key, long ttl, byte[] serializedValue); + + @Deprecated + default Long expire(byte[] key, int seconds) { + return expire(key, (long) seconds); + } + + Long expire(byte[] key, long seconds); Long pexpire(byte[] key, long milliseconds); @@ -73,7 +88,12 @@ public interface BinaryJedisCommands { Long setnx(byte[] key, byte[] value); - String setex(byte[] key, int seconds, byte[] value); + @Deprecated + default String setex(byte[] key, int seconds, byte[] value) { + return setex(key, (long) seconds, value); + } + + String setex(byte[] key, long seconds, byte[] value); String psetex(byte[] key, long milliseconds, byte[] value); @@ -261,13 +281,11 @@ public interface BinaryJedisCommands { Set zrangeByLex(byte[] key, byte[] min, byte[] max); - Set zrangeByLex(byte[] key, byte[] min, byte[] max, int offset, - int count); + Set zrangeByLex(byte[] key, byte[] min, byte[] max, int offset, int count); Set zrevrangeByLex(byte[] key, byte[] max, byte[] min); - Set zrevrangeByLex(byte[] key, byte[] max, byte[] min, int offset, - int count); + Set zrevrangeByLex(byte[] key, byte[] max, byte[] min, int offset, int count); Long zremrangeByLex(byte[] key, byte[] min, byte[] max); @@ -363,8 +381,13 @@ List georadiusByMemberReadonly(byte[] key, byte[] member, dou byte[] xadd(final byte[] key, final byte[] id, final Map hash, long maxLen, boolean approximateLength); Long xlen(final byte[] key); - - List xrange(final byte[] key, final byte[] start, final byte[] end, final long count); + + @Deprecated + default List xrange(final byte[] key, final byte[] start, final byte[] end, final long count) { + return xrange(key, start, end, (int) Math.max(count, (long) Integer.MAX_VALUE)); + } + + List xrange(final byte[] key, final byte[] start, final byte[] end, final int count); List xrevrange(final byte[] key, final byte[] end, final byte[] start, final int count); @@ -382,13 +405,22 @@ List georadiusByMemberReadonly(byte[] key, byte[] member, dou Long xtrim(byte[] key, long maxLen, boolean approximateLength); - List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); + List xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); + + List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[]... ids); + + @Deprecated + StreamInfo xinfoStream(byte[] key); + + Object xinfoStreamBinary(byte[] key); - List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[][] ids); + @Deprecated + List xinfoGroup(byte[] key); - StreamInfo xinfoStream (byte[] key); + List xinfoGroupBinary(byte[] key); - List xinfoGroup (byte[] key); + @Deprecated + List xinfoConsumers(byte[] key, byte[] group); - List xinfoConsumers (byte[] key, byte[] group); + List xinfoConsumersBinary(byte[] key, byte[] group); } diff --git a/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java index 1e0d7e45b2..1a84a9e6a0 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java @@ -38,7 +38,12 @@ public interface BinaryRedisPipeline { Response exists(byte[] key); - Response expire(byte[] key, int seconds); + @Deprecated + default Response expire(byte[] key, int seconds) { + return expire(key, (long) seconds); + } + + Response expire(byte[] key, long seconds); Response pexpire(byte[] key, long milliseconds); @@ -136,7 +141,12 @@ public interface BinaryRedisPipeline { Response setrange(byte[] key, long offset, byte[] value); - Response setex(byte[] key, int seconds, byte[] value); + @Deprecated + default Response setex(byte[] key, int seconds, byte[] value) { + return setex(key, (long) seconds, value); + } + + Response setex(byte[] key, long seconds, byte[] value); Response setnx(byte[] key, byte[] value); @@ -282,9 +292,19 @@ Response> zrevrangeByLex(byte[] key, byte[] max, byte[] min, Response dump(byte[] key); - Response restore(byte[] key, int ttl, byte[] serializedValue); + @Deprecated + default Response restore(byte[] key, int ttl, byte[] serializedValue) { + return restore(key, (long) ttl, serializedValue); + } + + Response restore(byte[] key, long ttl, byte[] serializedValue); - Response restoreReplace(byte[] key, int ttl, byte[] serializedValue); + @Deprecated + default Response restoreReplace(byte[] key, int ttl, byte[] serializedValue) { + return restoreReplace(key, (long) ttl, serializedValue); + } + + Response restoreReplace(byte[] key, long ttl, byte[] serializedValue); Response migrate(String host, int port, byte[] key, int destinationDB, int timeout); @@ -352,8 +372,8 @@ Response> georadiusByMemberReadonly(byte[] key, byte[] m Response xgroupDelConsumer(byte[] key, byte[] groupname, byte[] consumername); - Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); - + Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); + Response xdel(byte[] key, byte[]... ids); Response xtrim(byte[] key, long maxLen, boolean approximateLength); diff --git a/src/main/java/redis/clients/jedis/commands/Commands.java b/src/main/java/redis/clients/jedis/commands/Commands.java index 298808097a..f0e242ef3a 100644 --- a/src/main/java/redis/clients/jedis/commands/Commands.java +++ b/src/main/java/redis/clients/jedis/commands/Commands.java @@ -42,7 +42,12 @@ public interface Commands { void renamenx(String oldkey, String newkey); - void expire(String key, int seconds); + @Deprecated + default void expire(String key, int seconds) { + expire(key, (long) seconds); + } + + void expire(String key, long seconds); void expireAt(String key, long unixTime); @@ -70,7 +75,12 @@ public interface Commands { void setnx(String key, String value); - void setex(String key, int seconds, String value); + @Deprecated + default void setex(String key, int seconds, String value) { + setex(key, (long) seconds, value); + } + + void setex(String key, long seconds, String value); void mset(String... keysvalues); @@ -344,9 +354,19 @@ void zrevrangeByScoreWithScores(String key, String max, String min, void dump(String key); - void restore(String key, int ttl, byte[] serializedValue); + @Deprecated + default void restore(String key, int ttl, byte[] serializedValue) { + restore(key, (long) ttl, serializedValue); + } + + void restore(String key, long ttl, byte[] serializedValue); + + @Deprecated + default void restoreReplace(String key, int ttl, byte[] serializedValue) { + restoreReplace(key, (long) ttl, serializedValue); + } - void restoreReplace(String key, int ttl, byte[] serializedValue); + void restoreReplace(String key, long ttl, byte[] serializedValue); void scan(String cursor, ScanParams params); diff --git a/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java index 8fb53f9c24..45c5887563 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java @@ -37,9 +37,19 @@ public interface JedisClusterCommands { byte[] dump(String key); - String restore(String key, int ttl, byte[] serializedValue); + @Deprecated + default String restore(String key, int ttl, byte[] serializedValue) { + return restore(key, (long) ttl, serializedValue); + } + + String restore(String key, long ttl, byte[] serializedValue); + + @Deprecated + default Long expire(String key, int seconds) { + return expire(key, (long) seconds); + } - Long expire(String key, int seconds); + Long expire(String key, long seconds); Long pexpire(String key, long milliseconds); @@ -67,7 +77,12 @@ public interface JedisClusterCommands { Long setnx(String key, String value); - String setex(String key, int seconds, String value); + @Deprecated + default String setex(String key, int seconds, String value) { + return setex(key, (long) seconds, value); + } + + String setex(String key, long seconds, String value); String psetex(String key, long milliseconds, String value); @@ -255,13 +270,11 @@ public interface JedisClusterCommands { Set zrangeByLex(String key, String min, String max); - Set zrangeByLex(String key, String min, String max, int offset, - int count); + Set zrangeByLex(String key, String min, String max, int offset, int count); Set zrevrangeByLex(String key, String max, String min); - Set zrevrangeByLex(String key, String max, String min, - int offset, int count); + Set zrevrangeByLex(String key, String max, String min, int offset, int count); Long zremrangeByLex(String key, String min, String max); diff --git a/src/main/java/redis/clients/jedis/commands/JedisCommands.java b/src/main/java/redis/clients/jedis/commands/JedisCommands.java index 42e687097b..120e0a2543 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisCommands.java @@ -45,11 +45,26 @@ public interface JedisCommands { byte[] dump(String key); - String restore(String key, int ttl, byte[] serializedValue); + @Deprecated + default String restore(String key, int ttl, byte[] serializedValue) { + return restore(key, (long) ttl, serializedValue); + } - String restoreReplace(String key, int ttl, byte[] serializedValue); + String restore(String key, long ttl, byte[] serializedValue); - Long expire(String key, int seconds); + @Deprecated + default String restoreReplace(String key, int ttl, byte[] serializedValue) { + return restoreReplace(key, (long) ttl, serializedValue); + } + + String restoreReplace(String key, long ttl, byte[] serializedValue); + + @Deprecated + default Long expire(String key, int seconds) { + return expire(key, (long) seconds); + } + + Long expire(String key, long seconds); Long pexpire(String key, long milliseconds); @@ -77,7 +92,12 @@ public interface JedisCommands { Long setnx(String key, String value); - String setex(String key, int seconds, String value); + @Deprecated + default String setex(String key, int seconds, String value) { + return setex(key, (long) seconds, value); + } + + String setex(String key, long seconds, String value); String psetex(String key, long milliseconds, String value); diff --git a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java index 8106a2f9a5..0909834e97 100644 --- a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java @@ -40,7 +40,12 @@ public interface RedisPipeline { Response exists(String key); - Response expire(String key, int seconds); + @Deprecated + default Response expire(String key, int seconds) { + return expire(key, (long) seconds); + } + + Response expire(String key, long seconds); Response pexpire(String key, long milliseconds); @@ -140,7 +145,12 @@ public interface RedisPipeline { Response setbit(String key, long offset, boolean value); - Response setex(String key, int seconds, String value); + @Deprecated + default Response setex(String key, int seconds, String value) { + return setex(key, (long) seconds, value); + } + + Response setex(String key, long seconds, String value); Response setnx(String key, String value); @@ -283,9 +293,19 @@ Response> zrevrangeByLex(String key, String max, String min, Response dump(String key); - Response restore(String key, int ttl, byte[] serializedValue); + @Deprecated + default Response restore(String key, int ttl, byte[] serializedValue) { + return restore(key, (long) ttl, serializedValue); + } + + Response restore(String key, long ttl, byte[] serializedValue); + + @Deprecated + default Response restoreReplace(String key, int ttl, byte[] serializedValue) { + return restoreReplace(key, (long) ttl, serializedValue); + } - Response restoreReplace(String key, int ttl, byte[] serializedValue); + Response restoreReplace(String key, long ttl, byte[] serializedValue); Response migrate(String host, int port, String key, int destinationDB, int timeout); From bb900953ba533cfa10f3974708983ac6311a8930 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Tue, 2 Mar 2021 16:02:59 +0600 Subject: [PATCH 2/4] backward compatibility --- src/main/java/redis/clients/jedis/PipelineBase.java | 8 +++++++- .../redis/clients/jedis/commands/BinaryRedisPipeline.java | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/redis/clients/jedis/PipelineBase.java b/src/main/java/redis/clients/jedis/PipelineBase.java index f823d3fc60..d71598862f 100644 --- a/src/main/java/redis/clients/jedis/PipelineBase.java +++ b/src/main/java/redis/clients/jedis/PipelineBase.java @@ -2088,7 +2088,13 @@ public Response> xpending(String key, String groupname, } @Override - public Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername){ + public Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername){ + getClient(key).xpending(key, groupname, start, end, count, consumername); + return getResponse(BuilderFactory.STREAM_PENDING_ENTRY_LIST); + } + + @Override + public Response> xpendingBinary(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername) { getClient(key).xpending(key, groupname, start, end, count, consumername); return getResponse(BuilderFactory.OBJECT_LIST); } diff --git a/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java index 1a84a9e6a0..16f13b4685 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java @@ -372,7 +372,10 @@ Response> georadiusByMemberReadonly(byte[] key, byte[] m Response xgroupDelConsumer(byte[] key, byte[] groupname, byte[] consumername); - Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); + @Deprecated + Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); + + Response> xpendingBinary(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); Response xdel(byte[] key, byte[]... ids); From 7d212137ef6b947297494cd65f9dc46d8c98f3d7 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Tue, 2 Mar 2021 16:32:16 +0600 Subject: [PATCH 3/4] deprecation javadoc --- .../commands/BinaryJedisClusterCommands.java | 30 ++++++++------ .../jedis/commands/BinaryJedisCommands.java | 36 +++++++++++++--- .../jedis/commands/BinaryRedisPipeline.java | 41 +++++++++++-------- .../clients/jedis/commands/Commands.java | 37 ++++++++++------- .../jedis/commands/JedisClusterCommands.java | 21 +++++++--- .../clients/jedis/commands/JedisCommands.java | 34 +++++++++------ .../clients/jedis/commands/RedisPipeline.java | 41 +++++++++++-------- 7 files changed, 157 insertions(+), 83 deletions(-) diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java index 539ea58132..d155fee5e1 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisClusterCommands.java @@ -35,6 +35,9 @@ public interface BinaryJedisClusterCommands { byte[] dump(byte[] key); + /** + * @deprecated Use {@link #restore(byte[], long, byte[])}. + */ @Deprecated default String restore(byte[] key, int ttl, byte[] serializedValue) { return restore(key, (long) ttl, serializedValue); @@ -70,6 +73,9 @@ default String restore(byte[] key, int ttl, byte[] serializedValue) { Long setnx(byte[] key, byte[] value); + /** + * @deprecated Use {@link #setex(byte[], long, byte[])}. + */ @Deprecated default String setex(byte[] key, int seconds, byte[] value) { return setex(key, (long) seconds, value); @@ -263,13 +269,11 @@ default String setex(byte[] key, int seconds, byte[] value) { Set zrangeByLex(byte[] key, byte[] min, byte[] max); - Set zrangeByLex(byte[] key, byte[] min, byte[] max, int offset, - int count); + Set zrangeByLex(byte[] key, byte[] min, byte[] max, int offset, int count); Set zrevrangeByLex(byte[] key, byte[] max, byte[] min); - Set zrevrangeByLex(byte[] key, byte[] max, byte[] min, int offset, - int count); + Set zrevrangeByLex(byte[] key, byte[] max, byte[] min, int offset, int count); Long zremrangeByLex(byte[] key, byte[] min, byte[] max); @@ -307,17 +311,16 @@ Set zrevrangeByLex(byte[] key, byte[] max, byte[] min, int offset, List geopos(byte[] key, byte[]... members); - List georadius(byte[] key, double longitude, double latitude, double radius, - GeoUnit unit); + List georadius(byte[] key, double longitude, double latitude, double radius, GeoUnit unit); - List georadiusReadonly(byte[] key, double longitude, double latitude, double radius, - GeoUnit unit); + List georadiusReadonly(byte[] key, double longitude, double latitude, + double radius, GeoUnit unit); List georadius(byte[] key, double longitude, double latitude, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusReadonly(byte[] key, double longitude, double latitude, double radius, - GeoUnit unit, GeoRadiusParam param); + List georadiusReadonly(byte[] key, double longitude, double latitude, + double radius, GeoUnit unit, GeoRadiusParam param); List georadiusByMember(byte[] key, byte[] member, double radius, GeoUnit unit); @@ -326,8 +329,8 @@ List georadiusReadonly(byte[] key, double longitude, double l List georadiusByMember(byte[] key, byte[] member, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusByMemberReadonly(byte[] key, byte[] member, double radius, GeoUnit unit, - GeoRadiusParam param); + List georadiusByMemberReadonly(byte[] key, byte[] member, double radius, + GeoUnit unit, GeoRadiusParam param); ScanResult> hscan(byte[] key, byte[] cursor); @@ -363,6 +366,9 @@ List georadiusByMemberReadonly(byte[] key, byte[] member, dou Long xlen(final byte[] key); + /** + * @deprecated Use {@link #xrange(byte[], byte[], byte[], int)}. + */ @Deprecated List xrange(final byte[] key, final byte[] start, final byte[] end, final long count); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java index db34b3dda4..632a78cd10 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryJedisCommands.java @@ -41,6 +41,9 @@ public interface BinaryJedisCommands { byte[] dump(byte[] key); + /** + * @deprecated Use {@link #restore(byte[], long, byte[])}. + */ @Deprecated default String restore(byte[] key, int ttl, byte[] serializedValue) { return restore(key, (long) ttl, serializedValue); @@ -48,6 +51,9 @@ default String restore(byte[] key, int ttl, byte[] serializedValue) { String restore(byte[] key, long ttl, byte[] serializedValue); + /** + * @deprecated Use {@link #restoreReplace(byte[], long, byte[])}. + */ @Deprecated default String restoreReplace(byte[] key, int ttl, byte[] serializedValue) { return restoreReplace(key, (long) ttl, serializedValue); @@ -55,6 +61,9 @@ default String restoreReplace(byte[] key, int ttl, byte[] serializedValue) { String restoreReplace(byte[] key, long ttl, byte[] serializedValue); + /** + * @deprecated Use {@link #expire(byte[], long)}. + */ @Deprecated default Long expire(byte[] key, int seconds) { return expire(key, (long) seconds); @@ -88,6 +97,9 @@ default Long expire(byte[] key, int seconds) { Long setnx(byte[] key, byte[] value); + /** + * @deprecated Use {@link #setex(byte[], long, byte[])}. + */ @Deprecated default String setex(byte[] key, int seconds, byte[] value) { return setex(key, (long) seconds, value); @@ -328,14 +340,14 @@ default String setex(byte[] key, int seconds, byte[] value) { List georadius(byte[] key, double longitude, double latitude, double radius, GeoUnit unit); - List georadiusReadonly(byte[] key, double longitude, double latitude, double radius, - GeoUnit unit); + List georadiusReadonly(byte[] key, double longitude, double latitude, + double radius, GeoUnit unit); List georadius(byte[] key, double longitude, double latitude, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusReadonly(byte[] key, double longitude, double latitude, double radius, - GeoUnit unit, GeoRadiusParam param); + List georadiusReadonly(byte[] key, double longitude, double latitude, + double radius, GeoUnit unit, GeoRadiusParam param); List georadiusByMember(byte[] key, byte[] member, double radius, GeoUnit unit); @@ -344,8 +356,8 @@ List georadiusReadonly(byte[] key, double longitude, double l List georadiusByMember(byte[] key, byte[] member, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusByMemberReadonly(byte[] key, byte[] member, double radius, GeoUnit unit, - GeoRadiusParam param); + List georadiusByMemberReadonly(byte[] key, byte[] member, double radius, + GeoUnit unit, GeoRadiusParam param); ScanResult> hscan(byte[] key, byte[] cursor); @@ -382,6 +394,9 @@ List georadiusByMemberReadonly(byte[] key, byte[] member, dou Long xlen(final byte[] key); + /** + * @deprecated Use {@link #xrange(byte[], byte[], byte[], int)}. + */ @Deprecated default List xrange(final byte[] key, final byte[] start, final byte[] end, final long count) { return xrange(key, start, end, (int) Math.max(count, (long) Integer.MAX_VALUE)); @@ -409,16 +424,25 @@ default List xrange(final byte[] key, final byte[] start, final byte[] e List xclaim(byte[] key, byte[] groupname, byte[] consumername, long minIdleTime, long newIdleTime, int retries, boolean force, byte[]... ids); + /** + * @deprecated Use {@link #xinfoStreamBinary(byte[])}. + */ @Deprecated StreamInfo xinfoStream(byte[] key); Object xinfoStreamBinary(byte[] key); + /** + * @deprecated Use {@link #xinfoGroupBinary(byte[])}. + */ @Deprecated List xinfoGroup(byte[] key); List xinfoGroupBinary(byte[] key); + /** + * @deprecated Use {@link #xinfoConsumersBinary(byte[], byte[])}. + */ @Deprecated List xinfoConsumers(byte[] key, byte[] group); diff --git a/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java b/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java index 16f13b4685..2ce3e2f938 100644 --- a/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/BinaryRedisPipeline.java @@ -38,6 +38,9 @@ public interface BinaryRedisPipeline { Response exists(byte[] key); + /** + * @deprecated Use {@link #expire(byte[], long)}. + */ @Deprecated default Response expire(byte[] key, int seconds) { return expire(key, (long) seconds); @@ -141,6 +144,9 @@ default Response expire(byte[] key, int seconds) { Response setrange(byte[] key, long offset, byte[] value); + /** + * @deprecated Use {@link #setex(byte[], long, byte[])}. + */ @Deprecated default Response setex(byte[] key, int seconds, byte[] value) { return setex(key, (long) seconds, value); @@ -214,11 +220,9 @@ default Response setex(byte[] key, int seconds, byte[] value) { Response> zrangeByScoreWithScores(byte[] key, byte[] min, byte[] max); - Response> zrangeByScoreWithScores(byte[] key, double min, double max, int offset, - int count); + Response> zrangeByScoreWithScores(byte[] key, double min, double max, int offset, int count); - Response> zrangeByScoreWithScores(byte[] key, byte[] min, byte[] max, int offset, - int count); + Response> zrangeByScoreWithScores(byte[] key, byte[] min, byte[] max, int offset, int count); Response> zrevrangeByScore(byte[] key, double max, double min); @@ -232,11 +236,9 @@ Response> zrangeByScoreWithScores(byte[] key, byte[] min, byte[] max, Response> zrevrangeByScoreWithScores(byte[] key, byte[] max, byte[] min); - Response> zrevrangeByScoreWithScores(byte[] key, double max, double min, int offset, - int count); + Response> zrevrangeByScoreWithScores(byte[] key, double max, double min, int offset, int count); - Response> zrevrangeByScoreWithScores(byte[] key, byte[] max, byte[] min, int offset, - int count); + Response> zrevrangeByScoreWithScores(byte[] key, byte[] max, byte[] min, int offset, int count); Response> zrangeWithScores(byte[] key, long start, long stop); @@ -272,13 +274,11 @@ Response> zrevrangeByScoreWithScores(byte[] key, byte[] max, byte[] m Response> zrangeByLex(byte[] key, byte[] min, byte[] max); - Response> zrangeByLex(byte[] key, byte[] min, byte[] max, - int offset, int count); + Response> zrangeByLex(byte[] key, byte[] min, byte[] max, int offset, int count); Response> zrevrangeByLex(byte[] key, byte[] max, byte[] min); - Response> zrevrangeByLex(byte[] key, byte[] max, byte[] min, - int offset, int count); + Response> zrevrangeByLex(byte[] key, byte[] max, byte[] min, int offset, int count); Response zremrangeByLex(byte[] key, byte[] min, byte[] max); @@ -292,6 +292,9 @@ Response> zrevrangeByLex(byte[] key, byte[] max, byte[] min, Response dump(byte[] key); + /** + * @deprecated Use {@link #restore(byte[], long, byte[])}. + */ @Deprecated default Response restore(byte[] key, int ttl, byte[] serializedValue) { return restore(key, (long) ttl, serializedValue); @@ -299,6 +302,9 @@ default Response restore(byte[] key, int ttl, byte[] serializedValue) { Response restore(byte[] key, long ttl, byte[] serializedValue); + /** + * @deprecated Use {@link #restoreReplace(byte[], long, byte[])}. + */ @Deprecated default Response restoreReplace(byte[] key, int ttl, byte[] serializedValue) { return restoreReplace(key, (long) ttl, serializedValue); @@ -337,14 +343,14 @@ Response> georadiusReadonly(byte[] key, double longitude Response> georadiusByMember(byte[] key, byte[] member, double radius, GeoUnit unit); - Response> georadiusByMemberReadonly(byte[] key, byte[] member, double radius, - GeoUnit unit); + Response> georadiusByMemberReadonly(byte[] key, byte[] member, + double radius, GeoUnit unit); Response> georadiusByMember(byte[] key, byte[] member, double radius, GeoUnit unit, GeoRadiusParam param); - Response> georadiusByMemberReadonly(byte[] key, byte[] member, double radius, - GeoUnit unit, GeoRadiusParam param); + Response> georadiusByMemberReadonly(byte[] key, byte[] member, + double radius, GeoUnit unit, GeoRadiusParam param); Response> bitfield(byte[] key, byte[]... elements); @@ -372,6 +378,9 @@ Response> georadiusByMemberReadonly(byte[] key, byte[] m Response xgroupDelConsumer(byte[] key, byte[] groupname, byte[] consumername); + /** + * @deprecated Use {@link #xpendingBinary(byte[], byte[], byte[], byte[], int, byte[])}. + */ @Deprecated Response> xpending(byte[] key, byte[] groupname, byte[] start, byte[] end, int count, byte[] consumername); diff --git a/src/main/java/redis/clients/jedis/commands/Commands.java b/src/main/java/redis/clients/jedis/commands/Commands.java index f0e242ef3a..19b3338d92 100644 --- a/src/main/java/redis/clients/jedis/commands/Commands.java +++ b/src/main/java/redis/clients/jedis/commands/Commands.java @@ -42,6 +42,9 @@ public interface Commands { void renamenx(String oldkey, String newkey); + /** + * @deprecated Use {@link #expire(java.lang.String, long)}. + */ @Deprecated default void expire(String key, int seconds) { expire(key, (long) seconds); @@ -75,6 +78,9 @@ default void expire(String key, int seconds) { void setnx(String key, String value); + /** + * @deprecated Use {@link #setex(java.lang.String, long, java.lang.String)}. + */ @Deprecated default void setex(String key, int seconds, String value) { setex(key, (long) seconds, value); @@ -256,39 +262,33 @@ default void setex(String key, int seconds, String value) { void zrangeByScore(String key, String min, String max); - void zrangeByScore(String key, double min, double max, int offset, - int count); + void zrangeByScore(String key, double min, double max, int offset, int count); void zrangeByScore(String key, String min, String max, int offset, int count); void zrangeByScoreWithScores(String key, double min, double max); - void zrangeByScoreWithScores(String key, double min, double max, - int offset, int count); + void zrangeByScoreWithScores(String key, double min, double max, int offset, int count); void zrangeByScoreWithScores(String key, String min, String max); - void zrangeByScoreWithScores(String key, String min, String max, - int offset, int count); + void zrangeByScoreWithScores(String key, String min, String max, int offset, int count); void zrevrangeByScore(String key, double max, double min); void zrevrangeByScore(String key, String max, String min); - void zrevrangeByScore(String key, double max, double min, int offset, - int count); + void zrevrangeByScore(String key, double max, double min, int offset, int count); void zrevrangeByScore(String key, String max, String min, int offset, int count); void zrevrangeByScoreWithScores(String key, double max, double min); - void zrevrangeByScoreWithScores(String key, double max, double min, - int offset, int count); + void zrevrangeByScoreWithScores(String key, double max, double min, int offset, int count); void zrevrangeByScoreWithScores(String key, String max, String min); - void zrevrangeByScoreWithScores(String key, String max, String min, - int offset, int count); + void zrevrangeByScoreWithScores(String key, String max, String min, int offset, int count); void zremrangeByRank(String key, long start, long stop); @@ -354,6 +354,9 @@ void zrevrangeByScoreWithScores(String key, String max, String min, void dump(String key); + /** + * @deprecated Use {@link #restore(java.lang.String, long, byte[])}. + */ @Deprecated default void restore(String key, int ttl, byte[] serializedValue) { restore(key, (long) ttl, serializedValue); @@ -361,6 +364,9 @@ default void restore(String key, int ttl, byte[] serializedValue) { void restore(String key, long ttl, byte[] serializedValue); + /** + * @deprecated Use {@link #restoreReplace(java.lang.String, long, byte[])}. + */ @Deprecated default void restoreReplace(String key, int ttl, byte[] serializedValue) { restoreReplace(key, (long) ttl, serializedValue); @@ -442,9 +448,12 @@ default void restoreReplace(String key, int ttl, byte[] serializedValue) { void xpending(String key, String groupname, StreamEntryID start, StreamEntryID end, int count, String consumername); - void xclaim(String key, String group, String consumername, long minIdleTime, long newIdleTime, int retries, - boolean force, StreamEntryID... ids); + void xclaim(String key, String group, String consumername, long minIdleTime, long newIdleTime, + int retries, boolean force, StreamEntryID... ids); + void xinfoStream (String key); + void xinfoGroup (String key); + void xinfoConsumers (String key, String group); } diff --git a/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java b/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java index 45c5887563..4d8b83edea 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisClusterCommands.java @@ -37,6 +37,9 @@ public interface JedisClusterCommands { byte[] dump(String key); + /** + * @deprecated Use {@link #restore(java.lang.String, long, byte[])}. + */ @Deprecated default String restore(String key, int ttl, byte[] serializedValue) { return restore(key, (long) ttl, serializedValue); @@ -44,6 +47,9 @@ default String restore(String key, int ttl, byte[] serializedValue) { String restore(String key, long ttl, byte[] serializedValue); + /** + * @deprecated Use {@link #expire(java.lang.String, long)}. + */ @Deprecated default Long expire(String key, int seconds) { return expire(key, (long) seconds); @@ -77,6 +83,9 @@ default Long expire(String key, int seconds) { Long setnx(String key, String value); + /** + * @deprecated Use {@link #setex(java.lang.String, long, java.lang.String)}. + */ @Deprecated default String setex(String key, int seconds, String value) { return setex(key, (long) seconds, value); @@ -325,14 +334,14 @@ default String setex(String key, int seconds, String value) { List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit); - List georadiusReadonly(String key, double longitude, double latitude, double radius, - GeoUnit unit); + List georadiusReadonly(String key, double longitude, double latitude, + double radius, GeoUnit unit); List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusReadonly(String key, double longitude, double latitude, double radius, - GeoUnit unit, GeoRadiusParam param); + List georadiusReadonly(String key, double longitude, double latitude, + double radius, GeoUnit unit, GeoRadiusParam param); List georadiusByMember(String key, String member, double radius, GeoUnit unit); @@ -341,8 +350,8 @@ List georadiusReadonly(String key, double longitude, double l List georadiusByMember(String key, String member, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusByMemberReadonly(String key, String member, double radius, GeoUnit unit, - GeoRadiusParam param); + List georadiusByMemberReadonly(String key, String member, double radius, + GeoUnit unit, GeoRadiusParam param); /** * Executes BITFIELD Redis command diff --git a/src/main/java/redis/clients/jedis/commands/JedisCommands.java b/src/main/java/redis/clients/jedis/commands/JedisCommands.java index 120e0a2543..cb50b08ae5 100644 --- a/src/main/java/redis/clients/jedis/commands/JedisCommands.java +++ b/src/main/java/redis/clients/jedis/commands/JedisCommands.java @@ -45,6 +45,9 @@ public interface JedisCommands { byte[] dump(String key); + /** + * @deprecated Use {@link #restore(java.lang.String, long, byte[])}. + */ @Deprecated default String restore(String key, int ttl, byte[] serializedValue) { return restore(key, (long) ttl, serializedValue); @@ -52,6 +55,9 @@ default String restore(String key, int ttl, byte[] serializedValue) { String restore(String key, long ttl, byte[] serializedValue); + /** + * @deprecated Use {@link #restoreReplace(java.lang.String, long, byte[])}. + */ @Deprecated default String restoreReplace(String key, int ttl, byte[] serializedValue) { return restoreReplace(key, (long) ttl, serializedValue); @@ -59,6 +65,10 @@ default String restoreReplace(String key, int ttl, byte[] serializedValue) { String restoreReplace(String key, long ttl, byte[] serializedValue); + + /** + * @deprecated Use {@link #expire(java.lang.String, long)}. + */ @Deprecated default Long expire(String key, int seconds) { return expire(key, (long) seconds); @@ -92,6 +102,9 @@ default Long expire(String key, int seconds) { Long setnx(String key, String value); + /** + * @deprecated Use {@link #setex(java.lang.String, long, java.lang.String)}. + */ @Deprecated default String setex(String key, int seconds, String value) { return setex(key, (long) seconds, value); @@ -285,13 +298,11 @@ default String setex(String key, int seconds, String value) { Set zrangeByLex(String key, String min, String max); - Set zrangeByLex(String key, String min, String max, int offset, - int count); + Set zrangeByLex(String key, String min, String max, int offset, int count); Set zrevrangeByLex(String key, String max, String min); - Set zrevrangeByLex(String key, String max, String min, - int offset, int count); + Set zrevrangeByLex(String key, String max, String min, int offset, int count); Long zremrangeByLex(String key, String min, String max); @@ -323,8 +334,7 @@ Set zrevrangeByLex(String key, String max, String min, ScanResult> hscan(String key, String cursor); - ScanResult> hscan(String key, String cursor, - ScanParams params); + ScanResult> hscan(String key, String cursor, ScanParams params); ScanResult sscan(String key, String cursor); @@ -355,14 +365,14 @@ ScanResult> hscan(String key, String cursor, List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit); - List georadiusReadonly(String key, double longitude, double latitude, double radius, - GeoUnit unit); + List georadiusReadonly(String key, double longitude, double latitude, + double radius, GeoUnit unit); List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusReadonly(String key, double longitude, double latitude, double radius, - GeoUnit unit, GeoRadiusParam param); + List georadiusReadonly(String key, double longitude, double latitude, + double radius, GeoUnit unit, GeoRadiusParam param); List georadiusByMember(String key, String member, double radius, GeoUnit unit); @@ -371,8 +381,8 @@ List georadiusReadonly(String key, double longitude, double l List georadiusByMember(String key, String member, double radius, GeoUnit unit, GeoRadiusParam param); - List georadiusByMemberReadonly(String key, String member, double radius, GeoUnit unit, - GeoRadiusParam param); + List georadiusByMemberReadonly(String key, String member, double radius, + GeoUnit unit, GeoRadiusParam param); /** * Executes BITFIELD Redis command diff --git a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java index 0909834e97..7fbfa93047 100644 --- a/src/main/java/redis/clients/jedis/commands/RedisPipeline.java +++ b/src/main/java/redis/clients/jedis/commands/RedisPipeline.java @@ -40,6 +40,9 @@ public interface RedisPipeline { Response exists(String key); + /** + * @deprecated Use {@link #expire(java.lang.String, long)}. + */ @Deprecated default Response expire(String key, int seconds) { return expire(key, (long) seconds); @@ -145,6 +148,9 @@ default Response expire(String key, int seconds) { Response setbit(String key, long offset, boolean value); + /** + * @deprecated Use {@link #setex(java.lang.String, long, java.lang.String)}. + */ @Deprecated default Response setex(String key, int seconds, String value) { return setex(key, (long) seconds, value); @@ -212,8 +218,7 @@ default Response setex(String key, int seconds, String value) { Response> zrangeByScoreWithScores(String key, double min, double max); - Response> zrangeByScoreWithScores(String key, double min, double max, int offset, - int count); + Response> zrangeByScoreWithScores(String key, double min, double max, int offset, int count); Response> zrevrangeByScore(String key, double max, double min); @@ -227,11 +232,9 @@ Response> zrangeByScoreWithScores(String key, double min, double max, Response> zrevrangeByScoreWithScores(String key, String max, String min); - Response> zrevrangeByScoreWithScores(String key, double max, double min, int offset, - int count); + Response> zrevrangeByScoreWithScores(String key, double max, double min, int offset, int count); - Response> zrevrangeByScoreWithScores(String key, String max, String min, int offset, - int count); + Response> zrevrangeByScoreWithScores(String key, String max, String min, int offset, int count); Response> zrangeWithScores(String key, long start, long stop); @@ -267,13 +270,11 @@ Response> zrevrangeByScoreWithScores(String key, String max, String m Response> zrangeByLex(String key, String min, String max); - Response> zrangeByLex(String key, String min, String max, - int offset, int count); + Response> zrangeByLex(String key, String min, String max, int offset, int count); Response> zrevrangeByLex(String key, String max, String min); - Response> zrevrangeByLex(String key, String max, String min, - int offset, int count); + Response> zrevrangeByLex(String key, String max, String min, int offset, int count); Response zremrangeByLex(String key, String min, String max); @@ -293,6 +294,9 @@ Response> zrevrangeByLex(String key, String max, String min, Response dump(String key); + /** + * @deprecated Use {@link #restore(java.lang.String, long, byte[])}. + */ @Deprecated default Response restore(String key, int ttl, byte[] serializedValue) { return restore(key, (long) ttl, serializedValue); @@ -300,6 +304,9 @@ default Response restore(String key, int ttl, byte[] serializedValue) { Response restore(String key, long ttl, byte[] serializedValue); + /** + * @deprecated Use {@link #restoreReplace(java.lang.String, long, byte[])}. + */ @Deprecated default Response restoreReplace(String key, int ttl, byte[] serializedValue) { return restoreReplace(key, (long) ttl, serializedValue); @@ -338,14 +345,14 @@ Response> georadiusReadonly(String key, double longitude Response> georadiusByMember(String key, String member, double radius, GeoUnit unit); - Response> georadiusByMemberReadonly(String key, String member, double radius, - GeoUnit unit); + Response> georadiusByMemberReadonly(String key, String member, + double radius, GeoUnit unit); Response> georadiusByMember(String key, String member, double radius, GeoUnit unit, GeoRadiusParam param); - Response> georadiusByMemberReadonly(String key, String member, double radius, - GeoUnit unit, GeoRadiusParam param); + Response> georadiusByMemberReadonly(String key, String member, + double radius, GeoUnit unit, GeoRadiusParam param); Response xadd(String key, StreamEntryID id, Map hash); @@ -367,7 +374,8 @@ Response> georadiusByMemberReadonly(String key, String m Response xgroupDelConsumer( String key, String groupname, String consumername); - Response> xpending(String key, String groupname, StreamEntryID start, StreamEntryID end, int count, String consumername); + Response> xpending(String key, String groupname, + StreamEntryID start, StreamEntryID end, int count, String consumername); Response xdel( String key, StreamEntryID... ids); @@ -386,8 +394,7 @@ Response> xclaim( String key, String group, String consumernam Response> zrangeByScoreWithScores(String key, String min, String max); - Response> zrangeByScoreWithScores(String key, String min, String max, int offset, - int count); + Response> zrangeByScoreWithScores(String key, String min, String max, int offset, int count); Response objectRefcount(String key); From e9bd9f47d9cc13e2e367705aa74827c4c55390a3 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Tue, 2 Mar 2021 19:15:51 +0600 Subject: [PATCH 4/4] deprecation javadoc in class --- .../java/redis/clients/jedis/BinaryClient.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java index 4f57575793..8487c05a7f 100644 --- a/src/main/java/redis/clients/jedis/BinaryClient.java +++ b/src/main/java/redis/clients/jedis/BinaryClient.java @@ -193,6 +193,9 @@ public void dbSize() { sendCommand(DBSIZE); } + /** + * @deprecated Use {@link #expire(byte[], long)}. + */ @Deprecated public void expire(final byte[] key, final int seconds) { sendCommand(EXPIRE, key, toByteArray(seconds)); @@ -242,6 +245,9 @@ public void setnx(final byte[] key, final byte[] value) { sendCommand(SETNX, key, value); } + /** + * @deprecated Use {@link #setex(byte[], long, byte[])}. + */ @Deprecated public void setex(final byte[] key, final int seconds, final byte[] value) { sendCommand(SETEX, key, toByteArray(seconds), value); @@ -1078,6 +1084,9 @@ public void dump(final byte[] key) { sendCommand(DUMP, key); } + /** + * @deprecated Use {@link #restore(byte[], long, byte[])}. + */ @Deprecated public void restore(final byte[] key, final int ttl, final byte[] serializedValue) { sendCommand(RESTORE, key, toByteArray(ttl), serializedValue); @@ -1087,6 +1096,9 @@ public void restore(final byte[] key, final long ttl, final byte[] serializedVal sendCommand(RESTORE, key, toByteArray(ttl), serializedValue); } + /** + * @deprecated Use {@link #restoreReplace(byte[], long, byte[])}. + */ @Deprecated public void restoreReplace(final byte[] key, final int ttl, final byte[] serializedValue) { sendCommand(RESTORE, key, toByteArray(ttl), serializedValue, Keyword.REPLACE.getRaw()); @@ -1462,6 +1474,9 @@ public void xlen(final byte[] key) { sendCommand(XLEN, key); } + /** + * @deprecated Use {@link #xrange(byte[], byte[], byte[], int)}. + */ @Deprecated public void xrange(final byte[] key, final byte[] start, final byte[] end, final long count) { sendCommand(XRANGE, key, start, end, Keyword.COUNT.getRaw(), toByteArray(count));