update

Author: injectives

driver/src/main/java/org/neo4j/driver/internal/adaptedbolt/ErrorMapper.java

@@ -16,6 +16,7 @@
  */
 package org.neo4j.driver.internal.adaptedbolt;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.CompletionException;
 import javax.net.ssl.SSLHandshakeException;
@@ -25,6 +26,7 @@
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.exceptions.ConnectionReadTimeoutException;
 import org.neo4j.driver.exceptions.DatabaseException;
+import org.neo4j.driver.exceptions.DiscoveryException;
 import org.neo4j.driver.exceptions.FatalDiscoveryException;
 import org.neo4j.driver.exceptions.Neo4jException;
 import org.neo4j.driver.exceptions.ProtocolException;
@@ -40,6 +42,7 @@
 import org.neo4j.driver.internal.bolt.api.exception.BoltClientException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltConnectionAcquisitionException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltConnectionReadTimeoutException;
+import org.neo4j.driver.internal.bolt.api.exception.BoltDiscoveryException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltFailureException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltGqlErrorException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltProtocolException;
@@ -174,8 +177,24 @@ protected Throwable mapGqlCause(BoltGqlErrorException boltGqlErrorException) {
     }
 
     protected Throwable mapServiceUnavailable(BoltServiceUnavailableException boltServiceUnavailableException) {
-        return new ServiceUnavailableException(
-                boltServiceUnavailableException.getMessage(), boltServiceUnavailableException);
+        var e = Arrays.stream(boltServiceUnavailableException.getSuppressed())
+                .map(throwable -> {
+                    if (throwable instanceof BoltDiscoveryException boltDiscoveryException) {
+                        return new DiscoveryException(boltDiscoveryException.getMessage(), boltDiscoveryException);
+                    } else {
+                        return null;
+                    }
+                })
+                .toList();
+
+        if (e.isEmpty()) {
+            return new ServiceUnavailableException(
+                    boltServiceUnavailableException.getMessage(), boltServiceUnavailableException);
+        } else {
+            var ex = new ServiceUnavailableException(boltServiceUnavailableException.getMessage());
+            e.forEach(ex::addSuppressed);
+            return ex;
+        }
     }
 
     private static String extractErrorClass(String code) {

driver/src/main/java/org/neo4j/driver/internal/bolt/routedimpl/DiscoveryException.java renamed to driver/src/main/java/org/neo4j/driver/internal/bolt/api/exception/BoltDiscoveryException.java

@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.internal.bolt.routedimpl;
+package org.neo4j.driver.internal.bolt.api.exception;
 
 import java.io.Serial;
 
-public class DiscoveryException extends Exception {
+public class BoltDiscoveryException extends BoltException {
     @Serial
-    private static final long serialVersionUID = -668036174842016259L;
+    private static final long serialVersionUID = -177641311561760099L;
 
-    public DiscoveryException(String message, Throwable cause) {
+    public BoltDiscoveryException(String message, Throwable cause) {
         super(message, cause);
     }
 }

driver/src/main/java/org/neo4j/driver/internal/bolt/routedimpl/cluster/RediscoveryImpl.java

@@ -46,14 +46,14 @@
 import org.neo4j.driver.internal.bolt.api.LoggingProvider;
 import org.neo4j.driver.internal.bolt.api.ResponseHandler;
 import org.neo4j.driver.internal.bolt.api.SecurityPlan;
+import org.neo4j.driver.internal.bolt.api.exception.BoltDiscoveryException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltFailureException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltProtocolException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltServiceUnavailableException;
 import org.neo4j.driver.internal.bolt.api.exception.BoltUnsupportedFeatureException;
 import org.neo4j.driver.internal.bolt.api.exception.MinVersionAcquisitionException;
 import org.neo4j.driver.internal.bolt.api.summary.RouteSummary;
 import org.neo4j.driver.internal.bolt.routedimpl.AuthTokenManagerExecutionException;
-import org.neo4j.driver.internal.bolt.routedimpl.DiscoveryException;
 import org.neo4j.driver.internal.bolt.routedimpl.util.FutureUtil;
 
 public class RediscoveryImpl implements Rediscovery {
@@ -439,7 +439,7 @@ private ClusterComposition handleRoutingProcedureError(
         }
 
         // Retryable error happened during discovery.
-        var discoveryError = new DiscoveryException(format(RECOVERABLE_ROUTING_ERROR, routerAddress), error);
+        var discoveryError = new BoltDiscoveryException(format(RECOVERABLE_ROUTING_ERROR, routerAddress), error);
         FutureUtil.combineErrors(baseError, discoveryError); // we record each failure here
         log.log(System.Logger.Level.WARNING, RECOVERABLE_DISCOVERY_ERROR_WITH_SERVER, routerAddress);
         log.log(