From 9f7ca2d848325bf13de31c93509900133da2b4c4 Mon Sep 17 00:00:00 2001
From: lepdou <ledouzhang@tencent.com>
Date: Thu, 1 Dec 2022 14:16:49 +0800
Subject: [PATCH] add @Primary for AffectedConfigurationPropertiesRebinder bean
 (#754)

---
 CHANGELOG.md                                                   | 2 ++
 pom.xml                                                        | 2 +-
 .../cloud/polaris/config/PolarisConfigAutoConfiguration.java   | 3 ++-
 .../config/spring/annotation/SpringValueProcessorTest.java     | 2 ++
 spring-cloud-tencent-dependencies/pom.xml                      | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 671ece8fb..b77d84945 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,4 @@
 # Change Log
 ---
+
+- [Optimize: add @Primary for ConfigurationPropertiesRebinder](https://github.com/Tencent/spring-cloud-tencent/pull/754)
diff --git a/pom.xml b/pom.xml
index 87607c549..f38a565d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.8.1-2022.0.0-RC2</revision>
+		<revision>1.8.2-2022.0.0-RC2-SNAPSHOT</revision>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>2022.0.0-RC2</spring.cloud.version>
diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java
index aa3198435..f336be29c 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java
@@ -39,6 +39,7 @@ import org.springframework.cloud.context.properties.ConfigurationPropertiesRebin
 import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
 /**
  * polaris config module auto configuration at init application context phase.
@@ -60,7 +61,7 @@ public class PolarisConfigAutoConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
+	@Primary
 	@ConditionalOnReflectRefreshType
 	public ConfigurationPropertiesRebinder affectedConfigurationPropertiesRebinder(
 			ConfigurationPropertiesBeans beans) {
diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java
index 99f1b9b14..413af645e 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java
@@ -79,6 +79,7 @@ public class SpringValueProcessorTest {
 				.withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class))
 				.withConfiguration(AutoConfigurations.of(ValueTest.class))
 				.withConfiguration(AutoConfigurations.of(PolarisConfigAutoConfiguration.class))
+				.withAllowBeanDefinitionOverriding(true)
 				.withPropertyValues("spring.application.name=" + "conditionalOnConfigReflectEnabledTest")
 				.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
 				.withPropertyValues("spring.cloud.polaris.config.refresh-type=" + RefreshType.REFLECT)
@@ -116,6 +117,7 @@ public class SpringValueProcessorTest {
 				.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
 				.withPropertyValues("spring.cloud.polaris.config.refresh-type=" + RefreshType.REFLECT)
 				.withPropertyValues("spring.cloud.polaris.config.enabled=true")
+				.withAllowBeanDefinitionOverriding(true)
 				.withPropertyValues("name=test");
 		contextRunner.run(context -> {
 			SpringValueRegistry springValueRegistry = context.getBean(SpringValueRegistry.class);
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 5a99a59af..b50dd27aa 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.8.1-2022.0.0-RC2</revision>
+		<revision>1.8.2-2022.0.0-RC2-SNAPSHOT</revision>
 
 		<!-- Dependencies -->
 		<polaris.version>1.9.1</polaris.version>