wip

Author: injectives

driver/src/main/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthChecker.java

@@ -42,13 +42,15 @@ public class NettyChannelHealthChecker implements ChannelHealthChecker, Authoriz
 {
     private final PoolSettings poolSettings;
     private final Clock clock;
+    private final Logging logging;
     private final Logger log;
     private final AtomicReference<Optional<Long>> minCreationTimestampMillisOpt;
 
     public NettyChannelHealthChecker( PoolSettings poolSettings, Clock clock, Logging logging )
     {
         this.poolSettings = poolSettings;
         this.clock = clock;
+        this.logging = logging;
         this.log = logging.getLog( getClass() );
         this.minCreationTimestampMillisOpt = new AtomicReference<>( Optional.empty() );
     }
@@ -129,7 +131,7 @@ private boolean hasBeenIdleForTooLong( Channel channel )
     private Future<Boolean> ping( Channel channel )
     {
         Promise<Boolean> result = channel.eventLoop().newPromise();
-        messageDispatcher( channel ).enqueue( new PingResponseHandler( result, channel, log ) );
+        messageDispatcher( channel ).enqueue( new PingResponseHandler( result, channel, logging ) );
         channel.writeAndFlush( ResetMessage.RESET, channel.voidPromise() );
         return result;
     }

driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerImpl.java

@@ -25,6 +25,7 @@
 import java.util.concurrent.CompletionStage;
 
 import org.neo4j.driver.Logger;
+import org.neo4j.driver.Logging;
 import org.neo4j.driver.internal.BoltServerAddress;
 import org.neo4j.driver.internal.DatabaseName;
 import org.neo4j.driver.internal.async.ConnectionContext;
@@ -45,15 +46,16 @@ public class RoutingTableHandlerImpl implements RoutingTableHandler
     private final long routingTablePurgeDelayMs;
     private final Set<BoltServerAddress> resolvedInitialRouters = new HashSet<>();
 
-    public RoutingTableHandlerImpl( RoutingTable routingTable, Rediscovery rediscovery, ConnectionPool connectionPool, RoutingTableRegistry routingTableRegistry,
-            Logger log, long routingTablePurgeDelayMs )
+    public RoutingTableHandlerImpl( RoutingTable routingTable, Rediscovery rediscovery, ConnectionPool connectionPool,
+                                    RoutingTableRegistry routingTableRegistry,
+                                    Logging logging, long routingTablePurgeDelayMs )
     {
         this.routingTable = routingTable;
         this.databaseName = routingTable.database();
         this.rediscovery = rediscovery;
         this.connectionPool = connectionPool;
         this.routingTableRegistry = routingTableRegistry;
-        this.log = log;
+        this.log = logging.getLog( getClass() );
         this.routingTablePurgeDelayMs = routingTablePurgeDelayMs;
     }
 

driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImpl.java

@@ -121,6 +121,7 @@ static class RoutingTableHandlerFactory
     {
         private final ConnectionPool connectionPool;
         private final Rediscovery rediscovery;
+        private final Logging logging;
         private final Logger log;
         private final Clock clock;
         private final long routingTablePurgeDelayMs;
@@ -130,14 +131,15 @@ static class RoutingTableHandlerFactory
             this.connectionPool = connectionPool;
             this.rediscovery = rediscovery;
             this.clock = clock;
+            this.logging = logging;
             this.log = logging.getLog( getClass() );
             this.routingTablePurgeDelayMs = routingTablePurgeDelayMs;
         }
 
         RoutingTableHandler newInstance( DatabaseName databaseName, RoutingTableRegistry allTables )
         {
             ClusterRoutingTable routingTable = new ClusterRoutingTable( databaseName, clock );
-            return new RoutingTableHandlerImpl( routingTable, rediscovery, connectionPool, allTables, log, routingTablePurgeDelayMs );
+            return new RoutingTableHandlerImpl( routingTable, rediscovery, connectionPool, allTables, logging, routingTablePurgeDelayMs );
         }
     }
 }

