Merge branch 1.2 into 1.3

Author: lutovich

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

@@ -28,8 +28,7 @@
 import org.neo4j.driver.internal.net.SocketConnector;
 import org.neo4j.driver.internal.net.pooling.PoolSettings;
 import org.neo4j.driver.internal.net.pooling.SocketConnectionPool;
-import org.neo4j.driver.internal.retry.ExponentialBackoff;
-import org.neo4j.driver.internal.retry.RetryDecision;
+import org.neo4j.driver.internal.retry.ExponentialBackoffRetryLogic;
 import org.neo4j.driver.internal.retry.RetryLogic;
 import org.neo4j.driver.internal.retry.RetrySettings;
 import org.neo4j.driver.internal.security.SecurityPlan;
@@ -57,7 +56,7 @@ public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings r
         BoltServerAddress address = BoltServerAddress.from( uri );
         SecurityPlan securityPlan = createSecurityPlan( address, config );
         ConnectionPool connectionPool = createConnectionPool( authToken, securityPlan, config );
-        RetryLogic<RetryDecision> retryLogic = createRetryLogic( retrySettings );
+        RetryLogic retryLogic = createRetryLogic( retrySettings, config.logging() );
 
         try
         {
@@ -80,8 +79,7 @@ public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings r
     }
 
     private Driver createDriver( BoltServerAddress address, String scheme, ConnectionPool connectionPool,
-            Config config, RoutingSettings routingSettings, SecurityPlan securityPlan,
-            RetryLogic<RetryDecision> retryLogic )
+            Config config, RoutingSettings routingSettings, SecurityPlan securityPlan, RetryLogic retryLogic )
     {
         switch ( scheme.toLowerCase() )
         {
@@ -100,7 +98,7 @@ private Driver createDriver( BoltServerAddress address, String scheme, Connectio
      * <b>This method is protected only for testing</b>
      */
     protected Driver createDirectDriver( BoltServerAddress address, ConnectionPool connectionPool, Config config,
-            SecurityPlan securityPlan, RetryLogic<RetryDecision> retryLogic )
+            SecurityPlan securityPlan, RetryLogic retryLogic )
     {
         ConnectionProvider connectionProvider = new DirectConnectionProvider( address, connectionPool );
         SessionFactory sessionFactory = createSessionFactory( connectionProvider, retryLogic, config );
@@ -113,8 +111,7 @@ protected Driver createDirectDriver( BoltServerAddress address, ConnectionPool c
      * <b>This method is protected only for testing</b>
      */
     protected Driver createRoutingDriver( BoltServerAddress address, ConnectionPool connectionPool,
-            Config config, RoutingSettings routingSettings, SecurityPlan securityPlan,
-            RetryLogic<RetryDecision> retryLogic )
+            Config config, RoutingSettings routingSettings, SecurityPlan securityPlan, RetryLogic retryLogic )
     {
         if ( !securityPlan.isRoutingCompatible() )
         {
@@ -190,19 +187,19 @@ protected Connector createConnector( ConnectionSettings connectionSettings, Secu
      * <b>This method is protected only for testing</b>
      */
     protected SessionFactory createSessionFactory( ConnectionProvider connectionProvider,
-            RetryLogic<RetryDecision> retryLogic, Config config )
+            RetryLogic retryLogic, Config config )
     {
         return new SessionFactoryImpl( connectionProvider, retryLogic, config );
     }
 
     /**
-     * Creates new {@link RetryLogic<RetryDecision>}.
+     * Creates new {@link RetryLogic >}.
      * <p>
      * <b>This method is protected only for testing</b>
      */
-    protected RetryLogic<RetryDecision> createRetryLogic( RetrySettings settings )
+    protected RetryLogic createRetryLogic( RetrySettings settings, Logging logging )
     {
-        return ExponentialBackoff.create( settings, createClock() );
+        return new ExponentialBackoffRetryLogic( settings, createClock(), logging );
     }
 
     private static SecurityPlan createSecurityPlan( BoltServerAddress address, Config config )
@@ -230,7 +227,7 @@ private static SecurityPlan createSecurityPlanImpl( BoltServerAddress address, C
 
         if ( requiresEncryption )
         {
-            Logger logger = config.logging().getLog( "session" );
+            Logger logger = config.logging().getLog( "SecurityPlan" );
             switch ( config.trustStrategy().strategy() )
             {
 

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

@@ -18,7 +18,6 @@
  */
 package org.neo4j.driver.internal;
 
-import org.neo4j.driver.internal.retry.RetryDecision;
 import org.neo4j.driver.internal.retry.RetryLogic;
 import org.neo4j.driver.internal.spi.ConnectionProvider;
 import org.neo4j.driver.v1.AccessMode;
@@ -30,8 +29,8 @@ class LeakLoggingNetworkSession extends NetworkSession
 {
     private final String stackTrace;
 
-    LeakLoggingNetworkSession( ConnectionProvider connectionProvider, AccessMode mode,
-            RetryLogic<RetryDecision> retryLogic, Logging logging )
+    LeakLoggingNetworkSession( ConnectionProvider connectionProvider, AccessMode mode, RetryLogic retryLogic,
+            Logging logging )
     {
         super( connectionProvider, mode, retryLogic, logging );
         this.stackTrace = captureStackTrace();

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

@@ -23,12 +23,12 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.neo4j.driver.internal.retry.RetryDecision;
 import org.neo4j.driver.internal.retry.RetryLogic;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.spi.ConnectionProvider;
 import org.neo4j.driver.internal.spi.PooledConnection;
 import org.neo4j.driver.internal.types.InternalTypeSystem;
+import org.neo4j.driver.internal.util.Supplier;
 import org.neo4j.driver.v1.AccessMode;
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Logging;
@@ -49,7 +49,7 @@ public class NetworkSession implements Session, SessionResourcesHandler
 {
     private final ConnectionProvider connectionProvider;
     private final AccessMode mode;
-    private final RetryLogic<RetryDecision> retryLogic;
+    private final RetryLogic retryLogic;
     protected final Logger logger;
 
     private String bookmark;
@@ -58,7 +58,7 @@ public class NetworkSession implements Session, SessionResourcesHandler
 
     private final AtomicBoolean isOpen = new AtomicBoolean( true );
 
-    public NetworkSession( ConnectionProvider connectionProvider, AccessMode mode, RetryLogic<RetryDecision> retryLogic,
+    public NetworkSession( ConnectionProvider connectionProvider, AccessMode mode, RetryLogic retryLogic,
             Logging logging )
     {
         this.connectionProvider = connectionProvider;
@@ -160,8 +160,7 @@ public void close()
                 }
                 catch ( Throwable e )
                 {
-                    // Best-effort
-                    logger.warn( "WARNING: Failed to close tx due to error: " + e.toString() );
+                    logger.warn( "Failed to close transaction", e );
                 }
             }
         }
@@ -252,46 +251,31 @@ public synchronized void onConnectionError( boolean recoverable )
         }
     }
 
-    private <T> T transaction( AccessMode mode, TransactionWork<T> work )
+    private <T> T transaction( final AccessMode mode, final TransactionWork<T> work )
     {
-        RetryDecision decision = null;
-        List<Throwable> errors = null;
-
-        while ( true )
+        return retryLogic.retry( new Supplier<T>()
         {
-            try ( Transaction tx = beginTransaction( mode ) )
-            {
-                T result;
-                try
-                {
-                    result = work.execute( tx );
-                }
-                catch ( Throwable t )
-                {
-                    // mark transaction for failure if the given unit of work threw exception
-                    // this will override any success marks that were made by the unit of work
-                    tx.failure();
-                    throw t;
-                }
-                // given unit of work completed successfully, mark transaction for commit
-                tx.success();
-                return result;
-            }
-            catch ( Throwable newError )
+            @Override
+            public T get()
             {
-                decision = retryLogic.apply( newError, decision );
-
-                if ( decision.shouldRetry() )
+                try ( Transaction tx = beginTransaction( mode ) )
                 {
-                    errors = recordError( newError, errors );
-                }
-                else
-                {
-                    addSuppressed( newError, errors );
-                    throw newError;
+                    try
+                    {
+                        T result = work.execute( tx );
+                        tx.success();
+                        return result;
+                    }
+                    catch ( Throwable t )
+                    {
+                        // mark transaction for failure if the given unit of work threw exception
+                        // this will override any success marks that were made by the unit of work
+                        tx.failure();
+                        throw t;
+                    }
                 }
             }
-        }
+        } );
     }
 
     private synchronized Transaction beginTransaction( AccessMode mode )

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

@@ -18,7 +18,6 @@
  */
 package org.neo4j.driver.internal;
 
-import org.neo4j.driver.internal.retry.RetryDecision;
 import org.neo4j.driver.internal.retry.RetryLogic;
 import org.neo4j.driver.internal.spi.ConnectionProvider;
 import org.neo4j.driver.v1.AccessMode;
@@ -29,11 +28,11 @@
 public class SessionFactoryImpl implements SessionFactory
 {
     protected final ConnectionProvider connectionProvider;
-    protected final RetryLogic<RetryDecision> retryLogic;
+    protected final RetryLogic retryLogic;
     protected final Logging logging;
     protected final boolean leakedSessionsLoggingEnabled;
 
-    SessionFactoryImpl( ConnectionProvider connectionProvider, RetryLogic<RetryDecision> retryLogic, Config config )
+    SessionFactoryImpl( ConnectionProvider connectionProvider, RetryLogic retryLogic, Config config )
     {
         this.connectionProvider = connectionProvider;
         this.leakedSessionsLoggingEnabled = config.logLeakedSessions();

driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java

@@ -43,6 +43,11 @@ public void warn( String message, Object... params )
     {
     }
 
+    @Override
+    public void warn( String message, Throwable cause )
+    {
+    }
+
     @Override
     public void debug( String message, Object... params )
     {

driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java

@@ -54,6 +54,12 @@ public void warn( String format, Object... params )
         delegate.log( Level.WARNING, String.format( format, params ) );
     }
 
+    @Override
+    public void warn( String message, Throwable cause )
+    {
+        delegate.log( Level.WARNING, message, cause );
+    }
+
     @Override
     public void debug( String format, Object... params )
     {

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

@@ -162,6 +162,6 @@ private void disposeSafely( PooledConnection connection )
 
     private static Logger createLogger( BoltServerAddress address, Logging logging )
     {
-        return logging.getLog( "connectionQueue[" + address + "]" );
+        return logging.getLog( "ConnectionQueue[" + address + "]" );
     }
 }