Introduce TestSliceTestContextBootstrapper for test slices

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.context.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.context.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.context.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.context.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.context.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.context.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.context.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.context.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.context.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.context.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.context.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.context.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.context.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> {
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestContextBootstrapper.java

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

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTestContextBootstrapper.java

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

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTestContextBootstrapper.java

@@ -17,9 +17,8 @@
 package org.springframework.boot.test.autoconfigure.web.reactive;
 
 import org.springframework.boot.test.context.ReactiveWebMergedContextConfiguration;
-import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
+import org.springframework.boot.test.context.TestSliceTestContextBootstrapper;
 import org.springframework.test.context.MergedContextConfiguration;
-import org.springframework.test.context.TestContextAnnotationUtils;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
@@ -28,17 +27,11 @@
  * @author Stephane Nicoll
  * @author Artsiom Yudovin
  */
-class WebFluxTestContextBootstrapper extends SpringBootTestContextBootstrapper {
+class WebFluxTestContextBootstrapper extends TestSliceTestContextBootstrapper<WebFluxTest> {
 
 	@Override
 	protected MergedContextConfiguration processMergedContextConfiguration(MergedContextConfiguration mergedConfig) {
 		return new ReactiveWebMergedContextConfiguration(super.processMergedContextConfiguration(mergedConfig));
 	}
 
-	@Override
-	protected String[] getProperties(Class<?> testClass) {
-		WebFluxTest webFluxTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, WebFluxTest.class);
-		return (webFluxTest != null) ? webFluxTest.properties() : null;
-	}
-
 }