Fix doCleanupAfterCompletion invocation

doCleanupAfterCompletion gets now subscribed to when processing
cleanup after a new transaction.

Author: mp911de

spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java

@@ -676,17 +676,18 @@ private Mono<Void> cleanupAfterCompletion(TransactionSynchronizationManager sync
 			if (status.isNewSynchronization()) {
 				synchronizationManager.clear();
 			}
+			Mono<Void> cleanup = Mono.empty();
 			if (status.isNewTransaction()) {
-				doCleanupAfterCompletion(synchronizationManager, status.getTransaction());
+				cleanup = doCleanupAfterCompletion(synchronizationManager, status.getTransaction());
 			}
 			if (status.getSuspendedResources() != null) {
 				if (status.isDebug()) {
 					logger.debug("Resuming suspended transaction after completion of inner transaction");
 				}
 				Object transaction = (status.hasTransaction() ? status.getTransaction() : null);
-				return resume(synchronizationManager, transaction, (SuspendedResourcesHolder) status.getSuspendedResources());
+				return cleanup.then(resume(synchronizationManager, transaction, (SuspendedResourcesHolder) status.getSuspendedResources()));
 			}
-			return Mono.empty();
+			return cleanup;
 		});
 	}
 

spring-tx/src/test/java/org/springframework/transaction/reactive/ReactiveTestTransactionManager.java

@@ -44,6 +44,8 @@ class ReactiveTestTransactionManager extends AbstractReactiveTransactionManager
 
 	protected boolean rollbackOnly = false;
 
+	protected boolean cleanup = false;
+
 
 	ReactiveTestTransactionManager(boolean existingTransaction, boolean canCreateTransaction) {
 		this.existingTransaction = existingTransaction;
@@ -96,4 +98,8 @@ protected Mono<Void> doSetRollbackOnly(TransactionSynchronizationManager synchro
 		return Mono.fromRunnable(() -> this.rollbackOnly = true);
 	}
 
+	@Override
+	protected Mono<Void> doCleanupAfterCompletion(TransactionSynchronizationManager synchronizationManager, Object transaction) {
+		return Mono.fromRunnable(() -> this.cleanup = true);
+	}
 }

spring-tx/src/test/java/org/springframework/transaction/reactive/ReactiveTransactionSupportTests.java

@@ -95,6 +95,7 @@ public void commitWithoutExistingTransaction() {
 		assertHasCommitted(tm);
 		assertHasNoRollback(tm);
 		assertHasNotSetRollbackOnly(tm);
+		assertHasCleanedUp(tm);
 	}
 
 	@Test
@@ -108,6 +109,7 @@ public void rollbackWithoutExistingTransaction() {
 		assertHasNotCommitted(tm);
 		assertHasRolledBack(tm);
 		assertHasNotSetRollbackOnly(tm);
+		assertHasCleanedUp(tm);
 	}
 
 	@Test
@@ -122,6 +124,7 @@ public void rollbackOnlyWithoutExistingTransaction() {
 		assertHasNotCommitted(tm);
 		assertHasRolledBack(tm);
 		assertHasNotSetRollbackOnly(tm);
+		assertHasCleanedUp(tm);
 	}
 
 	@Test
@@ -135,6 +138,7 @@ public void commitWithExistingTransaction() {
 		assertHasNotCommitted(tm);
 		assertHasNoRollback(tm);
 		assertHasNotSetRollbackOnly(tm);
+		assertHasNotCleanedUp(tm);
 	}
 
 	@Test
@@ -148,6 +152,7 @@ public void rollbackWithExistingTransaction() {
 		assertHasNotCommitted(tm);
 		assertHasNoRollback(tm);
 		assertHasSetRollbackOnly(tm);
+		assertHasNotCleanedUp(tm);
 	}
 
 	@Test
@@ -161,6 +166,7 @@ public void rollbackOnlyWithExistingTransaction() {
 		assertHasNotCommitted(tm);
 		assertHasNoRollback(tm);
 		assertHasSetRollbackOnly(tm);
+		assertHasNotCleanedUp(tm);
 	}
 
 	@Test
@@ -177,6 +183,7 @@ public void transactionTemplate() {
 		assertHasCommitted(tm);
 		assertHasNoRollback(tm);
 		assertHasNotSetRollbackOnly(tm);
+		assertHasCleanedUp(tm);
 	}
 
 	@Test
@@ -194,6 +201,7 @@ public void transactionTemplateWithException() {
 		assertHasNotCommitted(tm);
 		assertHasRolledBack(tm);
 		assertHasNotSetRollbackOnly(tm);
+		assertHasCleanedUp(tm);
 	}
 
 	private void assertHasBegan(ReactiveTestTransactionManager actual) {
@@ -228,4 +236,12 @@ private void assertHasNotSetRollbackOnly(ReactiveTestTransactionManager actual)
 		assertFalse("Expected to not call <ReactiveTransactionManager.setRollbackOnly()> but was <setRollbackOnly()> was called", actual.rollbackOnly);
 	}
 
+	private void assertHasCleanedUp(ReactiveTestTransactionManager actual) {
+		assertTrue("Expected <ReactiveTransactionManager.doCleanupAfterCompletion()> but was <doCleanupAfterCompletion()> was not invoked", actual.cleanup);
+	}
+
+	private void assertHasNotCleanedUp(ReactiveTestTransactionManager actual) {
+		assertFalse("Expected to not call <ReactiveTransactionManager.doCleanupAfterCompletion()> but was <doCleanupAfterCompletion()> was called", actual.cleanup);
+	}
+
 }