From 490b4d190e5abfb25aab0dcdc06b6334c3e6f96d Mon Sep 17 00:00:00 2001 From: seanyu Date: Fri, 17 Feb 2023 11:00:42 +0800 Subject: [PATCH] fix break changes --- .../discovery/PolarisServiceDiscovery.java | 2 +- .../endpoint/PolarisDiscoveryEndpoint.java | 2 +- .../discovery/PolarisServiceDiscoveryTest.java | 2 +- .../ratelimit/RateLimitRuleLabelResolver.java | 4 ++-- .../endpoint/PolarisRateLimitRuleEndpoint.java | 2 +- .../ratelimit/RateLimitRuleLabelResolverTest.java | 6 +++--- .../PolarisRateLimitRuleEndpointTests.java | 6 +++--- .../polaris/router/RouterRuleLabelResolver.java | 4 ++-- .../router/endpoint/PolarisRouterEndpoint.java | 2 +- .../router/RouterRuleLabelResolverTest.java | 4 ++-- .../endpoint/PolarisRouterEndpointTest.java | 4 ++-- spring-cloud-tencent-commons/pom.xml | 3 +++ spring-cloud-tencent-dependencies/pom.xml | 15 ++++++++++++++- .../cloud/polaris/context/ServiceRuleManager.java | 4 ++-- 14 files changed, 38 insertions(+), 22 deletions(-) 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 022cab1d4..55b8e97c9 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 instances = new ArrayList<>(); InstancesResponse filteredInstances = polarisDiscoveryHandler.getHealthyInstances(serviceId); - ServiceInstances serviceInstances = filteredInstances.toServiceInstances(); + ServiceInstances serviceInstances = filteredInstances.getServiceInstances(); 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 6603896d2..7bd2174bd 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.toServiceInstances(); + return instancesResponse.getServiceInstances(); } } 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 8e70596d3..dbbc3f282 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.toServiceInstances()).thenReturn(mockDefaultServiceInstances); + when(mockInstancesResponse.getServiceInstances()).thenReturn(mockDefaultServiceInstances); when(polarisDiscoveryHandler.getHealthyInstances(anyString())).thenReturn(mockInstancesResponse); List serviceInstances = polarisServiceDiscovery.getInstances(SERVICE_PROVIDER); diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolver.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolver.java index 37e77fd12..fed34dcc8 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolver.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolver.java @@ -26,8 +26,8 @@ import java.util.Set; import com.tencent.cloud.common.util.expresstion.ExpressionLabelUtils; import com.tencent.cloud.polaris.context.ServiceRuleManager; -import com.tencent.polaris.client.pb.ModelProto; -import com.tencent.polaris.client.pb.RateLimitProto; +import com.tencent.polaris.specification.api.v1.model.ModelProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RateLimitProto; import org.springframework.util.CollectionUtils; diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java index a97069c2e..9aba2592d 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpoint.java @@ -28,7 +28,7 @@ import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.polaris.context.ServiceRuleManager; import com.tencent.cloud.polaris.ratelimit.config.PolarisRateLimitProperties; -import com.tencent.polaris.client.pb.RateLimitProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RateLimitProto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java index c9abe032d..558de41c6 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java @@ -21,8 +21,8 @@ import java.util.Set; import com.google.protobuf.StringValue; import com.tencent.cloud.polaris.context.ServiceRuleManager; -import com.tencent.polaris.client.pb.ModelProto; -import com.tencent.polaris.client.pb.RateLimitProto; +import com.tencent.polaris.specification.api.v1.model.ModelProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RateLimitProto; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -61,7 +61,7 @@ public class RateLimitRuleLabelResolverTest { } else { ModelProto.MatchString matchString = ModelProto.MatchString.newBuilder() - .setType(ModelProto.Operation.EXACT) + .setType(ModelProto.MatchString.MatchStringType.EXACT) .setValue(StringValue.of("value")) .setValueType(ModelProto.MatchString.ValueType.TEXT).build(); RateLimitProto.Rule rule = RateLimitProto.Rule.newBuilder() diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java index d157c1e0a..a7a1db907 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java @@ -22,8 +22,8 @@ import java.util.Map; import com.google.protobuf.StringValue; import com.tencent.cloud.polaris.context.ServiceRuleManager; import com.tencent.cloud.polaris.ratelimit.config.PolarisRateLimitProperties; -import com.tencent.polaris.client.pb.ModelProto; -import com.tencent.polaris.client.pb.RateLimitProto; +import com.tencent.polaris.specification.api.v1.model.ModelProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RateLimitProto; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -83,7 +83,7 @@ public class PolarisRateLimitRuleEndpointTests { } else { ModelProto.MatchString matchString = ModelProto.MatchString.newBuilder() - .setType(ModelProto.Operation.EXACT) + .setType(ModelProto.MatchString.MatchStringType.EXACT) .setValue(StringValue.of("value")) .setValueType(ModelProto.MatchString.ValueType.TEXT).build(); RateLimitProto.Rule rule = RateLimitProto.Rule.newBuilder() diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolver.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolver.java index b7b5821a1..b410db615 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolver.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolver.java @@ -26,8 +26,8 @@ import java.util.Set; import com.tencent.cloud.common.util.expresstion.ExpressionLabelUtils; import com.tencent.cloud.polaris.context.ServiceRuleManager; -import com.tencent.polaris.client.pb.ModelProto; -import com.tencent.polaris.client.pb.RoutingProto; +import com.tencent.polaris.specification.api.v1.model.ModelProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RoutingProto; import org.springframework.util.CollectionUtils; diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java index 6fd47cf21..661af3a1c 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpoint.java @@ -28,7 +28,7 @@ import com.google.protobuf.util.JsonFormat; import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.polaris.context.ServiceRuleManager; -import com.tencent.polaris.client.pb.RoutingProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RoutingProto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolverTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolverTest.java index 9e07504f2..8dccefede 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolverTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/RouterRuleLabelResolverTest.java @@ -26,8 +26,8 @@ import java.util.Set; import com.google.common.collect.Lists; import com.tencent.cloud.polaris.context.ServiceRuleManager; -import com.tencent.polaris.client.pb.ModelProto; -import com.tencent.polaris.client.pb.RoutingProto; +import com.tencent.polaris.specification.api.v1.model.ModelProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RoutingProto; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java index e400013c1..bc8aafcbf 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/endpoint/PolarisRouterEndpointTest.java @@ -25,8 +25,8 @@ import java.util.Map; import com.google.common.collect.Lists; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.cloud.polaris.context.ServiceRuleManager; -import com.tencent.polaris.client.pb.ModelProto; -import com.tencent.polaris.client.pb.RoutingProto; +import com.tencent.polaris.specification.api.v1.model.ModelProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RoutingProto; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-commons/pom.xml index 5e373d142..9a80abe64 100644 --- a/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-commons/pom.xml @@ -105,5 +105,8 @@ system-stubs-junit4 test + + + diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index c7b234d28..3f9b662fc 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -73,7 +73,8 @@ 1.10.0-2021.0.5-SNAPSHOT - 1.10.5 + 1.11.0-SNAPSHOT + 1.50.0 31.0.1-jre 1.2.11 4.5.1 @@ -231,6 +232,18 @@ ${byte-buddy.version} + + io.grpc + grpc-all + ${grpc.version} + + + grpc-xds + io.grpc + + + + org.mockito mockito-inline diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/ServiceRuleManager.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/ServiceRuleManager.java index 6ace65e70..8294fb0eb 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/ServiceRuleManager.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/ServiceRuleManager.java @@ -32,8 +32,8 @@ import com.tencent.polaris.client.flow.BaseFlow; import com.tencent.polaris.client.flow.DefaultFlowControlParam; import com.tencent.polaris.client.flow.FlowControlParam; import com.tencent.polaris.client.flow.ResourcesResponse; -import com.tencent.polaris.client.pb.RateLimitProto; -import com.tencent.polaris.client.pb.RoutingProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RateLimitProto; +import com.tencent.polaris.specification.api.v1.traffic.manage.RoutingProto; import org.slf4j.Logger; import org.slf4j.LoggerFactory;