diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java index 754c25cf35..30db023714 100644 --- a/src/main/java/redis/clients/jedis/CommandObjects.java +++ b/src/main/java/redis/clients/jedis/CommandObjects.java @@ -3625,8 +3625,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/commands/commandobjects/CommandObjectsJsonCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java index a416be2103..6e24cdd322 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java @@ -235,9 +235,7 @@ public void testJsonMergeOldPath() { @Test @Deprecated - public void testJsonGenericObjectResp2() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); - + public void testJsonGenericObject() { String key = "user:1000"; Person person = new Person(); @@ -256,29 +254,6 @@ public void testJsonGenericObjectResp2() { assertThat(resultMap, hasEntry("age", 30.0)); } - @Test - @Deprecated - public void testJsonGenericObjectResp3() { - assumeThat(protocol, equalTo(RedisProtocol.RESP3)); - - String key = "user:1000"; - - Person person = new Person("John Doe", 30); - - String setResult = exec(commandObjects.jsonSet(key, Path.ROOT_PATH, person)); - assertThat(setResult, equalTo("OK")); - - Object getRoot = exec(commandObjects.jsonGet(key)); - assertThat(getRoot, instanceOf(JSONArray.class)); - - JSONObject expectedPerson = new JSONObject(); - expectedPerson.put("name", "John Doe"); - expectedPerson.put("age", 30); - - JSONArray expected = new JSONArray().put(expectedPerson); - assertThat(getRoot, jsonEquals(expected)); - } - @Test @Deprecated public void testJsonGetWithClass() { 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 6168c2e2de..688e64a12e 100644 --- a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java +++ b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java @@ -50,8 +50,6 @@ public void setUp() { @Test public void basicSetGetShouldSucceed() { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); - // naive set with a path jsonV2.jsonSetWithEscape("null", ROOT_PATH, (Object) null); assertJsonArrayEquals(jsonArray((Object) null), jsonV2.jsonGet("null", ROOT_PATH)); @@ -72,29 +70,6 @@ public void basicSetGetShouldSucceed() { assertJsonArrayEquals(jsonArray("strung"), jsonV2.jsonGet("obj", p)); } - @Test - public void basicSetGetShouldSucceedResp3() { - Assume.assumeTrue(protocol == 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());