add some code cleanups

Author: gkorland

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

@@ -1,7 +1,5 @@
 package com.redislabs.redisgraph;
 
-import redis.clients.jedis.Jedis;
-
 public interface RedisGraphGeneralContext extends RedisGraph {
 
     /**

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

@@ -3,7 +3,6 @@
 import com.redislabs.redisgraph.RedisGraph;
 import com.redislabs.redisgraph.ResultSet;
 import com.redislabs.redisgraph.impl.Utils;
-import com.redislabs.redisgraph.impl.graph_cache.RedisGraphCaches;
 import redis.clients.jedis.Jedis;
 
 import java.util.List;

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

@@ -3,18 +3,12 @@
 import com.redislabs.redisgraph.RedisGraphContexted;
 import com.redislabs.redisgraph.RedisGraphGeneralContext;
 import com.redislabs.redisgraph.ResultSet;
-import com.redislabs.redisgraph.impl.Utils;
 import com.redislabs.redisgraph.impl.graph_cache.RedisGraphCaches;
-import com.redislabs.redisgraph.impl.resultset.ResultSetImpl;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.util.Pool;
 import redis.clients.jedis.util.SafeEncoder;
 
-import java.util.*;
-
-
-
 /**
  *
  */

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

@@ -6,7 +6,6 @@
 import com.redislabs.redisgraph.graph_entities.Node;
 import com.redislabs.redisgraph.graph_entities.Property;
 import com.redislabs.redisgraph.impl.graph_cache.GraphCache;
-import com.redislabs.redisgraph.impl.graph_cache.RedisGraphCaches;
 import redis.clients.jedis.util.SafeEncoder;
 
 import java.util.ArrayList;
@@ -22,17 +21,15 @@ public class ResultSetImpl implements ResultSet {
 
     private int position = 0;
     private final RedisGraph redisGraph;
-    private final String graphId;
     private final GraphCache cache;
 
     /**
      * @param rawResponse the raw representation of response is at most 3 lists of objects.
      *                    The last list is the statistics list.
      * @param redisGraph, the graph local cache
      */
-    public ResultSetImpl(List<Object> rawResponse, RedisGraph redisGraph, String graphId, GraphCache cache) {
+    public ResultSetImpl(List<Object> rawResponse, RedisGraph redisGraph, GraphCache cache) {
         this.redisGraph = redisGraph;
-        this.graphId = graphId;
         this.cache = cache;
         if (rawResponse.size() != 3) {
 
@@ -78,10 +75,8 @@ private List<Record> parseResult(List<List<Object>> rawResultSet) {
                         case COLUMN_RELATION:
                             parsedRow.add(deserializeEdge(obj));
                             break;
-                        case COLUMN_SCALAR: {
+                        case COLUMN_SCALAR: 
                             parsedRow.add(deserializeScalar(obj));
-
-                        }
                     }
 
                 }
@@ -134,8 +129,8 @@ private Node deserializeNode(List<Object> rawNodeData) {
         Node node = new Node();
         deserializeGraphEntityId(node, rawNodeData.get(0));
         List<Long> labelsIndices = (List<Long>) rawNodeData.get(1);
-        for (long labelIndex : labelsIndices) {
-            String label = cache.getLabel((int) labelIndex, redisGraph);
+        for (Long labelIndex : labelsIndices) {
+            String label = cache.getLabel(labelIndex.intValue(), redisGraph);
             node.addLabel(label);
         }
         deserializeGraphEntityProperties(node, (List<List<Object>>) rawNodeData.get(2));
@@ -149,7 +144,7 @@ private Node deserializeNode(List<Object> rawNodeData) {
      * @param rawEntityId raw representation of entity id to be set to the graph entity
      */
     private void deserializeGraphEntityId(GraphEntity graphEntity, Object rawEntityId) {
-        int id = (int) (long) rawEntityId;
+        int id = ((Long) rawEntityId).intValue();
         graphEntity.setId(id);
     }