Retire DatabaseTransactionManager. (#2385)

node/src/main/kotlin/net/corda/node/services/persistence/NodeAttachmentService.kt

@@ -17,7 +17,6 @@ import net.corda.core.node.services.vault.AttachmentSort
 import net.corda.core.serialization.*
 import net.corda.core.utilities.contextLogger
 import net.corda.node.services.vault.HibernateAttachmentQueryCriteriaParser
-import net.corda.nodeapi.internal.persistence.DatabaseTransactionManager
 import net.corda.nodeapi.internal.persistence.NODE_DATABASE_PREFIX
 import net.corda.nodeapi.internal.persistence.currentDBSession
 import java.io.*
@@ -242,8 +241,7 @@ class NodeAttachmentService(metrics: MetricRegistry) : AttachmentStorage, Single
 
     override fun queryAttachments(criteria: AttachmentQueryCriteria, sorting: AttachmentSort?): List<AttachmentId> {
         log.info("Attachment query criteria: $criteria, sorting: $sorting")
-
-        val session = DatabaseTransactionManager.current().session
+        val session = currentDBSession()
         val criteriaBuilder = session.criteriaBuilder
 
         val criteriaQuery = criteriaBuilder.createQuery(DBAttachment::class.java)

node/src/main/kotlin/net/corda/node/services/schema/HibernateObserver.kt

@@ -10,8 +10,8 @@ import net.corda.core.schemas.PersistentStateRef
 import net.corda.core.utilities.contextLogger
 import net.corda.core.utilities.debug
 import net.corda.node.services.api.SchemaService
-import net.corda.nodeapi.internal.persistence.DatabaseTransactionManager
 import net.corda.nodeapi.internal.persistence.HibernateConfiguration
+import net.corda.nodeapi.internal.persistence.contextTransaction
 import org.hibernate.FlushMode
 import rx.Observable
 
@@ -54,7 +54,7 @@ class HibernateObserver private constructor(private val config: HibernateConfigu
     internal fun persistStatesWithSchema(statesAndRefs: List<ContractStateAndRef>, schema: MappedSchema) {
         val sessionFactory = config.sessionFactoryForSchemas(setOf(schema))
         val session = sessionFactory.withOptions().
-                connection(DatabaseTransactionManager.current().connection).
+                connection(contextTransaction.connection).
                 flushMode(FlushMode.MANUAL).
                 openSession()
         session.use { thisSession ->

node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt

@@ -27,7 +27,8 @@ import net.corda.node.services.logging.pushToLoggingContext
 import net.corda.node.services.statemachine.FlowSessionState.Initiating
 import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.persistence.DatabaseTransaction
-import net.corda.nodeapi.internal.persistence.DatabaseTransactionManager
+import net.corda.nodeapi.internal.persistence.contextTransaction
+import net.corda.nodeapi.internal.persistence.contextTransactionOrNull
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.nio.file.Paths
@@ -122,7 +123,7 @@ class FlowStateMachineImpl<R>(override val id: StateMachineRunId,
     private fun createTransaction() {
         // Make sure we have a database transaction
         database.createTransaction()
-        logger.trace { "Starting database transaction ${DatabaseTransactionManager.currentOrNull()} on ${Strand.currentStrand()}" }
+        logger.trace { "Starting database transaction $contextTransactionOrNull on ${Strand.currentStrand()}" }
     }
 
     private fun processException(exception: Throwable, propagated: Boolean) {
@@ -132,7 +133,7 @@ class FlowStateMachineImpl<R>(override val id: StateMachineRunId,
     }
 
     internal fun commitTransaction() {
-        val transaction = DatabaseTransactionManager.current()
+        val transaction = contextTransaction
         try {
             logger.trace { "Committing database transaction $transaction on ${Strand.currentStrand()}." }
             transaction.commit()
@@ -468,7 +469,8 @@ class FlowStateMachineImpl<R>(override val id: StateMachineRunId,
     private fun suspend(ioRequest: FlowIORequest) {
         // We have to pass the thread local database transaction across via a transient field as the fiber park
         // swaps them out.
-        txTrampoline = DatabaseTransactionManager.setThreadLocalTx(null)
+        txTrampoline = contextTransactionOrNull
+        contextTransactionOrNull = null
         if (ioRequest is WaitingRequest)
             waitingForResponse = ioRequest
 
@@ -477,7 +479,7 @@ class FlowStateMachineImpl<R>(override val id: StateMachineRunId,
             logger.trace { "Suspended on $ioRequest" }
             // restore the Tx onto the ThreadLocal so that we can commit the ensuing checkpoint to the DB
             try {
-                DatabaseTransactionManager.setThreadLocalTx(txTrampoline)
+                contextTransactionOrNull = txTrampoline
                 txTrampoline = null
                 actionOnSuspend(ioRequest)
             } catch (t: Throwable) {

node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt

@@ -17,12 +17,8 @@ import net.corda.core.transactions.NotaryChangeWireTransaction
 import net.corda.core.transactions.WireTransaction
 import net.corda.core.utilities.*
 import net.corda.node.services.api.VaultServiceInternal
-import net.corda.nodeapi.internal.persistence.HibernateConfiguration
 import net.corda.node.services.statemachine.FlowStateMachineImpl
-import net.corda.nodeapi.internal.persistence.DatabaseTransactionManager
-import net.corda.nodeapi.internal.persistence.bufferUntilDatabaseCommit
-import net.corda.nodeapi.internal.persistence.currentDBSession
-import net.corda.nodeapi.internal.persistence.wrapWithDatabaseTransaction
+import net.corda.nodeapi.internal.persistence.*
 import org.hibernate.Session
 import rx.Observable
 import rx.subjects.PublishSubject
@@ -479,8 +475,7 @@ class NodeVaultService(
         }
     }
 
-    private fun getSession() = DatabaseTransactionManager.currentOrNew().session
-
+    private fun getSession() = contextDatabase.currentOrNew().session
     /**
      * Derive list from existing vault states and then incrementally update using vault observables
      */

node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt

@@ -14,7 +14,6 @@ import net.corda.core.schemas.QueryableState
 import net.corda.node.services.api.SchemaService
 import net.corda.node.internal.configureDatabase
 import net.corda.nodeapi.internal.persistence.DatabaseConfig
-import net.corda.nodeapi.internal.persistence.DatabaseTransactionManager
 import net.corda.testing.internal.LogHelper
 import net.corda.testing.TestIdentity
 import net.corda.testing.contracts.DummyContract
@@ -71,11 +70,11 @@ class HibernateObserverTests {
         database.transaction {
             val MEGA_CORP = TestIdentity(CordaX500Name("MegaCorp", "London", "GB")).party
             rawUpdatesPublisher.onNext(Vault.Update(emptySet(), setOf(StateAndRef(TransactionState(TestState(), DummyContract.PROGRAM_ID, MEGA_CORP), StateRef(SecureHash.sha256("dummy"), 0)))))
-            val parentRowCountResult = DatabaseTransactionManager.current().connection.prepareStatement("select count(*) from Parents").executeQuery()
+            val parentRowCountResult = connection.prepareStatement("select count(*) from Parents").executeQuery()
             parentRowCountResult.next()
             val parentRows = parentRowCountResult.getInt(1)
             parentRowCountResult.close()
-            val childrenRowCountResult = DatabaseTransactionManager.current().connection.prepareStatement("select count(*) from Children").executeQuery()
+            val childrenRowCountResult = connection.prepareStatement("select count(*) from Children").executeQuery()
             childrenRowCountResult.next()
             val childrenRows = childrenRowCountResult.getInt(1)
             childrenRowCountResult.close()

node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt

@@ -16,9 +16,7 @@ import java.io.Closeable
 import java.util.*
 
 class ObservablesTests {
-
-    private fun isInDatabaseTransaction(): Boolean = (DatabaseTransactionManager.currentOrNull() != null)
-
+    private fun isInDatabaseTransaction() = contextTransactionOrNull != null
     private val toBeClosed = mutableListOf<Closeable>()
 
     private fun createDatabase(): CordaPersistence {
@@ -168,7 +166,7 @@ class ObservablesTests {
         observableWithDbTx.first().subscribe { undelayedEvent.set(it to isInDatabaseTransaction()) }
 
         fun observeSecondEvent(event: Int, future: SettableFuture<Pair<Int, UUID?>>) {
-            future.set(event to if (isInDatabaseTransaction()) DatabaseTransactionManager.transactionId else null)
+            future.set(event to if (isInDatabaseTransaction()) contextTransaction.id else null)
         }
 
         observableWithDbTx.skip(1).first().subscribe { observeSecondEvent(it, delayedEventFromSecondObserver) }