Skip to content

Commit c9f4dee

Browse files
authored
Deprecate RedisJSON v1 support (#3503)
* Deprecate RedisJSON v1 support * in CommandObjects
1 parent 3d874e1 commit c9f4dee

File tree

6 files changed

+160
-3
lines changed

6 files changed

+160
-3
lines changed

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3427,11 +3427,13 @@ public final CommandObject<String> jsonSetWithEscape(String key, Path2 path, Obj
34273427
getJsonObjectMapper().toJson(object)), BuilderFactory.STRING);
34283428
}
34293429

3430+
@Deprecated
34303431
public final CommandObject<String> jsonSet(String key, Path path, Object pojo) {
34313432
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(
34323433
getJsonObjectMapper().toJson(pojo)), BuilderFactory.STRING);
34333434
}
34343435

3436+
@Deprecated
34353437
public final CommandObject<String> jsonSetWithPlainString(String key, Path path, String string) {
34363438
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(string), BuilderFactory.STRING);
34373439
}
@@ -3445,6 +3447,7 @@ public final CommandObject<String> jsonSetWithEscape(String key, Path2 path, Obj
34453447
getJsonObjectMapper().toJson(object)).addParams(params), BuilderFactory.STRING);
34463448
}
34473449

3450+
@Deprecated
34483451
public final CommandObject<String> jsonSet(String key, Path path, Object pojo, JsonSetParams params) {
34493452
return new CommandObject<>(commandArguments(JsonCommand.SET).key(key).add(path).add(
34503453
getJsonObjectMapper().toJson(pojo)).addParams(params), BuilderFactory.STRING);
@@ -3454,6 +3457,7 @@ public final CommandObject<String> jsonMerge(String key, Path2 path, Object obje
34543457
return new CommandObject<>(commandArguments(JsonCommand.MERGE).key(key).add(path).add(object), BuilderFactory.STRING);
34553458
}
34563459

3460+
@Deprecated
34573461
public final CommandObject<String> jsonMerge(String key, Path path, Object pojo) {
34583462
return new CommandObject<>(commandArguments(JsonCommand.MERGE).key(key).add(path).add(
34593463
getJsonObjectMapper().toJson(pojo)), BuilderFactory.STRING);
@@ -3464,6 +3468,7 @@ public final CommandObject<Object> jsonGet(String key) {
34643468
protocol != RedisProtocol.RESP3 ? JSON_GENERIC_OBJECT : JsonBuilderFactory.JSON_OBJECT);
34653469
}
34663470

3471+
@Deprecated
34673472
public final <T> CommandObject<T> jsonGet(String key, Class<T> clazz) {
34683473
return new CommandObject<>(commandArguments(JsonCommand.GET).key(key), new JsonObjectBuilder<>(clazz));
34693474
}
@@ -3472,14 +3477,17 @@ public final CommandObject<Object> jsonGet(String key, Path2... paths) {
34723477
return new CommandObject<>(commandArguments(JsonCommand.GET).key(key).addObjects((Object[]) paths), JsonBuilderFactory.JSON_OBJECT);
34733478
}
34743479

3480+
@Deprecated
34753481
public final CommandObject<Object> jsonGet(String key, Path... paths) {
34763482
return new CommandObject<>(commandArguments(JsonCommand.GET).key(key).addObjects((Object[]) paths), JSON_GENERIC_OBJECT);
34773483
}
34783484

3485+
@Deprecated
34793486
public final CommandObject<String> jsonGetAsPlainString(String key, Path path) {
34803487
return new CommandObject<>(commandArguments(JsonCommand.GET).key(key).add(path), BuilderFactory.STRING);
34813488
}
34823489

3490+
@Deprecated
34833491
public final <T> CommandObject<T> jsonGet(String key, Class<T> clazz, Path... paths) {
34843492
return new CommandObject<>(commandArguments(JsonCommand.GET).key(key).addObjects((Object[]) paths), new JsonObjectBuilder<>(clazz));
34853493
}
@@ -3488,6 +3496,7 @@ public final CommandObject<List<JSONArray>> jsonMGet(Path2 path, String... keys)
34883496
return new CommandObject<>(commandArguments(JsonCommand.MGET).keys((Object[]) keys).add(path), JsonBuilderFactory.JSON_ARRAY_LIST);
34893497
}
34903498

