Merge pull request #44354 from quaff

* gh-44354:
  Polish "Introduce TestSliceTestContextBootstrapper for test slices"
  Introduce TestSliceTestContextBootstrapper for test slices

Closes gh-44354

Author: wilkinsona

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/TestSliceTestContextBootstrapper.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2012-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test.autoconfigure;
+
+import java.lang.annotation.Annotation;
+
+import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.annotation.MergedAnnotation;
+import org.springframework.core.annotation.MergedAnnotations;
+import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
+import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.test.context.TestContextBootstrapper;
+import org.springframework.util.Assert;
+
+/**
+ * Base class for test slice {@link TestContextBootstrapper test context bootstrappers}.
+ *
+ * @param <T> the test slice annotation
+ * @author Yanming Zhou
+ * @since 4.0.0
+ */
+public abstract class TestSliceTestContextBootstrapper<T extends Annotation> extends SpringBootTestContextBootstrapper {
+
+	private final Class<T> annotationType;
+
+	@SuppressWarnings("unchecked")
+	protected TestSliceTestContextBootstrapper() {
+		this.annotationType = (Class<T>) ResolvableType.forClass(getClass())
+			.as(TestSliceTestContextBootstrapper.class)
+			.getGeneric(0)
+			.resolve();
+		Assert.notNull(this.annotationType, "'%s' doesn't contain type parameter of '%s'"
+			.formatted(getClass().getName(), TestSliceTestContextBootstrapper.class.getName()));
+	}
+
+	@Override
+	protected String[] getProperties(Class<?> testClass) {
+		MergedAnnotation<T> annotation = MergedAnnotations.search(SearchStrategy.TYPE_HIERARCHY)
+			.withEnclosingClasses(TestContextAnnotationUtils::searchEnclosingClass)
+			.from(testClass)
+			.get(this.annotationType);
+		return annotation.isPresent() ? annotation.getStringArray("properties") : null;
+	}
+
+}

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestContextBootstrapper.java

@@ -16,8 +16,7 @@
 
 package org.springframework.boot.test.autoconfigure.data.cassandra;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
@@ -26,13 +25,6 @@
  *
  * @author Artsiom Yudovin
  */
-class DataCassandraTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataCassandraTest dataCassandraTest = TestContextAnnotationUtils.findMergedAnnotation(testClass,
-				DataCassandraTest.class);
-		return (dataCassandraTest != null) ? dataCassandraTest.properties() : null;
-	}
+class DataCassandraTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataCassandraTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestContextBootstrapper.java

@@ -16,8 +16,7 @@
 
 package org.springframework.boot.test.autoconfigure.data.couchbase;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
@@ -26,13 +25,6 @@
  *
  * @author Eddú Meléndez
  */
-class DataCouchbaseTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataCouchbaseTest dataCouchbaseTest = TestContextAnnotationUtils.findMergedAnnotation(testClass,
-				DataCouchbaseTest.class);
-		return (dataCouchbaseTest != null) ? dataCouchbaseTest.properties() : null;
-	}
+class DataCouchbaseTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataCouchbaseTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestContextBootstrapper.java

@@ -16,8 +16,7 @@
 
 package org.springframework.boot.test.autoconfigure.data.elasticsearch;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
@@ -26,13 +25,6 @@
  *
  * @author Eddú Meléndez
  */
-class DataElasticsearchTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataElasticsearchTest dataElasticsearchTest = TestContextAnnotationUtils.findMergedAnnotation(testClass,
-				DataElasticsearchTest.class);
-		return (dataElasticsearchTest != null) ? dataElasticsearchTest.properties() : null;
-	}
+class DataElasticsearchTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataElasticsearchTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/jdbc/DataJdbcTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.data.jdbc;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link DataJdbcTest @DataJdbcTest} support.
  *
  * @author Andy Wilkinson
  */
