Revert "Fix incompatibilities with the latest RedisStack (#3855)"

This reverts commit 6b9d338.

Author: sazzad16

Diff for: src/main/java/redis/clients/jedis/CommandObjects.java

@@ -3495,7 +3495,8 @@ public final CommandObject<String> jsonMerge(String key, Path path, Object pojo)
   }
 
   public final CommandObject<Object> jsonGet(String key) {
-    return new CommandObject<>(commandArguments(JsonCommand.GET).key(key), JSON_GENERIC_OBJECT);
+    return new CommandObject<>(commandArguments(JsonCommand.GET).key(key),
+        protocol != RedisProtocol.RESP3 ? JSON_GENERIC_OBJECT : JsonBuilderFactory.JSON_OBJECT);
   }
 
   @Deprecated

Diff for: src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java

@@ -269,13 +269,14 @@ public void testJsonGenericObjectResp3() {
     assertThat(setResult, equalTo("OK"));
 
     Object getRoot = exec(commandObjects.jsonGet(key));
-    assertThat(getRoot, instanceOf(JSONObject.class));
+    assertThat(getRoot, instanceOf(JSONArray.class));
 
     JSONObject expectedPerson = new JSONObject();
     expectedPerson.put("name", "John Doe");
     expectedPerson.put("age", 30);
 
-    assertThat(expectedPerson, jsonEquals(getRoot));
+    JSONArray expected = new JSONArray().put(expectedPerson);
+    assertThat(getRoot, jsonEquals(expected));
   }
 
   @Test

Diff for: src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGraphCommandsTest.java

@@ -9,12 +9,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.graph.ResultSet;
 
-@Ignore
 public class PipeliningBaseGraphCommandsTest extends PipeliningBaseMockedTestBase {
 
   @Test

Diff for: src/test/java/redis/clients/jedis/modules/graph/GraphAPITest.java

@@ -9,7 +9,10 @@
 
 import java.util.*;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -22,7 +25,6 @@
 
 import redis.clients.jedis.modules.RedisModuleCommandsTestBase;
 
-@Ignore
 @RunWith(Parameterized.class)
 public class GraphAPITest extends RedisModuleCommandsTestBase {
 

Diff for: src/test/java/redis/clients/jedis/modules/graph/GraphPipelineTest.java

@@ -9,7 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -23,7 +26,6 @@
 import redis.clients.jedis.graph.entities.Property;
 import redis.clients.jedis.modules.RedisModuleCommandsTestBase;
 
-@Ignore
 @RunWith(Parameterized.class)
 public class GraphPipelineTest extends RedisModuleCommandsTestBase {
 

Diff for: src/test/java/redis/clients/jedis/modules/graph/GraphTransactionTest.java

@@ -10,7 +10,6 @@
 import java.util.List;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -24,7 +23,6 @@
 import redis.clients.jedis.graph.entities.Property;
 import redis.clients.jedis.modules.RedisModuleCommandsTestBase;
 
-@Ignore
 @RunWith(Parameterized.class)
 public class GraphTransactionTest extends RedisModuleCommandsTestBase {
 

Diff for: src/test/java/redis/clients/jedis/modules/graph/GraphValuesTest.java

@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -13,7 +12,6 @@
 import redis.clients.jedis.graph.ResultSet;
 import redis.clients.jedis.modules.RedisModuleCommandsTestBase;
 
-@Ignore
 @RunWith(Parameterized.class)
 public class GraphValuesTest extends RedisModuleCommandsTestBase {
 

Diff for: src/test/java/redis/clients/jedis/modules/graph/PathBuilderTest.java

@@ -3,11 +3,9 @@
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import redis.clients.jedis.graph.entities.Edge;
 
-@Ignore
 public class PathBuilderTest {
 
   @Test

Diff for: src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java

@@ -50,6 +50,8 @@ 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));
@@ -70,6 +72,29 @@ 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());