Rename Session.newTransaction() to Session.beginTransaction()

Author: boggle

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

@@ -84,7 +84,7 @@ public Driver( URI url, Config config )
     /**
      * Establish a session
      * @return a session that could be used to run {@link Session#run(String) a statement} or
-     * {@link Session#newTransaction() a transaction }.
+     * {@link Session#beginTransaction() a transaction }.
      */
     public Session session()
     {

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

@@ -45,7 +45,7 @@ public interface Session extends AutoCloseable, StatementRunner
      *
      * @return a new transaction
      */
-    Transaction newTransaction();
+    Transaction beginTransaction();
 
     @Override
     void close();

driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java

@@ -107,7 +107,7 @@ public void close()
     }
 
     @Override
-    public Transaction newTransaction()
+    public Transaction beginTransaction()
     {
         ensureNoOpenTransaction();
         return currentTransaction = new StandardTransaction( connection, txCleanup );

driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java

@@ -56,7 +56,7 @@ public void shouldThrowHelpfulSyntaxError() throws Throwable
     public void shouldNotAllowMoreTxAfterClientException() throws Throwable
     {
         // Given
-        Transaction tx = session.newTransaction();
+        Transaction tx = session.beginTransaction();
 
         // And Given an error has occurred
         try { tx.run( "invalid" ); } catch ( ClientException e ) {}
@@ -87,14 +87,14 @@ public void shouldAllowNewStatementAfterRecoverableError() throws Throwable
     public void shouldAllowNewTransactionAfterRecoverableError() throws Throwable
     {
         // Given an error has occurred in a prior transaction
-        try ( Transaction tx = session.newTransaction() )
+        try ( Transaction tx = session.beginTransaction() )
         {
             tx.run( "invalid" );
         }
         catch ( ClientException e ) {}
 
         // When
-        try ( Transaction tx = session.newTransaction() )
+        try ( Transaction tx = session.beginTransaction() )
         {
             int val = tx.run( "RETURN 1" ).single().get( "1" ).javaInteger();
 

driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java

@@ -43,7 +43,7 @@ public class TransactionIT
     public void shouldRunAndCommit() throws Throwable
     {
         // When
-        try ( Transaction tx = session.newTransaction() )
+        try ( Transaction tx = session.beginTransaction() )
         {
             tx.run( "CREATE (n:FirstNode)" );
             tx.run( "CREATE (n:SecondNode)" );
@@ -60,7 +60,7 @@ public void shouldRunAndCommit() throws Throwable
     public void shouldRunAndRollbackByDefault() throws Throwable
     {
         // When
-        try ( Transaction tx = session.newTransaction() )
+        try ( Transaction tx = session.beginTransaction() )
         {
             tx.run( "CREATE (n:FirstNode)" );
             tx.run( "CREATE (n:SecondNode)" );
@@ -78,7 +78,7 @@ public void shouldRetrieveResults() throws Throwable
         session.run( "CREATE (n {name:'Steve Brook'})" );
 
         // When
-        try ( Transaction tx = session.newTransaction() )
+        try ( Transaction tx = session.beginTransaction() )
         {
             Result res = tx.run( "MATCH (n) RETURN n.name" );
 
@@ -91,7 +91,7 @@ public void shouldRetrieveResults() throws Throwable
     public void shouldNotAllowSessionLevelStatementsWhenThereIsATransaction() throws Throwable
     {
         // Given
-        session.newTransaction();
+        session.beginTransaction();
 
         // Expect
         exception.expect( ClientException.class );
@@ -104,7 +104,7 @@ public void shouldNotAllowSessionLevelStatementsWhenThereIsATransaction() throws
     public void shouldBeClosedAfterRollback() throws Throwable
     {
         // When
-        Transaction tx = session.newTransaction();
+        Transaction tx = session.beginTransaction();
         tx.close();
 
         // Then
@@ -115,7 +115,7 @@ public void shouldBeClosedAfterRollback() throws Throwable
     public void shouldBeClosedAfterCommit() throws Throwable
     {
         // When
-        Transaction tx = session.newTransaction();
+        Transaction tx = session.beginTransaction();
         tx.success();
         tx.close();
 
@@ -127,7 +127,7 @@ public void shouldBeClosedAfterCommit() throws Throwable
     public void shouldBeOpenBeforeCommit() throws Throwable
     {
         // When
-        Transaction tx = session.newTransaction();
+        Transaction tx = session.beginTransaction();
 
         // Then
         assertTrue( tx.isOpen() );

driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java

@@ -55,13 +55,13 @@ public void shouldNotAllowNewTxWhileOneIsRunning() throws Throwable
         // Given
         Connection mock = mock( Connection.class );
         StandardSession sess = new StandardSession( mock );
-        sess.newTransaction();
+        sess.beginTransaction();
 
         // Expect
         exception.expect( ClientException.class );
 
         // When
-        sess.newTransaction();
+        sess.beginTransaction();
     }
 
     @Test
@@ -70,10 +70,10 @@ public void shouldBeAbleToOpenTxAfterPreviousIsClosed() throws Throwable
         // Given
         Connection mock = mock( Connection.class );
         StandardSession sess = new StandardSession( mock );
-        sess.newTransaction().close();
+        sess.beginTransaction().close();
 
         // When
-        Transaction tx = sess.newTransaction();
+        Transaction tx = sess.beginTransaction();
 
         // Then we should've gotten a transaction object back
         assertNotNull( tx );

driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java

@@ -93,9 +93,9 @@ public void close()
     }
 
     @Override
-    public Transaction newTransaction()
+    public Transaction beginTransaction()
     {
-        return realSession.newTransaction();
+        return realSession.beginTransaction();
     }
 
     @Override