From 6f1d7dbec500bc9ce93b68d8955ac7735181d50b Mon Sep 17 00:00:00 2001
From: fishtailfu <fishtailfu@tencent.com>
Date: Thu, 28 Aug 2025 11:40:43 +0800
Subject: [PATCH] fix: remove metadata failover config

---
 .../extend/nacos/NacosContextProperties.java  | 23 +++++--------------
 .../nacos/NacosContextPropertiesTest.java     |  2 ++
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java
index 778043d8b..7986f6550 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java
@@ -20,6 +20,10 @@ package com.tencent.cloud.polaris.extend.nacos;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import static shade.polaris.com.alibaba.nacos.api.common.Constants.DEFAULT_CLUSTER_NAME;
+import static shade.polaris.com.alibaba.nacos.api.common.Constants.DEFAULT_GROUP;
+import static shade.polaris.com.alibaba.nacos.api.common.Constants.DEFAULT_NAMESPACE_ID;
+
 /**
  * Discovery configuration of Nacos.
  *
@@ -28,21 +32,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties("spring.cloud.nacos")
 public class NacosContextProperties {
 
-	/**
-	 * Nacos default group name.
-	 */
-	public static final String DEFAULT_GROUP = "DEFAULT_GROUP";
-
-	/**
-	 * Nacos default cluster name.
-	 */
-	public static final String DEFAULT_CLUSTER = "DEFAULT";
-
-	/**
-	 * Nacos default namespace name.
-	 */
-	public static final String DEFAULT_NAMESPACE = "public";
-
 	@Value("${spring.cloud.nacos.discovery.enabled:#{'false'}}")
 	private boolean discoveryEnabled;
 
@@ -87,7 +76,7 @@ public class NacosContextProperties {
 	 * cluster name for nacos .
 	 */
 	@Value("${spring.cloud.nacos.discovery.cluster-name:DEFAULT}")
-	private String clusterName = DEFAULT_CLUSTER;
+	private String clusterName = DEFAULT_CLUSTER_NAME;
 
 	/**
 	 * group name for nacos.
@@ -96,7 +85,7 @@ public class NacosContextProperties {
 	private String group = DEFAULT_GROUP;
 
 	@Value("${spring.cloud.nacos.discovery.namespace:public}")
-	private String namespace = DEFAULT_NAMESPACE;
+	private String namespace = DEFAULT_NAMESPACE_ID;
 
 	@Value("${spring.cloud.nacos.discovery.weight:1.0}")
 	private double weight = 1.0;
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java
index 4449279b7..f4cd2a160 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/extend/nacos/NacosContextPropertiesTest.java
@@ -34,6 +34,7 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.CollectionUtils;
 
+import static com.tencent.polaris.plugins.connector.common.constant.NacosConstant.MetadataMapKey.NACOS_CLUSTER_KEY;
 import static com.tencent.polaris.plugins.connector.common.constant.NacosConstant.MetadataMapKey.NACOS_GROUP_KEY;
 import static org.assertj.core.api.Assertions.assertThat;
 import static shade.polaris.com.alibaba.nacos.api.PropertyKeyConst.CONTEXT_PATH;
@@ -92,6 +93,7 @@ public class NacosContextPropertiesTest {
 		assertThat(metadata.get(CONTEXT_PATH)).isEqualTo(nacosContextProperties.getContextPath());
 		assertThat(metadata.get(NAMESPACE)).isEqualTo(nacosContextProperties.getNamespace());
 		assertThat(metadata.get(NACOS_GROUP_KEY)).isEqualTo(nacosContextProperties.getGroup());
+		assertThat(metadata.get(NACOS_CLUSTER_KEY)).isEqualTo(nacosContextProperties.getClusterName());
 	}
 
 	@SpringBootApplication