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

# Conflicts:
#	src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java
#	src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java

Author: DvirDukhan

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

@@ -9,7 +9,6 @@
 import redis.clients.jedis.util.Pool;
 import redis.clients.jedis.util.SafeEncoder;
 
-
 /**
  *
  */

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

@@ -136,8 +136,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));
@@ -151,7 +151,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);
     }