From 141ee68f17d9da74709c52db4348b61f7b958426 Mon Sep 17 00:00:00 2001
From: wulingxiao <1251605638@qqcom>
Date: Sat, 15 Oct 2022 22:00:39 +0800
Subject: [PATCH] Optimize:remove useless component annotation.

---
 .../DiscoveryPropertiesAutoConfiguration.java |  9 ++++++--
 .../discovery/PolarisDiscoveryHandler.java    | 21 +++++++++++--------
 .../util/ApplicationContextAwareUtils.java    |  1 -
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java
index 6e9f1b236..ba3752dfe 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java
@@ -21,6 +21,9 @@ import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
 import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler;
 import com.tencent.cloud.polaris.extend.consul.ConsulContextProperties;
 
+import com.tencent.polaris.api.core.ConsumerAPI;
+import com.tencent.polaris.api.core.ProviderAPI;
+import com.tencent.polaris.client.api.SDKContext;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,8 +41,10 @@ public class DiscoveryPropertiesAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public PolarisDiscoveryHandler polarisDiscoveryHandler() {
-		return new PolarisDiscoveryHandler();
+	public PolarisDiscoveryHandler polarisDiscoveryHandler(PolarisDiscoveryProperties polarisDiscoveryProperties,
+														   ProviderAPI providerAPI, SDKContext sdkContext,
+														   ConsumerAPI polarisConsumer) {
+		return new PolarisDiscoveryHandler(polarisDiscoveryProperties,providerAPI,sdkContext,polarisConsumer);
 	}
 
 	@Bean
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java
index 2388c1381..c59c34dbd 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java
@@ -36,20 +36,23 @@ import org.springframework.stereotype.Component;
  *
  * @author Haotian Zhang, Andrew Shan, Jie Cheng
  */
-@Component
 public class PolarisDiscoveryHandler {
 
-	@Autowired
-	private PolarisDiscoveryProperties polarisDiscoveryProperties;
+	private final PolarisDiscoveryProperties polarisDiscoveryProperties;
 
-	@Autowired
-	private ProviderAPI providerAPI;
+	private final ProviderAPI providerAPI;
 
-	@Autowired
-	private SDKContext sdkContext;
+	private final SDKContext sdkContext;
 
-	@Autowired
-	private ConsumerAPI polarisConsumer;
+	private final ConsumerAPI polarisConsumer;
+
+	public PolarisDiscoveryHandler(PolarisDiscoveryProperties polarisDiscoveryProperties,
+								   ProviderAPI providerAPI, SDKContext sdkContext, ConsumerAPI polarisConsumer) {
+		this.polarisDiscoveryProperties = polarisDiscoveryProperties;
+		this.providerAPI = providerAPI;
+		this.sdkContext = sdkContext;
+		this.polarisConsumer = polarisConsumer;
+	}
 
 	/**
 	 * Get a list of healthy instances.
diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ApplicationContextAwareUtils.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ApplicationContextAwareUtils.java
index b611cc04f..ef8c3b6b2 100644
--- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ApplicationContextAwareUtils.java
+++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ApplicationContextAwareUtils.java
@@ -28,7 +28,6 @@ import org.springframework.stereotype.Component;
  *
  * @author Hongwei Zhu
  */
-@Component
 public class ApplicationContextAwareUtils implements ApplicationContextAware {
 
 	private static ApplicationContext applicationContext;