Skip to content

Commit 3f695a9

Browse files
sazzad16sazzad16
authored
Cleanup deprecations for Jedis 5.0 (#3391)
1 parent 8ee0d30 commit 3f695a9

File tree

59 files changed

+161
-1422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+161
-1422
lines changed

‎src/main/java/redis/clients/jedis/CommandArguments.java

-8
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,6 @@ public CommandArguments addObjects(Collection args) {
5656
return this;
5757
}
5858

59-
@Deprecated
60-
public CommandArguments addObjects(int[] ints) {
61-
for (int i : ints) {
62-
add(i);
63-
}
64-
return this;
65-
}
66-
6759
public CommandArguments key(Object key) {
6860
if (key instanceof Rawable) {
6961
Rawable raw = (Rawable) key;

‎src/main/java/redis/clients/jedis/CommandObjects.java

+14-93
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@ public final CommandObject<String> get(String key) {
430430
return new CommandObject<>(commandArguments(Command.GET).key(key), BuilderFactory.STRING);
431431
}
432432

433+
public final CommandObject<String> setGet(String key, String value) {
434+
return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).add(Keyword.GET), BuilderFactory.STRING);
435+
}
436+
433437
public final CommandObject<String> setGet(String key, String value, SetParams params) {
434438
return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params)
435439
.add(Keyword.GET), BuilderFactory.STRING);
@@ -447,6 +451,10 @@ public final CommandObject<byte[]> get(byte[] key) {
447451
return new CommandObject<>(commandArguments(Command.GET).key(key), BuilderFactory.BINARY);
448452
}
449453

454+
public final CommandObject<byte[]> setGet(byte[] key, byte[] value) {
455+
return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).add(Keyword.GET), BuilderFactory.BINARY);
456+
}
457+
450458
public final CommandObject<byte[]> setGet(byte[] key, byte[] value, SetParams params) {
451459
return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params)
452460
.add(Keyword.GET), BuilderFactory.BINARY);
@@ -676,34 +684,6 @@ public final CommandObject<Long> bitop(BitOP op, byte[] destKey, byte[]... srcKe
676684
return new CommandObject<>(commandArguments(BITOP).add(op).key(destKey).keys((Object[]) srcKeys), BuilderFactory.LONG);
677685
}
678686

679-
/**
680-
* @param keyA
681-
* @param keyB
682-
* @param params
683-
* @return
684-
* @deprecated STRALGO LCS command will be removed from Redis 7.
685-
* LCS can be used instead of this method.
686-
*/
687-
@Deprecated
688-
public final CommandObject<LCSMatchResult> strAlgoLCSKeys(String keyA, String keyB, StrAlgoLCSParams params) {
689-
return new CommandObject<>(commandArguments(STRALGO).add(Keyword.LCS).add(Keyword.KEYS)
690-
.key(keyA).key(keyB).addParams(params), BuilderFactory.STR_ALGO_LCS_RESULT_BUILDER);
691-
}
692-
693-
/**
694-
* @param keyA
695-
* @param keyB
696-
* @param params
697-
* @return
698-
* @deprecated STRALGO LCS command will be removed from Redis 7.
699-
* LCS can be used instead of this method.
700-
*/
701-
@Deprecated
702-
public final CommandObject<LCSMatchResult> strAlgoLCSKeys(byte[] keyA, byte[] keyB, StrAlgoLCSParams params) {
703-
return new CommandObject<>(commandArguments(STRALGO).add(Keyword.LCS).add(Keyword.KEYS)
704-
.key(keyA).key(keyB).addParams(params), BuilderFactory.STR_ALGO_LCS_RESULT_BUILDER);
705-
}
706-
707687
public final CommandObject<LCSMatchResult> lcs(String keyA, String keyB, LCSParams params) {
708688
return new CommandObject<>(commandArguments(Command.LCS).key(keyA).key(keyB)
709689
.addParams(params), BuilderFactory.STR_ALGO_LCS_RESULT_BUILDER);
@@ -2525,25 +2505,6 @@ public final CommandObject<StreamPendingSummary> xpending(String key, String gro
25252505
BuilderFactory.STREAM_PENDING_SUMMARY);
25262506
}
25272507

