Merge pull request #19 from arangodb/updateTo5.0.6

Update to5.0.6

Author: hkernbach

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.arangodb</groupId>
 	<artifactId>arangodb-java-driver-async</artifactId>
-	<version>5.0.5</version>
+	<version>5.0.6</version>
 	<inceptionYear>2016</inceptionYear>
 	<packaging>jar</packaging>
 

src/main/java/com/arangodb/internal/ArangoDBAsyncImpl.java

@@ -21,12 +21,8 @@
 package com.arangodb.internal;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 
 import com.arangodb.ArangoDBAsync;
 import com.arangodb.ArangoDBException;
@@ -37,10 +33,8 @@
 import com.arangodb.entity.Permissions;
 import com.arangodb.entity.ServerRole;
 import com.arangodb.entity.UserEntity;
-import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
 import com.arangodb.internal.net.CommunicationProtocol;
 import com.arangodb.internal.net.HostResolver;
-import com.arangodb.internal.net.HostResolver.EndpointResolver;
 import com.arangodb.internal.util.ArangoSerializationFactory;
 import com.arangodb.internal.util.ArangoSerializationFactory.Serializer;
 import com.arangodb.internal.velocystream.VstCommunication;
@@ -51,10 +45,7 @@
 import com.arangodb.model.LogOptions;
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
-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;
 
 /**
@@ -67,50 +58,16 @@ public class ArangoDBAsyncImpl extends InternalArangoDB<ArangoExecutorAsync> imp
 
 	public ArangoDBAsyncImpl(final VstCommunicationAsync.Builder commBuilder, final ArangoSerializationFactory util,
 		final VstCommunicationSync.Builder syncbuilder, final HostResolver hostResolver, final ArangoContext context) {
-		super(new ArangoExecutorAsync(commBuilder.build(util.get(Serializer.INTERNAL)), util, new DocumentCache()),
-				util, context);
+		
+		super(new ArangoExecutorAsync(commBuilder.build(util.get(Serializer.INTERNAL)), util, new DocumentCache()), util, context);
+		
 		final VstCommunication<Response, VstConnectionSync> cacheCom = syncbuilder.build(util.get(Serializer.INTERNAL));
+		
 		cp = new VstProtocol(cacheCom);
-		hostResolver.init(new EndpointResolver() {
-			@Override
-			public Collection<String> resolve(final boolean closeConnections) throws ArangoDBException {
-				try {
-					return executor.execute(new Request(ArangoRequestParam.SYSTEM, RequestType.GET, PATH_ENDPOINTS),
-						new ResponseDeserializer<Collection<String>>() {
-							@Override
-							public Collection<String> deserialize(final Response response) throws VPackException {
-								final VPackSlice field = response.getBody().get("endpoints");
-								Collection<String> endpoints;
-								if (field.isNone()) {
-									endpoints = Collections.<String> emptyList();
-								} else {
-									final Collection<Map<String, String>> tmp = util().deserialize(field,
-										Collection.class);
-									endpoints = new ArrayList<>();
-									for (final Map<String, String> map : tmp) {
-										for (final String value : map.values()) {
-											endpoints.add(value);
-										}
-									}
-								}
-								return endpoints;
-							}
-						}, null).get();
-				} catch (InterruptedException | ExecutionException e) {
-					throw new ArangoDBException(e);
-					// TODO
-					// if (e.getResponseCode() == 403) {
-					// response = Collections.<String> emptyList();
-					// } else {
-					// throw e;
-					// }
-				} finally {
-					if (closeConnections) {
-						ArangoDBAsyncImpl.this.shutdown();
-					}
-				}
-			}
-		});
+		
+		ArangoExecutorSync arangoExecutorSync = new ArangoExecutorSync(cp, util, new DocumentCache());
+		hostResolver.init(arangoExecutorSync, util.get(Serializer.INTERNAL));
+
 	}
 
 	@Override

src/main/java/com/arangodb/internal/ArangoDatabaseAsyncImpl.java

@@ -214,11 +214,12 @@ public <T> CompletableFuture<ArangoCursorAsync<T>> query(final String query, fin
 	}
 
 	@Override
-	public <T> CompletableFuture<ArangoCursorAsync<T>> cursor(final String cursorId, final Class<T> type)
-			throws ArangoDBException {
+	public <T> CompletableFuture<ArangoCursorAsync<T>> cursor(final String cursorId, final Class<T> type) throws ArangoDBException {
+		
 		final HostHandle hostHandle = new HostHandle();
-		final CompletableFuture<CursorEntity> execution = executor.execute(queryNextRequest(cursorId, null),
-			CursorEntity.class, hostHandle);
+		
+		final CompletableFuture<CursorEntity> execution = executor.execute(queryNextRequest(cursorId, null, null), CursorEntity.class, hostHandle);
+		
 		return execution.thenApply(result -> {
 			return createCursor(result, type, null, hostHandle);
 		});
@@ -231,8 +232,8 @@ private <T> ArangoCursorAsync<T> createCursor(
 		final HostHandle hostHandle) {
 		return new ArangoCursorAsyncImpl<>(this, new ArangoCursorExecute() {
 			@Override
-			public CursorEntity next(final String id) {
-				final CompletableFuture<CursorEntity> result = executor.execute(queryNextRequest(id, options),
+			public CursorEntity next(final String id, Map<String, String> meta) {
+				final CompletableFuture<CursorEntity> result = executor.execute(queryNextRequest(id, options, meta),
 					CursorEntity.class, hostHandle);
 				try {
 					return result.get();
@@ -242,9 +243,9 @@ public CursorEntity next(final String id) {
 			}
 
 			@Override
-			public void close(final String id) {
+			public void close(final String id, Map<String, String> meta) {
 				try {
-					executor.execute(queryCloseRequest(id, options), Void.class, hostHandle).get();
+					executor.execute(queryCloseRequest(id, options, meta), Void.class, hostHandle).get();
 				} catch (InterruptedException | ExecutionException e) {
 					throw new ArangoDBException(e);
 				}

src/test/java/com/arangodb/ArangoGraphTest.java

@@ -37,10 +37,10 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.arangodb.entity.ArangoDBVersion.License;
 import com.arangodb.entity.CollectionPropertiesEntity;
 import com.arangodb.entity.EdgeDefinition;
 import com.arangodb.entity.GraphEntity;
+import com.arangodb.entity.License;
 import com.arangodb.entity.ServerRole;
 import com.arangodb.model.GraphCreateOptions;