refactor: Fix typo in ErrorMapper.mapAndThrow method (#1643)

injectives · web-flow · commit 8d5d60143aa0 · 2025-05-09T13:52:10.000+01:00
diff --git a/driver/src/main/java/org/neo4j/driver/internal/adaptedbolt/AdaptingDriverBoltConnection.java b/driver/src/main/java/org/neo4j/driver/internal/adaptedbolt/AdaptingDriverBoltConnection.java
@@ -42,27 +42,27 @@ final class AdaptingDriverBoltConnection implements DriverBoltConnection {
     public CompletionStage<Void> writeAndFlush(DriverResponseHandler handler, List<Message> messages) {
         return connection
                 .writeAndFlush(new AdaptingDriverResponseHandler(handler, errorMapper, boltValueFactory), messages)
-                .exceptionally(errorMapper::mapAndTrow);
+                .exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
     public CompletionStage<Void> write(List<Message> messages) {
-        return connection.write(messages).exceptionally(errorMapper::mapAndTrow);
+        return connection.write(messages).exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
     public CompletionStage<Void> forceClose(String reason) {
-        return connection.forceClose(reason).exceptionally(errorMapper::mapAndTrow);
+        return connection.forceClose(reason).exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
     public CompletionStage<Void> close() {
-        return connection.close().exceptionally(errorMapper::mapAndTrow);
+        return connection.close().exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
     public CompletionStage<AuthInfo> authData() {
-        return connection.authInfo().exceptionally(errorMapper::mapAndTrow);
+        return connection.authInfo().exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
diff --git a/driver/src/main/java/org/neo4j/driver/internal/adaptedbolt/AdaptingDriverBoltConnectionProvider.java b/driver/src/main/java/org/neo4j/driver/internal/adaptedbolt/AdaptingDriverBoltConnectionProvider.java
@@ -97,7 +97,7 @@ public CompletionStage<DriverBoltConnection> connect(
                         notificationConfig,
                         databaseNameConsumer,
                         additionalParameters)
-                .exceptionally(errorMapper::mapAndTrow)
+                .exceptionally(errorMapper::mapAndThrow)
                 .thenApply(boltConnection -> new AdaptingDriverBoltConnection(
                         boltConnection,
                         routed ? new RoutedErrorMapper(boltConnection.serverAddress(), mode) : errorMapper,
@@ -114,7 +114,7 @@ public CompletionStage<Void> verifyConnectivity(SecurityPlan securityPlan, Map<S
                         connectTimeoutMillis,
                         securityPlan,
                         AuthTokens.custom(boltValueFactory.toBoltMap(authMap)))
-                .exceptionally(errorMapper::mapAndTrow);
+                .exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
@@ -127,7 +127,7 @@ public CompletionStage<Boolean> supportsMultiDb(SecurityPlan securityPlan, Map<S
                         connectTimeoutMillis,
                         securityPlan,
                         AuthTokens.custom(boltValueFactory.toBoltMap(authMap)))
-                .exceptionally(errorMapper::mapAndTrow);
+                .exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
@@ -140,11 +140,11 @@ public CompletionStage<Boolean> supportsSessionAuth(SecurityPlan securityPlan, M
                         connectTimeoutMillis,
                         securityPlan,
                         AuthTokens.custom(boltValueFactory.toBoltMap(authMap)))
-                .exceptionally(errorMapper::mapAndTrow);
+                .exceptionally(errorMapper::mapAndThrow);
     }
 
     @Override
     public CompletionStage<Void> close() {
-        return delegate.close().exceptionally(errorMapper::mapAndTrow);
+        return delegate.close().exceptionally(errorMapper::mapAndThrow);
     }
 }
diff --git a/driver/src/main/java/org/neo4j/driver/internal/adaptedbolt/ErrorMapper.java b/driver/src/main/java/org/neo4j/driver/internal/adaptedbolt/ErrorMapper.java
@@ -62,7 +62,7 @@ public static ErrorMapper getInstance() {
 
     protected ErrorMapper() {}
 
-    <T> T mapAndTrow(Throwable throwable) {
+    <T> T mapAndThrow(Throwable throwable) {
         throwable = map(throwable);
         if (throwable instanceof RuntimeException runtimeException) {
             throw runtimeException;

Original file line number	Diff line number	Diff line change
`@@ -42,27 +42,27 @@ final class AdaptingDriverBoltConnection implements DriverBoltConnection {`
`42`	`42`	`public CompletionStage<Void> writeAndFlush(DriverResponseHandler handler, List<Message> messages) {`
`43`	`43`	`return connection`
`44`	`44`	`.writeAndFlush(new AdaptingDriverResponseHandler(handler, errorMapper, boltValueFactory), messages)`
`45`		`- .exceptionally(errorMapper::mapAndTrow);`
	`45`	`+ .exceptionally(errorMapper::mapAndThrow);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`
`49`	`49`	`public CompletionStage<Void> write(List<Message> messages) {`
`50`		`- return connection.write(messages).exceptionally(errorMapper::mapAndTrow);`
	`50`	`+ return connection.write(messages).exceptionally(errorMapper::mapAndThrow);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
`54`	`54`	`public CompletionStage<Void> forceClose(String reason) {`
`55`		`- return connection.forceClose(reason).exceptionally(errorMapper::mapAndTrow);`
	`55`	`+ return connection.forceClose(reason).exceptionally(errorMapper::mapAndThrow);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`
`59`	`59`	`public CompletionStage<Void> close() {`
`60`		`- return connection.close().exceptionally(errorMapper::mapAndTrow);`
	`60`	`+ return connection.close().exceptionally(errorMapper::mapAndThrow);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`
`64`	`64`	`public CompletionStage<AuthInfo> authData() {`
`65`		`- return connection.authInfo().exceptionally(errorMapper::mapAndTrow);`
	`65`	`+ return connection.authInfo().exceptionally(errorMapper::mapAndThrow);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`