Merge pull request #322 from lutovich/1.2-err-handling-in-conn

Move error handling logic to the connection layer

Author: Zhen Li

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

@@ -39,7 +39,7 @@
 import static org.neo4j.driver.v1.Values.ofValue;
 import static org.neo4j.driver.v1.Values.value;
 
-class ExplicitTransaction implements Transaction
+public class ExplicitTransaction implements Transaction
 {
     private enum State
     {
@@ -71,7 +71,7 @@ private enum State
     private String bookmark = null;
     private State state = State.ACTIVE;
 
-    ExplicitTransaction( Connection conn, Runnable cleanup )
+    public ExplicitTransaction( Connection conn, Runnable cleanup )
     {
         this( conn, cleanup, null );
     }

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

@@ -18,7 +18,7 @@
  */
 package org.neo4j.driver.internal;
 
-import org.neo4j.driver.internal.spi.Connection;
+import org.neo4j.driver.internal.spi.PooledConnection;
 import org.neo4j.driver.v1.Logger;
 
 import static java.lang.System.lineSeparator;
@@ -28,7 +28,7 @@ class LeakLoggingNetworkSession extends NetworkSession
     private final Logger log;
     private final String stackTrace;
 
-    LeakLoggingNetworkSession( Connection connection, Logger log )
+    LeakLoggingNetworkSession( PooledConnection connection, Logger log )
     {
         super( connection );
         this.log = log;

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

@@ -18,7 +18,7 @@
  */
 package org.neo4j.driver.internal;
 
-import org.neo4j.driver.internal.spi.Connection;
+import org.neo4j.driver.internal.spi.PooledConnection;
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Logging;
 import org.neo4j.driver.v1.Session;
@@ -35,7 +35,7 @@ class LeakLoggingNetworkSessionFactory implements SessionFactory
     }
 
     @Override
-    public Session newInstance( Connection connection )
+    public Session newInstance( PooledConnection connection )
     {
         return new LeakLoggingNetworkSession( connection, logger );
     }

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

@@ -24,6 +24,7 @@
 
 import org.neo4j.driver.internal.logging.DevNullLogger;
 import org.neo4j.driver.internal.spi.Connection;
+import org.neo4j.driver.internal.spi.PooledConnection;
 import org.neo4j.driver.internal.types.InternalTypeSystem;
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Record;
@@ -41,7 +42,7 @@
 
 public class NetworkSession implements Session
 {
-    protected Connection connection;
+    private final PooledConnection connection;
     private final String sessionId;
     private final Logger logger;
 
@@ -67,7 +68,7 @@ public void run()
     private ExplicitTransaction currentTransaction;
     private AtomicBoolean isOpen = new AtomicBoolean( true );
 
-    NetworkSession( Connection connection )
+    public NetworkSession( PooledConnection connection )
     {
         this.connection = connection;
 

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

@@ -18,13 +18,13 @@
  */
 package org.neo4j.driver.internal;
 
-import org.neo4j.driver.internal.spi.Connection;
+import org.neo4j.driver.internal.spi.PooledConnection;
 import org.neo4j.driver.v1.Session;
 
 class NetworkSessionFactory implements SessionFactory
 {
     @Override
-    public Session newInstance( Connection connection )
+    public Session newInstance( PooledConnection connection )
     {
         return new NetworkSession( connection );
     }

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

@@ -22,8 +22,8 @@
 import org.neo4j.driver.internal.cluster.RoutingSettings;
 import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.security.SecurityPlan;
-import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.spi.ConnectionPool;
+import org.neo4j.driver.internal.spi.PooledConnection;
 import org.neo4j.driver.internal.util.Clock;
 import org.neo4j.driver.v1.AccessMode;
 import org.neo4j.driver.v1.Logging;
@@ -62,12 +62,11 @@ public RoutingDriver(
     @Override
     protected Session newSessionWithMode( AccessMode mode )
     {
-        Connection connection = acquireConnection( mode );
-        Session networkSession = sessionFactory.newInstance( connection );
-        return new RoutingNetworkSession( networkSession, mode, connection.boltServerAddress(), loadBalancer );
+        PooledConnection connection = acquireConnection( mode );
+        return sessionFactory.newInstance( connection );
     }
 
-    private Connection acquireConnection( AccessMode role )
+    private PooledConnection acquireConnection( AccessMode role )
     {
         switch ( role )
         {