From b2aaf9fc697b6215ec2169723ae2d7e26f668907 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 5 Feb 2025 15:55:30 +0800 Subject: [PATCH] Revise usage of @EnableConfigurationProperties 1. use `@EnableConfigurationProperties` to register configuration properties beans if the bean name is not relevant. 2. remove `@EnableConfigurationProperties` without specified value if the `@Configuration` class doesn't contain any `@ConfigurationProperties` bean. Signed-off-by: Yanming Zhou --- .../cloud/commons/util/UtilAutoConfiguration.java | 7 +------ .../cloud/client/actuator/FeaturesEndpointTests.java | 2 -- .../health/DiscoveryClientHealthIndicatorTests.java | 2 -- .../cloud/bootstrap/TestBootstrapConfiguration.java | 2 -- .../bootstrap/config/BootstrapConfigurationTests.java | 2 -- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java index 5df81a3c4..dfb267cc4 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java @@ -29,14 +29,9 @@ @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.util.enabled", matchIfMissing = true) @AutoConfigureOrder(0) -@EnableConfigurationProperties +@EnableConfigurationProperties(InetUtilsProperties.class) public class UtilAutoConfiguration { - @Bean - public InetUtilsProperties inetUtilsProperties() { - return new InetUtilsProperties(); - } - @Bean @ConditionalOnMissingBean public InetUtils inetUtils(InetUtilsProperties properties) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java index 3f0187a1f..3c45f779d 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -85,7 +84,6 @@ HasFeatures localFeatures() { } @Configuration(proxyBeanMethods = false) - @EnableConfigurationProperties public static class Config { @Autowired(required = false) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java index fcfe62170..3bfc2ac5a 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.health.contributor.CompositeHealthContributor; import org.springframework.boot.health.contributor.Health; import org.springframework.boot.health.contributor.HealthContributor; @@ -80,7 +79,6 @@ private Status assertHealth(Health health, Status expected) { } @Configuration(proxyBeanMethods = false) - @EnableConfigurationProperties public static class Config { @Bean diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java index 80584ebb4..de9f8b4c8 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java @@ -20,7 +20,6 @@ import java.util.List; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ConfigurableApplicationContext; @@ -37,7 +36,6 @@ */ @Order(0) @Configuration(proxyBeanMethods = false) -@EnableConfigurationProperties public class TestBootstrapConfiguration { public static List fooSightings = null; diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java index 9eba5b003..eb72f60c5 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java @@ -28,7 +28,6 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.cloud.bootstrap.BootstrapApplicationListener; @@ -758,7 +757,6 @@ public void bootstrapPropertiesWithActivateOnProfile() { } @Configuration(proxyBeanMethods = false) - @EnableConfigurationProperties protected static class BareConfiguration { }