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

Use MethodFilter.and() in TransactionalTestExecutionListener

Browse Source
This commit is contained in:
Sam Brannen
2020-11-11 11:11:34 +01:00
parent 2b1f229998
commit 3851b291da
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
View File

@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -46,6 +45,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
import org.springframework.transaction.interceptor.TransactionAttributeSource; import org.springframework.transaction.interceptor.TransactionAttributeSource;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import org.springframework.util.ReflectionUtils.MethodFilter;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@@ -462,9 +462,9 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
* as well as annotated interface default methods * as well as annotated interface default methods
*/ */
private List<Method> getAnnotatedMethods(Class<?> clazz, Class<? extends Annotation> annotationType) { private List<Method> getAnnotatedMethods(Class<?> clazz, Class<? extends Annotation> annotationType) {
return Arrays.stream(ReflectionUtils.getUniqueDeclaredMethods(clazz, ReflectionUtils.USER_DECLARED_METHODS)) MethodFilter methodFilter = ReflectionUtils.USER_DECLARED_METHODS
.filter(method -> AnnotatedElementUtils.hasAnnotation(method, annotationType)) .and(method -> AnnotatedElementUtils.hasAnnotation(method, annotationType));
.collect(Collectors.toList()); return Arrays.asList(ReflectionUtils.getUniqueDeclaredMethods(clazz, methodFilter));
} }
} }