3499+
@Deprecated
34913500
public final <T> CommandObject<List<T>> jsonMGet(Path path, Class<T> clazz, String... keys) {
34923501
return new CommandObject<>(commandArguments(JsonCommand.MGET).keys((Object[]) keys).add(path), new JsonObjectListBuilder<>(clazz));
34933502
}
@@ -3500,6 +3509,7 @@ public final CommandObject<Long> jsonDel(String key, Path2 path) {
35003509
return new CommandObject<>(commandArguments(JsonCommand.DEL).key(key).add(path), BuilderFactory.LONG);
35013510
}
35023511

3512+
@Deprecated
35033513
public final CommandObject<Long> jsonDel(String key, Path path) {
35043514
return new CommandObject<>(commandArguments(JsonCommand.DEL).key(key).add(path), BuilderFactory.LONG);
35053515
}
@@ -3512,6 +3522,7 @@ public final CommandObject<Long> jsonClear(String key, Path2 path) {
35123522
return new CommandObject<>(commandArguments(JsonCommand.CLEAR).key(key).add(path), BuilderFactory.LONG);
35133523
}
35143524

3525+
@Deprecated
35153526
public final CommandObject<Long> jsonClear(String key, Path path) {
35163527
return new CommandObject<>(commandArguments(JsonCommand.CLEAR).key(key).add(path), BuilderFactory.LONG);
35173528
}
@@ -3520,10 +3531,12 @@ public final CommandObject<List<Boolean>> jsonToggle(String key, Path2 path) {
35203531
return new CommandObject<>(commandArguments(JsonCommand.TOGGLE).key(key).add(path), BuilderFactory.BOOLEAN_LIST);
35213532
}
35223533

3534+
@Deprecated
35233535
public final CommandObject<String> jsonToggle(String key, Path path) {
35243536
return new CommandObject<>(commandArguments(JsonCommand.TOGGLE).key(key).add(path), BuilderFactory.STRING);
35253537
}
35263538

3539+
@Deprecated
35273540
public final CommandObject<Class<?>> jsonType(String key) {
35283541
return new CommandObject<>(commandArguments(JsonCommand.TYPE).key(key), JsonBuilderFactory.JSON_TYPE);
35293542
}
@@ -3533,10 +3546,12 @@ public final CommandObject<List<Class<?>>> jsonType(String key, Path2 path) {
35333546
protocol != RedisProtocol.RESP3 ? JsonBuilderFactory.JSON_TYPE_LIST : JsonBuilderFactory.JSON_TYPE_RESPONSE_RESP3_COMPATIBLE);
35343547
}
35353548

3549+
@Deprecated
35363550
public final CommandObject<Class<?>> jsonType(String key, Path path) {
35373551
return new CommandObject<>(commandArguments(JsonCommand.TYPE).key(key).add(path), JsonBuilderFactory.JSON_TYPE);
35383552
}
35393553

3554+
@Deprecated
35403555
public final CommandObject<Long> jsonStrAppend(String key, Object string) {
35413556
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(
35423557
getJsonObjectMapper().toJson(string)), BuilderFactory.LONG);
@@ -3547,11 +3562,13 @@ public final CommandObject<List<Long>> jsonStrAppend(String key, Path2 path, Obj
35473562
getJsonObjectMapper().toJson(string)), BuilderFactory.LONG_LIST);
35483563
}
35493564

3565+
@Deprecated
35503566
public final CommandObject<Long> jsonStrAppend(String key, Path path, Object string) {
35513567
return new CommandObject<>(commandArguments(JsonCommand.STRAPPEND).key(key).add(path).add(
35523568
getJsonObjectMapper().toJson(string)), BuilderFactory.LONG);
35533569
}
35543570

3571+
@Deprecated
35553572
public final CommandObject<Long> jsonStrLen(String key) {
35563573
return new CommandObject<>(commandArguments(JsonCommand.STRLEN).key(key), BuilderFactory.LONG);
35573574
}
@@ -3560,6 +3577,7 @@ public final CommandObject<List<Long>> jsonStrLen(String key, Path2 path) {
35603577
return new CommandObject<>(commandArguments(JsonCommand.STRLEN).key(key).add(path), BuilderFactory.LONG_LIST);
35613578
}
35623579

