root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Enforce REQUIRES_NEW for correct transaction configuration 

Closes gh-31414
This commit is contained in:
Juergen Hoeller 2023-10-11 17:14:32 +02:00
parent 2cdc114273
commit c7b832cfc8
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-tx/src/main/java/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.java
View File

@ -20,14 +20,12 @@ import java.lang.reflect.Method;
import org.springframework.context.ApplicationListener;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.transaction.event.TransactionalEventListenerFactory;
/**
* Extension of {@link TransactionalEventListenerFactory},
* detecting invalid transaction configuration for transactional event listeners:
* {@link Transactional} only supported with {@link Propagation#REQUIRES_NEW} or
* {@link Async}.
* {@link Transactional} only supported with {@link Propagation#REQUIRES_NEW}.
*
* @author Juergen Hoeller
* @since 6.1
@ -39,10 +37,9 @@ public class RestrictedTransactionalEventListenerFactory extends TransactionalEv
@Override
public ApplicationListener<?> createApplicationListener(String beanName, Class<?> type, Method method) {
Transactional txAnn = AnnotatedElementUtils.findMergedAnnotation(method, Transactional.class);
if (txAnn != null && txAnn.propagation() != Propagation.REQUIRES_NEW &&
!AnnotatedElementUtils.hasAnnotation(method, Async.class)) {
if (txAnn != null && txAnn.propagation() != Propagation.REQUIRES_NEW) {
throw new IllegalStateException("@TransactionalEventListener method must not be annotated with " +
"@Transactional unless when marked as REQUIRES_NEW or declared as @Async: " + method);
"@Transactional unless when declared as REQUIRES_NEW: " + method);
}
return super.createApplicationListener(beanName, type, method);
}

2
spring-tx/src/test/java/org/springframework/transaction/event/TransactionalApplicationListenerMethodAdapterTests.java
View File

@ -233,7 +233,7 @@ public class TransactionalApplicationListenerMethodAdapterTests {
}
@TransactionalEventListener
@Async @Transactional
@Async @Transactional(propagation = Propagation.REQUIRES_NEW)
public void withAsyncTransactionalAnnotation(String data) {
}
}