Skip to content

Commit 72073c5

Browse files
committed
Address change in JSON.GET command without path (#3858)
1 parent fe87260 commit 72073c5

File tree

2 files changed

+1
-27
lines changed

2 files changed

+1
-27
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -3458,8 +3458,7 @@ public final CommandObject<String> jsonMerge(String key, Path path, Object pojo)
34583458
}
34593459

34603460
public final CommandObject<Object> jsonGet(String key) {
3461-
return new CommandObject<>(commandArguments(JsonCommand.GET).key(key),
3462-
protocol != RedisProtocol.RESP3 ? JSON_GENERIC_OBJECT : JsonBuilderFactory.JSON_OBJECT);
3461+
return new CommandObject<>(commandArguments(JsonCommand.GET).key(key), JSON_GENERIC_OBJECT);
34633462
}
34643463

34653464
@Deprecated

src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java

-25
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public void setUp() {
4444

4545
@Test
4646
public void basicSetGetShouldSucceed() {
47-
Assume.assumeFalse(RedisProtocolUtil.getRedisProtocol() == RedisProtocol.RESP3);
48-
4947
// naive set with a path
5048
jsonV2.jsonSetWithEscape("null", ROOT_PATH, (Object) null);
5149
assertJsonArrayEquals(jsonArray((Object) null), jsonV2.jsonGet("null", ROOT_PATH));
@@ -66,29 +64,6 @@ public void basicSetGetShouldSucceed() {
6664
assertJsonArrayEquals(jsonArray("strung"), jsonV2.jsonGet("obj", p));
6765
}
6866

69-
@Test
70-
public void basicSetGetShouldSucceedResp3() {
71-
Assume.assumeTrue(RedisProtocolUtil.getRedisProtocol() == RedisProtocol.RESP3);
72-
73-
// naive set with a path
74-
jsonV2.jsonSetWithEscape("null", ROOT_PATH, (Object) null);
75-
assertJsonArrayEquals(jsonArray((Object) null), jsonV2.jsonGet("null", ROOT_PATH));
76-
77-
// real scalar value and no path
78-
jsonV2.jsonSetWithEscape("str", "strong");
79-
assertJsonArrayEquals(jsonArray("strong"), jsonV2.jsonGet("str"));
80-
81-
// a slightly more complex object
82-
IRLObject obj = new IRLObject();
83-
jsonV2.jsonSetWithEscape("obj", obj);
84-
assertJsonArrayEquals(jsonArray(new JSONObject(gson.toJson(obj))), jsonV2.jsonGet("obj"));
85-
86-
// check an update
87-
Path2 p = Path2.of(".str");
88-
jsonV2.jsonSet("obj", p, gson.toJson("strung"));
89-
assertJsonArrayEquals(jsonArray("strung"), jsonV2.jsonGet("obj", p));
90-
}
91-
9267
@Test
9368
public void setExistingPathOnlyIfExistsShouldSucceed() {
9469
jsonV2.jsonSetWithEscape("obj", new IRLObject());

0 commit comments

Comments
 (0)