From 2b3a8ff647251bfee8d358f002e335944904012c Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 25 Sep 2025 11:39:55 -0700 Subject: [PATCH] Relocate `@TypeExcludeFilters` to spring-boot-test Move `@TypeExcludeFilters` and supporting code from the `spring-boot-test-autoconfigure` module to `spring-boot-test` since it's generally applicable. See gh-46356 See gh-47322 --- core/spring-boot-test/build.gradle | 2 ++ .../AnnotationCustomizableTypeExcludeFilter.java | 4 ++-- .../filter/annotation}/FilterAnnotations.java | 10 ++++------ ...ndardAnnotationCustomizableTypeExcludeFilter.java | 4 ++-- .../filter/annotation}/TypeExcludeFilters.java | 12 +++++------- .../TypeExcludeFiltersContextCustomizer.java | 2 +- .../TypeExcludeFiltersContextCustomizerFactory.java | 2 +- .../context/filter/annotation}/TypeIncludes.java | 2 +- .../context/filter/annotation}/package-info.java | 6 +++--- .../src/main/resources/META-INF/spring.factories | 3 ++- .../filter/annotation}/FilterAnnotationsTests.java | 2 +- ...eExcludeFiltersContextCustomizerFactoryTests.java | 4 ++-- .../test/autoconfigure/DataCassandraTest.java | 2 +- .../DataCassandraTypeExcludeFilter.java | 2 +- .../test/autoconfigure/DataCouchbaseTest.java | 2 +- .../DataCouchbaseTypeExcludeFilter.java | 2 +- .../test/autoconfigure/DataElasticsearchTest.java | 2 +- .../DataElasticsearchTypeExcludeFilter.java | 2 +- .../data/jdbc/test/autoconfigure/DataJdbcTest.java | 2 +- .../autoconfigure/DataJdbcTypeExcludeFilter.java | 2 +- .../data/jpa/test/autoconfigure/DataJpaTest.java | 2 +- .../test/autoconfigure/DataJpaTypeExcludeFilter.java | 2 +- .../data/ldap/test/autoconfigure/DataLdapTest.java | 2 +- .../autoconfigure/DataLdapTypeExcludeFilter.java | 2 +- .../mongodb/test/autoconfigure/DataMongoTest.java | 2 +- .../autoconfigure/DataMongoTypeExcludeFilter.java | 2 +- .../data/neo4j/test/autoconfigure/DataNeo4jTest.java | 2 +- .../autoconfigure/DataNeo4jTypeExcludeFilter.java | 2 +- .../data/r2dbc/test/autoconfigure/DataR2dbcTest.java | 2 +- .../autoconfigure/DataR2dbcTypeExcludeFilter.java | 2 +- .../data/redis/test/autoconfigure/DataRedisTest.java | 2 +- .../autoconfigure/DataRedisTypeExcludeFilter.java | 2 +- .../boot/graphql/test/autoconfigure/GraphQlTest.java | 2 +- .../test/autoconfigure/GraphQlTypeExcludeFilter.java | 2 +- .../boot/jdbc/test/autoconfigure/JdbcTest.java | 2 +- .../test/autoconfigure/JdbcTypeExcludeFilter.java | 2 +- .../boot/jooq/test/autoconfigure/JooqTest.java | 2 +- .../test/autoconfigure/JooqTypeExcludeFilter.java | 2 +- .../boot/json/test/autoconfigure/JsonTest.java | 2 +- .../test/autoconfigure/JsonTypeExcludeFilter.java | 2 +- .../test/autoconfigure/RestClientTest.java | 2 +- .../autoconfigure/RestClientTypeExcludeFilter.java | 2 +- .../src/main/resources/META-INF/spring.factories | 1 - .../boot/webflux/test/autoconfigure/WebFluxTest.java | 2 +- .../test/autoconfigure/WebFluxTypeExcludeFilter.java | 2 +- .../boot/webmvc/test/autoconfigure/WebMvcTest.java | 2 +- .../test/autoconfigure/WebMvcTypeExcludeFilter.java | 2 +- .../client/WebServiceClientExcludeFilter.java | 2 +- .../autoconfigure/client/WebServiceClientTest.java | 2 +- .../autoconfigure/server/WebServiceServerTest.java | 2 +- .../server/WebServiceServerTypeExcludeFilter.java | 2 +- 51 files changed, 64 insertions(+), 66 deletions(-) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/AnnotationCustomizableTypeExcludeFilter.java (98%) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/FilterAnnotations.java (91%) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/StandardAnnotationCustomizableTypeExcludeFilter.java (97%) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/TypeExcludeFilters.java (78%) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/TypeExcludeFiltersContextCustomizer.java (98%) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/TypeExcludeFiltersContextCustomizerFactory.java (97%) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/TypeIncludes.java (98%) rename {module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation}/package-info.java (79%) rename {module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation}/FilterAnnotationsTests.java (98%) rename {module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter => core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation}/TypeExcludeFiltersContextCustomizerFactoryTests.java (95%) diff --git a/core/spring-boot-test/build.gradle b/core/spring-boot-test/build.gradle index bcf95660fbf..04b91f1c9e2 100644 --- a/core/spring-boot-test/build.gradle +++ b/core/spring-boot-test/build.gradle @@ -46,6 +46,8 @@ dependencies { testImplementation("org.springframework:spring-webmvc") testImplementation("org.testng:testng") + testRuntimeOnly("org.aspectj:aspectjrt") + testRuntimeOnly("org.aspectj:aspectjweaver") testRuntimeOnly("org.junit.vintage:junit-vintage-engine") } diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/AnnotationCustomizableTypeExcludeFilter.java similarity index 98% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/AnnotationCustomizableTypeExcludeFilter.java index fe1f1ff67ab..e47ccb161ac 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/AnnotationCustomizableTypeExcludeFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.io.IOException; import java.lang.annotation.Annotation; @@ -38,7 +38,7 @@ import org.springframework.util.ObjectUtils; * annotation. * * @author Phillip Webb - * @since 1.4.0 + * @since 4.0.0 */ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExcludeFilter implements BeanClassLoaderAware { diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotations.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/FilterAnnotations.java similarity index 91% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotations.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/FilterAnnotations.java index 292e2931649..b8444059346 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotations.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/FilterAnnotations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.io.IOException; import java.lang.annotation.Annotation; @@ -40,15 +40,14 @@ import org.springframework.util.Assert; * Utility to load {@link TypeFilter TypeFilters} from {@link Filter @Filter} annotations. * * @author Phillip Webb - * @since 1.4.0 */ -public class FilterAnnotations implements Iterable { +class FilterAnnotations implements Iterable { private final ClassLoader classLoader; private final List filters; - public FilterAnnotations(ClassLoader classLoader, Filter[] filters) { + FilterAnnotations(ClassLoader classLoader, Filter[] filters) { Assert.notNull(filters, "'filters' must not be null"); this.classLoader = classLoader; this.filters = createTypeFilters(filters); @@ -99,8 +98,7 @@ public class FilterAnnotations implements Iterable { return this.filters.iterator(); } - public boolean anyMatches(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) - throws IOException { + boolean anyMatches(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { for (TypeFilter filter : this) { if (filter.match(metadataReader, metadataReaderFactory)) { return true; diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/StandardAnnotationCustomizableTypeExcludeFilter.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/StandardAnnotationCustomizableTypeExcludeFilter.java similarity index 97% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/StandardAnnotationCustomizableTypeExcludeFilter.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/StandardAnnotationCustomizableTypeExcludeFilter.java index 632994a21d9..3c68d037402 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/StandardAnnotationCustomizableTypeExcludeFilter.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/StandardAnnotationCustomizableTypeExcludeFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.lang.annotation.Annotation; import java.util.Collections; @@ -36,7 +36,7 @@ import org.springframework.util.Assert; * * @param the annotation type * @author Phillip Webb - * @since 2.2.0 + * @since 4.0.0 */ public abstract class StandardAnnotationCustomizableTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFilters.java similarity index 78% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFilters.java index fa54dcd2e14..c41e0ffa0b5 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFilters.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,16 +23,15 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.TypeExcludeFilter; +import org.springframework.context.ApplicationContext; /** * Annotation that can be on tests to define a set of {@link TypeExcludeFilter} classes - * that should be applied to {@link SpringBootApplication @SpringBootApplication} - * component scanning. + * that should be registered with the {@link ApplicationContext}. * * @author Phillip Webb - * @since 1.4.0 + * @since 4.0.0 * @see TypeExcludeFilter */ @Target(ElementType.TYPE) @@ -42,8 +41,7 @@ import org.springframework.boot.context.TypeExcludeFilter; public @interface TypeExcludeFilters { /** - * Specifies {@link TypeExcludeFilter} classes that should be applied to - * {@link SpringBootApplication @SpringBootApplication} component scanning. Classes + * Specifies {@link TypeExcludeFilter} classes that should be registered. Classes * specified here can either have a no-arg constructor or accept a single * {@code Class} argument if they need access to the {@code testClass}. * @see TypeExcludeFilter diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizer.java similarity index 98% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizer.java index 8b6604c843c..ea53e0b8bcf 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.io.IOException; import java.lang.reflect.Constructor; diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactory.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizerFactory.java similarity index 97% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactory.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizerFactory.java index 2e6475854de..04b91385e2e 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactory.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.util.Arrays; import java.util.LinkedHashSet; diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeIncludes.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeIncludes.java similarity index 98% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeIncludes.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeIncludes.java index 26c76022a2a..20858a977d9 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeIncludes.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/TypeIncludes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.io.BufferedReader; import java.io.IOException; diff --git a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/package-info.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/package-info.java similarity index 79% rename from module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/package-info.java rename to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/package-info.java index 159cc6ad58b..fd0fafd3545 100644 --- a/module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/package-info.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/annotation/package-info.java @@ -15,10 +15,10 @@ */ /** - * Helper utilities for using {@link org.springframework.boot.context.TypeExcludeFilter} - * with auto-configured tests. + * Test annotations support for + * {@link org.springframework.boot.context.TypeExcludeFilter}. */ @NullMarked -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import org.jspecify.annotations.NullMarked; diff --git a/core/spring-boot-test/src/main/resources/META-INF/spring.factories b/core/spring-boot-test/src/main/resources/META-INF/spring.factories index 81a8a894621..b6141e873a9 100644 --- a/core/spring-boot-test/src/main/resources/META-INF/spring.factories +++ b/core/spring-boot-test/src/main/resources/META-INF/spring.factories @@ -1,7 +1,8 @@ # Spring Test Context Customizer Factories org.springframework.test.context.ContextCustomizerFactory=\ org.springframework.boot.test.context.ImportsContextCustomizerFactory,\ -org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory +org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory,\ +org.springframework.boot.test.context.filter.annotation.TypeExcludeFiltersContextCustomizerFactory # Application Context Initializers org.springframework.context.ApplicationContextInitializer=\ diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotationsTests.java b/core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation/FilterAnnotationsTests.java similarity index 98% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotationsTests.java rename to core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation/FilterAnnotationsTests.java index 6dd6fee16ef..df135c4d0e4 100644 --- a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotationsTests.java +++ b/core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation/FilterAnnotationsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import java.io.IOException; import java.lang.annotation.Documented; diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactoryTests.java b/core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizerFactoryTests.java similarity index 95% rename from module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactoryTests.java rename to core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizerFactoryTests.java index 3e3ff901986..fc9214c47eb 100644 --- a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactoryTests.java +++ b/core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizerFactoryTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.filter; +package org.springframework.boot.test.context.filter.annotation; import org.junit.jupiter.api.Test; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFiltersContextCustomizerFactoryTests.EnclosingClass.WithEnclosingClassExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFiltersContextCustomizerFactoryTests.EnclosingClass.WithEnclosingClassExcludeFilters; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.type.classreading.MetadataReader; diff --git a/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java b/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java index 0deba6df2ce..bfed9bed0ad 100644 --- a/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java +++ b/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTypeExcludeFilter.java b/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTypeExcludeFilter.java index 75049748847..fdf007e4568 100644 --- a/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTypeExcludeFilter.java +++ b/module/spring-boot-data-cassandra-test/src/main/java/org/springframework/boot/data/cassandra/test/autoconfigure/DataCassandraTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.cassandra.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataCassandraTest @DataCassandraTest}. diff --git a/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTest.java b/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTest.java index 2296f6dcdb1..2aa7ac11be6 100644 --- a/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTest.java +++ b/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTypeExcludeFilter.java b/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTypeExcludeFilter.java index 85a1386effb..2367668fa6f 100644 --- a/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTypeExcludeFilter.java +++ b/module/spring-boot-data-couchbase-test/src/main/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.couchbase.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataCouchbaseTest @DataCouchbaseaTest}. diff --git a/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTest.java b/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTest.java index fdd4ed4340c..30a9e4c3648 100644 --- a/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTest.java +++ b/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTypeExcludeFilter.java b/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTypeExcludeFilter.java index e5baaeac780..d5b3e6eefb0 100644 --- a/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTypeExcludeFilter.java +++ b/module/spring-boot-data-elasticsearch-test/src/main/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.elasticsearch.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataElasticsearchTest @DataElasticsearchTest}. diff --git a/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTest.java b/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTest.java index daf3a5e734c..de915394aa8 100644 --- a/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTest.java +++ b/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTest.java @@ -29,8 +29,8 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTypeExcludeFilter.java b/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTypeExcludeFilter.java index 2fe3242b31f..11902e1baec 100644 --- a/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTypeExcludeFilter.java +++ b/module/spring-boot-data-jdbc-test/src/main/java/org/springframework/boot/data/jdbc/test/autoconfigure/DataJdbcTypeExcludeFilter.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration; /** diff --git a/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java b/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java index e14dec4be81..8882d5035c4 100644 --- a/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java +++ b/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTest.java @@ -31,9 +31,9 @@ import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.jpa.test.autoconfigure.AutoConfigureTestEntityManager; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.autoconfigure.properties.PropertyMapping; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTypeExcludeFilter.java b/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTypeExcludeFilter.java index 2f337fa82de..c5795a7c40c 100644 --- a/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTypeExcludeFilter.java +++ b/module/spring-boot-data-jpa-test/src/main/java/org/springframework/boot/data/jpa/test/autoconfigure/DataJpaTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.jpa.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataJpaTest @DataJpaTest}. diff --git a/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java b/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java index 1cac04c6792..fbd2f33533f 100644 --- a/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java +++ b/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTypeExcludeFilter.java b/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTypeExcludeFilter.java index 3238083c41d..bc8f4f22fc6 100644 --- a/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTypeExcludeFilter.java +++ b/module/spring-boot-data-ldap-test/src/main/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.ldap.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataLdapTest @DataLdapTest}. diff --git a/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java b/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java index 3464624148e..cb1e7c8f28a 100644 --- a/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java +++ b/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTypeExcludeFilter.java b/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTypeExcludeFilter.java index 2636893528b..8286883c3ee 100644 --- a/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTypeExcludeFilter.java +++ b/module/spring-boot-data-mongodb-test/src/main/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.mongodb.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataMongoTest @DataMongoTest}. diff --git a/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java b/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java index e1aa65cb457..ed12f461dd1 100644 --- a/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java +++ b/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTypeExcludeFilter.java b/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTypeExcludeFilter.java index 00889dd771a..8e4da509ea0 100644 --- a/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTypeExcludeFilter.java +++ b/module/spring-boot-data-neo4j-test/src/main/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.neo4j.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataNeo4jTest @DataNeo4jTest}. diff --git a/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTest.java b/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTest.java index cade199806c..d694c974b32 100644 --- a/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTest.java +++ b/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTypeExcludeFilter.java b/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTypeExcludeFilter.java index fd9651c4970..53d8ed1e0b5 100644 --- a/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTypeExcludeFilter.java +++ b/module/spring-boot-data-r2dbc-test/src/main/java/org/springframework/boot/data/r2dbc/test/autoconfigure/DataR2dbcTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.r2dbc.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataR2dbcTest @DataR2dbcTest}. diff --git a/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java b/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java index 93dd9936dd3..eff22d9b10e 100644 --- a/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java +++ b/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTypeExcludeFilter.java b/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTypeExcludeFilter.java index 0f8236fdcab..31398e0ccd3 100644 --- a/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTypeExcludeFilter.java +++ b/module/spring-boot-data-redis-test/src/main/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.data.redis.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link DataRedisTest @DataRedisTest}. diff --git a/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTest.java b/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTest.java index 021cbb40c21..8e0023192f6 100644 --- a/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTest.java +++ b/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTest.java @@ -31,7 +31,7 @@ import org.springframework.boot.graphql.test.autoconfigure.tester.AutoConfigureG import org.springframework.boot.graphql.test.autoconfigure.tester.AutoConfigureHttpGraphQlTester; import org.springframework.boot.json.test.autoconfigure.AutoConfigureJson; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTypeExcludeFilter.java b/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTypeExcludeFilter.java index 9c03d794f3e..7e23ac59c00 100644 --- a/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTypeExcludeFilter.java +++ b/module/spring-boot-graphql-test/src/main/java/org/springframework/boot/graphql/test/autoconfigure/GraphQlTypeExcludeFilter.java @@ -26,7 +26,7 @@ import graphql.execution.instrumentation.Instrumentation; import org.springframework.boot.context.TypeExcludeFilter; import org.springframework.boot.graphql.autoconfigure.GraphQlSourceBuilderCustomizer; import org.springframework.boot.jackson.JsonComponent; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.GenericConverter; import org.springframework.graphql.execution.DataFetcherExceptionResolver; diff --git a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java index 001313c8ad5..6663bd68544 100644 --- a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java +++ b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTest.java @@ -28,8 +28,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTypeExcludeFilter.java b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTypeExcludeFilter.java index 9128ed7d27a..8fad85a1188 100644 --- a/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTypeExcludeFilter.java +++ b/module/spring-boot-jdbc-test/src/main/java/org/springframework/boot/jdbc/test/autoconfigure/JdbcTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.jdbc.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link JdbcTest @JdbcTest}. diff --git a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java index d8a7a55622a..dfe881e4304 100644 --- a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java +++ b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTest.java @@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTypeExcludeFilter.java b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTypeExcludeFilter.java index dc36fdabb4e..ad7dd5069e7 100644 --- a/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTypeExcludeFilter.java +++ b/module/spring-boot-jooq-test/src/main/java/org/springframework/boot/jooq/test/autoconfigure/JooqTypeExcludeFilter.java @@ -17,7 +17,7 @@ package org.springframework.boot.jooq.test.autoconfigure; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link JooqTest @JooqTest}. diff --git a/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTest.java b/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTest.java index 7ffaec42210..a03a51ae990 100644 --- a/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTest.java +++ b/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTest.java @@ -31,7 +31,7 @@ import org.springframework.boot.json.test.GsonTester; import org.springframework.boot.json.test.JacksonTester; import org.springframework.boot.json.test.JsonbTester; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTypeExcludeFilter.java b/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTypeExcludeFilter.java index a610c9adf93..eeb702a5dbc 100644 --- a/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTypeExcludeFilter.java +++ b/module/spring-boot-json-test/src/main/java/org/springframework/boot/json/test/autoconfigure/JsonTypeExcludeFilter.java @@ -22,7 +22,7 @@ import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; import org.springframework.boot.jackson.JsonComponent; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; import org.springframework.util.ClassUtils; /** diff --git a/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTest.java b/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTest.java index fe31707a82e..39f2bcc6a0e 100644 --- a/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTest.java +++ b/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTest.java @@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTypeExcludeFilter.java b/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTypeExcludeFilter.java index 7bb148f1eff..3c8f6a57cd4 100644 --- a/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTypeExcludeFilter.java +++ b/module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/autoconfigure/RestClientTypeExcludeFilter.java @@ -23,7 +23,7 @@ import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; import org.springframework.boot.jackson.JsonComponent; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; import org.springframework.util.ClassUtils; /** diff --git a/module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories b/module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories index 9ff7f084a64..0a5f9ec4c3f 100644 --- a/module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/module/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories @@ -2,5 +2,4 @@ org.springframework.test.context.ContextCustomizerFactory=\ org.springframework.boot.test.autoconfigure.OnFailureConditionReportContextCustomizerFactory,\ org.springframework.boot.test.autoconfigure.OverrideAutoConfigurationContextCustomizerFactory,\ -org.springframework.boot.test.autoconfigure.filter.TypeExcludeFiltersContextCustomizerFactory,\ org.springframework.boot.test.autoconfigure.properties.PropertyMappingContextCustomizerFactory diff --git a/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java b/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java index 1a16b83fdc9..fb520b0f690 100644 --- a/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java +++ b/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTest.java @@ -29,8 +29,8 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.json.test.autoconfigure.AutoConfigureJson; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; diff --git a/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTypeExcludeFilter.java b/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTypeExcludeFilter.java index c575a4f0496..cf8931fc2b3 100644 --- a/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTypeExcludeFilter.java +++ b/module/spring-boot-webflux-test/src/main/java/org/springframework/boot/webflux/test/autoconfigure/WebFluxTypeExcludeFilter.java @@ -22,7 +22,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.GenericConverter; import org.springframework.stereotype.Controller; diff --git a/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java b/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java index cb18113eb2e..a9a56406d43 100644 --- a/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java +++ b/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTest.java @@ -28,8 +28,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; diff --git a/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTypeExcludeFilter.java b/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTypeExcludeFilter.java index 93a18138ab3..5cd9da9f334 100644 --- a/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTypeExcludeFilter.java +++ b/module/spring-boot-webmvc-test/src/main/java/org/springframework/boot/webmvc/test/autoconfigure/WebMvcTypeExcludeFilter.java @@ -22,7 +22,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.webmvc.autoconfigure.WebMvcRegistrations; diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientExcludeFilter.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientExcludeFilter.java index 12198042bed..85bc93241c6 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientExcludeFilter.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientExcludeFilter.java @@ -21,7 +21,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; /** * {@link TypeExcludeFilter} for {@link WebServiceClientTest @WebServiceClientTest}. diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientTest.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientTest.java index 43c4fe5fdca..915d3d9f12d 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientTest.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/client/WebServiceClientTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.boot.webservices.client.WebServiceTemplateBuilder; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.annotation.AliasFor; diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java index 0f25a6e871b..1483d51dc20 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTypeExcludeFilter.java b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTypeExcludeFilter.java index 303c8d483c1..bef66a4923b 100644 --- a/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTypeExcludeFilter.java +++ b/module/spring-boot-webservices-test/src/main/java/org/springframework/boot/webservices/test/autoconfigure/server/WebServiceServerTypeExcludeFilter.java @@ -22,7 +22,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.StandardAnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.StandardAnnotationCustomizableTypeExcludeFilter; import org.springframework.util.ObjectUtils; import org.springframework.ws.server.EndpointInterceptor; import org.springframework.ws.server.endpoint.annotation.Endpoint;