fix: remove metadata failover config

pull/1718/head
fishtailfu 7 days ago
parent 583a4588ed
commit 6f1d7dbec5

@ -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;

@ -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

Loading…
Cancel
Save