Wrap checked exceptions when rethrowing async exception

Driver may throw checked exception without declaring it. This update fixes this behaviour.

Author: injectives

driver/src/main/java/org/neo4j/driver/exceptions/DriverExecutionException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.neo4j.driver.exceptions;
+
+/**
+ * This exception indicates a driver execution failure.
+ */
+public class DriverExecutionException extends RuntimeException {
+    public DriverExecutionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

driver/src/main/java/org/neo4j/driver/internal/util/ErrorUtil.java

@@ -18,14 +18,14 @@
  */
 package org.neo4j.driver.internal.util;
 
-import io.netty.util.internal.PlatformDependent;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
 import org.neo4j.driver.exceptions.AuthenticationException;
 import org.neo4j.driver.exceptions.AuthorizationExpiredException;
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.exceptions.DatabaseException;
+import org.neo4j.driver.exceptions.DriverExecutionException;
 import org.neo4j.driver.exceptions.FatalDiscoveryException;
 import org.neo4j.driver.exceptions.Neo4jException;
 import org.neo4j.driver.exceptions.ResultConsumedException;
@@ -115,7 +115,13 @@ public static void rethrowAsyncException(ExecutionException e) {
                 .toArray(StackTraceElement[]::new);
         error.setStackTrace(currentStackTrace);
 
-        PlatformDependent.throwException(error);
+        RuntimeException exception;
+        if (error instanceof RuntimeException) {
+            exception = (RuntimeException) error;
+        } else {
+            exception = new DriverExecutionException("Execution failed", error);
+        }
+        throw exception;
     }
 
     private static boolean isProtocolViolationError(Neo4jException error) {

driver/src/test/java/org/neo4j/driver/internal/util/ErrorUtilTest.java

@@ -24,17 +24,24 @@
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 import static org.neo4j.driver.internal.util.ErrorUtil.isFatal;
 import static org.neo4j.driver.internal.util.ErrorUtil.newConnectionTerminatedError;
 import static org.neo4j.driver.internal.util.ErrorUtil.newNeo4jError;
+import static org.neo4j.driver.internal.util.ErrorUtil.rethrowAsyncException;
 
 import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.concurrent.ExecutionException;
 import org.junit.jupiter.api.Test;
 import org.neo4j.driver.exceptions.AuthenticationException;
 import org.neo4j.driver.exceptions.AuthorizationExpiredException;
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.exceptions.DatabaseException;
+import org.neo4j.driver.exceptions.DriverExecutionException;
 import org.neo4j.driver.exceptions.Neo4jException;
 import org.neo4j.driver.exceptions.ServiceUnavailableException;
 import org.neo4j.driver.exceptions.TokenExpiredException;
@@ -195,4 +202,16 @@ void shouldMapTransientTransactionLockClientStoppedToClientException() {
         assertEquals("Neo.ClientError.Transaction.LockClientStopped", error.code());
         assertEquals(message, error.getMessage());
     }
+
+    @Test
+    void shouldWrapCheckedExceptionsInNeo4jExceptionWhenRethrowingAsyncException() {
+        ExecutionException ee = mock(ExecutionException.class);
+        UnknownHostException uhe = mock(UnknownHostException.class);
+        given(ee.getCause()).willReturn(uhe);
+        given(uhe.getStackTrace()).willReturn(new StackTraceElement[0]);
+
+        DriverExecutionException actual = assertThrows(DriverExecutionException.class, () -> rethrowAsyncException(ee));
+
+        assertEquals(actual.getCause(), uhe);
+    }
 }

driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java

@@ -44,6 +44,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import org.junit.jupiter.api.Test;
+import org.neo4j.driver.exceptions.DriverExecutionException;
 import org.neo4j.driver.internal.async.connection.EventLoopGroupFactory;
 
 class FuturesTest {
@@ -177,8 +178,8 @@ void shouldThrowInBlockingGetWhenFutureThrowsCheckedException() {
         CompletableFuture<String> future = new CompletableFuture<>();
         future.completeExceptionally(error);
 
-        Exception e = assertThrows(Exception.class, () -> Futures.blockingGet(future));
-        assertEquals(error, e);
+        DriverExecutionException e = assertThrows(DriverExecutionException.class, () -> Futures.blockingGet(future));
+        assertEquals(error, e.getCause());
     }
 
     @Test