Allow Propagation.NOT_SUPPORTED with @TransactionalEventListener

Closes gh-31907
spring-projects · Dec 26, 2023 · 75c7596 · xak2000 · Dec 26, 2023 · 75c7596
1 parent 17d362f
commit 75c7596
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/...g/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.java b/...g/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.java
@@ -25,7 +25,8 @@
 /**
  * Extension of {@link TransactionalEventListenerFactory},
  * detecting invalid transaction configuration for transactional event listeners:
- * {@link Transactional} only supported with {@link Propagation#REQUIRES_NEW}.
+ * {@link Transactional} only supported with {@link Propagation#REQUIRES_NEW}
+ * and {@link Propagation#NEVER}.
  *
  * @author Juergen Hoeller
  * @since 6.1
@@ -37,9 +38,12 @@ 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) {
-			throw new IllegalStateException("@TransactionalEventListener method must not be annotated with " +
-					"@Transactional unless when declared as REQUIRES_NEW: " + method);
+		if (txAnn != null) {
+			Propagation propagation = txAnn.propagation();
+			if (propagation != Propagation.REQUIRES_NEW && propagation != Propagation.NOT_SUPPORTED) {
+				throw new IllegalStateException("@TransactionalEventListener method must not be annotated with " +
+						"@Transactional unless when declared as REQUIRES_NEW or NOT_SUPPORTED: " + method);
+			}
 		}
 		return super.createApplicationListener(beanName, type, method);
 	}

diff --git a/...springframework/transaction/event/TransactionalApplicationListenerMethodAdapterTests.java b/...springframework/transaction/event/TransactionalApplicationListenerMethodAdapterTests.java
@@ -143,6 +143,13 @@ public void withTransactionalRequiresNewAnnotation() {
 		assertThatNoException().isThrownBy(() -> factory.createApplicationListener("test", SampleEvents.class, m));
 	}
 
+	@Test
+	public void withTransactionalNotSupportedAnnotation() {
+		RestrictedTransactionalEventListenerFactory factory = new RestrictedTransactionalEventListenerFactory();
+		Method m = ReflectionUtils.findMethod(SampleEvents.class, "withTransactionalNotSupportedAnnotation", String.class);
+		assertThatNoException().isThrownBy(() -> factory.createApplicationListener("test", SampleEvents.class, m));
+	}
+
 	@Test
 	public void withAsyncTransactionalAnnotation() {
 		RestrictedTransactionalEventListenerFactory factory = new RestrictedTransactionalEventListenerFactory();
@@ -232,6 +239,11 @@ public void withTransactionalAnnotation(String data) {
 		public void withTransactionalRequiresNewAnnotation(String data) {
 		}
 
+		@TransactionalEventListener
+		@Transactional(propagation = Propagation.NOT_SUPPORTED)
+		public void withTransactionalNotSupportedAnnotation(String data) {
+		}
+
 		@TransactionalEventListener
 		@Async @Transactional(propagation = Propagation.REQUIRES_NEW)
 		public void withAsyncTransactionalAnnotation(String data) {