Merge branch 'multi-exec' of https://github.com/RedisGraph/JRedisGraph into multi-exec

Author: DvirDukhan

pom.xml

@@ -77,10 +77,10 @@
 		</dependency>
 	</dependencies>
 	<properties>
-		<maven.compiler.source>10</maven.compiler.source>
-		<maven.compiler.target>10</maven.compiler.target>
-		<maven.test.source>10</maven.test.source>
-		<maven.test.target>10</maven.test.target>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
+		<maven.test.source>8</maven.test.source>
+		<maven.test.target>8</maven.test.target>
 	</properties>
 
 	<distributionManagement>

src/main/java/com/redislabs/redisgraph/graph_entities/Node.java

@@ -10,7 +10,7 @@
 public class Node extends GraphEntity {
 
     //members
-    final private List<String> labels = new ArrayList<>();
+    private final List<String> labels = new ArrayList<>();
 
     /**
      * @param label - a label to be add
@@ -32,7 +32,7 @@ public void removeLabel(String label) {
      * @throws IndexOutOfBoundsException if the index is out of range
      *                                   ({@code index < 0 || index >= getNumberOfLabels()})
      */
-    public String getLabel(int index) throws IndexOutOfBoundsException{
+    public String getLabel(int index){
         return labels.get(index);
     }
 

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

@@ -15,11 +15,9 @@
  * Utilities class
  */
 public class Utils {
-    public static final List<String> dummyList = new ArrayList<>(0);
-    public static final Map<String, List<String>> dummyMap = new HashMap<>(0);
-    public static final String compactString = "--COMPACT";
-
-
+    public static final List<String> DUMMY_LIST = new ArrayList<>(0);
+    public static final Map<String, List<String>> DUMMY_MAP = new HashMap<>(0);
+    public static final String COMPACT_STRING = "--COMPACT";
 
     private static final CharSequenceTranslator ESCAPE_CHYPER;
     static {
@@ -28,6 +26,8 @@ public class Utils {
         escapeJavaMap.put("\"", "\\\"");
         ESCAPE_CHYPER = new AggregateTranslator(new LookupTranslator(Collections.unmodifiableMap(escapeJavaMap)));
     }
+    
+    private Utils() {}
 
     /**
      *

src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java

@@ -43,11 +43,11 @@ public ResultSet query(String graphId, String query, Object ...args) {
 
 
     public ResultSet callProcedure(String graphId, String procedure){
-        return callProcedure(graphId, procedure, Utils.dummyList, Utils.dummyMap);
+        return callProcedure(graphId, procedure, Utils.DUMMY_LIST, Utils.DUMMY_MAP);
     }
 
     public ResultSet callProcedure(String graphId, String procedure, List<String> args){
-        return callProcedure(graphId, procedure, args, Utils.dummyMap);
+        return callProcedure(graphId, procedure, args, Utils.DUMMY_MAP);
     }
 
     public ResultSet callProcedure(String graphId, String procedure, List<String> args  , Map<String, List<String>> kwargs){

src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java

@@ -48,7 +48,7 @@ protected ResultSet sendQuery(String graphId, String preparedQuery) {
         Jedis conn = getConnection();
         List<Object> rawResponse;
         try {
-            rawResponse = (List<Object>) conn.sendCommand(RedisGraphCommand.QUERY, graphId, preparedQuery, Utils.compactString);
+            rawResponse = (List<Object>) conn.sendCommand(RedisGraphCommand.QUERY, graphId, preparedQuery, Utils.COMPACT_STRING);
         }
         catch (Exception e) {
             conn.close();

src/main/java/com/redislabs/redisgraph/impl/api/RedisGraphTransaction.java

@@ -57,7 +57,7 @@ public ResultSet build(Object o) {
      * @return response with result set with the procedure data
      */
     public Response<ResultSet> callProcedure(String graphId, String procedure){
-        return callProcedure(graphId, procedure, Utils.dummyList, Utils.dummyMap);
+        return callProcedure(graphId, procedure, Utils.DUMMY_LIST, Utils.DUMMY_MAP);
     }
 
     /**
@@ -68,7 +68,7 @@ public Response<ResultSet> callProcedure(String graphId, String procedure){
      * @return response with result set with the procedure data
      */
     public Response<ResultSet> callProcedure(String graphId, String procedure, List<String> args  ){
-        return callProcedure(graphId, procedure, args, Utils.dummyMap);
+        return callProcedure(graphId, procedure, args, Utils.DUMMY_MAP);
     }