From e351b44abdaaf8278124b749bab6bd2f4eb51f7f Mon Sep 17 00:00:00 2001
From: seanyu <seansyyu@tencent.com>
Date: Fri, 31 Mar 2023 13:54:50 +0800
Subject: [PATCH] remove sca dependency

---
 .../pom.xml                                            |  7 -------
 .../config/NacosDiscoveryAdapterAutoConfiguration.java |  3 +--
 .../adapter/transformer/NacosInstanceTransformer.java  | 10 ++++------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml
index 4d5a1b3f4..b8550b454 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml
@@ -20,13 +20,6 @@
 			<artifactId>spring-cloud-starter-tencent-polaris-router</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-			<version>2021.1</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/config/NacosDiscoveryAdapterAutoConfiguration.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/config/NacosDiscoveryAdapterAutoConfiguration.java
index 1fa15978e..08aaf6651 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/config/NacosDiscoveryAdapterAutoConfiguration.java
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/config/NacosDiscoveryAdapterAutoConfiguration.java
@@ -18,7 +18,6 @@
 
 package com.tencent.cloud.plugin.discovery.adapter.config;
 
-import com.alibaba.cloud.nacos.NacosServiceInstance;
 import com.tencent.cloud.plugin.discovery.adapter.transformer.NacosInstanceTransformer;
 import com.tencent.cloud.polaris.router.config.ConditionalOnPolarisRouterEnabled;
 import com.tencent.cloud.polaris.router.config.LoadBalancerConfiguration;
@@ -45,7 +44,7 @@ public class NacosDiscoveryAdapterAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnPolarisRouterEnabled
-	@ConditionalOnClass(NacosServiceInstance.class)
+	@ConditionalOnClass(name = "com.alibaba.cloud.nacos.NacosServiceInstance")
 	public InstanceTransformer instanceTransformer() {
 		return new NacosInstanceTransformer();
 	}
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosInstanceTransformer.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosInstanceTransformer.java
index cdbf417a9..c35f3a0fa 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosInstanceTransformer.java
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosInstanceTransformer.java
@@ -18,7 +18,6 @@
 
 package com.tencent.cloud.plugin.discovery.adapter.transformer;
 
-import com.alibaba.cloud.nacos.NacosServiceInstance;
 import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 import org.apache.commons.lang.StringUtils;
@@ -34,17 +33,16 @@ public class NacosInstanceTransformer implements InstanceTransformer {
 
 	@Override
 	public void transformCustom(DefaultInstance instance, ServiceInstance serviceInstance) {
-		if (serviceInstance instanceof NacosServiceInstance) {
-			NacosServiceInstance nacosServiceInstance = (NacosServiceInstance) serviceInstance;
-			String nacosWeight = nacosServiceInstance.getMetadata().get("nacos.weight");
+		if ("com.alibaba.cloud.nacos.NacosServiceInstance".equals(serviceInstance.getClass().getName())) {
+			String nacosWeight = serviceInstance.getMetadata().get("nacos.weight");
 			instance.setWeight(
 					StringUtils.isBlank(nacosWeight) ? 100 : new Double(Double.parseDouble(nacosWeight) * 100).intValue()
 			);
-			String nacosHealthy = nacosServiceInstance.getMetadata().get("nacos.healthy");
+			String nacosHealthy = serviceInstance.getMetadata().get("nacos.healthy");
 			instance.setHealthy(
 					!StringUtils.isBlank(nacosHealthy) && Boolean.parseBoolean(nacosHealthy)
 			);
-			String nacosInstanceId = nacosServiceInstance.getMetadata().get("nacos.instanceId");
+			String nacosInstanceId = serviceInstance.getMetadata().get("nacos.instanceId");
 			instance.setId(nacosInstanceId);
 		}
 	}