From 105b75ac16f3fb05ec813037faf555daa72c0d7f Mon Sep 17 00:00:00 2001
From: DerekYRC <15521077528@163.com>
Date: Mon, 11 Jul 2022 22:34:55 +0800
Subject: [PATCH] Remove @Value annotation from classed annotated with
 @ConfigurationProperties annotation

---
 .../polaris/PolarisDiscoveryProperties.java   | 32 ++++++---------
 .../consul/ConsulContextProperties.java       | 40 +++++++++++++++++++
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java
index b7e5b936c..27f4e38c0 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java
@@ -48,8 +48,7 @@ public class PolarisDiscoveryProperties {
 	@PostConstruct
 	public void init() {
 		if (StringUtils.isEmpty(service)) {
-			service = environment.getProperty("spring.cloud.polaris.service");
-			if (StringUtils.isEmpty(service)) {
+			service = environment.getProperty("spring.cloud.polaris.service"); if (StringUtils.isEmpty(service)) {
 				service = environment.getProperty("spring.application.name");
 			}
 		}
@@ -157,10 +156,18 @@ public class PolarisDiscoveryProperties {
 		return enabled;
 	}
 
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
 	public void setEnabled(Boolean enabled) {
 		this.enabled = enabled;
 	}
 
+	public Boolean getRegisterEnabled() {
+		return registerEnabled;
+	}
+
 	public boolean isRegisterEnabled() {
 		return registerEnabled;
 	}
@@ -219,20 +226,7 @@ public class PolarisDiscoveryProperties {
 
 	@Override
 	public String toString() {
-		return "PolarisDiscoveryProperties{" +
-				"namespace='" + namespace + '\'' +
-				", service='" + service + '\'' +
-				", token='" + token + '\'' +
-				", weight=" + weight +
-				", version='" + version + '\'' +
-				", protocol='" + protocol + '\'' +
-				", port=" + port +
-				", enabled=" + enabled +
-				", registerEnabled=" + registerEnabled +
-				", heartbeatEnabled=" + heartbeatEnabled +
-				", healthCheckUrl='" + healthCheckUrl + '\'' +
-				", serviceListRefreshInterval=" + serviceListRefreshInterval +
-				'}';
+		return "PolarisDiscoveryProperties{" + "namespace='" + namespace + '\'' + ", service='" + service + '\'' + ", token='" + token + '\'' + ", weight=" + weight + ", version='" + version + '\'' + ", protocol='" + protocol + '\'' + ", port=" + port + ", enabled=" + enabled + ", registerEnabled=" + registerEnabled + ", heartbeatEnabled=" + heartbeatEnabled + ", healthCheckUrl='" + healthCheckUrl + '\'' + ", serviceListRefreshInterval=" + serviceListRefreshInterval + '}';
 	}
 
 	@Bean
@@ -252,12 +246,10 @@ public class PolarisDiscoveryProperties {
 		public void modify(ConfigurationImpl configuration) {
 			if (polarisDiscoveryProperties != null) {
 				DiscoveryConfigImpl discoveryConfig = new DiscoveryConfigImpl();
-				discoveryConfig.setServerConnectorId(ID);
-				discoveryConfig.setEnable(polarisDiscoveryProperties.enabled);
+				discoveryConfig.setServerConnectorId(ID); discoveryConfig.setEnable(polarisDiscoveryProperties.enabled);
 				configuration.getConsumer().getDiscoveries().add(discoveryConfig);
 
-				RegisterConfigImpl registerConfig = new RegisterConfigImpl();
-				registerConfig.setServerConnectorId(ID);
+				RegisterConfigImpl registerConfig = new RegisterConfigImpl(); registerConfig.setServerConnectorId(ID);
 				registerConfig.setEnable(polarisDiscoveryProperties.registerEnabled);
 				configuration.getProvider().getRegisters().add(registerConfig);
 			}
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java
index a18894044..4ab47569d 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java
@@ -109,10 +109,50 @@ public class ConsulContextProperties {
 		return register;
 	}
 
+	public void setRegister(boolean register) {
+		this.register = register;
+	}
+
 	public boolean isDiscoveryEnabled() {
 		return discoveryEnabled;
 	}
 
+	public void setDiscoveryEnabled(boolean discoveryEnabled) {
+		this.discoveryEnabled = discoveryEnabled;
+	}
+
+	public String getInstanceId() {
+		return instanceId;
+	}
+
+	public void setInstanceId(String instanceId) {
+		this.instanceId = instanceId;
+	}
+
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+
+	public String getIpAddress() {
+		return ipAddress;
+	}
+
+	public void setIpAddress(String ipAddress) {
+		this.ipAddress = ipAddress;
+	}
+
+	public boolean isPreferIpAddress() {
+		return preferIpAddress;
+	}
+
+	public void setPreferIpAddress(boolean preferIpAddress) {
+		this.preferIpAddress = preferIpAddress;
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	public ConsulConfigModifier consulConfigModifier() {