Fix for #377 - ClassCastException when acquireHostList=true (#378)

wajda · rashtao · web-flow · commit e48ace1f92bd · 2021-03-23T10:33:51.000+01:00
* isuse #377 - use a separate (sync) HostHandler and HostResolver for the Execution used to call `/_api/cluster/endpoints` * re-enabled acquireHostList in async tests Co-authored-by: Michele Rastelli <rashtao@gmail.com>
diff --git a/src/main/java/com/arangodb/async/ArangoDBAsync.java b/src/main/java/com/arangodb/async/ArangoDBAsync.java
@@ -44,6 +44,7 @@
 import com.arangodb.internal.util.ArangoSerializerImpl;
 import com.arangodb.internal.util.DefaultArangoSerialization;
 import com.arangodb.internal.velocystream.VstCommunicationSync;
+import com.arangodb.internal.velocystream.VstConnectionFactorySync;
 import com.arangodb.model.DBCreateOptions;
 import com.arangodb.model.LogOptions;
 import com.arangodb.model.UserCreateOptions;
@@ -775,12 +776,22 @@ public synchronized ArangoDBAsync build() {
 
             final int max = maxConnections != null ? Math.max(1, maxConnections)
                     : ArangoDefaults.MAX_CONNECTIONS_VST_DEFAULT;
-            final ConnectionFactory connectionFactory = new VstConnectionFactoryAsync(host, timeout, connectionTtl,
+            final ConnectionFactory syncConnectionFactory = new VstConnectionFactorySync(host, timeout, connectionTtl,
                     keepAliveInterval, useSsl, sslContext);
-            final HostResolver hostResolver = createHostResolver(createHostList(max, connectionFactory), max,
-                    connectionFactory);
-            final HostHandler hostHandler = createHostHandler(hostResolver);
-            return new ArangoDBAsyncImpl(asyncBuilder(hostHandler), util, syncBuilder(hostHandler), hostResolver,
+            final ConnectionFactory asyncConnectionFactory = new VstConnectionFactoryAsync(host, timeout, connectionTtl,
+                    keepAliveInterval, useSsl, sslContext);
+            final HostResolver syncHostResolver = createHostResolver(createHostList(max, syncConnectionFactory), max,
+                    syncConnectionFactory);
+            final HostResolver asyncHostResolver = createHostResolver(createHostList(max, asyncConnectionFactory), max,
+                    asyncConnectionFactory);
+            final HostHandler syncHostHandler = createHostHandler(syncHostResolver);
+            final HostHandler asyncHostHandler = createHostHandler(asyncHostResolver);
+            return new ArangoDBAsyncImpl(
+                    asyncBuilder(asyncHostHandler),
+                    util,
+                    syncBuilder(syncHostHandler),
+                    asyncHostResolver,
+                    syncHostResolver,
                     new ArangoContext());
         }
 
diff --git a/src/main/java/com/arangodb/async/internal/ArangoDBAsyncImpl.java b/src/main/java/com/arangodb/async/internal/ArangoDBAsyncImpl.java
@@ -52,17 +52,24 @@ public class ArangoDBAsyncImpl extends InternalArangoDB<ArangoExecutorAsync> imp
 
     private final CommunicationProtocol cp;
 
-    public ArangoDBAsyncImpl(final VstCommunicationAsync.Builder commBuilder, final ArangoSerializationFactory util,
-                             final VstCommunicationSync.Builder syncbuilder, final HostResolver hostResolver, final ArangoContext context) {
+    public ArangoDBAsyncImpl(
+            final VstCommunicationAsync.Builder asyncCommBuilder,
+            final ArangoSerializationFactory util,
+            final VstCommunicationSync.Builder syncCommBuilder,
+            final HostResolver asyncHostResolver,
+            final HostResolver syncHostResolver,
+            final ArangoContext context
+    ) {
 
-        super(new ArangoExecutorAsync(commBuilder.build(util.get(Serializer.INTERNAL)), util, new DocumentCache()), util, context);
+        super(new ArangoExecutorAsync(asyncCommBuilder.build(util.get(Serializer.INTERNAL)), util, new DocumentCache()), util, context);
 
-        final VstCommunication<Response, VstConnectionSync> cacheCom = syncbuilder.build(util.get(Serializer.INTERNAL));
+        final VstCommunication<Response, VstConnectionSync> cacheCom = syncCommBuilder.build(util.get(Serializer.INTERNAL));
 
         cp = new VstProtocol(cacheCom);
 
         ArangoExecutorSync arangoExecutorSync = new ArangoExecutorSync(cp, util, new DocumentCache());
-        hostResolver.init(arangoExecutorSync, util.get(Serializer.INTERNAL));
+        asyncHostResolver.init(arangoExecutorSync, util.get(Serializer.INTERNAL));
+        syncHostResolver.init(arangoExecutorSync, util.get(Serializer.INTERNAL));
 
     }
 
diff --git a/src/test/java/com/arangodb/async/ArangoDBTest.java b/src/test/java/com/arangodb/async/ArangoDBTest.java
diff --git a/src/test/java/com/arangodb/async/ArangoSslTest.java b/src/test/java/com/arangodb/async/ArangoSslTest.java
@@ -68,7 +68,7 @@ public void connect() throws Exception {
         final SSLContext sc = SSLContext.getInstance("TLS");
         sc.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 
-        final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().acquireHostList(false)
+        final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder()
                 .loadProperties(ArangoSslTest.class.getResourceAsStream("/arangodb-ssl.properties")).useSsl(true)
                 .sslContext(sc).build();
         final ArangoDBVersion version = arangoDB.getVersion().get();
@@ -79,7 +79,7 @@ public void connect() throws Exception {
     @Ignore
     public void connectWithoutValidSslContext() throws Exception {
         try {
-            final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().acquireHostList(false)
+            final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder()
                     .loadProperties(ArangoSslTest.class.getResourceAsStream("/arangodb-ssl.properties")).useSsl(true)
                     .build();
             arangoDB.getVersion().get();
diff --git a/src/test/java/com/arangodb/async/BaseTest.java b/src/test/java/com/arangodb/async/BaseTest.java
@@ -40,13 +40,10 @@ public abstract class BaseTest {
     static ArangoDBAsync arangoDB;
     static ArangoDatabaseAsync db;
 
-    @ClassRule
-    public static TestRule acquireHostListRule = TestUtils.acquireHostListRule;
-
     @BeforeClass
     public static void init() throws InterruptedException, ExecutionException {
         if (arangoDB == null) {
-            arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();
+            arangoDB = new ArangoDBAsync.Builder().build();
         }
 
         if (arangoDB.db(TEST_DB).exists().get()) {
diff --git a/src/test/java/com/arangodb/async/CommunicationTest.java b/src/test/java/com/arangodb/async/CommunicationTest.java
@@ -36,7 +36,7 @@ public class CommunicationTest {
     @Test
     @Ignore
     public void disconnect() {
-        final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();
+        final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().build();
         final CompletableFuture<ArangoCursorAsync<Object>> result = arangoDB.db().query("return sleep(1)", null, null,
                 null);
         arangoDB.shutdown();
diff --git a/src/test/java/com/arangodb/async/ConcurrencyTest.java b/src/test/java/com/arangodb/async/ConcurrencyTest.java
@@ -42,7 +42,7 @@ public class ConcurrencyTest {
 
     @Before
     public void initialize() {
-        arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();
+        arangoDB = new ArangoDBAsync.Builder().build();
     }
 
     /**
diff --git a/src/test/java/com/arangodb/async/TestUtils.java b/src/test/java/com/arangodb/async/TestUtils.java
diff --git a/src/test/java/com/arangodb/async/debug/ConsolidationIntervalMsec.java b/src/test/java/com/arangodb/async/debug/ConsolidationIntervalMsec.java
@@ -48,7 +48,7 @@ public class ConsolidationIntervalMsec extends BaseTest {
     public void consolidationIntervalMsec() throws ExecutionException, InterruptedException {
         assumeTrue(isAtLeastVersion(3, 4));
 
-        ArangoDBAsync arango = new ArangoDBAsync.Builder().acquireHostList(false)
+        ArangoDBAsync arango = new ArangoDBAsync.Builder()
                 .user("root")
                 .password("test")
                 .build();
diff --git a/src/test/java/com/arangodb/async/example/ExampleBase.java b/src/test/java/com/arangodb/async/example/ExampleBase.java
@@ -41,7 +41,7 @@ public class ExampleBase {
 
     @BeforeClass
     public static void setUp() throws InterruptedException, ExecutionException {
-        arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();
+        arangoDB = new ArangoDBAsync.Builder().build();
         if (arangoDB.db(DB_NAME).exists().get()) {
             arangoDB.db(DB_NAME).drop().get();
         }
diff --git a/src/test/java/com/arangodb/async/example/graph/AQLActorsAndMoviesExample.java b/src/test/java/com/arangodb/async/example/graph/AQLActorsAndMoviesExample.java
@@ -53,7 +53,7 @@ public class AQLActorsAndMoviesExample {
 
     @BeforeClass
     public static void setUp() throws InterruptedException, ExecutionException {
-        arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();
+        arangoDB = new ArangoDBAsync.Builder().build();
         if (arangoDB.db(TEST_DB).exists().get()) {
             arangoDB.db(TEST_DB).drop().get();
         }
diff --git a/src/test/java/com/arangodb/async/example/graph/BaseGraphTest.java b/src/test/java/com/arangodb/async/example/graph/BaseGraphTest.java
@@ -46,7 +46,7 @@ public abstract class BaseGraphTest {
     @BeforeClass
     public static void init() throws InterruptedException, ExecutionException {
         if (arangoDB == null) {
-            arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();
+            arangoDB = new ArangoDBAsync.Builder().build();
         }
         if (arangoDB.db(TEST_DB).exists().get()) {
             arangoDB.db(TEST_DB).drop().get();
diff --git a/src/test/java/com/arangodb/async/example/ssl/SslExample.java b/src/test/java/com/arangodb/async/example/ssl/SslExample.java
@@ -66,7 +66,7 @@ public void connect() throws Exception {
         final SSLContext sc = SSLContext.getInstance("TLS");
         sc.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 
-        final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().acquireHostList(false)
+        final ArangoDBAsync arangoDB = new ArangoDBAsync.Builder()
                 .loadProperties(SslExample.class.getResourceAsStream("/arangodb-ssl.properties")).useSsl(true)
                 .sslContext(sc).build();
         final ArangoDBVersion version = arangoDB.getVersion().get();
diff --git a/src/test/java/com/arangodb/async/serde/CustomSerdeTest.java b/src/test/java/com/arangodb/async/serde/CustomSerdeTest.java
@@ -60,7 +60,7 @@ public void init() throws ExecutionException, InterruptedException {
             mapper.configure(WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED, true);
             mapper.configure(USE_BIG_INTEGER_FOR_INTS, true);
         });
-        ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).serializer(arangoJack).build();
+        ArangoDBAsync arangoDB = new ArangoDBAsync.Builder().serializer(arangoJack).build();
 
         String TEST_DB = "custom-serde-test";
         db = arangoDB.db(TEST_DB);

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class ConcurrencyTest {`
`42`	`42`
`43`	`43`	`@Before`
`44`	`44`	`public void initialize() {`
`45`		`- arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();`
	`45`	`+ arangoDB = new ArangoDBAsync.Builder().build();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class ExampleBase {`
`41`	`41`
`42`	`42`	`@BeforeClass`
`43`	`43`	`public static void setUp() throws InterruptedException, ExecutionException {`
`44`		`- arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();`
	`44`	`+ arangoDB = new ArangoDBAsync.Builder().build();`
`45`	`45`	`if (arangoDB.db(DB_NAME).exists().get()) {`
`46`	`46`	`arangoDB.db(DB_NAME).drop().get();`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public class AQLActorsAndMoviesExample {`
`53`	`53`
`54`	`54`	`@BeforeClass`
`55`	`55`	`public static void setUp() throws InterruptedException, ExecutionException {`
`56`		`- arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();`
	`56`	`+ arangoDB = new ArangoDBAsync.Builder().build();`
`57`	`57`	`if (arangoDB.db(TEST_DB).exists().get()) {`
`58`	`58`	`arangoDB.db(TEST_DB).drop().get();`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public abstract class BaseGraphTest {`
`46`	`46`	`@BeforeClass`
`47`	`47`	`public static void init() throws InterruptedException, ExecutionException {`
`48`	`48`	`if (arangoDB == null) {`
`49`		`- arangoDB = new ArangoDBAsync.Builder().acquireHostList(false).build();`
	`49`	`+ arangoDB = new ArangoDBAsync.Builder().build();`
`50`	`50`	`}`
`51`	`51`	`if (arangoDB.db(TEST_DB).exists().get()) {`
`52`	`52`	`arangoDB.db(TEST_DB).drop().get();`