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/Neo4jException.java

@@ -23,7 +23,7 @@
  *
  * @since 1.0
  */
-public abstract class Neo4jException extends RuntimeException {
+public class Neo4jException extends RuntimeException {
     private static final long serialVersionUID = -80579062276712566L;
 
     private final String code;

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

@@ -18,7 +18,6 @@
  */
 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;
@@ -115,7 +114,13 @@ public static void rethrowAsyncException(ExecutionException e) {
                 .toArray(StackTraceElement[]::new);
         error.setStackTrace(currentStackTrace);
 
-        PlatformDependent.throwException(error);
+        RuntimeException neo4jException;
+        if (error instanceof RuntimeException) {
+            neo4jException = (RuntimeException) error;
+        } else {
+            neo4jException = new Neo4jException("Execution failed", error);
+        }
+        throw neo4jException;
     }
 
     private static boolean isProtocolViolationError(Neo4jException error) {

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

@@ -24,12 +24,18 @@
 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;
@@ -195,4 +201,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]);
+
+        Neo4jException actual = assertThrows(Neo4jException.class, () -> rethrowAsyncException(ee));
+
+        assertEquals(actual.getCause(), uhe);
+    }
 }