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

Use MergedAnnotationCollectors again in TestContextAnnotationUtils 

See gh-26031
This commit is contained in:
Sam Brannen 2020-11-04 14:42:19 +01:00
parent 0a0299693b
commit b077e4cd85
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java
View File

@ -19,15 +19,14 @@ package org.springframework.test.context;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.springframework.core.SpringProperties; import org.springframework.core.SpringProperties;
import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotation;
import org.springframework.core.annotation.MergedAnnotationCollectors;
import org.springframework.core.annotation.MergedAnnotationPredicates; import org.springframework.core.annotation.MergedAnnotationPredicates;
import org.springframework.core.annotation.MergedAnnotations; import org.springframework.core.annotation.MergedAnnotations;
import org.springframework.core.annotation.MergedAnnotations.SearchStrategy; import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
@ -147,8 +146,7 @@ public abstract class TestContextAnnotationUtils {
// Present (via @Inherited semantics), directly present, or meta-present? // Present (via @Inherited semantics), directly present, or meta-present?
Set<T> mergedAnnotations = MergedAnnotations.from(clazz, SearchStrategy.INHERITED_ANNOTATIONS) Set<T> mergedAnnotations = MergedAnnotations.from(clazz, SearchStrategy.INHERITED_ANNOTATIONS)
.stream(annotationType) .stream(annotationType)
.map(MergedAnnotation::synthesize) .collect(MergedAnnotationCollectors.toAnnotationSet());
.collect(Collectors.toCollection(LinkedHashSet::new));
if (!mergedAnnotations.isEmpty()) { if (!mergedAnnotations.isEmpty()) {
return mergedAnnotations; return mergedAnnotations;
@ -557,8 +555,7 @@ public abstract class TestContextAnnotationUtils {
return MergedAnnotations.from(getRootDeclaringClass(), searchStrategy, RepeatableContainers.none()) return MergedAnnotations.from(getRootDeclaringClass(), searchStrategy, RepeatableContainers.none())
.stream(getAnnotationType()) .stream(getAnnotationType())
.filter(MergedAnnotationPredicates.firstRunOf(MergedAnnotation::getAggregateIndex)) .filter(MergedAnnotationPredicates.firstRunOf(MergedAnnotation::getAggregateIndex))
.map(MergedAnnotation::synthesize) .collect(MergedAnnotationCollectors.toAnnotationSet());
.collect(Collectors.toCollection(LinkedHashSet::new));
} }
/** /**