3580+
@Deprecated
35633581
public final CommandObject<Long> jsonStrLen(String key, Path path) {
35643582
return new CommandObject<>(commandArguments(JsonCommand.STRLEN).key(key).add(path), BuilderFactory.LONG);
35653583
}
@@ -3569,6 +3587,7 @@ public final CommandObject<Object> jsonNumIncrBy(String key, Path2 path, double
35693587
JsonBuilderFactory.JSON_ARRAY_OR_DOUBLE_LIST);
35703588
}
35713589

3590+
@Deprecated
35723591
public final CommandObject<Double> jsonNumIncrBy(String key, Path path, double value) {
35733592
return new CommandObject<>(commandArguments(JsonCommand.NUMINCRBY).key(key).add(path).add(value), BuilderFactory.DOUBLE);
35743593
}
@@ -3594,6 +3613,7 @@ public final CommandObject<List<Long>> jsonArrAppendWithEscape(String key, Path2
35943613
return new CommandObject<>(args, BuilderFactory.LONG_LIST);
35953614
}
35963615

3616+
@Deprecated
35973617
public final CommandObject<Long> jsonArrAppend(String key, Path path, Object... pojos) {
35983618
CommandArguments args = commandArguments(JsonCommand.ARRAPPEND).key(key).add(path);
35993619
for (Object pojo : pojos) {
@@ -3611,6 +3631,7 @@ public final CommandObject<List<Long>> jsonArrIndexWithEscape(String key, Path2
36113631
getJsonObjectMapper().toJson(scalar)), BuilderFactory.LONG_LIST);
36123632
}
36133633

3634+
@Deprecated
36143635
public final CommandObject<Long> jsonArrIndex(String key, Path path, Object scalar) {
36153636
return new CommandObject<>(commandArguments(JsonCommand.ARRINDEX).key(key).add(path).add(
36163637
getJsonObjectMapper().toJson(scalar)), BuilderFactory.LONG);
@@ -3629,6 +3650,7 @@ public final CommandObject<List<Long>> jsonArrInsertWithEscape(String key, Path2
36293650
return new CommandObject<>(args, BuilderFactory.LONG_LIST);
36303651
}
36313652

3653+
@Deprecated
36323654
public final CommandObject<Long> jsonArrInsert(String key, Path path, int index, Object... pojos) {
36333655
CommandArguments args = commandArguments(JsonCommand.ARRINSERT).key(key).add(path).add(index);
36343656
for (Object pojo : pojos) {
@@ -3637,10 +3659,12 @@ public final CommandObject<Long> jsonArrInsert(String key, Path path, int index,
36373659
return new CommandObject<>(args, BuilderFactory.LONG);
36383660
}
36393661

3662+
@Deprecated
36403663
public final CommandObject<Object> jsonArrPop(String key) {
36413664
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key), new JsonObjectBuilder<>(Object.class));
36423665
}
36433666

3667+
@Deprecated
36443668
public final <T> CommandObject<T> jsonArrPop(String key, Class<T> clazz) {
36453669
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key), new JsonObjectBuilder<>(clazz));
36463670
}
@@ -3649,10 +3673,12 @@ public final CommandObject<List<Object>> jsonArrPop(String key, Path2 path) {
36493673
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key).add(path), new JsonObjectListBuilder<>(Object.class));
36503674
}
36513675

3676+
@Deprecated
36523677
public final CommandObject<Object> jsonArrPop(String key, Path path) {
36533678
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key).add(path), new JsonObjectBuilder<>(Object.class));
36543679
}
36553680

3681+
@Deprecated
36563682
public final <T> CommandObject<T> jsonArrPop(String key, Class<T> clazz, Path path) {
36573683
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key).add(path), new JsonObjectBuilder<>(clazz));
36583684
}
@@ -3661,14 +3687,17 @@ public final CommandObject<List<Object>> jsonArrPop(String key, Path2 path, int
36613687
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key).add(path).add(index), new JsonObjectListBuilder<>(Object.class));
36623688
}
36633689

