Update

Author: injectives

benchkit-backend/pom.xml

@@ -27,30 +27,6 @@
             <artifactId>neo4j-java-driver</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.neo4j.driver</groupId>
-            <artifactId>neo4j-bolt-api</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.neo4j.driver</groupId>
-            <artifactId>neo4j-bolt-api-netty</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.neo4j.driver</groupId>
-            <artifactId>neo4j-bolt-api-pooled</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.neo4j.driver</groupId>
-            <artifactId>neo4j-bolt-api-routed</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>

bundle/pom.xml

@@ -82,7 +82,7 @@
           <configuration>
             <instructions combine.children="append">
               <_removeheaders>Bnd-*,Private-Package,Bundle-ClassPath,Embed-Dependency,Embed-Transitive,Embedded-Artifacts,Include-Resource</_removeheaders>
-              <Embed-Dependency>neo4j-bolt-api-netty,netty-handler,netty-tcnative-classes,reactor-core</Embed-Dependency>
+              <Embed-Dependency>neo4j-bolt-connection-netty,netty-handler,netty-tcnative-classes,reactor-core</Embed-Dependency>
             </instructions>
           </configuration>
         </plugin>
@@ -203,28 +203,8 @@
               </artifactSet>
               <relocations>
                 <relocation>
-                  <pattern>org.neo4j.driver.internal.bolt.api</pattern>
-                  <shadedPattern>org.neo4j.driver.internal.bolt.api</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.neo4j.driver.internal.bolt.basicimpl.impl</pattern>
-                  <shadedPattern>org.neo4j.driver.internal.bolt.basicimpl</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.neo4j.driver.internal.bolt.basicimpl.BootstrapFactory</pattern>
-                  <shadedPattern>org.neo4j.driver.internal.bolt.basicimpl.BootstrapFactory</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.neo4j.driver.internal.bolt.basicimpl.NettyBoltConnectionProvider</pattern>
-                  <shadedPattern>org.neo4j.driver.internal.bolt.basicimpl.NettyBoltConnectionProvider</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.neo4j.driver.internal.bolt.pooledimpl</pattern>
-                  <shadedPattern>org.neo4j.driver.internal.bolt.pooledimpl</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.neo4j.driver.internal.bolt.routedimpl</pattern>
-                  <shadedPattern>org.neo4j.driver.internal.bolt.routedimpl</shadedPattern>
+                  <pattern>org.neo4j.bolt.connection</pattern>
+                  <shadedPattern>org.neo4j.driver.internal.shaded.bolt.connection</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>io.netty</pattern>

bundle/src/main/jpms/module-info.java

@@ -28,11 +28,12 @@
     exports org.neo4j.driver.net;
     exports org.neo4j.driver.util;
     exports org.neo4j.driver.exceptions;
+    exports org.neo4j.driver.exceptions.value;
 
     requires transitive java.logging;
     requires transitive org.reactivestreams;
     requires static micrometer.core;
-    requires static org.graalvm.sdk;
+    requires static org.graalvm.nativeimage;
     requires static org.slf4j;
     requires static java.management;
     requires static reactor.blockhound;

driver/pom.xml

@@ -20,7 +20,7 @@
     <rootDir>${project.basedir}/..</rootDir>
     <api.classes.directory>${basedir}/target/classes-without-jpms</api.classes.directory>
     <maven.compiler.xlint.extras>,-try</maven.compiler.xlint.extras>
-    <surefire.jpms.args>--add-opens org.neo4j.driver/org.neo4j.driver.internal.bolt.basicimpl.impl.util.messaging=ALL-UNNAMED</surefire.jpms.args>
+    <surefire.jpms.args>--add-opens org.neo4j.driver/org.neo4j.bolt.connection.netty.impl.util.messaging=ALL-UNNAMED</surefire.jpms.args>
     <failsafe.parallelizable.jpms.args>--add-opens org.neo4j.driver/org.neo4j.driver.internal.util=ALL-UNNAMED --add-opens org.neo4j.driver/org.neo4j.driver.internal.async=ALL-UNNAMED</failsafe.parallelizable.jpms.args>
     <blockhound.tag>blockHoundTest</blockhound.tag>
     <maven.deploy.skip>false</maven.deploy.skip>

driver/src/main/java/module-info.java

@@ -30,10 +30,10 @@
     exports org.neo4j.driver.exceptions;
     exports org.neo4j.driver.exceptions.value;
 
-    requires org.neo4j.bolt.api;
-    requires org.neo4j.bolt.netty;
-    requires org.neo4j.bolt.pooled;
-    requires org.neo4j.bolt.routed;
+    requires org.neo4j.bolt.connection;
+    requires org.neo4j.bolt.connection.netty;
+    requires org.neo4j.bolt.connection.pooled;
+    requires org.neo4j.bolt.connection.routed;
     requires reactor.core;
     requires io.netty.common;
     requires transitive java.logging;

driver/src/main/java/org/neo4j/driver/internal/BoltLoggingProvider.java

