From 406613c6fdefcd5b55860ee3e67c42d0a9017eef Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Dec 2025 08:46:46 +0000 Subject: [PATCH 1/2] Initial plan From 1078df0300b83fcc6a2085ebb681a1fb854856ee Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Dec 2025 08:53:56 +0000 Subject: [PATCH 2/2] Fix BeanPostProcessorChecker warnings with Spring Cloud 2025.0.0 Replace static DynamicDataSourceProperties bean method with @EnableConfigurationProperties annotation to properly integrate with Spring Cloud's configurationPropertiesBeans BeanPostProcessor. Co-authored-by: huayanYu <16700837+huayanYu@users.noreply.github.com> --- .../autoconfigure/DynamicDataSourceAopConfiguration.java | 8 ++------ .../autoconfigure/DynamicDataSourceAopConfiguration.java | 8 ++------ .../autoconfigure/DynamicDataSourceAopConfiguration.java | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dynamic-datasource-spring-boot-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java b/dynamic-datasource-spring-boot-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java index 04258777..29f31a75 100644 --- a/dynamic-datasource-spring-boot-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java +++ b/dynamic-datasource-spring-boot-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Role; @@ -48,6 +49,7 @@ */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(DynamicDataSourceProperties.class) public class DynamicDataSourceAopConfiguration { private final DynamicDataSourceProperties properties; @@ -56,12 +58,6 @@ public DynamicDataSourceAopConfiguration(DynamicDataSourceProperties properties) this.properties = properties; } - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) - @Bean - public static DynamicDataSourceProperties dynamicDataSourceProperties() { - return new DynamicDataSourceProperties(); - } - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean @ConditionalOnMissingBean diff --git a/dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java b/dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java index 9d5f34e1..ac8f233a 100644 --- a/dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java +++ b/dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Role; @@ -48,6 +49,7 @@ */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(DynamicDataSourceProperties.class) public class DynamicDataSourceAopConfiguration { private final DynamicDataSourceProperties properties; @@ -56,12 +58,6 @@ public DynamicDataSourceAopConfiguration(DynamicDataSourceProperties properties) this.properties = properties; } - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) - @Bean - public static DynamicDataSourceProperties dynamicDataSourceProperties() { - return new DynamicDataSourceProperties(); - } - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean @ConditionalOnMissingBean diff --git a/dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java b/dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java index 9d5f34e1..ac8f233a 100644 --- a/dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java +++ b/dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Role; @@ -48,6 +49,7 @@ */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(DynamicDataSourceProperties.class) public class DynamicDataSourceAopConfiguration { private final DynamicDataSourceProperties properties; @@ -56,12 +58,6 @@ public DynamicDataSourceAopConfiguration(DynamicDataSourceProperties properties) this.properties = properties; } - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) - @Bean - public static DynamicDataSourceProperties dynamicDataSourceProperties() { - return new DynamicDataSourceProperties(); - } - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean @ConditionalOnMissingBean