Update driver version and DriverFactory

injectives · injectives · commit 83d9daff0ea1 · 2025-02-03T12:02:32.000Z
diff --git a/benchkit-backend/pom.xml b/benchkit-backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>neo4j-java-driver-parent</artifactId>
         <groupId>org.neo4j.driver</groupId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
     </parent>
 
     <artifactId>benchkit-backend</artifactId>
diff --git a/bolt-api-netty/pom.xml b/bolt-api-netty/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.neo4j.driver</groupId>
         <artifactId>neo4j-java-driver-parent</artifactId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
     </parent>
 
     <artifactId>neo4j-bolt-api-netty</artifactId>
diff --git a/bolt-api-pooled/pom.xml b/bolt-api-pooled/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.neo4j.driver</groupId>
         <artifactId>neo4j-java-driver-parent</artifactId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
     </parent>
 
     <artifactId>neo4j-bolt-api-pooled</artifactId>
diff --git a/bolt-api-routed/pom.xml b/bolt-api-routed/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.neo4j.driver</groupId>
         <artifactId>neo4j-java-driver-parent</artifactId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
     </parent>
 
     <artifactId>neo4j-bolt-api-routed</artifactId>
diff --git a/bolt-api-test-values/pom.xml b/bolt-api-test-values/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.neo4j.driver</groupId>
         <artifactId>neo4j-java-driver-parent</artifactId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
     </parent>
 
     <artifactId>neo4j-bolt-api-test-values</artifactId>
diff --git a/bolt-api/pom.xml b/bolt-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.neo4j.driver</groupId>
         <artifactId>neo4j-java-driver-parent</artifactId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
     </parent>
 
     <artifactId>neo4j-bolt-api</artifactId>
diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.neo4j.driver</groupId>
     <artifactId>neo4j-java-driver-parent</artifactId>
-    <version>5.27-SNAPSHOT</version>
+    <version>5.28-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/driver/pom.xml b/driver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.neo4j.driver</groupId>
     <artifactId>neo4j-java-driver-parent</artifactId>
-    <version>5.27-SNAPSHOT</version>
+    <version>5.28-SNAPSHOT</version>
   </parent>
 
   <artifactId>neo4j-java-driver</artifactId>
diff --git a/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java b/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java
@@ -170,7 +170,7 @@ private InternalDriver createDriver(
         try {
             var homeDatabaseCache =
                     HomeDatabaseCache.newInstance(uri.getScheme().startsWith("neo4j"));
-            boltConnectionProvider = createBoltConnectionProvider(
+            boltConnectionProvider = createDriverBoltConnectionProvider(
                     uri,
                     config,
                     eventLoopGroup,
@@ -223,7 +223,7 @@ private Function<BoltServerAddress, Set<BoltServerAddress>> createBoltServerAddr
                         .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    private DriverBoltConnectionProvider createBoltConnectionProvider(
+    private DriverBoltConnectionProvider createDriverBoltConnectionProvider(
             URI uri,
             Config config,
             EventLoopGroup eventLoopGroup,
@@ -238,6 +238,47 @@ private DriverBoltConnectionProvider createBoltConnectionProvider(
             MetricsListener metricsListener) {
         DriverBoltConnectionProvider boltConnectionProvider;
         var clock = createClock();
+        var errorMapper = ErrorMapper.getInstance();
+        return new AdaptingDriverBoltConnectionProvider(
+                createBoltConnectionProvider(
+                        uri,
+                        config,
+                        eventLoopGroup,
+                        routingSettings,
+                        rediscoverySupplier,
+                        boltConnectionListener,
+                        address,
+                        routingContext,
+                        boltAgent,
+                        userAgent,
+                        connectTimeoutMillis,
+                        metricsListener,
+                        clock),
+                errorMapper,
+                BoltValueFactory.getInstance(),
+                false,
+                address,
+                routingContext,
+                boltAgent,
+                userAgent,
+                connectTimeoutMillis);
+    }
+
+    protected BoltConnectionProvider createBoltConnectionProvider(
+            URI uri,
+            Config config,
+            EventLoopGroup eventLoopGroup,
+            RoutingSettings routingSettings,
+            Supplier<Rediscovery> rediscoverySupplier,
+            BoltConnectionListener boltConnectionListener,
+            BoltServerAddress address,
+            RoutingContext routingContext,
+            BoltAgent boltAgent,
+            String userAgent,
+            int connectTimeoutMillis,
+            MetricsListener metricsListener,
+            Clock clock) {
+        BoltConnectionProvider boltConnectionProvider;
         var loggingProvider = new BoltLoggingProvider(config.logging());
         Function<BoltServerAddress, BoltConnectionProvider> pooledBoltConnectionProviderSupplier =
                 selectedAddress -> createPooledBoltConnectionProvider(
@@ -252,42 +293,23 @@ private DriverBoltConnectionProvider createBoltConnectionProvider(
                         userAgent,
                         connectTimeoutMillis,
                         metricsListener);
-        var errorMapper = ErrorMapper.getInstance();
         if (uri.getScheme().startsWith("bolt")) {
             assertNoRoutingContext(uri, routingSettings);
-            boltConnectionProvider = new AdaptingDriverBoltConnectionProvider(
-                    pooledBoltConnectionProviderSupplier.apply(address),
-                    errorMapper,
-                    BoltValueFactory.getInstance(),
-                    false,
-                    address,
-                    routingContext,
-                    boltAgent,
-                    userAgent,
-                    connectTimeoutMillis);
+            boltConnectionProvider = pooledBoltConnectionProviderSupplier.apply(address);
         } else {
-            boltConnectionProvider = new AdaptingDriverBoltConnectionProvider(
-                    createRoutedBoltConnectionProvider(
-                            config,
-                            pooledBoltConnectionProviderSupplier,
-                            routingSettings,
-                            rediscoverySupplier,
-                            clock,
-                            loggingProvider,
-                            address,
-                            routingContext,
-                            boltAgent,
-                            userAgent,
-                            connectTimeoutMillis,
-                            metricsListener),
-                    errorMapper,
-                    BoltValueFactory.getInstance(),
-                    true,
+            boltConnectionProvider = createRoutedBoltConnectionProvider(
+                    config,
+                    pooledBoltConnectionProviderSupplier,
+                    routingSettings,
+                    rediscoverySupplier,
+                    clock,
+                    loggingProvider,
                     address,
                     routingContext,
                     boltAgent,
                     userAgent,
-                    connectTimeoutMillis);
+                    connectTimeoutMillis,
+                    metricsListener);
         }
         return boltConnectionProvider;
     }
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.neo4j.driver</groupId>
     <artifactId>neo4j-java-driver-parent</artifactId>
-    <version>5.27-SNAPSHOT</version>
+    <version>5.28-SNAPSHOT</version>
   </parent>
 
   <groupId>org.neo4j.doc.driver</groupId>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.neo4j.driver</groupId>
   <artifactId>neo4j-java-driver-parent</artifactId>
-  <version>5.27-SNAPSHOT</version>
+  <version>5.28-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>Neo4j Java Driver Project</name>
diff --git a/testkit-backend/pom.xml b/testkit-backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>neo4j-java-driver-parent</artifactId>
         <groupId>org.neo4j.driver</groupId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
     </parent>
 
     <artifactId>testkit-backend</artifactId>
diff --git a/testkit-tests/pom.xml b/testkit-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.neo4j.driver</groupId>
         <artifactId>neo4j-java-driver-parent</artifactId>
-        <version>5.27-SNAPSHOT</version>
+        <version>5.28-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
