Skip to content

Commit af31e6f

Browse files
author
mpv1989
committed
compatiblity with sync driver
1 parent b8c4dc4 commit af31e6f

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
import com.arangodb.model.UserCreateOptions;
6060
import com.arangodb.model.UserUpdateOptions;
6161
import com.arangodb.util.ArangoDeserializer;
62+
import com.arangodb.util.ArangoSerialization;
6263
import com.arangodb.util.ArangoSerializer;
63-
import com.arangodb.util.ArangoUtil;
6464
import com.arangodb.velocypack.VPack;
6565
import com.arangodb.velocypack.VPackAnnotationFieldFilter;
6666
import com.arangodb.velocypack.VPackAnnotationFieldNaming;
@@ -357,10 +357,10 @@ private CommunicationSync.Builder syncBuilder(final HostHandler hostHandler) {
357357

358358
}
359359

360-
public ArangoDBAsync(final CommunicationAsync.Builder commBuilder, final ArangoUtil util,
360+
public ArangoDBAsync(final CommunicationAsync.Builder commBuilder, final ArangoSerialization util,
361361
final CollectionCache collectionCache, final CommunicationSync.Builder syncbuilder) {
362362
super(new ArangoExecutorAsync(commBuilder.build(util, collectionCache), util, new DocumentCache(),
363-
collectionCache));
363+
collectionCache), util);
364364
final Communication<Response, ConnectionSync> cacheCom = syncbuilder.build(util, collectionCache);
365365
collectionCache.init(new DBAccess() {
366366
@Override

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import com.arangodb.model.GraphCreateOptions;
5858
import com.arangodb.model.TransactionOptions;
5959
import com.arangodb.model.TraversalOptions;
60-
import com.arangodb.util.ArangoUtil;
60+
import com.arangodb.util.ArangoSerialization;
6161
import com.arangodb.velocypack.Type;
6262
import com.arangodb.velocystream.Request;
6363
import com.arangodb.velocystream.Response;
@@ -70,12 +70,12 @@ public class ArangoDatabaseAsync extends
7070
InternalArangoDatabase<ArangoDBAsync, ArangoExecutorAsync, CompletableFuture<Response>, ConnectionAsync> {
7171

7272
protected ArangoDatabaseAsync(final ArangoDBAsync arangoDB, final String name) {
73-
super(arangoDB, arangoDB.executor(), name);
73+
super(arangoDB, arangoDB.executor(), arangoDB.util(), name);
7474
}
7575

76-
protected ArangoDatabaseAsync(final CommunicationAsync communication, final ArangoUtil util,
76+
protected ArangoDatabaseAsync(final CommunicationAsync communication, final ArangoSerialization util,
7777
final DocumentCache documentCache, final CollectionCache collectionCache, final String name) {
78-
super(null, new ArangoExecutorAsync(communication, util, documentCache, collectionCache), name);
78+
super(null, new ArangoExecutorAsync(communication, util, documentCache, collectionCache), util, name);
7979
}
8080

8181
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.arangodb.ArangoDBException;
2727
import com.arangodb.internal.velocystream.Communication;
2828
import com.arangodb.internal.velocystream.ConnectionAsync;
29-
import com.arangodb.util.ArangoUtil;
29+
import com.arangodb.util.ArangoSerialization;
3030
import com.arangodb.velocypack.exception.VPackException;
3131
import com.arangodb.velocystream.Request;
3232
import com.arangodb.velocystream.Response;
@@ -38,7 +38,7 @@
3838
public class ArangoExecutorAsync extends ArangoExecutor<CompletableFuture<Response>, ConnectionAsync> {
3939

4040
public ArangoExecutorAsync(final Communication<CompletableFuture<Response>, ConnectionAsync> communication,
41-
final ArangoUtil util, final DocumentCache documentCache, final CollectionCache collectionCache) {
41+
final ArangoSerialization util, final DocumentCache documentCache, final CollectionCache collectionCache) {
4242
super(communication, util, documentCache, collectionCache);
4343
}
4444

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.arangodb.entity.ErrorEntity;
3434
import com.arangodb.internal.ArangoDBConstants;
3535
import com.arangodb.internal.CollectionCache;
36-
import com.arangodb.util.ArangoUtil;
36+
import com.arangodb.util.ArangoSerialization;
3737
import com.arangodb.velocypack.exception.VPackException;
3838
import com.arangodb.velocypack.exception.VPackParserException;
3939
import com.arangodb.velocystream.Request;
@@ -99,15 +99,15 @@ public Builder maxConnections(final Integer maxConnections) {
9999
}
100100

101101
public Communication<CompletableFuture<Response>, ConnectionAsync> build(
102-
final ArangoUtil util,
102+
final ArangoSerialization util,
103103
final CollectionCache collectionCache) {
104104
return new CommunicationAsync(hostHandler, timeout, user, password, useSsl, sslContext, util,
105105
collectionCache, chunksize, maxConnections);
106106
}
107107
}
108108

109109
private CommunicationAsync(final HostHandler hostHandler, final Integer timeout, final String user,
110-
final String password, final Boolean useSsl, final SSLContext sslContext, final ArangoUtil util,
110+
final String password, final Boolean useSsl, final SSLContext sslContext, final ArangoSerialization util,
111111
final CollectionCache collectionCache, final Integer chunksize, final Integer maxConnections) {
112112
super(timeout, user, password, useSsl, sslContext, util, collectionCache, chunksize,
113113
new ConnectionPool<ConnectionAsync>(maxConnections) {

0 commit comments

Comments
 (0)