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

---
 pom.xml                                       | 16 ++++++-------
 .../polaris/PolarisDiscoveryProperties.java   | 24 +++++++++++++++----
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index d13aac07e..5f1c6be78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,10 +149,10 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-checkstyle-plugin</artifactId>-->
+<!--			</plugin>-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -222,10 +222,10 @@
 
 	<reporting>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-checkstyle-plugin</artifactId>-->
+<!--			</plugin>-->
 		</plugins>
 	</reporting>
 
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 27f4e38c0..fb2a2d42f 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,7 +48,8 @@ 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");
 			}
 		}
@@ -226,7 +227,20 @@ 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
@@ -246,10 +260,12 @@ 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);
 			}