2528-
/**
2529-
* @param key
2530-
* @param groupName
2531-
* @param start
2532-
* @param end
2533-
* @param count
2534-
* @param consumerName
2535-
* @return
2536-
* @deprecated Use {@link CommandObjects#xpending(java.lang.String, java.lang.String, redis.clients.jedis.params.XPendingParams)}.
2537-
*/
2538-
@Deprecated
2539-
public final CommandObject<List<StreamPendingEntry>> xpending(String key, String groupName,
2540-
StreamEntryID start, StreamEntryID end, int count, String consumerName) {
2541-
CommandArguments args = commandArguments(XPENDING).key(key).add(groupName)
2542-
.add(start == null ? "-" : start).add(end == null ? "+" : end).add(count);
2543-
if (consumerName != null) args.add(consumerName);
2544-
return new CommandObject<>(args, BuilderFactory.STREAM_PENDING_ENTRY_LIST);
2545-
}
2546-
25472508
public final CommandObject<List<StreamPendingEntry>> xpending(String key, String groupName, XPendingParams params) {
25482509
return new CommandObject<>(commandArguments(XPENDING).key(key).add(groupName)
25492510
.addParams(params), BuilderFactory.STREAM_PENDING_ENTRY_LIST);
@@ -2554,18 +2515,6 @@ public final CommandObject<Object> xpending(byte[] key, byte[] groupName) {
25542515
BuilderFactory.RAW_OBJECT);
25552516
}
25562517

2557-
/**
2558-
* @deprecated Use {@link CommandObjects#xpending(byte[], byte[], redis.clients.jedis.params.XPendingParams)}.
2559-
*/
2560-
@Deprecated
2561-
public final CommandObject<List<Object>> xpending(byte[] key, byte[] groupName,
2562-
byte[] start, byte[] end, int count, byte[] consumerName) {
2563-
CommandArguments args = commandArguments(XPENDING).key(key).add(groupName)
2564-
.add(start == null ? "-" : start).add(end == null ? "+" : end).add(count);
2565-
if (consumerName != null) args.add(consumerName);
2566-
return new CommandObject<>(args, BuilderFactory.RAW_OBJECT_LIST);
2567-
}
2568-
25692518
public final CommandObject<List<Object>> xpending(byte[] key, byte[] groupName, XPendingParams params) {
25702519
return new CommandObject<>(commandArguments(XPENDING).key(key).add(groupName)
25712520
.addParams(params), BuilderFactory.RAW_OBJECT_LIST);
@@ -2653,20 +2602,10 @@ public final CommandObject<Object> xinfoStreamFull(byte[] key) {
26532602
return new CommandObject<>(commandArguments(XINFO).add(STREAM).key(key).add(FULL), BuilderFactory.RAW_OBJECT);
26542603
}
26552604

2656-
@Deprecated
2657-
public final CommandObject<List<StreamGroupInfo>> xinfoGroup(String key) {
2658-
return new CommandObject<>(commandArguments(XINFO).add(GROUPS).key(key), BuilderFactory.STREAM_GROUP_INFO_LIST);
2659-
}
2660-
26612605
public final CommandObject<List<StreamGroupInfo>> xinfoGroups(String key) {
26622606
return new CommandObject<>(commandArguments(XINFO).add(GROUPS).key(key), BuilderFactory.STREAM_GROUP_INFO_LIST);
26632607
}
26642608

2665-
@Deprecated
2666-
public final CommandObject<List<Object>> xinfoGroup(byte[] key) {
2667-
return new CommandObject<>(commandArguments(XINFO).add(GROUPS).key(key), BuilderFactory.RAW_OBJECT_LIST);
2668-
}
2669-
26702609
public final CommandObject<List<Object>> xinfoGroups(byte[] key) {
26712610
return new CommandObject<>(commandArguments(XINFO).add(GROUPS).key(key), BuilderFactory.RAW_OBJECT_LIST);
26722611
}
@@ -3048,20 +2987,6 @@ public final CommandObject<String> functionRestore(byte[] serializedValue, Funct
30482987
// Scripting commands
30492988

30502989
// Miscellaneous commands
3051-
@Deprecated
3052-
public final CommandObject<LCSMatchResult> strAlgoLCSStrings(String strA, String strB, StrAlgoLCSParams params) {
3053-
return new CommandObject<>(commandArguments(STRALGO).add(Keyword.LCS).add(STRINGS)
3054-
.add(strA).add(strB).addParams(params),
3055-
BuilderFactory.STR_ALGO_LCS_RESULT_BUILDER);
3056-
}
3057-
3058-
@Deprecated
3059-
public final CommandObject<LCSMatchResult> strAlgoLCSStrings(byte[] strA, byte[] strB, StrAlgoLCSParams params) {
3060-
return new CommandObject<>(commandArguments(STRALGO).add(Keyword.LCS).add(STRINGS)
3061-
.add(strA).add(strB).addParams(params),
3062-
BuilderFactory.STR_ALGO_LCS_RESULT_BUILDER);
3063-
}
3064-
30652990
public final CommandObject<Boolean> copy(String srcKey, String dstKey, int dstDB, boolean replace) {
30662991
CommandArguments args = commandArguments(Command.COPY).key(srcKey).key(dstKey).add(DB).add(dstDB);
30672992
if (replace) args.add(REPLACE);
@@ -3237,22 +3162,22 @@ public final CommandObject<String> ftAlter(String indexName, Iterable<SchemaFiel
32373162

32383163
public final CommandObject<SearchResult> ftSearch(String indexName, String query) {
32393164
return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName).add(query),
3240-
new SearchResultBuilder(true, false, false, true));
3165+
new SearchResultBuilder(true, false, true));
32413166
}
32423167

32433168
public final CommandObject<SearchResult> ftSearch(String indexName, String query, FTSearchParams params) {
32443169
return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName)
3245-
.add(query).addParams(params), new SearchResultBuilder(!params.getNoContent(), params.getWithScores(), false, true));
3170+
.add(query).addParams(params), new SearchResultBuilder(!params.getNoContent(), params.getWithScores(), true));
32463171
}
32473172