3690+
@Deprecated
36643691
public final CommandObject<Object> jsonArrPop(String key, Path path, int index) {
36653692
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key).add(path).add(index), new JsonObjectBuilder<>(Object.class));
36663693
}
36673694

3695+
@Deprecated
36683696
public final <T> CommandObject<T> jsonArrPop(String key, Class<T> clazz, Path path, int index) {
36693697
return new CommandObject<>(commandArguments(JsonCommand.ARRPOP).key(key).add(path).add(index), new JsonObjectBuilder<>(clazz));
36703698
}
36713699

3700+
@Deprecated
36723701
public final CommandObject<Long> jsonArrLen(String key) {
36733702
return new CommandObject<>(commandArguments(JsonCommand.ARRLEN).key(key), BuilderFactory.LONG);
36743703
}
@@ -3677,6 +3706,7 @@ public final CommandObject<List<Long>> jsonArrLen(String key, Path2 path) {
36773706
return new CommandObject<>(commandArguments(JsonCommand.ARRLEN).key(key).add(path), BuilderFactory.LONG_LIST);
36783707
}
36793708

3709+
@Deprecated
36803710
public final CommandObject<Long> jsonArrLen(String key, Path path) {
36813711
return new CommandObject<>(commandArguments(JsonCommand.ARRLEN).key(key).add(path), BuilderFactory.LONG);
36823712
}
@@ -3685,14 +3715,17 @@ public final CommandObject<List<Long>> jsonArrTrim(String key, Path2 path, int s
36853715
return new CommandObject<>(commandArguments(JsonCommand.ARRTRIM).key(key).add(path).add(start).add(stop), BuilderFactory.LONG_LIST);
36863716
}
36873717

3718+
@Deprecated
36883719
public final CommandObject<Long> jsonArrTrim(String key, Path path, int start, int stop) {
36893720
return new CommandObject<>(commandArguments(JsonCommand.ARRTRIM).key(key).add(path).add(start).add(stop), BuilderFactory.LONG);
36903721
}
36913722

3723+
@Deprecated
36923724
public final CommandObject<Long> jsonObjLen(String key) {
36933725
return new CommandObject<>(commandArguments(JsonCommand.OBJLEN).key(key), BuilderFactory.LONG);
36943726
}
36953727

3728+
@Deprecated
36963729
public final CommandObject<Long> jsonObjLen(String key, Path path) {
36973730
return new CommandObject<>(commandArguments(JsonCommand.OBJLEN).key(key).add(path), BuilderFactory.LONG);
36983731
}
@@ -3701,10 +3734,12 @@ public final CommandObject<List<Long>> jsonObjLen(String key, Path2 path) {
37013734
return new CommandObject<>(commandArguments(JsonCommand.OBJLEN).key(key).add(path), BuilderFactory.LONG_LIST);
37023735
}
37033736

3737+
@Deprecated
37043738
public final CommandObject<List<String>> jsonObjKeys(String key) {
37053739
return new CommandObject<>(commandArguments(JsonCommand.OBJKEYS).key(key), BuilderFactory.STRING_LIST);
37063740
}
37073741

3742+
@Deprecated
37083743
public final CommandObject<List<String>> jsonObjKeys(String key, Path path) {
37093744
return new CommandObject<>(commandArguments(JsonCommand.OBJKEYS).key(key).add(path), BuilderFactory.STRING_LIST);
37103745
}
@@ -3713,10 +3748,12 @@ public final CommandObject<List<List<String>>> jsonObjKeys(String key, Path2 pat
37133748
return new CommandObject<>(commandArguments(JsonCommand.OBJKEYS).key(key).add(path), BuilderFactory.STRING_LIST_LIST);
37143749
}
37153750

3751+
@Deprecated
37163752
public final CommandObject<Long> jsonDebugMemory(String key) {
37173753
return new CommandObject<>(commandArguments(JsonCommand.DEBUG).add("MEMORY").key(key), BuilderFactory.LONG);
37183754
}
37193755

3756+
@Deprecated
37203757
public final CommandObject<Long> jsonDebugMemory(String key, Path path) {
37213758
return new CommandObject<>(commandArguments(JsonCommand.DEBUG).add("MEMORY").key(key).add(path), BuilderFactory.LONG);
37223759
}

0 commit comments

Comments
 (0)