Add error handler for transactional event

Author: hyh1016

spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java

@@ -30,6 +30,7 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.config.TransactionManagementConfigUtils;
+import org.springframework.transaction.config.TransactionalEventErrorHandler;
 import org.springframework.transaction.event.TransactionalEventListenerFactory;
 import org.springframework.transaction.interceptor.RollbackRuleAttribute;
 import org.springframework.transaction.interceptor.TransactionAttributeSource;
@@ -93,8 +94,8 @@ public TransactionAttributeSource transactionAttributeSource() {
 
 	@Bean(name = TransactionManagementConfigUtils.TRANSACTIONAL_EVENT_LISTENER_FACTORY_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
-	public static TransactionalEventListenerFactory transactionalEventListenerFactory() {
-		return new RestrictedTransactionalEventListenerFactory();
+	public static TransactionalEventListenerFactory transactionalEventListenerFactory(@Nullable TransactionalEventErrorHandler errorHandler) {
+		return new RestrictedTransactionalEventListenerFactory(errorHandler);
 	}
 
 }

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

@@ -18,8 +18,10 @@
 
 import java.lang.reflect.Method;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.transaction.config.TransactionalEventErrorHandler;
 import org.springframework.transaction.event.TransactionalEventListenerFactory;
 
 /**
@@ -35,6 +37,10 @@
  */
 public class RestrictedTransactionalEventListenerFactory extends TransactionalEventListenerFactory {
 
+	public RestrictedTransactionalEventListenerFactory(@Nullable TransactionalEventErrorHandler errorHandler) {
+		super(errorHandler);
+	}
+
 	@Override
 	public ApplicationListener<?> createApplicationListener(String beanName, Class<?> type, Method method) {
 		Transactional txAnn = AnnotatedElementUtils.findMergedAnnotation(method, Transactional.class);

spring-tx/src/main/java/org/springframework/transaction/config/TransactionalEventErrorHandler.java

@@ -0,0 +1,16 @@
+package org.springframework.transaction.config;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.transaction.event.TransactionalApplicationListener;
+
+public abstract class TransactionalEventErrorHandler implements TransactionalApplicationListener.SynchronizationCallback {
+
+	public abstract void handle(ApplicationEvent event, @Nullable Throwable ex);
+
+	@Override
+	public void postProcessEvent(ApplicationEvent event, @Nullable Throwable ex) {
+		handle(event, ex);
+	}
+
+}

spring-tx/src/main/java/org/springframework/transaction/event/TransactionalEventListenerFactory.java

@@ -18,10 +18,12 @@
 
 import java.lang.reflect.Method;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.EventListenerFactory;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.transaction.config.TransactionalEventErrorHandler;
 
 /**
  * {@link EventListenerFactory} implementation that handles {@link TransactionalEventListener}
@@ -35,6 +37,13 @@ public class TransactionalEventListenerFactory implements EventListenerFactory,
 
 	private int order = 50;
 
+	private @Nullable TransactionalEventErrorHandler errorHandler;
+
+	public TransactionalEventListenerFactory() { }
+
+	public TransactionalEventListenerFactory(@Nullable TransactionalEventErrorHandler errorHandler) {
+		this.errorHandler = errorHandler;
+	}
 
 	public void setOrder(int order) {
 		this.order = order;
@@ -53,7 +62,14 @@ public boolean supportsMethod(Method method) {
 
 	@Override
 	public ApplicationListener<?> createApplicationListener(String beanName, Class<?> type, Method method) {
-		return new TransactionalApplicationListenerMethodAdapter(beanName, type, method);
+		if (errorHandler == null) {
+			return new TransactionalApplicationListenerMethodAdapter(beanName, type, method);
+		}
+		else {
+			TransactionalApplicationListenerMethodAdapter listener = new TransactionalApplicationListenerMethodAdapter(beanName, type, method);
+			listener.addCallback(errorHandler);
+			return listener;
+		}
 	}
 
 }