-class DataJdbcTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataJdbcTest dataJdbcTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, DataJdbcTest.class);
-		return (dataJdbcTest != null) ? dataJdbcTest.properties() : null;
-	}
+class DataJdbcTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataJdbcTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.data.ldap;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link DataLdapTest @DataLdapTest} support.
  *
  * @author Artsiom Yudovin
  */
-class DataLdapTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataLdapTest dataLdapTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, DataLdapTest.class);
-		return (dataLdapTest != null) ? dataLdapTest.properties() : null;
-	}
+class DataLdapTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataLdapTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.data.mongo;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link DataMongoTest @DataMongoTest} support.
  *
  * @author Artsiom Yudovin
  */
-class DataMongoTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataMongoTest dataMongoTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, DataMongoTest.class);
-		return (dataMongoTest != null) ? dataMongoTest.properties() : null;
-	}
+class DataMongoTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataMongoTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.data.neo4j;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link DataNeo4jTest @DataNeo4jTest} support.
  *
  * @author Artsiom Yudovin
  */
-class DataNeo4jTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataNeo4jTest dataNeo4jTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, DataNeo4jTest.class);
-		return (dataNeo4jTest != null) ? dataNeo4jTest.properties() : null;
-	}
+class DataNeo4jTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataNeo4jTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.data.r2dbc;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link DataR2dbcTest @DataR2dbcTest} support.
  *
  * @author Mark Paluch
  */
-class DataR2dbcTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataR2dbcTest dataR2dbcTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, DataR2dbcTest.class);
-		return (dataR2dbcTest != null) ? dataR2dbcTest.properties() : null;
-	}
+class DataR2dbcTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataR2dbcTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.data.redis;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link DataRedisTest @DataRedisTest} support.
  *
  * @author Artsiom Yudovin
  */
-class DataRedisTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		DataRedisTest dataRedisTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, DataRedisTest.class);
-		return (dataRedisTest != null) ? dataRedisTest.properties() : null;
-	}
+class DataRedisTestContextBootstrapper extends TestSliceTestContextBootstrapper<DataRedisTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.graphql;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link GraphQlTest @GraphQlTest}.
  *
  * @author Brian Clozel
  */
-class GraphQlTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		GraphQlTest graphQlTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, GraphQlTest.class);
-		return (graphQlTest != null) ? graphQlTest.properties() : null;
-	}
+class GraphQlTestContextBootstrapper extends TestSliceTestContextBootstrapper<GraphQlTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestContextBootstrapper.java

@@ -16,21 +16,15 @@
 
 package org.springframework.boot.test.autoconfigure.jdbc;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link JdbcTest @JdbcTest} support.
  *
  * @author Artsiom Yudovin
+ * @author Yanming Zhou
  */
-class JdbcTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		JdbcTest jdbcTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, JdbcTest.class);
-		return (jdbcTest != null) ? jdbcTest.properties() : null;
-	}
+class JdbcTestContextBootstrapper extends TestSliceTestContextBootstrapper<JdbcTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.jooq;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link JooqTest @JooqTest} support.
  *
  * @author Artsiom Yudovin
  */
-class JooqTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		JooqTest jooqTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, JooqTest.class);
-		return (jooqTest != null) ? jooqTest.properties() : null;
-	}
+class JooqTestContextBootstrapper extends TestSliceTestContextBootstrapper<JooqTest> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestContextBootstrapper.java

@@ -16,21 +16,14 @@
 
 package org.springframework.boot.test.autoconfigure.json;
 
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.test.context.TestContextAnnotationUtils;
+import org.springframework.boot.test.autoconfigure.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
  * {@link TestContextBootstrapper} for {@link JsonTest @JsonTest} support.
  *
  * @author Artsiom Yudovin
  */
-class JsonTestContextBootstrapper extends SpringBootTestContextBootstrapper {
-
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		JsonTest jsonTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, JsonTest.class);
-		return (jsonTest != null) ? jsonTest.properties() : null;
-	}
+class JsonTestContextBootstrapper extends TestSliceTestContextBootstrapper<JsonTest> {
 
 }