Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Find TransactionalEventListener annotation on target method

Browse Source 
Closes gh-31034

(cherry picked from commit 6fc4898a1b)
This commit is contained in:
Juergen Hoeller
2023-08-12 11:19:21 +02:00
parent 0c275107ea
commit bb46b31925
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-tx/src/main/java/org/springframework/transaction/event/TransactionalApplicationListenerMethodAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,13 +63,13 @@ public class TransactionalApplicationListenerMethodAdapter extends ApplicationLi
*/
public TransactionalApplicationListenerMethodAdapter(String beanName, Class<?> targetClass, Method method) {
super(beanName, targetClass, method);
TransactionalEventListener ann =
AnnotatedElementUtils.findMergedAnnotation(method, TransactionalEventListener.class);
if (ann == null) {
TransactionalEventListener eventAnn =
AnnotatedElementUtils.findMergedAnnotation(getTargetMethod(), TransactionalEventListener.class);
if (eventAnn == null) {
throw new IllegalStateException("No TransactionalEventListener annotation found on method: " + method);
}
this.annotation = ann;
this.transactionPhase = ann.phase();
this.annotation = eventAnn;
this.transactionPhase = eventAnn.phase();
}

30
spring-tx/src/test/java/org/springframework/transaction/event/TransactionalEventListenerTests.java
View File

@@ -156,6 +156,17 @@ public class TransactionalEventListenerTests {
getEventCollector().assertNoEventReceived();
}
@Test
public void afterCommitWithTransactionalComponentListenerWithInterfaceProxy() {
load(TransactionalComponentTestListenerWithInterface.class);
this.transactionTemplate.execute(status -> {
getContext().publishEvent("SKIP");
getEventCollector().assertNoEventReceived();
return null;
});
getEventCollector().assertNoEventReceived();
}
@Test
public void afterRollback() {
load(AfterCompletionExplicitTestListener.class);
@@ -525,6 +536,25 @@ public class TransactionalEventListenerTests {
}
interface TransactionalComponentTestInterface {
void handleAfterCommit(String data);
}
@Transactional
@Component
static class TransactionalComponentTestListenerWithInterface extends BaseTransactionalTestListener implements
TransactionalComponentTestInterface {
@TransactionalEventListener(condition = "!'SKIP'.equals(#data)")
@Override
public void handleAfterCommit(String data) {
handleEvent(EventCollector.AFTER_COMMIT, data);
}
}
@Component
static class BeforeCommitTestListener extends BaseTransactionalTestListener {