Merge pull request #99 from RedisGraph/records_iterator

results set is iterable

Author: swilly22

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

@@ -5,7 +5,7 @@
 /**
  * Hold a query result
  */
-public interface ResultSet extends Iterator<Record> {
+public interface ResultSet extends Iterable<Record>, Iterator<Record> {
 
     int size();
 

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

@@ -12,11 +12,13 @@
 import redis.clients.jedis.exceptions.JedisDataException;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 
 public class ResultSetImpl implements ResultSet {
+    
 
     private final Header header;
     private final Statistics statistics;
@@ -275,11 +277,13 @@ private ResultSetScalarTypes getValueTypeFromObject(Object rawScalarType) {
     }
 
     @Override
+    @Deprecated
     public boolean hasNext() {
         return position < results.size();
     }
 
     @Override
+    @Deprecated
     public Record next() {
         if (!hasNext())
             throw new NoSuchElementException();
@@ -316,4 +320,11 @@ public String toString() {
         sb.append('}');
         return sb.toString();
     }
+
+
+	@Override
+	public Iterator<Record> iterator() {
+		// TODO Auto-generated method stub
+		return results.iterator();
+	}
 }

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

@@ -0,0 +1,66 @@
+package com.redislabs.redisgraph;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.redislabs.redisgraph.impl.api.RedisGraph;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IterableTest {
+
+  private RedisGraphContextGenerator api;
+
+  @Before
+  public void createApi() {
+    //        api = new RedisGraph();
+    api = new RedisGraph();
+  }
+
+  @After
+  public void deleteGraph() {
+
+    api.deleteGraph("social");
+    api.close();
+  }
+
+  @Test
+  public void testRecordsIterator() {
+    api.query("social", "UNWIND(range(0,50)) as i CREATE(:N{i:i})");
+
+    ResultSet rs = api.query("social", "MATCH(n) RETURN n");
+    int count = 0;
+    while (rs.hasNext()) {
+      rs.next();
+      count++;
+    }
+    assertEquals(rs.size(), count);
+  }
+
+  @Test
+  public void testRecordsIterable() {
+    api.query("social", "UNWIND(range(0,50)) as i CREATE(:N{i:i})");
+
+    ResultSet rs = api.query("social", "MATCH(n) RETURN n");
+    int count = 0;
+    for(Record row: rs) {
+      count++;
+    }
+    assertEquals(rs.size(), count);
+  }
+
+  @Test
+  public void testRecordsIteratorAndIterable() {
+    api.query("social", "UNWIND(range(0,50)) as i CREATE(:N{i:i})");
+
+    ResultSet rs = api.query("social", "MATCH(n) RETURN n");
+    rs.next();
+    int count = 0;
+    for(Record row: rs) {
+      count++;
+    }
+    assertEquals(rs.size(), count);
+  }
+
+}