From 72073c5d0fe6cf8c3513c23b243b7f8cd0dec758 Mon Sep 17 00:00:00 2001 From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:32:07 +0600 Subject: [PATCH] Address change in JSON.GET command without path (#3858) --- .../redis/clients/jedis/CommandObjects.java | 3 +-- .../jedis/modules/json/RedisJsonV2Test.java | 25 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java index da773d5782..26bdbac760 100644 --- a/src/main/java/redis/clients/jedis/CommandObjects.java +++ b/src/main/java/redis/clients/jedis/CommandObjects.java @@ -3458,8 +3458,7 @@ public final CommandObject jsonMerge(String key, Path path, Object pojo) } public final CommandObject jsonGet(String key) { - return new CommandObject<>(commandArguments(JsonCommand.GET).key(key), - protocol != RedisProtocol.RESP3 ? JSON_GENERIC_OBJECT : JsonBuilderFactory.JSON_OBJECT); + return new CommandObject<>(commandArguments(JsonCommand.GET).key(key), JSON_GENERIC_OBJECT); } @Deprecated diff --git a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java index f36832da51..6be0b9575e 100644 --- a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java +++ b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java @@ -44,8 +44,6 @@ public void setUp() { @Test public void basicSetGetShouldSucceed() { - Assume.assumeFalse(RedisProtocolUtil.getRedisProtocol() == RedisProtocol.RESP3); - // naive set with a path jsonV2.jsonSetWithEscape("null", ROOT_PATH, (Object) null); assertJsonArrayEquals(jsonArray((Object) null), jsonV2.jsonGet("null", ROOT_PATH)); @@ -66,29 +64,6 @@ public void basicSetGetShouldSucceed() { assertJsonArrayEquals(jsonArray("strung"), jsonV2.jsonGet("obj", p)); } - @Test - public void basicSetGetShouldSucceedResp3() { - Assume.assumeTrue(RedisProtocolUtil.getRedisProtocol() == RedisProtocol.RESP3); - - // naive set with a path - jsonV2.jsonSetWithEscape("null", ROOT_PATH, (Object) null); - assertJsonArrayEquals(jsonArray((Object) null), jsonV2.jsonGet("null", ROOT_PATH)); - - // real scalar value and no path - jsonV2.jsonSetWithEscape("str", "strong"); - assertJsonArrayEquals(jsonArray("strong"), jsonV2.jsonGet("str")); - - // a slightly more complex object - IRLObject obj = new IRLObject(); - jsonV2.jsonSetWithEscape("obj", obj); - assertJsonArrayEquals(jsonArray(new JSONObject(gson.toJson(obj))), jsonV2.jsonGet("obj")); - - // check an update - Path2 p = Path2.of(".str"); - jsonV2.jsonSet("obj", p, gson.toJson("strung")); - assertJsonArrayEquals(jsonArray("strung"), jsonV2.jsonGet("obj", p)); - } - @Test public void setExistingPathOnlyIfExistsShouldSucceed() { jsonV2.jsonSetWithEscape("obj", new IRLObject());