SessionParameters->ConnectionSettings

Author: technige

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

@@ -31,15 +31,15 @@
 
 abstract class BaseDriver implements Driver
 {
-    private final SessionParameters sessionParameters;
+    private final ConnectionSettings connectionSettings;
     private final SecurityPlan securityPlan;
     protected final List<BoltServerAddress> servers = new LinkedList<>();
     protected final Logger log;
 
-    BaseDriver( BoltServerAddress address, SessionParameters sessionParameters, SecurityPlan securityPlan, Logging logging )
+    BaseDriver( BoltServerAddress address, ConnectionSettings connectionSettings, SecurityPlan securityPlan, Logging logging )
     {
         this.servers.add( address );
-        this.sessionParameters = sessionParameters;
+        this.connectionSettings = connectionSettings;
         this.securityPlan = securityPlan;
         this.log = logging.getLog( Session.LOG_NAME );
     }

…j/driver/internal/SessionParameters.java …/driver/internal/ConnectionSettings.javadriver/src/main/java/org/neo4j/driver/internal/SessionParameters.java renamed to driver/src/main/java/org/neo4j/driver/internal/ConnectionSettings.java driver/src/main/java/org/neo4j/driver/internal/SessionParameters.java renamed to driver/src/main/java/org/neo4j/driver/internal/ConnectionSettings.java

@@ -24,7 +24,11 @@
 
 import static java.lang.String.format;
 
-public class SessionParameters
+/**
+ * The connection settings are used whenever a new connection is
+ * established to a server, specifically as part of the INIT request.
+ */
+public class ConnectionSettings
 {
     public static final String DEFAULT_USER_AGENT = format( "neo4j-java/%s", driverVersion() );
 
@@ -50,13 +54,13 @@ private static String driverVersion()
     private final AuthToken authToken;
     private final String userAgent;
 
-    public SessionParameters( AuthToken authToken, String userAgent )
+    public ConnectionSettings( AuthToken authToken, String userAgent )
     {
         this.authToken = authToken;
         this.userAgent = userAgent;
     }
 
-    public SessionParameters( AuthToken authToken )
+    public ConnectionSettings( AuthToken authToken )
     {
         this( authToken, DEFAULT_USER_AGENT );
     }

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

@@ -33,11 +33,11 @@ public class DirectDriver extends BaseDriver
 {
     private final ConnectionPool connections;
 
-    public DirectDriver( BoltServerAddress address, SessionParameters sessionParameters, SecurityPlan securityPlan,
+    public DirectDriver( BoltServerAddress address, ConnectionSettings connectionSettings, SecurityPlan securityPlan,
                          PoolSettings poolSettings, Logging logging )
     {
-        super( address, sessionParameters, securityPlan, logging );
-        this.connections = new SocketConnectionPool( sessionParameters, securityPlan, poolSettings, logging );
+        super( address, connectionSettings, securityPlan, logging );
+        this.connections = new SocketConnectionPool( connectionSettings, securityPlan, poolSettings, logging );
     }
 
     @Override

driver/src/main/java/org/neo4j/driver/internal/net/pooling/SocketConnectionPool.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.neo4j.driver.internal.SessionParameters;
+import org.neo4j.driver.internal.ConnectionSettings;
 import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.net.ConcurrencyGuardingConnection;
 import org.neo4j.driver.internal.net.SocketConnection;
@@ -38,7 +38,6 @@
 import org.neo4j.driver.v1.Logging;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.exceptions.ClientException;
-import org.neo4j.driver.v1.exceptions.Neo4jException;
 
 /**
  * The pool is designed to buffer certain amount of free sessions into session pool. When closing a session, we first
@@ -62,18 +61,18 @@ public class SocketConnectionPool implements ConnectionPool
 
     private final Clock clock = Clock.SYSTEM;
 
-    private final SessionParameters sessionParameters;
+    private final ConnectionSettings connectionSettings;
     private final SecurityPlan securityPlan;
     private final PoolSettings poolSettings;
     private final Logging logging;
 
     /** Shutdown flag */
     private final AtomicBoolean stopped = new AtomicBoolean( false );
 
-    public SocketConnectionPool( SessionParameters sessionParameters, SecurityPlan securityPlan,
+    public SocketConnectionPool( ConnectionSettings connectionSettings, SecurityPlan securityPlan,
                                  PoolSettings poolSettings, Logging logging )
     {
-        this.sessionParameters = sessionParameters;
+        this.connectionSettings = connectionSettings;
         this.securityPlan = securityPlan;
         this.poolSettings = poolSettings;
         this.logging = logging;
@@ -86,7 +85,7 @@ private Connection connect( BoltServerAddress address ) throws ClientException
         // Because SocketConnection is not thread safe, wrap it in this guard
         // to ensure concurrent access leads causes application errors
         conn = new ConcurrencyGuardingConnection( conn );
-        conn.init( sessionParameters.userAgent(), tokenAsMap( sessionParameters.authToken() ) );
+        conn.init( connectionSettings.userAgent(), tokenAsMap( connectionSettings.authToken() ) );
         return conn;
     }
 

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

@@ -19,7 +19,7 @@
 package org.neo4j.driver.v1;
 
 import org.neo4j.driver.internal.DirectDriver;
-import org.neo4j.driver.internal.SessionParameters;
+import org.neo4j.driver.internal.ConnectionSettings;
 import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.net.pooling.PoolSettings;
 import org.neo4j.driver.internal.security.SecurityPlan;
@@ -138,8 +138,8 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
         BoltServerAddress address = BoltServerAddress.from( uri );
 
         // Collate session parameters
-        SessionParameters sessionParameters =
-                new SessionParameters( authToken == null ? AuthTokens.none() : authToken );
+        ConnectionSettings connectionSettings =
+                new ConnectionSettings( authToken == null ? AuthTokens.none() : authToken );
 
         // Make sure we have some configuration to play with
         if (config == null)
@@ -167,7 +167,7 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
         switch ( scheme )
         {
         case "bolt":
-            return new DirectDriver( address, sessionParameters, securityPlan, poolSettings, config.logging() );
+            return new DirectDriver( address, connectionSettings, securityPlan, poolSettings, config.logging() );
         default:
             throw new ClientException( format( "Unsupported URI scheme: %s", scheme ) );
         }