Bolt refactoring (#1560)

* Bolt refactoring

* Update driver/src/main/java/org/neo4j/driver/internal/bolt/pooledimpl/PooledBoltConnectionProvider.java

Co-authored-by: Greg Woods <42248895+gjmwoods@users.noreply.github.com>

* Updates

---------

Co-authored-by: Greg Woods <42248895+gjmwoods@users.noreply.github.com>

Author: injectives

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.util.messaging=ALL-UNNAMED</surefire.jpms.args>
+    <surefire.jpms.args>--add-opens org.neo4j.driver/org.neo4j.driver.internal.bolt.basicimpl.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>
@@ -118,6 +118,10 @@
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.tngtech.archunit</groupId>
+      <artifactId>archunit-junit5</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

driver/src/main/java/org/neo4j/driver/Config.java

@@ -37,10 +37,8 @@
 import org.neo4j.driver.async.AsyncSession;
 import org.neo4j.driver.exceptions.UnsupportedFeatureException;
 import org.neo4j.driver.internal.InternalNotificationConfig;
+import org.neo4j.driver.internal.RoutingSettings;
 import org.neo4j.driver.internal.SecuritySettings;
-import org.neo4j.driver.internal.async.pool.PoolSettings;
-import org.neo4j.driver.internal.cluster.RoutingSettings;
-import org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil;
 import org.neo4j.driver.internal.retry.ExponentialBackoffRetryLogic;
 import org.neo4j.driver.net.ServerAddressResolver;
 import org.neo4j.driver.util.Experimental;
@@ -400,10 +398,10 @@ public boolean isTelemetryDisabled() {
     public static final class ConfigBuilder {
         private Logging logging = DEV_NULL_LOGGING;
         private boolean logLeakedSessions;
-        private int maxConnectionPoolSize = PoolSettings.DEFAULT_MAX_CONNECTION_POOL_SIZE;
-        private long idleTimeBeforeConnectionTest = PoolSettings.DEFAULT_IDLE_TIME_BEFORE_CONNECTION_TEST;
-        private long maxConnectionLifetimeMillis = PoolSettings.DEFAULT_MAX_CONNECTION_LIFETIME;
-        private long connectionAcquisitionTimeoutMillis = PoolSettings.DEFAULT_CONNECTION_ACQUISITION_TIMEOUT;
+        private int maxConnectionPoolSize = 100;
+        private long idleTimeBeforeConnectionTest = -1;
+        private long maxConnectionLifetimeMillis = TimeUnit.HOURS.toMillis(1);
+        private long connectionAcquisitionTimeoutMillis = TimeUnit.SECONDS.toMillis(60);
         private String userAgent = format("neo4j-java/%s", driverVersion());
         private final SecuritySettings.SecuritySettingsBuilder securitySettingsBuilder =
                 new SecuritySettings.SecuritySettingsBuilder();
@@ -412,7 +410,7 @@ public static final class ConfigBuilder {
         private long maxTransactionRetryTimeMillis = ExponentialBackoffRetryLogic.DEFAULT_MAX_RETRY_TIME_MS;
         private ServerAddressResolver resolver;
         private MetricsAdapter metricsAdapter = MetricsAdapter.DEV_NULL;
-        private long fetchSize = FetchSizeUtil.DEFAULT_FETCH_SIZE;
+        private long fetchSize = 1000;
         private int eventLoopThreads = 0;
 
         private NotificationConfig notificationConfig = NotificationConfig.defaultConfig();
@@ -644,7 +642,11 @@ public ConfigBuilder withRoutingTablePurgeDelay(long delay, TimeUnit unit) {
          * @return this builder
          */
         public ConfigBuilder withFetchSize(long size) {
-            this.fetchSize = FetchSizeUtil.assertValidFetchSize(size);
+            if (size <= 0 && size != -1) {
+                throw new IllegalArgumentException(String.format(
+                        "The record fetch size may not be 0 or negative. Illegal record fetch size: %s.", size));
+            }
+            this.fetchSize = size;
             return this;
         }
 

driver/src/main/java/org/neo4j/driver/GraphDatabase.java

@@ -32,6 +32,7 @@
  * @since 1.0
  */
 public final class GraphDatabase {
+
     private GraphDatabase() {}
 
     /**

driver/src/main/java/org/neo4j/driver/SessionConfig.java

@@ -17,7 +17,6 @@
 package org.neo4j.driver;
 
 import static java.util.Objects.requireNonNull;
-import static org.neo4j.driver.internal.handlers.pulln.FetchSizeUtil.assertValidFetchSize;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -374,7 +373,11 @@ public Builder withDatabase(String database) {
          * @return this builder
          */
         public Builder withFetchSize(long size) {
-            this.fetchSize = assertValidFetchSize(size);
+            if (size <= 0 && size != -1) {
+                throw new IllegalArgumentException(String.format(
+                        "The record fetch size may not be 0 or negative. Illegal record fetch size: %s.", size));
+            }
+            this.fetchSize = size;
             return this;
         }
 

driver/src/main/java/org/neo4j/driver/Values.java

@@ -40,10 +40,10 @@
 import java.util.stream.Stream;
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.internal.AsValue;
-import org.neo4j.driver.internal.GqlStatusError;
 import org.neo4j.driver.internal.InternalIsoDuration;
 import org.neo4j.driver.internal.InternalPoint2D;
 import org.neo4j.driver.internal.InternalPoint3D;
+import org.neo4j.driver.internal.bolt.api.GqlStatusError;
 import org.neo4j.driver.internal.value.BooleanValue;
 import org.neo4j.driver.internal.value.BytesValue;
 import org.neo4j.driver.internal.value.DateTimeValue;

driver/src/main/java/org/neo4j/driver/exceptions/AuthTokenManagerExecutionException.java

@@ -18,7 +18,7 @@
 
 import java.io.Serial;
 import org.neo4j.driver.AuthTokenManager;
-import org.neo4j.driver.internal.GqlStatusError;
+import org.neo4j.driver.internal.bolt.api.GqlStatusError;
 
 /**
  * The {@link org.neo4j.driver.AuthTokenManager} execution has lead to an unexpected result.

driver/src/main/java/org/neo4j/driver/exceptions/AuthenticationException.java

@@ -19,7 +19,7 @@
 import java.io.Serial;
 import java.util.Map;
 import org.neo4j.driver.Value;
-import org.neo4j.driver.internal.GqlStatusError;
+import org.neo4j.driver.internal.bolt.api.GqlStatusError;
 import org.neo4j.driver.util.Preview;
 
 /**

driver/src/main/java/org/neo4j/driver/exceptions/AuthorizationExpiredException.java

@@ -19,7 +19,7 @@
 import java.io.Serial;
 import java.util.Map;
 import org.neo4j.driver.Value;
-import org.neo4j.driver.internal.GqlStatusError;
+import org.neo4j.driver.internal.bolt.api.GqlStatusError;
 import org.neo4j.driver.util.Preview;
 
 /**

driver/src/main/java/org/neo4j/driver/exceptions/ClientException.java

@@ -19,7 +19,7 @@
 import java.io.Serial;
 import java.util.Map;
 import org.neo4j.driver.Value;
-import org.neo4j.driver.internal.GqlStatusError;
+import org.neo4j.driver.internal.bolt.api.GqlStatusError;
 import org.neo4j.driver.util.Preview;
 
 /**

driver/src/main/java/org/neo4j/driver/exceptions/ConnectionReadTimeoutException.java

@@ -39,6 +39,7 @@ public class ConnectionReadTimeoutException extends ServiceUnavailableException
      * @deprecated superseded by the {@link ConnectionReadTimeoutException#INSTANCE} value
      */
     @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
     public ConnectionReadTimeoutException(String message) {
         super(message);
     }