refactoring: ArangoCursor default methods

Author: rashtao

core/src/main/java/com/arangodb/ArangoCursor.java

@@ -23,8 +23,10 @@
 import com.arangodb.entity.CursorStats;
 import com.arangodb.entity.CursorWarning;
 import com.arangodb.model.AqlQueryOptions;
+import org.slf4j.LoggerFactory;
 
 import java.io.Closeable;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -70,7 +72,18 @@ public interface ArangoCursor<T> extends ArangoIterable<T>, ArangoIterator<T>, C
     /**
      * @return the remaining results as a {@code List}
      */
-    List<T> asListRemaining();
+    default List<T> asListRemaining() {
+        final List<T> remaining = new ArrayList<>();
+        while (hasNext()) {
+            remaining.add(next());
+        }
+        try {
+            close();
+        } catch (final Exception e) {
+            LoggerFactory.getLogger(ArangoCursor.class).warn("Could not close cursor: ", e);
+        }
+        return remaining;
+    }
 
     /**
      * @return true if the result is a potential dirty read

core/src/main/java/com/arangodb/ArangoIterable.java

@@ -21,6 +21,7 @@
 package com.arangodb;
 
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 /**
  * @author Mark Vollmary
@@ -30,6 +31,8 @@ public interface ArangoIterable<T> extends Iterable<T> {
     @Override
     ArangoIterator<T> iterator();
 
-    Stream<T> stream();
+    default Stream<T> stream() {
+        return StreamSupport.stream(spliterator(), false);
+    }
 
 }

core/src/main/java/com/arangodb/internal/cursor/ArangoCursorImpl.java

@@ -28,22 +28,15 @@
 import com.arangodb.internal.InternalArangoDatabase;
 import com.arangodb.internal.cursor.entity.InternalCursorEntity;
 import com.fasterxml.jackson.databind.JsonNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.List;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 /**
  * @author Mark Vollmary
  */
 public class ArangoCursorImpl<T> implements ArangoCursor<T> {
-    private final static Logger LOG = LoggerFactory.getLogger(ArangoCursorImpl.class);
 
     protected final ArangoCursorIterator<T> iterator;
     private final Class<T> type;
@@ -113,20 +106,6 @@ public boolean hasNext() {
         return iterator.hasNext();
     }
 
-    @Override
-    public List<T> asListRemaining() {
-        final List<T> remaining = new ArrayList<>();
-        while (hasNext()) {
-            remaining.add(next());
-        }
-        try {
-            close();
-        } catch (final Exception e) {
-            LOG.warn("Could not close cursor: ", e);
-        }
-        return remaining;
-    }
-
     @Override
     public boolean isPotentialDirtyRead() {
         return pontentialDirtyRead;
@@ -146,10 +125,6 @@ protected ArangoCursorExecute getExecute() {
         return execute;
     }
 
-    public Stream<T> stream() {
-        return StreamSupport.stream(spliterator(), false);
-    }
-
     protected static class ArangoCursorIterator<T> implements ArangoIterator<T> {
         private final String cursorId;
         private final Class<T> type;