Use cached SearchStrategy

See gh-19930
spring-projects · Oct 9, 2020 · 07027b8 · 07027b8
1 parent 136d185
commit 07027b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java b/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java
@@ -180,7 +180,7 @@ private static Class<?> resolveExplicitTestContextBootstrapper(Class<?> testClas
 	}
 
 	private static Class<?> resolveDefaultTestContextBootstrapper(Class<?> testClass) throws Exception {
-		SearchStrategy searchStrategy = MetaAnnotationUtils.lookUpSearchStrategy(testClass);
+		SearchStrategy searchStrategy = MetaAnnotationUtils.getSearchStrategy(testClass);
 		boolean webApp = MergedAnnotations.from(testClass, searchStrategy, RepeatableContainers.none())
 				.isPresent(WEB_APP_CONFIGURATION_ANNOTATION_CLASS_NAME);
 		ClassLoader classLoader = BootstrapUtils.class.getClassLoader();

diff --git a/...-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java b/...-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java
@@ -74,7 +74,7 @@ public abstract class TestPropertySourceUtils {
 
 
 	static MergedTestPropertySources buildMergedTestPropertySources(Class<?> testClass) {
-		SearchStrategy searchStrategy = MetaAnnotationUtils.lookUpSearchStrategy(testClass);
+		SearchStrategy searchStrategy = MetaAnnotationUtils.getSearchStrategy(testClass);
 		MergedAnnotations mergedAnnotations = MergedAnnotations.from(testClass, searchStrategy);
 		return (mergedAnnotations.isPresent(TestPropertySource.class) ?
 				mergeTestPropertySources(mergedAnnotations, searchStrategy) :

diff --git a/...g-test/src/main/java/org/springframework/test/context/web/WebTestContextBootstrapper.java b/...g-test/src/main/java/org/springframework/test/context/web/WebTestContextBootstrapper.java
@@ -74,7 +74,7 @@ protected MergedContextConfiguration processMergedContextConfiguration(MergedCon
 	}
 
 	private static MergedAnnotation<WebAppConfiguration> getWebAppConfiguration(Class<?> testClass) {
-		return MergedAnnotations.from(testClass, MetaAnnotationUtils.lookUpSearchStrategy(testClass),
+		return MergedAnnotations.from(testClass, MetaAnnotationUtils.getSearchStrategy(testClass),
 				RepeatableContainers.none()).get(WebAppConfiguration.class);
 	}
 

diff --git a/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java
@@ -299,11 +299,11 @@ private static UntypedAnnotationDescriptor findAnnotationDescriptorForTypes(@Nul
 	 * @return the resolved search strategy
 	 * @since 5.3
 	 */
-	private static SearchStrategy getSearchStrategy(Class<?> clazz) {
+	public static SearchStrategy getSearchStrategy(Class<?> clazz) {
 		return cachedSearchStrategies.get(clazz);
 	}
 
-	public static SearchStrategy lookUpSearchStrategy(Class<?> clazz) {
+	private static SearchStrategy lookUpSearchStrategy(Class<?> clazz) {
 		EnclosingConfiguration enclosingConfiguration =
 			MergedAnnotations.from(clazz, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES)
 				.stream(NestedTestConfiguration.class)
@@ -505,7 +505,7 @@ public AnnotationDescriptor<T> next() {
 		@SuppressWarnings("unchecked")
 		public Set<T> findAllLocalMergedAnnotations() {
 			Class<T> annotationType = (Class<T>) getAnnotationType();
-			SearchStrategy searchStrategy = lookUpSearchStrategy(getRootDeclaringClass());
+			SearchStrategy searchStrategy = getSearchStrategy(getRootDeclaringClass());
 			return MergedAnnotations.from(getRootDeclaringClass(), searchStrategy , RepeatableContainers.none())
 					.stream(annotationType)
 					.filter(MergedAnnotationPredicates.firstRunOf(MergedAnnotation::getAggregateIndex))