driver/src/main/java/org/neo4j/driver/internal/handlers/PingResponseHandler.java

@@ -23,21 +23,22 @@
 
 import java.util.Map;
 
-import org.neo4j.driver.internal.spi.ResponseHandler;
 import org.neo4j.driver.Logger;
+import org.neo4j.driver.Logging;
 import org.neo4j.driver.Value;
+import org.neo4j.driver.internal.spi.ResponseHandler;
 
 public class PingResponseHandler implements ResponseHandler
 {
     private final Promise<Boolean> result;
     private final Channel channel;
     private final Logger log;
 
-    public PingResponseHandler( Promise<Boolean> result, Channel channel, Logger log )
+    public PingResponseHandler( Promise<Boolean> result, Channel channel, Logging logging )
     {
         this.result = result;
         this.channel = channel;
-        this.log = log;
+        this.log = logging.getLog( getClass() );
     }
 
     @Override

driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java

@@ -59,7 +59,7 @@
 import static org.neo4j.driver.internal.async.ImmutableConnectionContext.simple;
 import static org.neo4j.driver.internal.cluster.RediscoveryUtil.contextWithMode;
 import static org.neo4j.driver.internal.cluster.RoutingSettings.STALE_ROUTING_TABLE_PURGE_DELAY_MS;
-import static org.neo4j.driver.internal.logging.DevNullLogger.DEV_NULL_LOGGER;
+import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
 import static org.neo4j.driver.internal.util.ClusterCompositionUtil.A;
 import static org.neo4j.driver.internal.util.ClusterCompositionUtil.B;
 import static org.neo4j.driver.internal.util.ClusterCompositionUtil.C;
@@ -308,13 +308,14 @@ private static ConnectionPool newConnectionPoolMockWithFailures(
 
     private static RoutingTableHandler newRoutingTableHandler( RoutingTable routingTable, Rediscovery rediscovery, ConnectionPool connectionPool )
     {
-        return new RoutingTableHandlerImpl( routingTable, rediscovery, connectionPool, newRoutingTableRegistryMock(), DEV_NULL_LOGGER,
-                STALE_ROUTING_TABLE_PURGE_DELAY_MS );
+        return new RoutingTableHandlerImpl( routingTable, rediscovery, connectionPool, newRoutingTableRegistryMock(), DEV_NULL_LOGGING,
+                                            STALE_ROUTING_TABLE_PURGE_DELAY_MS );
     }
 
     private static RoutingTableHandler newRoutingTableHandler( RoutingTable routingTable, Rediscovery rediscovery, ConnectionPool connectionPool,
             RoutingTableRegistry routingTableRegistry )
     {
-        return new RoutingTableHandlerImpl( routingTable, rediscovery, connectionPool, routingTableRegistry, DEV_NULL_LOGGER, STALE_ROUTING_TABLE_PURGE_DELAY_MS );
+        return new RoutingTableHandlerImpl( routingTable, rediscovery, connectionPool, routingTableRegistry, DEV_NULL_LOGGING,
+                                            STALE_ROUTING_TABLE_PURGE_DELAY_MS );
     }
 }

driver/src/test/java/org/neo4j/driver/internal/handlers/PingResponseHandlerTest.java

@@ -30,7 +30,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.neo4j.driver.internal.logging.DevNullLogger.DEV_NULL_LOGGER;
+import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
 
 class PingResponseHandlerTest
 {
@@ -73,6 +73,6 @@ private static Promise<Boolean> newPromise()
 
     private static PingResponseHandler newHandler( Promise<Boolean> result )
     {
-        return new PingResponseHandler( result, mock( Channel.class ), DEV_NULL_LOGGER );
+        return new PingResponseHandler( result, mock( Channel.class ), DEV_NULL_LOGGING );
     }
 }