@@ -16,8 +16,8 @@
  */
 package org.neo4j.driver.internal;
 
+import org.neo4j.bolt.connection.LoggingProvider;
 import org.neo4j.driver.Logging;
-import org.neo4j.driver.internal.bolt.api.LoggingProvider;
 
 public class BoltLoggingProvider implements LoggingProvider {
     private final Logging logging;

driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java

@@ -33,6 +33,19 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import org.neo4j.bolt.connection.BoltAgent;
+import org.neo4j.bolt.connection.BoltConnectionProvider;
+import org.neo4j.bolt.connection.BoltServerAddress;
+import org.neo4j.bolt.connection.DefaultDomainNameResolver;
+import org.neo4j.bolt.connection.DomainNameResolver;
+import org.neo4j.bolt.connection.LoggingProvider;
+import org.neo4j.bolt.connection.MetricsListener;
+import org.neo4j.bolt.connection.RoutingContext;
+import org.neo4j.bolt.connection.netty.BootstrapFactory;
+import org.neo4j.bolt.connection.netty.NettyBoltConnectionProvider;
+import org.neo4j.bolt.connection.pooled.PooledBoltConnectionProvider;
+import org.neo4j.bolt.connection.routed.Rediscovery;
+import org.neo4j.bolt.connection.routed.RoutedBoltConnectionProvider;
 import org.neo4j.driver.AuthTokenManager;
 import org.neo4j.driver.ClientCertificateManager;
 import org.neo4j.driver.Config;
@@ -42,19 +55,6 @@
 import org.neo4j.driver.internal.adaptedbolt.AdaptingDriverBoltConnectionProvider;
 import org.neo4j.driver.internal.adaptedbolt.DriverBoltConnectionProvider;
 import org.neo4j.driver.internal.adaptedbolt.ErrorMapper;
-import org.neo4j.driver.internal.bolt.api.BoltAgent;
-import org.neo4j.driver.internal.bolt.api.BoltConnectionProvider;
-import org.neo4j.driver.internal.bolt.api.BoltServerAddress;
-import org.neo4j.driver.internal.bolt.api.DefaultDomainNameResolver;
-import org.neo4j.driver.internal.bolt.api.DomainNameResolver;
-import org.neo4j.driver.internal.bolt.api.LoggingProvider;
-import org.neo4j.driver.internal.bolt.api.MetricsListener;
-import org.neo4j.driver.internal.bolt.api.RoutingContext;
-import org.neo4j.driver.internal.bolt.basicimpl.BootstrapFactory;
-import org.neo4j.driver.internal.bolt.basicimpl.NettyBoltConnectionProvider;
-import org.neo4j.driver.internal.bolt.pooledimpl.PooledBoltConnectionProvider;
-import org.neo4j.driver.internal.bolt.routedimpl.Rediscovery;
-import org.neo4j.driver.internal.bolt.routedimpl.RoutedBoltConnectionProvider;
 import org.neo4j.driver.internal.boltlistener.BoltConnectionListener;
 import org.neo4j.driver.internal.homedb.HomeDatabaseCache;
 import org.neo4j.driver.internal.metrics.DevNullMetricsProvider;

driver/src/main/java/org/neo4j/driver/internal/InternalExecutableQuery.java

@@ -20,6 +20,7 @@
 
 import java.util.Map;
 import java.util.stream.Collector;
+import org.neo4j.bolt.connection.TelemetryApi;
 import org.neo4j.driver.AccessMode;
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.Driver;
@@ -32,7 +33,6 @@
 import org.neo4j.driver.SessionConfig;
 import org.neo4j.driver.TransactionCallback;
 import org.neo4j.driver.TransactionConfig;
-import org.neo4j.driver.internal.bolt.api.TelemetryApi;
 
 public class InternalExecutableQuery implements ExecutableQuery {
     private final Driver driver;

driver/src/main/java/org/neo4j/driver/internal/InternalIsoDuration.java

@@ -30,7 +30,7 @@
 import java.util.Objects;
 import org.neo4j.driver.types.IsoDuration;
 
-public class InternalIsoDuration implements IsoDuration, org.neo4j.driver.internal.bolt.api.values.IsoDuration {
+public class InternalIsoDuration implements IsoDuration, org.neo4j.bolt.connection.values.IsoDuration {
     private static final long NANOS_PER_SECOND = 1_000_000_000;
     private static final List<TemporalUnit> SUPPORTED_UNITS = List.of(MONTHS, DAYS, SECONDS, NANOS);
 

driver/src/main/java/org/neo4j/driver/internal/InternalNode.java

@@ -26,7 +26,7 @@
 /**
  * {@link Node} implementation that directly contains labels and properties.
  */
-public class InternalNode extends InternalEntity implements Node, org.neo4j.driver.internal.bolt.api.values.Node {
+public class InternalNode extends InternalEntity implements Node, org.neo4j.bolt.connection.values.Node {
     private final Collection<String> labels;
 
     public InternalNode(long id) {