ExplicitTransaction->UnmanagedTransaction

Author: technige

driver/src/main/java/org/neo4j/driver/Bookmark.java

@@ -29,7 +29,7 @@
  * the database is as up-to-date as the latest transaction referenced by the supplied bookmarks.
  *
  * Within a session, bookmark propagation is carried out automatically.
- * Thus all transactions in a session including explicit and implicit transactions are ensured to be carried out one after another.
+ * Thus all transactions in a session (both managed and unmanaged) are guaranteed to be carried out one after another.
  *
  * To opt out of this mechanism for unrelated units of work, applications can use multiple sessions.
  */

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

@@ -35,7 +35,7 @@
  * <code>COMMIT</code> that query within its own transaction. This type
  * of transaction is known as an <em>autocommit transaction</em>.
  * <p>
- * Explicit transactions allow multiple queries to be committed as part of
+ * Unmanaged transactions allow multiple queries to be committed as part of
  * a single atomic operation and can be rolled back if necessary. They can also
  * be used to ensure <em>causal consistency</em>, meaning that an application
  * can run a series of queries on different members of a cluster, while
@@ -64,7 +64,7 @@
 public interface Session extends Resource, QueryRunner
 {
     /**
-     * Begin a new <em>explicit {@linkplain Transaction transaction}</em>. At
+     * Begin a new <em>unmanaged {@linkplain Transaction transaction}</em>. At
      * most one transaction may exist in a session at any point in time. To
      * maintain multiple concurrent transactions, use multiple concurrent
      * sessions.
@@ -74,7 +74,7 @@ public interface Session extends Resource, QueryRunner
     Transaction beginTransaction();
 
     /**
-     * Begin a new <em>explicit {@linkplain Transaction transaction}</em> with the specified {@link TransactionConfig configuration}.
+     * Begin a new <em>unmanaged {@linkplain Transaction transaction}</em> with the specified {@link TransactionConfig configuration}.
      * At most one transaction may exist in a session at any point in time. To
      * maintain multiple concurrent transactions, use multiple concurrent
      * sessions.

driver/src/main/java/org/neo4j/driver/TransactionConfig.java

@@ -32,7 +32,7 @@
 import static org.neo4j.driver.internal.util.Preconditions.checkArgument;
 
 /**
- * Configuration object containing settings for explicit and auto-commit transactions.
+ * Configuration object containing settings for transactions.
  * Instances are immutable and can be reused for multiple transactions.
  * <p>
  * Configuration is supported for:
@@ -42,7 +42,7 @@
  * <li>transactions started by transaction functions - using {@link Session#readTransaction(TransactionWork, TransactionConfig)},
  * {@link Session#writeTransaction(TransactionWork, TransactionConfig)}, {@link AsyncSession#readTransactionAsync(AsyncTransactionWork, TransactionConfig)} and
  * {@link AsyncSession#writeTransactionAsync(AsyncTransactionWork, TransactionConfig)}</li>
- * <li>explicit transactions - using {@link Session#beginTransaction(TransactionConfig)} and {@link AsyncSession#beginTransactionAsync(TransactionConfig)}</li>
+ * <li>unmanaged transactions - using {@link Session#beginTransaction(TransactionConfig)} and {@link AsyncSession#beginTransactionAsync(TransactionConfig)}</li>
  * </ul>
  * <p>
  * Creation of configuration objects can be done using the builder API:

driver/src/main/java/org/neo4j/driver/async/AsyncSession.java

@@ -43,7 +43,7 @@
  * <code>COMMIT</code> that query within its own transaction. This type
  * of transaction is known as an <em>autocommit transaction</em>.
  * <p>
- * Explicit transactions allow multiple queries to be committed as part of
+ * Unmanaged transactions allow multiple queries to be committed as part of
  * a single atomic operation and can be rolled back if necessary. They can also
  * be used to ensure <em>causal consistency</em>, meaning that an application
  * can run a series of queries on different members of a cluster, while
@@ -72,7 +72,7 @@
 public interface AsyncSession extends AsyncQueryRunner
 {
     /**
-     * Begin a new <em>explicit {@linkplain Transaction transaction}</em>. At
+     * Begin a new <em>unmanaged {@linkplain Transaction transaction}</em>. At
      * most one transaction may exist in a session at any point in time. To
      * maintain multiple concurrent transactions, use multiple concurrent
      * sessions.
@@ -93,7 +93,7 @@ public interface AsyncSession extends AsyncQueryRunner
     CompletionStage<AsyncTransaction> beginTransactionAsync();
 
     /**
-     * Begin a new <em>explicit {@linkplain AsyncTransaction transaction}</em> with the specified {@link TransactionConfig configuration}.
+     * Begin a new <em>unmanaged {@linkplain AsyncTransaction transaction}</em> with the specified {@link TransactionConfig configuration}.
      * At most one transaction may exist in a session at any point in time.
      * To maintain multiple concurrent transactions, use multiple concurrent sessions.
      * <p>

driver/src/main/java/org/neo4j/driver/exceptions/TransactionNestingException.java

@@ -19,7 +19,7 @@
 package org.neo4j.driver.exceptions;
 
 /**
- * This exception indicates a user is nesting new transaction with an on-going transaction (explicit and/or auto-commit).
+ * This exception indicates a user is nesting new transaction with an on-going transaction (unmanaged and/or auto-commit).
  */
 public class TransactionNestingException extends ClientException
 {

driver/src/main/java/org/neo4j/driver/internal/async/UnmanagedTransaction.java

@@ -142,7 +142,7 @@ public CompletionStage<ResultCursor> runAsync(Query query, boolean waitForRunRes
     {
         ensureCanRunQueries();
         CompletionStage<AsyncResultCursor> cursorStage =
-                protocol.runInExplicitTransaction( connection, query, this, waitForRunResponse, fetchSize ).asyncResult();
+                protocol.runInUnmanagedTransaction( connection, query, this, waitForRunResponse, fetchSize ).asyncResult();
         resultCursors.add( cursorStage );
         return cursorStage.thenApply( cursor -> cursor );
     }
@@ -151,7 +151,7 @@ public CompletionStage<RxResultCursor> runRx(Query query)
     {
         ensureCanRunQueries();
         CompletionStage<RxResultCursor> cursorStage =
-                protocol.runInExplicitTransaction( connection, query, this, false, fetchSize ).rxResult();
+                protocol.runInUnmanagedTransaction( connection, query, this, false, fetchSize ).rxResult();
         resultCursors.add( cursorStage );
         return cursorStage;
     }

driver/src/main/java/org/neo4j/driver/internal/messaging/BoltProtocol.java

@@ -68,7 +68,7 @@ public interface BoltProtocol
     void prepareToCloseChannel( Channel channel );
 
     /**
-     * Begin an explicit transaction.
+     * Begin an unmanaged transaction.
      *
      * @param connection the connection to use.
      * @param bookmark the bookmarks. Never null, should be {@link InternalBookmark#empty()} when absent.
@@ -78,15 +78,15 @@ public interface BoltProtocol
     CompletionStage<Void> beginTransaction( Connection connection, Bookmark bookmark, TransactionConfig config );
 
     /**
-     * Commit the explicit transaction.
+     * Commit the unmanaged transaction.
      *
      * @param connection the connection to use.
      * @return a completion stage completed with a bookmark when transaction is committed or completed exceptionally when there was a failure.
      */
     CompletionStage<Bookmark> commitTransaction( Connection connection );
 
     /**
-     * Rollback the explicit transaction.
+     * Rollback the unmanaged transaction.
      *
      * @param connection the connection to use.
      * @return a completion stage completed when transaction is rolled back or completed exceptionally when there was a failure.
@@ -110,7 +110,7 @@ ResultCursorFactory runInAutoCommitTransaction(Connection connection, Query quer
                                                    TransactionConfig config, boolean waitForRunResponse, long fetchSize );
 
     /**
-     * Execute the given query in a running explicit transaction, i.e. {@link Transaction#run(Query)}.
+     * Execute the given query in a running unmanaged transaction, i.e. {@link Transaction#run(Query)}.
      *
      * @param connection the network connection to use.
      * @param query the cypher to execute.
@@ -121,7 +121,7 @@ ResultCursorFactory runInAutoCommitTransaction(Connection connection, Query quer
      * @param fetchSize the record fetch size for PULL message.
      * @return stage with cursor.
      */
-    ResultCursorFactory runInExplicitTransaction(Connection connection, Query query, UnmanagedTransaction tx, boolean waitForRunResponse,
+    ResultCursorFactory runInUnmanagedTransaction(Connection connection, Query query, UnmanagedTransaction tx, boolean waitForRunResponse,
                                                  long fetchSize );
 
     /**

driver/src/main/java/org/neo4j/driver/internal/messaging/request/RunWithMetadataMessage.java

@@ -53,7 +53,7 @@ public static RunWithMetadataMessage autoCommitTxRunMessage(Query query, Duratio
         return new RunWithMetadataMessage( query.text(), query.parameters().asMap( ofValue() ), metadata );
     }
 
-    public static RunWithMetadataMessage explicitTxRunMessage( Query query)
+    public static RunWithMetadataMessage unmanagedTxRunMessage(Query query)
     {
         return new RunWithMetadataMessage( query.text(), query.parameters().asMap( ofValue() ), emptyMap() );
     }

driver/src/main/java/org/neo4j/driver/internal/messaging/v1/BoltProtocolV1.java

@@ -33,6 +33,7 @@
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.internal.BookmarkHolder;
 import org.neo4j.driver.internal.DatabaseName;
+import org.neo4j.driver.internal.InternalBookmark;
 import org.neo4j.driver.internal.async.UnmanagedTransaction;
 import org.neo4j.driver.internal.cursor.AsyncResultCursorOnlyFactory;
 import org.neo4j.driver.internal.cursor.ResultCursorFactory;
@@ -168,8 +169,8 @@ public ResultCursorFactory runInAutoCommitTransaction(Connection connection, Que
     }
 
     @Override
-    public ResultCursorFactory runInExplicitTransaction(Connection connection, Query query, UnmanagedTransaction tx,
-                                                        boolean waitForRunResponse, long ignored )
+    public ResultCursorFactory runInUnmanagedTransaction(Connection connection, Query query, UnmanagedTransaction tx,
+                                                         boolean waitForRunResponse, long ignored )
     {
         return buildResultCursorFactory( connection, query, tx, waitForRunResponse );
     }

driver/src/main/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3.java

@@ -31,6 +31,7 @@
 import org.neo4j.driver.Value;
 import org.neo4j.driver.internal.BookmarkHolder;
 import org.neo4j.driver.internal.DatabaseName;
+import org.neo4j.driver.internal.InternalBookmark;
 import org.neo4j.driver.internal.async.UnmanagedTransaction;
 import org.neo4j.driver.internal.cursor.AsyncResultCursorOnlyFactory;
 import org.neo4j.driver.internal.cursor.ResultCursorFactory;
@@ -57,7 +58,7 @@
 import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.assertEmptyDatabaseName;
 import static org.neo4j.driver.internal.messaging.request.RollbackMessage.ROLLBACK;
 import static org.neo4j.driver.internal.messaging.request.RunWithMetadataMessage.autoCommitTxRunMessage;
-import static org.neo4j.driver.internal.messaging.request.RunWithMetadataMessage.explicitTxRunMessage;
+import static org.neo4j.driver.internal.messaging.request.RunWithMetadataMessage.unmanagedTxRunMessage;
 
 public class BoltProtocolV3 implements BoltProtocol
 {
@@ -147,10 +148,10 @@ public ResultCursorFactory runInAutoCommitTransaction(Connection connection, Que
     }
 
     @Override
-    public ResultCursorFactory runInExplicitTransaction(Connection connection, Query query, UnmanagedTransaction tx,
-                                                        boolean waitForRunResponse, long fetchSize )
+    public ResultCursorFactory runInUnmanagedTransaction(Connection connection, Query query, UnmanagedTransaction tx,
+                                                         boolean waitForRunResponse, long fetchSize )
     {
-        RunWithMetadataMessage runMessage = explicitTxRunMessage(query);
+        RunWithMetadataMessage runMessage = unmanagedTxRunMessage(query);
         return buildResultCursorFactory( connection, query, BookmarkHolder.NO_OP, tx, runMessage, waitForRunResponse, fetchSize );
     }