fixed VST error handling

Author: rashtao

driver/src/main/java/com/arangodb/internal/velocystream/internal/VstConnectionSync.java

@@ -25,6 +25,7 @@
 
 import javax.net.ssl.SSLContext;
 import java.util.Collection;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
@@ -46,8 +47,13 @@ public Message write(final Message message, final Collection<Chunk> chunks) {
         super.writeIntern(message, chunks);
         try {
             return timeout == null || timeout == 0L ? task.get() : task.get(timeout, TimeUnit.MILLISECONDS);
-        } catch (final Exception e) {
+        } catch (final ExecutionException e) {
+            throw ArangoDBException.wrap(e.getCause());
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new ArangoDBException(e);
+        } catch (final Exception e) {
+            throw ArangoDBException.wrap(e);
         }
     }
 

resilience-tests/src/test/java/resilience/retry/RetryTest.java

@@ -114,9 +114,14 @@ void connectionTimeout(Protocol protocol) throws IOException, InterruptedExcepti
 
 
     /**
-     * on closed pending requests of safe HTTP methods: - retry 3 times - ArangoDBMultipleException with 3 exceptions
+     * on closed pending requests of safe HTTP methods:
      * <p>
-     * once restored: - the subsequent requests should be successful
+     * - retry 3 times
+     * - ArangoDBMultipleException with 3 exceptions
+     * <p>
+     * once restored:
+     * <p>
+     * - the subsequent requests should be successful
      */
     @ParameterizedTest
     @EnumSource(Protocol.class)
@@ -164,7 +169,6 @@ void retryGetOnClosedConnection(Protocol protocol) throws IOException, Interrupt
     @ParameterizedTest
     @EnumSource(Protocol.class)
     void notRetryPostOnClosedConnection(Protocol protocol) throws IOException, InterruptedException {
-        assumeTrue(protocol != Protocol.VST);
         ArangoDB arangoDB = dbBuilder()
                 .useProtocol(protocol)
                 .build();
@@ -182,7 +186,9 @@ void notRetryPostOnClosedConnection(Protocol protocol) throws IOException, Inter
         thrown.printStackTrace();
         assertThat(thrown).isInstanceOf(ArangoDBException.class);
         assertThat(thrown.getCause()).isInstanceOf(IOException.class);
-        assertThat(thrown.getCause().getCause()).isInstanceOf(HttpClosedException.class);
+        if (protocol != Protocol.VST) {
+            assertThat(thrown.getCause().getCause()).isInstanceOf(HttpClosedException.class);
+        }
 
         toxic.remove();
         Thread.sleep(100);

resilience-tests/src/test/java/resilience/shutdown/ShutdownTest.java

@@ -48,7 +48,6 @@ void shutdownWithPendingRequests(Protocol protocol) {
         ScheduledExecutorService es = Executors.newSingleThreadScheduledExecutor();
         es.schedule(arangoDB::shutdown, 200, TimeUnit.MILLISECONDS);
         Throwable thrown = catchThrowable(() -> arangoDB.db().query("return sleep(1)", Void.class));
-        thrown.printStackTrace();
         assertThat(thrown).isInstanceOf(ArangoDBException.class);
         assertThat(thrown.getCause()).isInstanceOf(IOException.class);
         assertThat(thrown.getCause().getCause()).isInstanceOf(HttpClosedException.class);