StatementResult now only allow Single() if at pos -1. StatementResult always allows list() which gives the remaingin records

Author: RagnarW

driver/src/main/java/org/neo4j/driver/internal/InternalStatementResult.java

@@ -42,7 +42,6 @@
 import org.neo4j.driver.v1.util.Function;
 import org.neo4j.driver.v1.util.Functions;
 
-import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 
 public class InternalStatementResult implements StatementResult
@@ -222,7 +221,7 @@ else if ( done )
     @Override
     public Record single()
     {
-        if( position > 0 )
+        if( position != -1 )
         {
             throw new NoSuchRecordException(
                     "Cannot retrieve the first record, because other operations have already used the first record. " +
@@ -274,12 +273,7 @@ public List<Record> list()
     @Override
     public <T> List<T> list( Function<Record, T> mapFunction )
     {
-        if ( isEmpty() )
-        {
-            assertOpen();
-            return emptyList();
-        }
-        else if ( position == -1 && hasNext() )
+        if ( hasNext() )
         {
             List<T> result = new ArrayList<>();
             do
@@ -293,9 +287,8 @@ else if ( position == -1 && hasNext() )
         }
         else
         {
-            throw new ClientException(
-                    format( "Can't retain records when cursor is not pointing at the first record (currently at position %d)", position )
-            );
+            assertOpen();
+            return emptyList();
         }
     }
 
@@ -331,12 +324,6 @@ private void assertOpen()
         }
     }
 
-    private boolean isEmpty()
-    {
-        tryFetching();
-        return position == -1 && recordBuffer.isEmpty() && done;
-    }
-
     private void tryFetching()
     {
         while ( recordBuffer.isEmpty() && !done )