delete graph

Author: swilly22

.idea/libraries/Maven__redis_clients_jedis_3_0_0.xml

@@ -20,14 +20,19 @@
             <artifactId>commons-pool2</artifactId>
             <version>2.0</version>
         </dependency>
-
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.9.0</version>
-            <type>jar</type>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/jedis-3.0.0.jar</systemPath>
+            <version>3.0.0</version>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>redis.clients</groupId>-->
+            <!--<artifactId>jedis</artifactId>-->
+            <!--<version>3.0.0</version>-->
+            <!--<type>jar</type>-->
+            <!--<scope>system</scope>-->
+            <!--<systemPath>${project.basedir}/lib/jedis-3.0.0.jar</systemPath>-->
+        <!--</dependency>-->
     </dependencies>
-</project>
+</project>

lib/commons-pool2-2.4.2.jar

@@ -59,7 +59,6 @@ public String createNode(String graph, Object... attributes) {
         return nodeId;
     }
 
-
     public String connectNodes(String graph, String srcNodeID, String relation, String destNodeID, Object... attributes) {
         Jedis conn = _conn();
 
@@ -70,7 +69,7 @@ public String connectNodes(String graph, String srcNodeID, String relation, Stri
         args.add(destNodeID);
 
         for(Object attr: attributes) {
-            args.add(attr);
+            args.add(attr.toString());
         }
 
         String[] stringArgs = args.toArray(new String[args.size()]);
@@ -90,10 +89,14 @@ public HashMap<String, String> getNode(String graphId, String id) {
         args.add(id);
 
         String[] stringArgs = args.toArray(new String[args.size()]);
-
-        List<String> properties = conn.getClient()
+        List<String> properties;
+        try {
+            properties = conn.getClient()
                 .sendCommand(Commands.Command.GETNODE, stringArgs)
                 .getMultiBulkReply();
+        } catch(ClassCastException e) {
+            return null;
+        }
 
         HashMap<String, String> attributes = new HashMap<String, String>(properties.size()/2);
 
@@ -115,10 +118,15 @@ public HashMap<String, String> getEdge(String graphId, String id) {
         args.add(id);
 
         String[] stringArgs = args.toArray(new String[args.size()]);
+        List<String> properties;
 
-        List<String> properties = conn.getClient()
+        try {
+            properties = conn.getClient()
                 .sendCommand(Commands.Command.GETEDGE, stringArgs)
                 .getMultiBulkReply();
+        } catch (ClassCastException e) {
+            return null;
+        }
 
         HashMap<String, String> attributes = new HashMap<String, String>(properties.size()/2);
 
@@ -166,7 +174,6 @@ public List<String> getNeighbours(String graphId, String nodeId, String edgeType
         return neighbours;
     }
 
-
     public ResultSet query(String graphId, String query) {
         Jedis conn = _conn();
 
@@ -181,4 +188,11 @@ public boolean setProperty(String elementId, String key, Object value) {
         Jedis conn = _conn();
         return conn.hset(elementId, key, value.toString()) == 1;
     }
+
+    public void deleteGraph(String graph) {
+        Jedis conn = _conn();
+        conn.getClient()
+                .sendCommand(Commands.Command.DELETEGRAPH, graph)
+                .getStatusCodeReply();
+    }
 }

lib/jedis-3.0.0.jar

@@ -45,6 +45,11 @@ public RedisNode createLabeledNode(String label, Object... attributes) {
 
     public RedisNode getNode(String id) {
         HashMap<String, String> attributes = client.getNode(this.graphId, id);
+
+        if(attributes == null) {
+            return null;
+        }
+
         String label = attributes.get("label");
         attributes.remove("label");
 
@@ -53,6 +58,11 @@ public RedisNode getNode(String id) {
 
     public RedisEdge getEdge(String id) {
         HashMap<String, String> attributes = client.getEdge(this.graphId, id);
+
+        if(attributes == null) {
+            return  null;
+        }
+
         String edgeId = attributes.get("id");
         String relation = attributes.get("type");
         String srcNodeId = attributes.get("src");
@@ -111,4 +121,8 @@ public ResultSet query(String query) {
     public boolean setProperty(String elementId, String key, Object value) {
         return client.setProperty(elementId, key, value);
     }
+
+    public void deleteGraph() {
+        client.deleteGraph(this.graphId);
+    }
 }

pom.xml

@@ -211,4 +211,22 @@ public void testGetNeighbours() throws Exception {
         neighbours = api.getNeighbours(amit.getId(), "knows", DIR_BOTH);
         Assert.assertEquals(neighbours.size(), 2);
     }
+
+    @org.testng.annotations.Test
+    public void testGraphDelete() throws Exception {
+        RedisGraphAPI api = new RedisGraphAPI("social");
+        RedisNode roi = api.createNode("name", "roi", "age", 32);
+        RedisNode amit = api.createNode("name", "amit", "age", 30);
+
+        // Connect source and destination nodes.
+        RedisEdge edge = api.connectNodes(roi, "knows", amit);
+
+        api.deleteGraph();
+
+        roi = api.getNode(roi.getId());
+        Assert.assertNull(roi);
+
+        edge = api.getEdge(edge.getId());
+        Assert.assertNull(edge);
+    }
 }