From 53b28e4cd304766068ec791cfc74a7f144246391 Mon Sep 17 00:00:00 2001
From: seanyu <seansyyu@tencent.com>
Date: Fri, 17 Feb 2023 14:02:43 +0800
Subject: [PATCH] fix break changes

---
 .../pom.xml                                   |  7 ++++++
 .../discovery/PolarisServiceDiscovery.java    |  2 +-
 .../endpoint/PolarisDiscoveryEndpoint.java    |  2 +-
 .../PolarisServiceDiscoveryTest.java          |  2 +-
 spring-cloud-tencent-commons/pom.xml          | 10 +++++++++
 spring-cloud-tencent-dependencies/pom.xml     | 22 ++++++++-----------
 6 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/spring-cloud-starter-tencent-metadata-transfer/pom.xml b/spring-cloud-starter-tencent-metadata-transfer/pom.xml
index 642bbec1a..f606642b1 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/pom.xml
+++ b/spring-cloud-starter-tencent-metadata-transfer/pom.xml
@@ -50,6 +50,13 @@
 			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 </project>
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java
index 55b8e97c9..022cab1d4 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java
@@ -65,7 +65,7 @@ public class PolarisServiceDiscovery {
 		serviceId = DiscoveryUtil.rewriteServiceId(serviceId);
 		List<ServiceInstance> instances = new ArrayList<>();
 		InstancesResponse filteredInstances = polarisDiscoveryHandler.getHealthyInstances(serviceId);
-		ServiceInstances serviceInstances = filteredInstances.getServiceInstances();
+		ServiceInstances serviceInstances = filteredInstances.toServiceInstances();
 		for (Instance instance : serviceInstances.getInstances()) {
 			instances.add(new PolarisServiceInstance(instance));
 		}
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java
index 7bd2174bd..6603896d2 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/endpoint/PolarisDiscoveryEndpoint.java
@@ -77,6 +77,6 @@ public class PolarisDiscoveryEndpoint {
 
 	private ServiceInstances getServiceInstances(String serviceId) {
 		InstancesResponse instancesResponse = polarisDiscoveryHandler.getHealthyInstances(serviceId);
-		return instancesResponse.getServiceInstances();
+		return instancesResponse.toServiceInstances();
 	}
 }
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java
index dbbc3f282..8e70596d3 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java
@@ -69,7 +69,7 @@ public class PolarisServiceDiscoveryTest {
 		DefaultServiceInstances mockDefaultServiceInstances = mock(DefaultServiceInstances.class);
 		when(mockDefaultServiceInstances.getInstances()).thenReturn(singletonList(mock(DefaultInstance.class)));
 		InstancesResponse mockInstancesResponse = mock(InstancesResponse.class);
-		when(mockInstancesResponse.getServiceInstances()).thenReturn(mockDefaultServiceInstances);
+		when(mockInstancesResponse.toServiceInstances()).thenReturn(mockDefaultServiceInstances);
 		when(polarisDiscoveryHandler.getHealthyInstances(anyString())).thenReturn(mockInstancesResponse);
 
 		List<ServiceInstance> serviceInstances = polarisServiceDiscovery.getInstances(SERVICE_PROVIDER);
diff --git a/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-commons/pom.xml
index 9a80abe64..05789f46b 100644
--- a/spring-cloud-tencent-commons/pom.xml
+++ b/spring-cloud-tencent-commons/pom.xml
@@ -106,7 +106,17 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 </project>
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 3f9b662fc..9f8ffbf05 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -74,7 +74,7 @@
 
 		<!-- Dependencies -->
 		<polaris.version>1.11.0-SNAPSHOT</polaris.version>
-		<grpc.version>1.50.0</grpc.version>
+		<junit.version>4.13.2</junit.version>
 		<guava.version>31.0.1-jre</guava.version>
 		<logback.version>1.2.11</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>
@@ -232,18 +232,6 @@
 				<version>${byte-buddy.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>io.grpc</groupId>
-				<artifactId>grpc-all</artifactId>
-				<version>${grpc.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>grpc-xds</artifactId>
-						<groupId>io.grpc</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-inline</artifactId>
@@ -264,6 +252,14 @@
 				<version>${system-stubs-junit4.version}</version>
 				<scope>test</scope>
 			</dependency>
+
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>