Revert "Deprecate .commit(), .rollback() or .close() managed transactions (#890)"

This reverts commit ed365bd.

Author: bigmontz

packages/core/src/index.ts

@@ -71,7 +71,6 @@ import ConnectionProvider from './connection-provider'
 import Connection from './connection'
 import Transaction from './transaction'
 import TransactionPromise from './transaction-promise'
-import ManagedTransaction from './transaction-managed'
 import Session, { TransactionConfig } from './session'
 import Driver, * as driver from './driver'
 import auth from './auth'
@@ -139,7 +138,6 @@ const forExport = {
   Result,
   Transaction,
   TransactionPromise,
-  ManagedTransaction,
   Session,
   Driver,
   Connection,
@@ -199,7 +197,6 @@ export {
   Connection,
   Transaction,
   TransactionPromise,
-  ManagedTransaction,
   Session,
   Driver,
   types,

packages/core/src/session.ts

@@ -32,10 +32,9 @@ import { Query, SessionMode } from './types'
 import Connection from './connection'
 import { NumberOrInteger } from './graph-types'
 import TransactionPromise from './transaction-promise'
-import ManagedTransaction from './transaction-managed'
 
 type ConnectionConsumer = (connection: Connection | void) => any | undefined
-type TransactionWork<T> = (tx: ManagedTransaction) => Promise<T> | T
+type TransactionWork<T> = (tx: Transaction) => Promise<T> | T
 
 interface TransactionConfig {
   timeout?: NumberOrInteger
@@ -337,7 +336,7 @@ class Session {
    * delay of 1 second and maximum retry time of 30 seconds. Maximum retry time is configurable via driver config's
    * `maxTransactionRetryTime` property in milliseconds.
    *
-   * @param {function(tx: ManagedTransaction): Promise} transactionWork - Callback that executes operations against
+   * @param {function(tx: Transaction): Promise} transactionWork - Callback that executes operations against
    * a given {@link Transaction}.
    * @param {TransactionConfig} [transactionConfig] - Configuration for all transactions started to execute the unit of work.
    * @return {Promise} Resolved promise as returned by the given function or rejected promise when given
@@ -359,7 +358,7 @@ class Session {
    * delay of 1 second and maximum retry time of 30 seconds. Maximum retry time is configurable via driver config's
    * `maxTransactionRetryTime` property in milliseconds.
    *
-   * @param {function(tx: ManagedTransaction): Promise} transactionWork - Callback that executes operations against
+   * @param {function(tx: Transaction): Promise} transactionWork - Callback that executes operations against
    * a given {@link Transaction}.
    * @param {TransactionConfig} [transactionConfig] - Configuration for all transactions started to execute the unit of work.
    * @return {Promise} Resolved promise as returned by the given function or rejected promise when given

packages/core/src/transaction-managed.ts

@@ -170,7 +170,6 @@ class TransactionPromise extends Transaction implements Promise<Transaction>{
 
   /**
    * @access private
-   * @returns {void}
    */
   private _onBeginError(error: Error): void {
     this._beginError = error;
@@ -181,7 +180,6 @@ class TransactionPromise extends Transaction implements Promise<Transaction>{
 
   /**
    * @access private
-   * @returns {void}
    */
   private _onBeginMetadata(metadata: any): void {
     this._beginMetadata = metadata || {};

packages/core/src/transaction-promise.ts

@@ -21,12 +21,10 @@ import { ConnectionProvider, newError, Transaction, TransactionPromise } from ".
 import { Bookmarks } from "../src/internal/bookmarks";
 import { ConnectionHolder } from "../src/internal/connection-holder";
 import { TxConfig } from "../src/internal/tx-config";
-import ManagedTransaction from "../src/transaction-managed";
 import FakeConnection from "./utils/connection.fake";
 
 
 testTx('Transaction', newRegularTransaction)
-testTx('ManagedTransaction', newManagedTransaction)
 
 testTx('TransactionPromise', newTransactionPromise, () => {
   describe('Promise', () => {
@@ -500,39 +498,6 @@ function newRegularTransaction({
   return transaction
 }
 
-function newManagedTransaction({
-  connection,
-  fetchSize = 1000,
-  highRecordWatermark = 700,
-  lowRecordWatermark = 300
-}: {
-  connection: FakeConnection
-  fetchSize?: number
-  highRecordWatermark?: number,
-  lowRecordWatermark?: number
-}): ManagedTransaction {
-  const connectionProvider = new ConnectionProvider()
-  connectionProvider.acquireConnection = () => Promise.resolve(connection)
-  connectionProvider.close = () => Promise.resolve()
-
-  const connectionHolder = new ConnectionHolder({ connectionProvider })
-  connectionHolder.initializeConnection()
-
-  const transaction = new ManagedTransaction({
-    connectionHolder,
-    onClose: () => { },
-    onBookmarks: (_: Bookmarks) => { },
-    onConnection: () => { },
-    reactive: false,
-    fetchSize,
-    impersonatedUser: "",
-    highRecordWatermark,
-    lowRecordWatermark
-  })
-
-  return transaction
-}
-
 function newFakeConnection(): FakeConnection {
   return new FakeConnection()
 }

packages/core/test/transaction.test.ts

@@ -64,7 +64,6 @@ import {
   Session,
   Transaction,
   TransactionPromise,
-  ManagedTransaction,
   ServerInfo,
   Connection,
   driver as coreDriver,
@@ -430,7 +429,6 @@ const forExport = {
   Session,
   Transaction,
   TransactionPromise,
-  ManagedTransaction,
   Point,
   Duration,
   LocalTime,
@@ -481,7 +479,6 @@ export {
   Session,
   Transaction,
   TransactionPromise,
-  ManagedTransaction,
   Point,
   Duration,
   LocalTime,

packages/neo4j-driver-lite/src/index.ts

@@ -21,7 +21,6 @@ import { flatMap, catchError, concat } from 'rxjs/operators'
 import RxResult from './result-rx'
 import { Session, internal } from 'neo4j-driver-core'
 import RxTransaction from './transaction-rx'
-import RxManagedTransaction from './transaction-managed-rx'
 import RxRetryLogic from './internal/retry-logic-rx'
 
 const {
@@ -85,7 +84,7 @@ export default class RxSession {
    * Executes the provided unit of work in a {@link READ} reactive transaction which is created with the provided
    * transaction configuration.
    * @public
-   * @param {function(txc: RxManagedTransaction): Observable} work - A unit of work to be executed.
+   * @param {function(txc: RxTransaction): Observable} work - A unit of work to be executed.
    * @param {TransactionConfig} transactionConfig - Configuration for the enclosing transaction created by the driver.
    * @returns {Observable} - A reactive stream returned by the unit of work.
    */
@@ -97,7 +96,7 @@ export default class RxSession {
    * Executes the provided unit of work in a {@link WRITE} reactive transaction which is created with the provided
    * transaction configuration.
    * @public
-   * @param {function(txc: RxManagedTransaction): Observable} work - A unit of work to be executed.
+   * @param {function(txc: RxTransaction): Observable} work - A unit of work to be executed.
    * @param {TransactionConfig} transactionConfig - Configuration for the enclosing transaction created by the driver.
    * @returns {Observable} - A reactive stream returned by the unit of work.
    */