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

Polish TestPropertySourceUtils

This commit is contained in:
Sam Brannen 2020-10-22 17:31:59 +02:00
parent b8b854db8c
commit aaa2d21058
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java
View File

@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -75,16 +76,15 @@ public abstract class TestPropertySourceUtils {
static MergedTestPropertySources buildMergedTestPropertySources(Class<?> testClass) { static MergedTestPropertySources buildMergedTestPropertySources(Class<?> testClass) {
List<MergedAnnotation<TestPropertySource>> mergedAnnotations = List<TestPropertySourceAttributes> attributesList =
findRepeatableAnnotations(testClass, TestPropertySource.class); findRepeatableAnnotations(testClass, TestPropertySource.class)
.map(TestPropertySourceAttributes::new)
.collect(Collectors.toList());
if (mergedAnnotations.isEmpty()) { if (attributesList.isEmpty()) {
return MergedTestPropertySources.empty(); return MergedTestPropertySources.empty();
} }
List<TestPropertySourceAttributes> attributesList = mergedAnnotations.stream()
.map(TestPropertySourceAttributes::new)
.collect(Collectors.toList());
return new MergedTestPropertySources(mergeLocations(attributesList), mergeProperties(attributesList)); return new MergedTestPropertySources(mergeLocations(attributesList), mergeProperties(attributesList));
} }
@ -273,12 +273,12 @@ public abstract class TestPropertySourceUtils {
return map; return map;
} }
private static <T extends Annotation> List<MergedAnnotation<T>> findRepeatableAnnotations( private static <T extends Annotation> Stream<MergedAnnotation<T>> findRepeatableAnnotations(
Class<?> clazz, Class<T> annotationType) { Class<?> clazz, Class<T> annotationType) {
List<List<MergedAnnotation<T>>> listOfLists = new ArrayList<>(); List<List<MergedAnnotation<T>>> listOfLists = new ArrayList<>();
findRepeatableAnnotations(clazz, annotationType, listOfLists, new int[] {0}); findRepeatableAnnotations(clazz, annotationType, listOfLists, new int[] {0});
return listOfLists.stream().flatMap(List::stream).collect(Collectors.toList()); return listOfLists.stream().flatMap(List::stream);
} }
private static <T extends Annotation> void findRepeatableAnnotations( private static <T extends Annotation> void findRepeatableAnnotations(