32483173
public final CommandObject<SearchResult> ftSearch(String indexName, Query query) {
32493174
return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName).addParams(query),
3250-
new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), query.getWithPayloads(), true));
3175+
new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), true));
32513176
}
32523177

32533178
public final CommandObject<SearchResult> ftSearch(byte[] indexName, Query query) {
32543179
return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName).addParams(query),
3255-
new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), query.getWithPayloads(), false));
3180+
new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), false));
32563181
}
32573182

32583183
public final CommandObject<String> ftExplain(String indexName, Query query) {
@@ -3296,15 +3221,15 @@ public final CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfi
32963221
return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.PROFILE), indexName)
32973222
.add(SearchKeyword.SEARCH).addParams(profileParams).add(SearchKeyword.QUERY)
32983223
.addParams(query), new SearchProfileResponseBuilder<>(new SearchResultBuilder(
3299-
!query.getNoContent(), query.getWithScores(), query.getWithPayloads(), true)));
3224+
!query.getNoContent(), query.getWithScores(), true)));
33003225
}
33013226

33023227
public final CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfileSearch(
33033228
String indexName, FTProfileParams profileParams, String query, FTSearchParams searchParams) {
33043229
return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.PROFILE), indexName)
33053230
.add(SearchKeyword.SEARCH).addParams(profileParams).add(SearchKeyword.QUERY).add(query)
33063231
.addParams(searchParams), new SearchProfileResponseBuilder<>(new SearchResultBuilder(
3307-
!searchParams.getNoContent(), searchParams.getWithScores(), false, true)));
3232+
!searchParams.getNoContent(), searchParams.getWithScores(), true)));
33083233
}
33093234

33103235
public final CommandObject<String> ftDropIndex(String indexName) {
@@ -4076,10 +4001,6 @@ public final CommandObject<List<Boolean>> topkQuery(String key, String... items)
40764001
return new CommandObject<>(commandArguments(TopKCommand.QUERY).key(key).addObjects((Object[]) items), BuilderFactory.BOOLEAN_LIST);
40774002
}
40784003

4079-
public final CommandObject<List<Long>> topkCount(String key, String... items) {
4080-
return new CommandObject<>(commandArguments(TopKCommand.COUNT).key(key).addObjects((Object[]) items), BuilderFactory.LONG_LIST);
4081-
}
4082-
40834004
public final CommandObject<List<String>> topkList(String key) {
40844005
return new CommandObject<>(commandArguments(TopKCommand.LIST).key(key), BuilderFactory.STRING_LIST);
40854006
}

‎src/main/java/redis/clients/jedis/ConnectionFactory.java

-9
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,6 @@ public ConnectionFactory(final JedisSocketFactory jedisSocketFactory, final Jedi
3535
this.jedisSocketFactory = jedisSocketFactory;
3636
}
3737

38-
/**
39-
* @deprecated Use {@link RedisCredentialsProvider} through
40-
* {@link JedisClientConfig#getCredentialsProvider()}.
41-
*/
42-
@Deprecated
43-
public void setPassword(final String password) {
44-
this.clientConfig.updatePassword(password);
45-
}
46-
4738
@Override
4839
public void activateObject(PooledObject<Connection> pooledConnection) throws Exception {
4940
// what to do ??

‎src/main/java/redis/clients/jedis/DefaultJedisClientConfig.java

-7
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ public Supplier<RedisCredentials> getCredentialsProvider() {
7878
return credentialsProvider;
7979
}
8080

81-
@Override
82-
@Deprecated
83-
public synchronized void updatePassword(String password) {
84-
((DefaultRedisCredentialsProvider) this.credentialsProvider)
85-
.setCredentials(new DefaultRedisCredentials(getUser(), password));
86-
}
87-
8881
@Override
8982
public int getDatabase() {
9083
return database;

0 commit comments

Comments
 (0)