prepare for jdk switch to 1.6

Author: Mark

src/main/java/com/arangodb/ArangoCollection.java

@@ -26,7 +26,6 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Optional;
 import java.util.Spliterators;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -49,18 +48,18 @@ public class ArangoCursor<T> implements Iterator<T>, Closeable {
 	private final Class<T> type;
 	private final ArangoCursorIterator<T> iterator;
 	private final String id;
-	private final Optional<Integer> count;
-	private final Optional<Extras> extra;
+	private final Integer count;
+	private final Extras extra;
 	private final boolean cached;
 
 	public ArangoCursor(final ArangoDatabase db, final Class<T> type, final CursorEntity result) {
 		super();
 		this.db = db;
 		this.type = type;
-		count = Optional.ofNullable(result.getCount());
-		extra = Optional.ofNullable(result.getExtra());
+		count = result.getCount();
+		extra = result.getExtra();
 		cached = result.getCached().booleanValue();
-		iterator = new ArangoCursorIterator<>(this, result);
+		iterator = new ArangoCursorIterator<T>(this, result);
 		id = result.getId();
 	}
 
@@ -72,16 +71,16 @@ public Class<T> getType() {
 		return type;
 	}
 
-	public Optional<Integer> getCount() {
+	public Integer getCount() {
 		return count;
 	}
 
-	public Optional<Stats> getStats() {
-		return extra.map(e -> e.getStats());
+	public Stats getStats() {
+		return extra != null ? extra.getStats() : null;
 	}
 
-	public Optional<Collection<Warning>> getWarnings() {
-		return extra.map(e -> e.getWarnings());
+	public Collection<Warning> getWarnings() {
+		return extra != null ? extra.getWarnings() : null;
 	}
 
 	public boolean isCached() {
@@ -115,8 +114,10 @@ public Stream<T> streamRemaining() {
 	}
 
 	public List<T> asListRemaining() {
-		final List<T> remaining = new ArrayList<>();
-		forEachRemaining(remaining::add);
+		final List<T> remaining = new ArrayList<T>();
+		while (hasNext()) {
+			remaining.add(next());
+		}
 		return remaining;
 	}
 

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

@@ -61,4 +61,9 @@ public T next() {
 		return cursor.getDb().deserialize(result.getResult().get(pos++), cursor.getType());
 	}
 
+	@Override
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+
 }

src/main/java/com/arangodb/ArangoCursorIterator.java

@@ -33,6 +33,7 @@
 import com.arangodb.entity.UserEntity;
 import com.arangodb.internal.ArangoDBConstants;
 import com.arangodb.internal.CollectionCache;
+import com.arangodb.internal.CollectionCache.DBAccess;
 import com.arangodb.internal.DocumentCache;
 import com.arangodb.internal.velocypack.VPackConfigure;
 import com.arangodb.internal.velocystream.Communication;
@@ -48,6 +49,7 @@
 import com.arangodb.velocypack.VPackParser;
 import com.arangodb.velocypack.VPackSerializer;
 import com.arangodb.velocypack.VPackSlice;
+import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.RequestType;
 import com.arangodb.velocystream.Response;
@@ -191,8 +193,11 @@ public ArangoDB(final Communication.Builder commBuilder, final VPack vpack, fina
 		super(commBuilder.build(vpack, collectionCache), vpack, vpackNull, vpackParser, new DocumentCache(),
 				collectionCache);
 		final Communication cacheCom = commBuilder.build(vpack, collectionCache);
-		collectionCache.init(name -> {
-			return new ArangoDatabase(cacheCom, vpackNull, vpack, vpackParser, documentCache, null, name);
+		collectionCache.init(new DBAccess() {
+			@Override
+			public ArangoDatabase db(final String name) {
+				return new ArangoDatabase(cacheCom, vpackNull, vpack, vpackParser, documentCache, null, name);
+			}
 		});
 	}
 
@@ -243,7 +248,12 @@ private Request createDatabaseRequest(final String name) {
 	}
 
 	private ResponseDeserializer<Boolean> createDatabaseResponseDeserializer() {
-		return response -> response.getBody().get().get(ArangoDBConstants.RESULT).getAsBoolean();
+		return new ResponseDeserializer<Boolean>() {
+			@Override
+			public Boolean deserialize(final Response response) throws VPackException {
+				return response.getBody().get(ArangoDBConstants.RESULT).getAsBoolean();
+			}
+		};
 	}
 
 	/**
@@ -270,10 +280,13 @@ private Request getDatabasesRequest() {
 	}
 
 	private ResponseDeserializer<Collection<String>> getDatabaseResponseDeserializer() {
-		return response -> {
-			final VPackSlice result = response.getBody().get().get(ArangoDBConstants.RESULT);
-			return deserialize(result, new Type<Collection<String>>() {
-			}.getType());
+		return new ResponseDeserializer<Collection<String>>() {
+			@Override
+			public Collection<String> deserialize(final Response response) throws VPackException {
+				final VPackSlice result = response.getBody().get(ArangoDBConstants.RESULT);
+				return ArangoDB.this.deserialize(result, new Type<Collection<String>>() {
+				}.getType());
+			}
 		};
 	}
 
@@ -495,10 +508,13 @@ private Request getUsersRequest() {
 	}
 
 	private ResponseDeserializer<Collection<UserEntity>> getUsersResponseDeserializer() {
-		return (response) -> {
-			final VPackSlice result = response.getBody().get().get(ArangoDBConstants.RESULT);
-			return deserialize(result, new Type<Collection<UserEntity>>() {
-			}.getType());
+		return new ResponseDeserializer<Collection<UserEntity>>() {
+			@Override
+			public Collection<UserEntity> deserialize(final Response response) throws VPackException {
+				final VPackSlice result = response.getBody().get(ArangoDBConstants.RESULT);
+				return ArangoDB.this.deserialize(result, new Type<Collection<UserEntity>>() {
+				}.getType());
+			}
 		};
 	}
 
@@ -581,7 +597,12 @@ private Request replaceUserRequest(final String user, final UserUpdateOptions op
 	}
 
 	public Response execute(final Request request) {
-		return executeSync(request, response -> response);
+		return executeSync(request, new ResponseDeserializer<Response>() {
+			@Override
+			public Response deserialize(final Response response) throws VPackException {
+				return response;
+			}
+		});
 	}
 
 	public CompletableFuture<Response> executeAsync(final Request request) {