fixed according to pull request comments

Author: DvirDukhan

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

@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+/**
+ * Query response header interface. Represents the response schame (column names and types)
+ */
 public interface Header {
 
 

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

@@ -1,6 +1,7 @@
 package com.redislabs.redisgraph;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 
@@ -22,11 +23,13 @@ public class RedisGraphAPI {
 
 	private final Pool<Jedis> client;
     private final String graphId;
-    private List<String> labels = new ArrayList<>();
-    private List<String> relationshipTypes = new ArrayList<>();
-    private List<String> propertyNames = new ArrayList<>();
+    private final List<String>  labels = new ArrayList<>();
+    private final List<String> relationshipTypes = new ArrayList<>();
+    private final List<String> propertyNames = new ArrayList<>();
+
+    private static final Map<String, RedisGraphAPI> apiMap = new ConcurrentHashMap<>();
+
 
-    private static RedisGraphAPI redisGraphAPI;
 
 
 
@@ -67,7 +70,8 @@ public RedisGraphAPI(String graphId, String host, int port) {
     public RedisGraphAPI(String graphId, Pool<Jedis> jedis) {
         this.graphId = graphId;
         this.client = jedis;
-        redisGraphAPI = this;
+        apiMap.put(graphId, this);
+
 
     }
 
@@ -79,7 +83,6 @@ public RedisGraphAPI(String graphId, Pool<Jedis> jedis) {
      * @return a result set 
      */
     public ResultSet query(String query, Object ...args) {
-        StringBuilder sb = new StringBuilder();
       if(args.length > 0) {
         for(int i=0; i<args.length; ++i) {
           if(args[i] instanceof String) {
@@ -90,7 +93,7 @@ public ResultSet query(String query, Object ...args) {
       }
 
       try (Jedis conn = getConnection()) {
-          return new ResultSetImpl(sendCompactCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply());
+          return new ResultSetImpl(sendCompactCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply(), graphId);
       }
     }
 
@@ -130,10 +133,10 @@ private BinaryClient sendCommand(Jedis conn, ProtocolCommand provider, String ..
      */
     private BinaryClient sendCompactCommand(Jedis conn, ProtocolCommand provider, String ...args) {
         BinaryClient binaryClient = conn.getClient();
-        List<String> largs = new ArrayList<>(Arrays.asList(args));
-        largs.add("--COMPACT");
-        String[] t = new String[largs.size()];
-        binaryClient.sendCommand(provider, largs.toArray(t));
+        String[] t = new String[args.length +1];
+        System.arraycopy(args, 0 , t, 0, args.length);
+        t[args.length]="--COMPACT";
+        binaryClient.sendCommand(provider, t);
         return binaryClient;
     }
 
@@ -174,24 +177,19 @@ public ResultSet callProcedure(String procedure, List<String> args  ){
      */
     public  String getLabel(int index){
         if (index >= labels.size()){
-            labels = getLabels();
+            getLabels();
         }
         return labels.get(index);
     }
 
     /**
      *
-     * @return list of all the node labels in the graph
+     * gets a list of all the node labels in the graph
      */
-    private  List<String> getLabels() {
-        ResultSet resultSet = callProcedure("db.labels");
-        ArrayList<String> labels = new ArrayList<>();
-        while (resultSet.hasNext()){
-            Record record = resultSet.next();
-            labels.add(record.getString(0));
+    private  void getLabels() {
+        getProcedureInfo(labels, "db.labels");
+
 
-        }
-        return labels;
     }
 
 
@@ -202,25 +200,19 @@ private  List<String> getLabels() {
      */
     public String getRelationshipType(int index){
         if (index >= relationshipTypes.size()){
-            relationshipTypes = getRelationshipTypes();
+            getRelationshipTypes();
         }
         return relationshipTypes.get(index);
     }
 
 
     /**
      *
-     * @return a list of the edge relationship types in the graph
+     * gets a list of the edge relationship types in the graph
      */
-    private List<String> getRelationshipTypes() {
-        ResultSet resultSet = callProcedure("db.relationshipTypes");
-        ArrayList<String> relationshipTypes = new ArrayList<>();
-        while (resultSet.hasNext()){
-            Record record = resultSet.next();
-            relationshipTypes.add(record.getString(0));
+    private void getRelationshipTypes() {
+        getProcedureInfo(relationshipTypes, "db.relationshipTypes" );
 
-        }
-        return relationshipTypes;
     }
 
 
@@ -231,27 +223,39 @@ private List<String> getRelationshipTypes() {
      */
     public String getPropertyName(int index){
         if (index >= propertyNames.size()){
-            propertyNames = getPropertyNames();
+            getPropertyNames();
         }
         return propertyNames.get(index);
     }
 
 
     /**
      *
-     * @return a list of all the property names in the graph
+     * gets a list of all the property names in the graph
      */
-    private List<String> getPropertyNames() {
-        ResultSet resultSet = callProcedure("db.propertyKeys");
-        ArrayList<String> propertyNames = new ArrayList<>();
+    private void getPropertyNames() {
+        getProcedureInfo(propertyNames, "db.propertyKeys");
+
+
+    }
+
+    /**
+     * Calls procedure in the graph and returns its data
+     * @param list a list for storing the data
+     * @param procedure to call in order to get the data
+     */
+    private void getProcedureInfo(List<String> list, String procedure){
+        ResultSet resultSet = callProcedure(procedure);
+        list.clear();
         while (resultSet.hasNext()){
             Record record = resultSet.next();
-            propertyNames.add(record.getString(0));
+            list.add(record.getString(0));
 
         }
-        return propertyNames;
+
     }
 
+
     /**
      * Invoke a stored procedure
      * @param procedure
@@ -277,7 +281,7 @@ public ResultSet callProcedure(String procedure, List<String> args  , Map<String
      * static function to access an initialized graph api
      * @return an initialized instance of RedisGraphAPI
      */
-    public static RedisGraphAPI getInstance(){
-        return redisGraphAPI;
+    public static RedisGraphAPI getInstance(String graphId){
+        return apiMap.get(graphId);
     }
 }

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

@@ -11,7 +11,11 @@ public class Utils {
      * @return the input string surounded with quotation marks, if needed
      */
     public static String quoteString(String str){
-        StringBuilder sb = new StringBuilder();
+        if(str.startsWith("\"") && str.endsWith("\"")){
+            return str;
+        }
+
+        StringBuilder sb = new StringBuilder(str.length()+2);
         if(str.charAt(0)!='"'){
             sb.append('"');
         }

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

@@ -9,9 +9,9 @@
 public class Edge extends GraphEntity {
 
     //memebers
-    String relationshipType;
-    int source;
-    int destination;
+    private  String relationshipType;
+    private int source;
+    private int destination;
 
 
     //getters & setters

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

@@ -16,8 +16,8 @@ public abstract class GraphEntity {
 
     //members
 
-    int id;
-    Map<String, Property> propertyMap = new HashMap<>();
+    protected int id;
+    protected final Map<String, Property> propertyMap = new HashMap<>();
 
 
     //setters & getters
@@ -58,7 +58,7 @@ public void addProperty(String name, ResultSetScalarTypes type, Object value){
     public void addProperty (Property property){
 
 
-        propertyMap.put(property.name, property);
+        propertyMap.put(property.getName(), property);
     }
 
     /**

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

@@ -60,7 +60,7 @@ private void buildSchema() {
         for (List<Object> tuple : this.raw) {
 
             //get type
-            ResultSetColumnTypes type = ResultSetColumnTypes.values()[(int) (long) tuple.get(0)];
+            ResultSetColumnTypes type = ResultSetColumnTypes.values()[((Long) tuple.get(0)).intValue()];
             //get text
             String text = SafeEncoder.encode((byte[]) tuple.get(1));
             if (type != null) {

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

@@ -10,7 +10,7 @@
 public class Node extends GraphEntity {
 
     //members
-    List<String> labels = new ArrayList<>();
+    final private List<String> labels = new ArrayList<>();
 
     /**
      * @param label - a label to be add

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

@@ -10,9 +10,9 @@
 public class Property {
 
     //members
-    String name;
-    ResultSet.ResultSetScalarTypes type;
-    Object value;
+    private String name;
+    private ResultSet.ResultSetScalarTypes type;
+    private Object value;
 
 
     /**

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

@@ -11,20 +11,22 @@
 
 public class ResultSetImpl implements ResultSet {
 
-    Header header = new HeaderImpl(new ArrayList<>());
-    Statistics statistics = new StatisticsImpl(new ArrayList<>());
+    private  Header header = new HeaderImpl(new ArrayList<>());
+    private  Statistics statistics = new StatisticsImpl(new ArrayList<>());
 
     private final List<Record> results = new ArrayList<>();
 
     private int position = 0;
+    private final String graphId;
 
     /**
      *
      * @param rawResponse the raw representation of response is at most 3 lists of objects.
      *                    The last list is the statistics list.
+     * @param  graphId, the graph ID
      */
-    public ResultSetImpl(List<Object> rawResponse){
-
+    public ResultSetImpl(List<Object> rawResponse, String graphId){
+        this.graphId = graphId;
         if(rawResponse.size() != 3){
 
             parseStatistics(rawResponse.get(rawResponse.size()-1));
@@ -50,7 +52,7 @@ private void parseResult(List<List<Object>> rawResultSet) {
             //go over each raw result
             for (List<Object> row : rawResultSet) {
 
-                List<Object> parsedRow = new ArrayList<>();
+                List<Object> parsedRow = new ArrayList<>(row.size());
                 //go over each object in the result
                 for (int i = 0; i < row.size(); i++) {
                     //get raw representation of the object
@@ -123,7 +125,7 @@ private Node deserializeNode(List<Object> rawNodeData) {
         deserializeGraphEntityId(node, rawNodeData.get(0));
         List<Long> labelsIndices = (List<Long>) rawNodeData.get(1);
         for (long labelIndex : labelsIndices) {
-            String label = RedisGraphAPI.getInstance().getLabel((int) labelIndex);
+            String label = RedisGraphAPI.getInstance(graphId).getLabel((int) labelIndex);
             node.addLabel(label);
         }
         deserializeGraphEntityProperties(node, (List<List<Object>>) rawNodeData.get(2));
@@ -155,7 +157,7 @@ private Edge deserializeEdge(List<Object> rawEdgeData) {
         Edge edge = new Edge();
         deserializeGraphEntityId(edge, rawEdgeData.get(0));
 
-        String relationshipType = RedisGraphAPI.getInstance().getRelationshipType((int) (long) rawEdgeData.get(1));
+        String relationshipType = RedisGraphAPI.getInstance(graphId).getRelationshipType(((Long) rawEdgeData.get(1)).intValue());
         edge.setRelationshipType(relationshipType);
 
         edge.setSource((int) (long) rawEdgeData.get(2));
@@ -179,7 +181,7 @@ void deserializeGraphEntityProperties(GraphEntity entity, List<List<Object>> raw
 
         for (List<Object> rawProperty : rawProperties) {
             Property property = new Property();
-            property.setName(RedisGraphAPI.getInstance().getPropertyName((int) (long) rawProperty.get(0)));
+            property.setName(RedisGraphAPI.getInstance(graphId).getPropertyName( ((Long) rawProperty.get(0)).intValue()));
 
             //trimmed for getting to value using deserializeScalar
             List<Object> propertyScalar = rawProperty.subList(1, rawProperty.size());

src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java

@@ -59,7 +59,6 @@ public void testCreateLabeledNode() {
         // Create a node with a label
         ResultSet resultSet = api.query("CREATE (:human{name:'danny',age:12})");
         Assert.assertFalse(resultSet.hasNext());
-//
         Assert.assertEquals("1", resultSet.getStatistics().getStringValue(Label.NODES_CREATED));
         Assert.assertEquals("2", resultSet.getStatistics().getStringValue(Label.PROPERTIES_SET));
         Assert.assertNotNull(resultSet.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME));