Merge pull request #273 from zhenlineo/1.1-remove-transact

Remove transact

Author: nigelsmall

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

@@ -20,30 +20,18 @@
 package org.neo4j.driver.internal;
 
 import org.neo4j.driver.internal.security.SecurityPlan;
-import org.neo4j.driver.v1.AccessMode;
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Logging;
-import org.neo4j.driver.v1.RetryLogic;
-import org.neo4j.driver.v1.Session;
-import org.neo4j.driver.v1.Transaction;
-import org.neo4j.driver.v1.exceptions.NotCommittedException;
-import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
-import org.neo4j.driver.v1.exceptions.SessionExpiredException;
-import org.neo4j.driver.v1.util.Function;
-
-import static java.lang.String.format;
 
 abstract class BaseDriver implements Driver
 {
-    private final DriverContract contract;
     private final SecurityPlan securityPlan;
     protected final Logger log;
     private final static String DRIVER_LOG_NAME = "Driver";
 
-    BaseDriver( DriverContract contract, SecurityPlan securityPlan, Logging logging )
+    BaseDriver( SecurityPlan securityPlan, Logging logging )
     {
-        this.contract = contract;
         this.securityPlan = securityPlan;
         this.log = logging.getLog( DRIVER_LOG_NAME );
     }
@@ -53,69 +41,4 @@ public boolean isEncrypted()
     {
         return securityPlan.requiresEncryption();
     }
-
-    public <T> T transact( RetryLogic logic, AccessMode mode, Function<Transaction, T> work )
-            throws NotCommittedException, ServiceUnavailableException
-    {
-        int remaining = logic.attempts();
-        while ( remaining > 0 )
-        {
-            try ( Session session = session( mode ) )
-            {
-                boolean failed = false;
-                Transaction tx = session.beginTransaction();
-                try {
-                    T result = work.apply( tx );
-                    tx.success();
-                    return result;
-                }
-                catch ( SessionExpiredException e )
-                {
-                    failed = true;
-                    tx.failure();
-                    remaining -= 1;
-                }
-                finally
-                {
-                    if ( failed )
-                    {
-                        try
-                        {
-                            tx.close();
-                        }
-                        catch ( Exception ex )
-                        {
-                            // ignore errors if we've already failed as
-                            // we already know this connection is problematic
-                        }
-                    }
-                    else
-                    {
-                        tx.close();
-                    }
-                }
-            }
-            try
-            {
-                Thread.sleep( logic.pauseMillis() );
-            }
-            catch ( InterruptedException e )
-            {
-                throw new NotCommittedException( format( "Interrupted after %d attempts", logic.attempts() - remaining ) );
-            }
-        }
-        throw new NotCommittedException( format( "Unable to commit transaction after %d attempts", logic.attempts() ) );
-    }
-
-    @Override
-    public <T> T read( Function<Transaction, T> work ) throws NotCommittedException, ServiceUnavailableException
-    {
-        return transact( contract.retryLogic(), AccessMode.READ, work );
-    }
-
-    @Override
-    public <T> T write( Function<Transaction, T> work ) throws NotCommittedException, ServiceUnavailableException
-    {
-        return transact( contract.retryLogic(), AccessMode.WRITE, work );
-    }
 }

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

@@ -24,9 +24,6 @@
 import org.neo4j.driver.v1.AccessMode;
 import org.neo4j.driver.v1.Logging;
 import org.neo4j.driver.v1.Session;
-import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
-import org.neo4j.driver.v1.exceptions.SessionExpiredException;
-import org.neo4j.driver.v1.util.Function;
 
 import static java.lang.String.format;
 
@@ -37,12 +34,11 @@ public class DirectDriver extends BaseDriver
 
     public DirectDriver(
             BoltServerAddress address,
-            DriverContract contract,
             ConnectionPool connections,
             SecurityPlan securityPlan,
             Logging logging )
     {
-        super( contract, securityPlan, logging );
+        super( securityPlan, logging );
         this.address = address;
         this.connections = connections;
     }

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

@@ -49,13 +49,12 @@ private static SecurityPlan verifiedSecurityPlan( SecurityPlan securityPlan )
     public RoutingDriver(
             RoutingSettings settings,
             BoltServerAddress seedAddress,
-            DriverContract contract,
             ConnectionPool connections,
             SecurityPlan securityPlan,
             Clock clock,
             Logging logging )
     {
-        super( contract, verifiedSecurityPlan( securityPlan ), logging );
+        super( verifiedSecurityPlan( securityPlan ), logging );
         this.loadBalancer = new LoadBalancer( settings, clock, log, connections, seedAddress );
     }
 

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

@@ -60,9 +60,6 @@ public class Config
     /** Strategy for how to trust encryption certificate */
     private final TrustStrategy trustStrategy;
 
-    /** Policy for retrying failed operations */
-    private final RetryLogic retryLogic;
-
     private final int routingFailureLimit;
     private final long routingRetryDelayMillis;
 
@@ -77,8 +74,6 @@ private Config( ConfigBuilder builder)
         this.trustStrategy = builder.trustStrategy;
         this.routingFailureLimit = builder.routingFailureLimit;
         this.routingRetryDelayMillis = builder.routingRetryDelayMillis;
-
-        this.retryLogic = builder.retryLogic;
     }
 
     /**
@@ -135,8 +130,6 @@ public TrustStrategy trustStrategy()
         return trustStrategy;
     }
 
-    public RetryLogic retryLogic() { return  retryLogic; }
-
     /**
      * Return a {@link ConfigBuilder} instance
      * @return a {@link ConfigBuilder} instance
@@ -169,7 +162,6 @@ public static class ConfigBuilder
         private long idleTimeBeforeConnectionTest = PoolSettings.DEFAULT_IDLE_TIME_BEFORE_CONNECTION_TEST;
         private EncryptionLevel encryptionLevel = EncryptionLevel.REQUIRED;
         private TrustStrategy trustStrategy = trustAllCertificates();
-        private RetryLogic retryLogic = RetryLogic.DEFAULT_RETRY_LOGIC;
         private int routingFailureLimit = 1;
         private long routingRetryDelayMillis = 5_000;
 
@@ -339,18 +331,6 @@ public ConfigBuilder withRoutingRetryDelay( long delay, TimeUnit unit )
             return this;
         }
 
-        /**
-         * Specify policy for retrying operations that fail but can be automatically reattempted.
-         *
-         * @param retryLogic
-         * @return
-         */
-        public ConfigBuilder withRetryLogic( RetryLogic retryLogic )
-        {
-            this.retryLogic = retryLogic;
-            return this;
-        }
-
         /**
          * Create a config instance from this builder.
          * @return a {@link Config} instance

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

@@ -21,10 +21,6 @@
 
 import java.net.URI;
 
-import org.neo4j.driver.v1.exceptions.NotCommittedException;
-import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
-import org.neo4j.driver.v1.util.Function;
-
 /**
  * A Neo4j database driver, through which you can create {@link Session sessions} to run statements against the database.
  * <p>
@@ -92,13 +88,6 @@ public interface Driver extends AutoCloseable
 
     Session session(AccessMode mode);
 
-    <T> T transact( RetryLogic logic, AccessMode mode, Function<Transaction, T> work )
-            throws NotCommittedException, ServiceUnavailableException;
-
-    <T> T read( Function<Transaction, T> work ) throws NotCommittedException, ServiceUnavailableException;
-
-    <T> T write( Function<Transaction, T> work ) throws NotCommittedException, ServiceUnavailableException;
-
     /**
      * Close all the resources assigned to this driver
      */

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

@@ -24,7 +24,6 @@
 
 import org.neo4j.driver.internal.ConnectionSettings;
 import org.neo4j.driver.internal.DirectDriver;
-import org.neo4j.driver.internal.DriverContract;
 import org.neo4j.driver.internal.NetworkSession;
 import org.neo4j.driver.internal.RoutingDriver;
 import org.neo4j.driver.internal.net.BoltServerAddress;
@@ -177,9 +176,6 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
             throw new ClientException( "Unable to establish SSL parameters", ex );
         }
 
-        // Construct driver contract
-        DriverContract driverContract = new DriverContract( config.retryLogic() );
-
         // Establish pool settings
         PoolSettings poolSettings = new PoolSettings(
                 config.maxIdleConnectionPoolSize(),
@@ -191,12 +187,11 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
         switch ( scheme.toLowerCase() )
         {
         case "bolt":
-            return new DirectDriver( address, driverContract, connectionPool, securityPlan, config.logging() );
+            return new DirectDriver( address, connectionPool, securityPlan, config.logging() );
         case "bolt+routing":
             return new RoutingDriver(
                     config.routingSettings(),
                     address,
-                    driverContract,
                     connectionPool,
                     securityPlan,
                     Clock.SYSTEM,