From cf740add85f104572b565d85d1efc8adccff113f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 30 Dec 2019 14:51:51 +0100 Subject: [PATCH] Fix component scan test setup This commit fixes the setup of tests using component scan. Previously, a configuration used an include filter to only include a particular configuration class in a given package. Unfortunately, include filters do not prevent regular filters by default and the definition did not have the intended behaviour. This commit disables default filters so that only the specified include filter is applied. --- .../condition/ConditionalOnMissingBeanTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index 9a24b37c29a..899e3a04ebf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -380,7 +380,7 @@ public class ConditionalOnMissingBeanTests { } @Configuration(proxyBeanMethods = false) - @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", + @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", useDefaultFilters = false, includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ScannedFactoryBeanConfiguration.class)) static class ComponentScannedFactoryBeanBeanMethodConfiguration { @@ -388,7 +388,7 @@ public class ConditionalOnMissingBeanTests { } @Configuration(proxyBeanMethods = false) - @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", + @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", useDefaultFilters = false, includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.class)) static class ComponentScannedFactoryBeanBeanMethodWithArgumentsConfiguration {