closable objects in examples and tests

Author: DvirDukhan

README.md

@@ -89,6 +89,7 @@ import com.redislabs.redisgraph.graph_entities.Edge;
 import com.redislabs.redisgraph.graph_entities.Node;
 import com.redislabs.redisgraph.impl.api.RedisGraph;
 
+import java.io.IOException;
 import java.util.List;
 
 public class RedisGraphExample {
@@ -115,24 +116,29 @@ public class RedisGraphExample {
         // delete graph
         graph.deleteGraph("social");
 
-        // get connection context
-        RedisGraphContext context = graph.getContext();
-        context.query("contextSocial","CREATE (:person{name:'roi',age:32})");
-        context.query("contextSocial","CREATE (:person{name:%s,age:%d})", "amit", 30);
-        context.query("contextSocial", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit') CREATE (a)-[:knows]->(b)");
-        // WATCH/MULTI/EXEC
-        context.watch("contextSocial");
-        RedisGraphTransaction t = context.multi();
-        t.query("contextSocial", "MATCH (a:person)-[r:knows]->(b:person) RETURN a, r, b");
-        // support for Redis/Jedis native commands in transaction
-        t.set("x", "1");
-        t.get("x");
-        // get multi/exec results
-        List<Object> execResults =  t.exec();
-        System.out.println(execResults.toString());
-
-        context.deleteGraph("contextSocial");
+        // get connection context - closable object
+        try(RedisGraphContext context = graph.getContext()) {
+            context.query("contextSocial","CREATE (:person{name:'roi',age:32})");
+            context.query("contextSocial","CREATE (:person{name:%s,age:%d})", "amit", 30);
+            context.query("contextSocial", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit') CREATE (a)-[:knows]->(b)");
+            // WATCH/MULTI/EXEC
+            context.watch("contextSocial");
+            RedisGraphTransaction t = context.multi();
+            t.query("contextSocial", "MATCH (a:person)-[r:knows]->(b:person) RETURN a, r, b");
+            // support for Redis/Jedis native commands in transaction
+            t.set("x", "1");
+            t.get("x");
+            // get multi/exec results
+            List<Object> execResults =  t.exec();
+            System.out.println(execResults.toString());
+
+            context.deleteGraph("contextSocial");
+        } catch (IOException e) {
+            
+        }
+
     }
 }
 
+
 ```

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

@@ -504,108 +504,111 @@ public void testEscapedQuery() {
 
     @Test
     public void testMultiExec(){
-        RedisGraphTransaction transaction = api.getContext().multi();
-
-        transaction.set("x", "1");
-        transaction.query("social", "CREATE (:Person {name:'a'})");
-        transaction.query("g", "CREATE (:Person {name:'a'})");
-        transaction.incr("x");
-        transaction.get("x");
-        transaction.query("social", "MATCH (n:Person) RETURN n");
-        transaction.deleteGraph("g");
-        transaction.callProcedure("social", "db.labels");
-        List<Object> results = transaction.exec();
-
-        // Redis set command
-        Assert.assertEquals(String.class, results.get(0).getClass());
-        Assert.assertEquals("OK", results.get(0));
-
-        // Redis graph command
-        Assert.assertEquals(ResultSetImpl.class, results.get(1).getClass());
-        ResultSet resultSet = (ResultSet) results.get(1);
-        Assert.assertEquals(1, resultSet.getStatistics().nodesCreated());
-        Assert.assertEquals(1, resultSet.getStatistics().propertiesSet());
-
-
-        Assert.assertEquals(ResultSetImpl.class, results.get(2).getClass());
-        resultSet = (ResultSet) results.get(2);
-        Assert.assertEquals(1, resultSet.getStatistics().nodesCreated());
-        Assert.assertEquals(1, resultSet.getStatistics().propertiesSet());
-
-        // Redis incr command
-        Assert.assertEquals(Long.class, results.get(3).getClass());
-        Assert.assertEquals((long)2, results.get(3));
-
-        // Redis get command
-        Assert.assertEquals(String.class, results.get(4).getClass());
-        Assert.assertEquals("2", results.get(4));
-
-        // Graph query result
-        Assert.assertEquals(ResultSetImpl.class, results.get(5).getClass());
-        resultSet = (ResultSet) results.get(5);
+        try (RedisGraphContext c = api.getContext()) {
+            RedisGraphTransaction transaction = api.getContext().multi();
+
+            transaction.set("x", "1");
+            transaction.query("social", "CREATE (:Person {name:'a'})");
+            transaction.query("g", "CREATE (:Person {name:'a'})");
+            transaction.incr("x");
+            transaction.get("x");
+            transaction.query("social", "MATCH (n:Person) RETURN n");
+            transaction.deleteGraph("g");
+            transaction.callProcedure("social", "db.labels");
+            List<Object> results = transaction.exec();
+
+            // Redis set command
+            Assert.assertEquals(String.class, results.get(0).getClass());
+            Assert.assertEquals("OK", results.get(0));
+
+            // Redis graph command
+            Assert.assertEquals(ResultSetImpl.class, results.get(1).getClass());
+            ResultSet resultSet = (ResultSet) results.get(1);
+            Assert.assertEquals(1, resultSet.getStatistics().nodesCreated());
+            Assert.assertEquals(1, resultSet.getStatistics().propertiesSet());
+
+
+            Assert.assertEquals(ResultSetImpl.class, results.get(2).getClass());
+            resultSet = (ResultSet) results.get(2);
+            Assert.assertEquals(1, resultSet.getStatistics().nodesCreated());
+            Assert.assertEquals(1, resultSet.getStatistics().propertiesSet());
+
+            // Redis incr command
+            Assert.assertEquals(Long.class, results.get(3).getClass());
+            Assert.assertEquals((long)2, results.get(3));
+
+            // Redis get command
+            Assert.assertEquals(String.class, results.get(4).getClass());
+            Assert.assertEquals("2", results.get(4));
+
+            // Graph query result
+            Assert.assertEquals(ResultSetImpl.class, results.get(5).getClass());
+            resultSet = (ResultSet) results.get(5);
 
-        Assert.assertNotNull(resultSet.getHeader());
-        Header header = resultSet.getHeader();
+            Assert.assertNotNull(resultSet.getHeader());
+            Header header = resultSet.getHeader();
 
 
-        List<String> schemaNames = header.getSchemaNames();
-        List<Header.ResultSetColumnTypes> schemaTypes = header.getSchemaTypes();
+            List<String> schemaNames = header.getSchemaNames();
+            List<Header.ResultSetColumnTypes> schemaTypes = header.getSchemaTypes();
 
-        Assert.assertNotNull(schemaNames);
-        Assert.assertNotNull(schemaTypes);
+            Assert.assertNotNull(schemaNames);
+            Assert.assertNotNull(schemaTypes);
 
-        Assert.assertEquals(1, schemaNames.size());
-        Assert.assertEquals(1, schemaTypes.size());
+            Assert.assertEquals(1, schemaNames.size());
+            Assert.assertEquals(1, schemaTypes.size());
 
-        Assert.assertEquals("n", schemaNames.get(0));
+            Assert.assertEquals("n", schemaNames.get(0));
 
-        Assert.assertEquals(COLUMN_NODE, schemaTypes.get(0));
+            Assert.assertEquals(COLUMN_NODE, schemaTypes.get(0));
 
-        Property nameProperty = new Property("name", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "a");
+            Property nameProperty = new Property("name", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "a");
 
-        Node expectedNode = new Node();
-        expectedNode.setId(0);
-        expectedNode.addLabel("Person");
-        expectedNode.addProperty(nameProperty);
-        // see that the result were pulled from the right graph
-        Assert.assertEquals(1, resultSet.size());
-        Assert.assertTrue(resultSet.hasNext());
-        Record record = resultSet.next();
-        Assert.assertFalse(resultSet.hasNext());
-        Assert.assertEquals(Arrays.asList("n"), record.keys());
-        Assert.assertEquals(expectedNode, record.getValue("n"));
-
-        // Graph delete
-        Assert.assertTrue(((String)results.get(6)).startsWith("Graph removed"));
+            Node expectedNode = new Node();
+            expectedNode.setId(0);
+            expectedNode.addLabel("Person");
+            expectedNode.addProperty(nameProperty);
+            // see that the result were pulled from the right graph
+            Assert.assertEquals(1, resultSet.size());
+            Assert.assertTrue(resultSet.hasNext());
+            Record record = resultSet.next();
+            Assert.assertFalse(resultSet.hasNext());
+            Assert.assertEquals(Arrays.asList("n"), record.keys());
+            Assert.assertEquals(expectedNode, record.getValue("n"));
 
+            // Graph delete
+            Assert.assertTrue(((String)results.get(6)).startsWith("Graph removed"));
 
-        Assert.assertEquals(ResultSetImpl.class, results.get(7).getClass());
-        resultSet = (ResultSet) results.get(7);
 
-        Assert.assertNotNull(resultSet.getHeader());
-        header = resultSet.getHeader();
+            Assert.assertEquals(ResultSetImpl.class, results.get(7).getClass());
+            resultSet = (ResultSet) results.get(7);
 
+            Assert.assertNotNull(resultSet.getHeader());
+            header = resultSet.getHeader();
 
-        schemaNames = header.getSchemaNames();
-        schemaTypes = header.getSchemaTypes();
 
-        Assert.assertNotNull(schemaNames);
-        Assert.assertNotNull(schemaTypes);
+            schemaNames = header.getSchemaNames();
+            schemaTypes = header.getSchemaTypes();
 
-        Assert.assertEquals(1, schemaNames.size());
-        Assert.assertEquals(1, schemaTypes.size());
+            Assert.assertNotNull(schemaNames);
+            Assert.assertNotNull(schemaTypes);
 
-        Assert.assertEquals("label", schemaNames.get(0));
+            Assert.assertEquals(1, schemaNames.size());
+            Assert.assertEquals(1, schemaTypes.size());
 
-        Assert.assertEquals(COLUMN_SCALAR, schemaTypes.get(0));
+            Assert.assertEquals("label", schemaNames.get(0));
 
-        Assert.assertEquals(1, resultSet.size());
-        Assert.assertTrue(resultSet.hasNext());
-        record = resultSet.next();
-        Assert.assertFalse(resultSet.hasNext());
-        Assert.assertEquals(Arrays.asList("label"), record.keys());
-        Assert.assertEquals("Person", record.getValue("label"));
+            Assert.assertEquals(COLUMN_SCALAR, schemaTypes.get(0));
 
+            Assert.assertEquals(1, resultSet.size());
+            Assert.assertTrue(resultSet.hasNext());
+            record = resultSet.next();
+            Assert.assertFalse(resultSet.hasNext());
+            Assert.assertEquals(Arrays.asList("label"), record.keys());
+            Assert.assertEquals("Person", record.getValue("label"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     @Test
@@ -651,69 +654,69 @@ public void testContextedAPI(){
         expectedEdge.addProperty(falseBooleanProperty);
         expectedEdge.addProperty(nullProperty);
 
-        RedisGraphContext c = api.getContext();
+        try(RedisGraphContext c = api.getContext()) {
+            Assert.assertNotNull(c.query("social", "CREATE (:person{name:%s',age:%d, doubleValue:%f, boolValue:%b, nullValue:null})", name, age, doubleValue, boolValue));
+            Assert.assertNotNull(c.query("social", "CREATE (:person{name:'amit',age:30})"));
+            Assert.assertNotNull(c.query("social", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit')  " +
+                    "CREATE (a)-[:knows{place:'TLV', since:2000,doubleValue:3.14, boolValue:false, nullValue:null}]->(b)"));
 
-        Assert.assertNotNull(c.query("social", "CREATE (:person{name:%s',age:%d, doubleValue:%f, boolValue:%b, nullValue:null})", name, age, doubleValue, boolValue));
-        Assert.assertNotNull(c.query("social", "CREATE (:person{name:'amit',age:30})"));
-        Assert.assertNotNull(c.query("social", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit')  " +
-                "CREATE (a)-[:knows{place:'TLV', since:2000,doubleValue:3.14, boolValue:false, nullValue:null}]->(b)"));
+            ResultSet resultSet = c.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r, " +
+                    "a.name, a.age, a.doubleValue, a.boolValue, a.nullValue, " +
+                    "r.place, r.since, r.doubleValue, r.boolValue, r.nullValue");
+            Assert.assertNotNull(resultSet);
 
-        ResultSet resultSet = c.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r, " +
-                "a.name, a.age, a.doubleValue, a.boolValue, a.nullValue, " +
-                "r.place, r.since, r.doubleValue, r.boolValue, r.nullValue");
-        Assert.assertNotNull(resultSet);
 
+            Assert.assertEquals(0, resultSet.getStatistics().nodesCreated());
+            Assert.assertEquals(0, resultSet.getStatistics().nodesDeleted());
+            Assert.assertEquals(0, resultSet.getStatistics().labelsAdded());
+            Assert.assertEquals(0, resultSet.getStatistics().propertiesSet());
+            Assert.assertEquals(0, resultSet.getStatistics().relationshipsCreated());
+            Assert.assertEquals(0, resultSet.getStatistics().relationshipsDeleted());
+            Assert.assertNotNull(resultSet.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME));
 
-        Assert.assertEquals(0, resultSet.getStatistics().nodesCreated());
-        Assert.assertEquals(0, resultSet.getStatistics().nodesDeleted());
-        Assert.assertEquals(0, resultSet.getStatistics().labelsAdded());
-        Assert.assertEquals(0, resultSet.getStatistics().propertiesSet());
-        Assert.assertEquals(0, resultSet.getStatistics().relationshipsCreated());
-        Assert.assertEquals(0, resultSet.getStatistics().relationshipsDeleted());
-        Assert.assertNotNull(resultSet.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME));
 
+            Assert.assertEquals(1, resultSet.size());
+            Assert.assertTrue(resultSet.hasNext());
+            Record record = resultSet.next();
+            Assert.assertFalse(resultSet.hasNext());
 
-        Assert.assertEquals(1, resultSet.size());
-        Assert.assertTrue(resultSet.hasNext());
-        Record record = resultSet.next();
-        Assert.assertFalse(resultSet.hasNext());
+            Node node = record.getValue(0);
+            Assert.assertNotNull(node);
 
-        Node node = record.getValue(0);
-        Assert.assertNotNull(node);
+            Assert.assertEquals(expectedNode, node);
 
-        Assert.assertEquals(expectedNode, node);
+            node = record.getValue("a");
+            Assert.assertEquals(expectedNode, node);
 
-        node = record.getValue("a");
-        Assert.assertEquals(expectedNode, node);
+            Edge edge = record.getValue(1);
+            Assert.assertNotNull(edge);
+            Assert.assertEquals(expectedEdge, edge);
 
-        Edge edge = record.getValue(1);
-        Assert.assertNotNull(edge);
-        Assert.assertEquals(expectedEdge, edge);
+            edge = record.getValue("r");
+            Assert.assertEquals(expectedEdge, edge);
 
-        edge = record.getValue("r");
-        Assert.assertEquals(expectedEdge, edge);
+            Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue", "a.nullValue",
+                    "r.place", "r.since", "r.doubleValue", "r.boolValue", "r.nullValue"), record.keys());
 
-        Assert.assertEquals(Arrays.asList("a", "r", "a.name", "a.age", "a.doubleValue", "a.boolValue", "a.nullValue",
-                "r.place", "r.since", "r.doubleValue", "r.boolValue", "r.nullValue"), record.keys());
+            Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge,
+                    name, age, doubleValue, true, null,
+                    place, since, doubleValue, false, null),
+                    record.values());
 
-        Assert.assertEquals(Arrays.asList(expectedNode, expectedEdge,
-                name, age, doubleValue, true, null,
-                place, since, doubleValue, false, null),
-                record.values());
+            Node a = record.getValue("a");
+            for (String propertyName : expectedNode.getEntityPropertyNames()){
+                Assert.assertEquals(expectedNode.getProperty(propertyName) ,a.getProperty(propertyName));
+            }
 
-        Node a = record.getValue("a");
-        for (String propertyName : expectedNode.getEntityPropertyNames()){
-            Assert.assertEquals(expectedNode.getProperty(propertyName) ,a.getProperty(propertyName));
+            Assert.assertEquals( "roi", record.getString(2));
+            Assert.assertEquals( "32", record.getString(3));
+            Assert.assertEquals( 32L, ((Integer)(record.getValue(3))).longValue());
+            Assert.assertEquals( 32L, ((Integer)record.getValue("a.age")).longValue());
+            Assert.assertEquals( "roi", record.getString("a.name"));
+            Assert.assertEquals( "32", record.getString("a.age"));
+        } catch (IOException e) {
+            e.printStackTrace();
         }
-
-        Assert.assertEquals( "roi", record.getString(2));
-        Assert.assertEquals( "32", record.getString(3));
-        Assert.assertEquals( 32L, ((Integer)(record.getValue(3))).longValue());
-        Assert.assertEquals( 32L, ((Integer)record.getValue("a.age")).longValue());
-        Assert.assertEquals( "roi", record.getString("a.name"));
-        Assert.assertEquals( "32", record.getString("a.age"));
-
-
     }
 
     @Test