diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/jdbc/DataJdbcTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/jdbc/DataJdbcTypeExcludeFilter.java index 165e0b36f1f..989c8ebc300 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/jdbc/DataJdbcTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/jdbc/DataJdbcTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link DataJdbcTest @DataJdbcTest}. * * @author Andy Wilkinson + * @since 2.2.1 */ -class DataJdbcTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class DataJdbcTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { DataJdbcTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTypeExcludeFilter.java index 4abf0b54604..8edac995c80 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link DataLdapTest @DataLdapTest}. * * @author Eddú Meléndez + * @since 2.2.1 */ -class DataLdapTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class DataLdapTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { DataLdapTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java index ad9fe6c776b..eef9d40879b 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link DataMongoTest @DataMongoTest}. * * @author Michael Simons + * @since 2.2.1 */ -class DataMongoTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class DataMongoTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { DataMongoTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTypeExcludeFilter.java index 41698c7a60e..736125bb054 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link DataNeo4jTest @DataNeo4jTest}. * * @author Eddú Meléndez + * @since 2.2.1 */ -class DataNeo4jTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class DataNeo4jTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { DataNeo4jTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTypeExcludeFilter.java index 22ced6b21ac..fb47c3cc96c 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link DataRedisTest @DataRedisTest}. * * @author Jayaram Pradhan + * @since 2.2.1 */ -class DataRedisTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class DataRedisTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { DataRedisTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java index c5f47c03bc1..5d53014af1c 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link JdbcTest @JdbcTest}. * * @author Stephane Nicoll + * @since 2.2.1 */ -class JdbcTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class JdbcTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { JdbcTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jooq/JooqTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jooq/JooqTypeExcludeFilter.java index 2572ec66e33..3a64b5af61b 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jooq/JooqTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jooq/JooqTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link JooqTest @JooqTest}. * * @author Michael Simons + * @since 2.2.1 */ -class JooqTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class JooqTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { JooqTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java index 638a66c8d5c..a2730b8f5e8 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java @@ -68,7 +68,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; @BootstrapWith(JsonTestContextBootstrapper.class) @ExtendWith(SpringExtension.class) @OverrideAutoConfiguration(enabled = false) -@TypeExcludeFilters(JsonExcludeFilter.class) +@TypeExcludeFilters(JsonTypeExcludeFilter.class) @AutoConfigureCache @AutoConfigureJson @AutoConfigureJsonTesters diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTypeExcludeFilter.java similarity index 90% rename from spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTypeExcludeFilter.java index 1a3aaea11d4..2f6479aafe5 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTypeExcludeFilter.java @@ -29,8 +29,9 @@ import org.springframework.util.ClassUtils; * {@link TypeExcludeFilter} for {@link JsonTest @JsonTest}. * * @author Phillip Webb + * @since 2.2.1 */ -class JsonExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class JsonTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { private static final String JACKSON_MODULE = "com.fasterxml.jackson.databind.Module"; @@ -47,7 +48,7 @@ class JsonExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter< DEFAULT_INCLUDES = Collections.unmodifiableSet(includes); } - JsonExcludeFilter(Class testClass) { + JsonTypeExcludeFilter(Class testClass) { super(testClass); } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java index 14762cadab4..00fa90478c7 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java @@ -23,8 +23,9 @@ import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCust * {@link TypeExcludeFilter} for {@link DataJpaTest @DataJpaTest}. * * @author Phillip Webb + * @since 2.2.1 */ -class DataJpaTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class DataJpaTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { DataJpaTypeExcludeFilter(Class testClass) { super(testClass); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTest.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTest.java index b013d82804d..eba5ed69d00 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTest.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTest.java @@ -72,7 +72,7 @@ import org.springframework.web.client.RestTemplate; @BootstrapWith(RestClientTestContextBootstrapper.class) @ExtendWith(SpringExtension.class) @OverrideAutoConfiguration(enabled = false) -@TypeExcludeFilters(RestClientExcludeFilter.class) +@TypeExcludeFilters(RestClientTypeExcludeFilter.class) @AutoConfigureCache @AutoConfigureWebClient @AutoConfigureMockRestServiceServer diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTypeExcludeFilter.java similarity index 88% rename from spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientExcludeFilter.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTypeExcludeFilter.java index c81d01cfb85..62127052c0a 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTypeExcludeFilter.java @@ -30,8 +30,9 @@ import org.springframework.util.ClassUtils; * {@link TypeExcludeFilter} for {@link RestClientTest @RestClientTest}. * * @author Stephane Nicoll + * @since 2.2.1 */ -class RestClientExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class RestClientTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { private static final Class[] NO_COMPONENTS = {}; @@ -41,10 +42,10 @@ class RestClientExcludeFilter extends StandardAnnotationCustomizableTypeExcludeF static { Set> includes = new LinkedHashSet<>(); - if (ClassUtils.isPresent(DATABIND_MODULE_CLASS_NAME, RestClientExcludeFilter.class.getClassLoader())) { + if (ClassUtils.isPresent(DATABIND_MODULE_CLASS_NAME, RestClientTypeExcludeFilter.class.getClassLoader())) { try { includes.add(Class.forName(DATABIND_MODULE_CLASS_NAME, true, - RestClientExcludeFilter.class.getClassLoader())); + RestClientTypeExcludeFilter.class.getClassLoader())); } catch (ClassNotFoundException ex) { throw new IllegalStateException("Failed to load " + DATABIND_MODULE_CLASS_NAME, ex); @@ -56,7 +57,7 @@ class RestClientExcludeFilter extends StandardAnnotationCustomizableTypeExcludeF private final Class[] components; - RestClientExcludeFilter(Class testClass) { + RestClientTypeExcludeFilter(Class testClass) { super(testClass); this.components = getAnnotation().getValue("components", Class[].class).orElse(NO_COMPONENTS); } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTypeExcludeFilter.java index 8ee84da0dd4..5ca155d0c33 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTypeExcludeFilter.java @@ -37,8 +37,9 @@ import org.springframework.web.server.WebFilter; * {@link TypeExcludeFilter} for {@link WebFluxTest @WebFluxTest}. * * @author Stephane Nicoll + * @since 2.2.1 */ -class WebFluxTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class WebFluxTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { private static final Class[] NO_CONTROLLERS = {}; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java index 77785766f9a..17a23686228 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java @@ -43,8 +43,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * * @author Phillip Webb * @author Madhura Bhave + * @since 2.2.1 */ -class WebMvcTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { +public final class WebMvcTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter { private static final Class[] NO_CONTROLLERS = {};