From e409527a086cbc4db051c1d9a518af14bdc66e04 Mon Sep 17 00:00:00 2001 From: lambdaxiao Date: Mon, 28 Feb 2022 21:41:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=8E=B7=E5=8F=96namespa?= =?UTF-8?q?ce=E4=B8=8B=E7=9A=84=E5=85=A8=E9=83=A8service=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../discovery/PolarisDiscoveryHandler.java | 20 ++++++++++++++++--- .../discovery/PolarisServiceDiscovery.java | 15 ++++++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index dcd69b98..f173b844 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -63,7 +63,7 @@ 1.1.4.Hoxton.SR9-SNAPSHOT - 1.2.2-SNAPSHOT + 1.2.4-SNAPSHOT 10.0.0-M6 2.0.0 diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index b765a36a..103fc3c8 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -23,10 +23,10 @@ import com.tencent.cloud.polaris.PolarisProperties; import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ProviderAPI; import com.tencent.polaris.api.pojo.ServiceInfo; -import com.tencent.polaris.api.rpc.GetAllInstancesRequest; -import com.tencent.polaris.api.rpc.GetInstancesRequest; -import com.tencent.polaris.api.rpc.InstancesResponse; +import com.tencent.polaris.api.rpc.*; + import java.util.Map; + import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -93,4 +93,18 @@ public class PolarisDiscoveryHandler { return providerAPI; } + /** + * Return all service for given namespace + * + * @return namespace下的服务列表 + */ + public ServicesResponse GetServices() { + String namespace = polarisProperties.getNamespace(); + Map allTransitiveCustomMetadata = MetadataContextHolder.get().getAllTransitiveCustomMetadata(); + GetServicesRequest request = new GetServicesRequest(); + request.setNamespace(namespace); + request.setMetadata(allTransitiveCustomMetadata); + return polarisConsumer.getServices(request); + } + } diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java index c06c3307..31eeb1fb 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java @@ -17,15 +17,21 @@ package com.tencent.cloud.polaris.discovery; +import com.tencent.cloud.polaris.PolarisProperties; import com.tencent.cloud.polaris.pojo.PolarisServiceInstance; import com.tencent.polaris.api.exception.PolarisException; import com.tencent.polaris.api.pojo.Instance; +import com.tencent.polaris.api.pojo.ServiceInfo; import com.tencent.polaris.api.pojo.ServiceInstances; import com.tencent.polaris.api.rpc.InstancesResponse; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; + +import com.tencent.polaris.api.rpc.ServicesResponse; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.client.ServiceInstance; /** @@ -57,13 +63,18 @@ public class PolarisServiceDiscovery { } /** - * TODO Return the names of all services. + * Return the names of all services. * * @return list of service names * @throws PolarisException polarisException */ public List getServices() throws PolarisException { - return Collections.emptyList(); + return polarisDiscoveryHandler. + GetServices(). + getServices(). + stream(). + map(ServiceInfo::getService). + collect(Collectors.toList()); } } From db4dcabd7a0bf0a32abea99a96a3990296e4f246 Mon Sep 17 00:00:00 2001 From: lambdaxiao Date: Tue, 1 Mar 2022 10:31:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=8E=B7=E5=8F=96service?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring-cloud-starter-tencent-polaris-discovery/pom.xml | 1 + .../cloud/polaris/discovery/PolarisDiscoveryHandler.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml index fa2cabb0..027ebf8c 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -35,6 +35,7 @@ com.tencent.polaris polaris-discovery-factory + 1.2.4-SNAPSHOT diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index 103fc3c8..9430d712 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -100,10 +100,8 @@ public class PolarisDiscoveryHandler { */ public ServicesResponse GetServices() { String namespace = polarisProperties.getNamespace(); - Map allTransitiveCustomMetadata = MetadataContextHolder.get().getAllTransitiveCustomMetadata(); GetServicesRequest request = new GetServicesRequest(); request.setNamespace(namespace); - request.setMetadata(allTransitiveCustomMetadata); return polarisConsumer.getServices(request); } From bd4472072d8b8a95bf2021567d5a7cd41819d6c8 Mon Sep 17 00:00:00 2001 From: lambdaxiao Date: Tue, 1 Mar 2022 10:42:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=92=8Cimport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring-cloud-starter-tencent-polaris-discovery/pom.xml | 1 - .../cloud/polaris/discovery/PolarisDiscoveryHandler.java | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml index 027ebf8c..fa2cabb0 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -35,7 +35,6 @@ com.tencent.polaris polaris-discovery-factory - 1.2.4-SNAPSHOT diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index 9430d712..d7eca59e 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -23,7 +23,11 @@ import com.tencent.cloud.polaris.PolarisProperties; import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ProviderAPI; import com.tencent.polaris.api.pojo.ServiceInfo; -import com.tencent.polaris.api.rpc.*; +import com.tencent.polaris.api.rpc.GetAllInstancesRequest; +import com.tencent.polaris.api.rpc.GetInstancesRequest; +import com.tencent.polaris.api.rpc.InstancesResponse; +import com.tencent.polaris.api.rpc.ServicesResponse; +import com.tencent.polaris.api.rpc.GetServicesRequest; import java.util.Map; From 47e23f2b15a944e512420ff0824ab32a057b7a7f Mon Sep 17 00:00:00 2001 From: lambdaxiao Date: Tue, 1 Mar 2022 17:58:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=8D=95=E6=B5=8B&&?= =?UTF-8?q?=E8=A7=84=E8=8C=83doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/polaris/discovery/PolarisDiscoveryHandler.java | 2 +- .../cloud/polaris/discovery/PolarisServiceDiscoveryTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index d7eca59e..e858d466 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -100,7 +100,7 @@ public class PolarisDiscoveryHandler { /** * Return all service for given namespace * - * @return namespace下的服务列表 + * @return service list */ public ServicesResponse GetServices() { String namespace = polarisProperties.getNamespace(); diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java index 77d99d44..5b6c7aa9 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java @@ -94,8 +94,7 @@ public class PolarisServiceDiscoveryTest { this.contextRunner.run(context -> { PolarisServiceDiscovery polarisServiceDiscovery = context.getBean(PolarisServiceDiscovery.class); List services = polarisServiceDiscovery.getServices(); - - assertThat(services.size()).isEqualTo(0); + assertThat(services.size()).isEqualTo(1); }); }