Fix @transactional support on suspending function

With this commit, @transactional on suspending functions returning a value now commits the transaction properly. Closes gh-25998
spring-projects · Nov 9, 2020 · 1f13516 · 1f13516
1 parent 6bb3ad7
commit 1f13516
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...x/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/...x/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -875,8 +875,8 @@ public Object invokeWithinTransaction(Method method, @Nullable Class<?> targetCl
 
 			String joinpointIdentification = methodIdentification(method, targetClass, txAttr);
 
-			// Optimize for Mono
-			if (Mono.class.isAssignableFrom(method.getReturnType())) {
+			// For Mono and suspending functions not returning kotlinx.coroutines.flow.Flow
+			if (Mono.class.isAssignableFrom(method.getReturnType()) || (KotlinDetector.isSuspendingFunction(method) && !COROUTINES_FLOW_CLASS_NAME.equals(new MethodParameter(method, -1).getParameterType().getName()))) {
 				return TransactionContextManager.currentContext().flatMap(context ->
 						createTransactionIfNecessary(rtm, txAttr, joinpointIdentification).flatMap(it -> {
 							try {

diff --git a/...springframework/transaction/annotation/CoroutinesAnnotationTransactionInterceptorTests.kt b/...springframework/transaction/annotation/CoroutinesAnnotationTransactionInterceptorTests.kt
@@ -19,7 +19,6 @@ package org.springframework.transaction.annotation
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.springframework.aop.framework.ProxyFactory
 import org.springframework.transaction.interceptor.TransactionInterceptor
@@ -64,7 +63,6 @@ class CoroutinesAnnotationTransactionInterceptorTests {
 	}
 
 	@Test
-	@Disabled("Currently fails due to gh-25998")
 	fun suspendingValueSuccess() {
 		val proxyFactory = ProxyFactory()
 		proxyFactory.setTarget(TestWithCoroutines())