changed Jedis client to new 3.1.0 version. Modified send command flow

Author: DvirDukhan

pom.xml

@@ -46,7 +46,14 @@
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
-	
+
+	<repositories>
+		<repository>
+			<id>snapshots-repo</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</repository>
+	</repositories>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -62,7 +69,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>3.0.1</version>
+			<version>3.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.commons</groupId>

src/main/java/com/redislabs/redisgraph/RedisGraph.java

@@ -10,6 +10,7 @@
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.commands.ProtocolCommand;
 import redis.clients.jedis.util.Pool;
+import redis.clients.jedis.util.SafeEncoder;
 
 import java.io.Closeable;
 import java.util.*;
@@ -29,7 +30,7 @@ public class RedisGraph implements Closeable {
 
 
 
-    private static final CharSequenceTranslator ESCAPE_CHYPER;
+    public static final CharSequenceTranslator ESCAPE_CHYPER;
     static {
         final Map<CharSequence, CharSequence> escapeJavaMap = new HashMap<>();
         escapeJavaMap.put("\'", "\\'");
@@ -91,7 +92,7 @@ public ResultSet query(String graphId, String query, Object ...args) {
         graphCaches.putIfAbsent(graphId, new GraphCache(graphId, this));
         List<Object> rawResponse = null;
         try(Jedis conn = getConnection()){
-            rawResponse= sendCompactCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply();
+            rawResponse = (List<Object>) conn.sendCommand(Command.QUERY, graphId, query, "--COMPACT");
         }
         return new ResultSetImpl(rawResponse, graphCaches.get(graphId));
 
@@ -129,40 +130,11 @@ public String deleteGraph(String graphId) {
         //clear local state
         graphCaches.remove(graphId);
         try (Jedis conn = getConnection()) {
-            return sendCommand(conn, Command.DELETE, graphId).getBulkReply();
+            return SafeEncoder.encode((byte[]) conn.sendCommand(Command.DELETE, graphId));
         }
 
     }
 
-
-    /**
-     * Sends command - will be replaced with sendCompactCommand once graph.delete support --compact flag
-     * @param conn - connection
-     * @param provider - command type
-     * @param args - command arguments
-     * @return
-     */
-    private BinaryClient sendCommand(Jedis conn, ProtocolCommand provider, String ...args) {
-        BinaryClient binaryClient = conn.getClient();
-        binaryClient.sendCommand(provider, args);
-        return binaryClient;
-    }
-
-
-    /**
-     * Sends the command with --COMPACT flag
-     * @param conn - connection
-     * @param provider - command type
-     * @param args - command arguments
-     * @return
-     */
-    private BinaryClient sendCompactCommand(Jedis conn, ProtocolCommand provider, String ...args) {
-        String[] t = new String[args.length +1];
-        System.arraycopy(args, 0 , t, 0, args.length);
-        t[args.length]="--COMPACT";
-        return sendCommand(conn, provider, t);
-    }
-
     private Jedis getConnection() {
         return this.client.getResource();
     }

src/main/java/com/redislabs/redisgraph/impl/JRedisGraphTransaction.java

@@ -0,0 +1,4 @@
+package com.redislabs.redisgraph.impl;
+
+public class JRedisGraphTransaction {
+}