compatibility with sync driver

Author: mpv1989

src/main/java/com/arangodb/ArangoDBAsync.java

@@ -58,8 +58,8 @@
 import com.arangodb.model.UserCreateOptions;
 import com.arangodb.model.UserUpdateOptions;
 import com.arangodb.util.ArangoDeserializer;
+import com.arangodb.util.ArangoSerialization;
 import com.arangodb.util.ArangoSerializer;
-import com.arangodb.util.ArangoUtil;
 import com.arangodb.velocypack.VPack;
 import com.arangodb.velocypack.VPackAnnotationFieldFilter;
 import com.arangodb.velocypack.VPackAnnotationFieldNaming;
@@ -356,10 +356,10 @@ private CommunicationSync.Builder syncBuilder(final HostHandler hostHandler) {
 
 	}
 
-	public ArangoDBAsync(final CommunicationAsync.Builder commBuilder, final ArangoUtil util,
+	public ArangoDBAsync(final CommunicationAsync.Builder commBuilder, final ArangoSerialization util,
 		final CollectionCache collectionCache, final CommunicationSync.Builder syncbuilder) {
 		super(new ArangoExecutorAsync(commBuilder.build(util, collectionCache), util, new DocumentCache(),
-				collectionCache));
+				collectionCache), util);
 		final Communication<Response, ConnectionSync> cacheCom = syncbuilder.build(util, collectionCache);
 		collectionCache.init(new DBAccess() {
 			@Override

src/main/java/com/arangodb/ArangoDatabaseAsync.java

@@ -57,7 +57,7 @@
 import com.arangodb.model.GraphCreateOptions;
 import com.arangodb.model.TransactionOptions;
 import com.arangodb.model.TraversalOptions;
-import com.arangodb.util.ArangoUtil;
+import com.arangodb.util.ArangoSerialization;
 import com.arangodb.velocypack.Type;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.Response;
@@ -70,12 +70,12 @@ public class ArangoDatabaseAsync extends
 		InternalArangoDatabase<ArangoDBAsync, ArangoExecutorAsync, CompletableFuture<Response>, ConnectionAsync> {
 
 	protected ArangoDatabaseAsync(final ArangoDBAsync arangoDB, final String name) {
-		super(arangoDB, arangoDB.executor(), name);
+		super(arangoDB, arangoDB.executor(), arangoDB.util(), name);
 	}
 
-	protected ArangoDatabaseAsync(final CommunicationAsync communication, final ArangoUtil util,
+	protected ArangoDatabaseAsync(final CommunicationAsync communication, final ArangoSerialization util,
 		final DocumentCache documentCache, final CollectionCache collectionCache, final String name) {
-		super(null, new ArangoExecutorAsync(communication, util, documentCache, collectionCache), name);
+		super(null, new ArangoExecutorAsync(communication, util, documentCache, collectionCache), util, name);
 	}
 
 	/**

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

@@ -26,7 +26,7 @@
 import com.arangodb.ArangoDBException;
 import com.arangodb.internal.velocystream.Communication;
 import com.arangodb.internal.velocystream.ConnectionAsync;
-import com.arangodb.util.ArangoUtil;
+import com.arangodb.util.ArangoSerialization;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocystream.Request;
 import com.arangodb.velocystream.Response;
@@ -38,7 +38,7 @@
 public class ArangoExecutorAsync extends ArangoExecutor<CompletableFuture<Response>, ConnectionAsync> {
 
 	public ArangoExecutorAsync(final Communication<CompletableFuture<Response>, ConnectionAsync> communication,
-		final ArangoUtil util, final DocumentCache documentCache, final CollectionCache collectionCache) {
+		final ArangoSerialization util, final DocumentCache documentCache, final CollectionCache collectionCache) {
 		super(communication, util, documentCache, collectionCache);
 	}
 

src/main/java/com/arangodb/internal/velocystream/CommunicationAsync.java

@@ -33,7 +33,7 @@
 import com.arangodb.entity.ErrorEntity;
 import com.arangodb.internal.ArangoDBConstants;
 import com.arangodb.internal.CollectionCache;
-import com.arangodb.util.ArangoUtil;
+import com.arangodb.util.ArangoSerialization;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocypack.exception.VPackParserException;
 import com.arangodb.velocystream.Request;
@@ -99,15 +99,15 @@ public Builder maxConnections(final Integer maxConnections) {
 		}
 
 		public Communication<CompletableFuture<Response>, ConnectionAsync> build(
-			final ArangoUtil util,
+			final ArangoSerialization util,
 			final CollectionCache collectionCache) {
 			return new CommunicationAsync(hostHandler, timeout, user, password, useSsl, sslContext, util,
 					collectionCache, chunksize, maxConnections);
 		}
 	}
 
 	private CommunicationAsync(final HostHandler hostHandler, final Integer timeout, final String user,
-		final String password, final Boolean useSsl, final SSLContext sslContext, final ArangoUtil util,
+		final String password, final Boolean useSsl, final SSLContext sslContext, final ArangoSerialization util,
 		final CollectionCache collectionCache, final Integer chunksize, final Integer maxConnections) {
 		super(timeout, user, password, useSsl, sslContext, util, collectionCache, chunksize,
 				new ConnectionPool<ConnectionAsync>(maxConnections) {

src/test/java/com/arangodb/ArangoSslTest.java

@@ -70,7 +70,9 @@ public void connect() throws Exception {
 		final SSLContext sc = SSLContext.getInstance("TLS");
 		sc.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 
-		final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().port(8530).useSsl(true).sslContext(sc).build();
+		final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder()
+				.loadProperties(ArangoSslTest.class.getResourceAsStream("/arangodb-ssl.properties")).useSsl(true)
+				.sslContext(sc).build();
 		final ArangoDBVersion version = arangoDB.getVersion().get();
 		assertThat(version, is(notNullValue()));
 	}
@@ -79,7 +81,9 @@ public void connect() throws Exception {
 	@Ignore
 	public void connectWithoutValidSslContext() throws Exception {
 		try {
-			final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().port(8530).useSsl(true).build();
+			final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder()
+					.loadProperties(ArangoSslTest.class.getResourceAsStream("/arangodb-ssl.properties")).useSsl(true)
+					.build();
 			arangoDB.getVersion().get();
 			fail("this should fail");
 		} catch (final ArangoDBException ex) {

src/test/java/com/arangodb/example/ssl/SslExample.java

@@ -69,7 +69,9 @@ public void connect() throws Exception {
 		final SSLContext sc = SSLContext.getInstance("TLS");
 		sc.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 
-		final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().port(8530).useSsl(true).sslContext(sc).build();
+		final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder()
+				.loadProperties(SslExample.class.getResourceAsStream("/arangodb-ssl.properties")).useSsl(true)
+				.sslContext(sc).build();
 		final ArangoDBVersion version = arangoDB.getVersion().get();
 		assertThat(version, is(notNullValue()));
 	}

src/test/resources/arangodb-ssl.properties

@@ -0,0 +1,2 @@
+arangodb.hosts=127.0.0.1:8530
+arangodb.useSsl=true