From 658276e14c504707d647a63ece6c04df3827f88f Mon Sep 17 00:00:00 2001 From: veteranchen Date: Thu, 27 Jul 2023 07:56:31 +0800 Subject: [PATCH] =?UTF-8?q?polaris=20load=20balancer:=20=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E8=B4=9F=E8=BD=BD=E5=9D=87=E8=A1=A1=E5=99=A8=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E5=9F=BA=E7=B1=BB=EF=BC=8C=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E8=BD=AE=E8=AE=AD=E8=B4=9F=E8=BD=BD=E5=9D=87?= =?UTF-8?q?=E8=A1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化 code style --issue=968 --- .../loadbalancer/PolarisAbstractLoadBalancer.java | 12 +++++++----- .../loadbalancer/PolarisRingHashLoadBalancer.java | 11 +++++------ .../PolarisWeightedRandomLoadBalancer.java | 1 + .../PolarisWeightedRoundRobinLoadBalancer.java | 3 +-- .../PolarisWeightedRoundRobinLoadBalancerTest.java | 11 ++++++----- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisAbstractLoadBalancer.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisAbstractLoadBalancer.java index c2b68fd42..f3ad9060d 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisAbstractLoadBalancer.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisAbstractLoadBalancer.java @@ -17,6 +17,9 @@ package com.tencent.cloud.polaris.loadbalancer; +import java.util.List; +import java.util.stream.Collectors; + import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.pojo.PolarisServiceInstance; import com.tencent.polaris.api.pojo.DefaultServiceInstances; @@ -28,6 +31,8 @@ import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceRequest; import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import reactor.core.publisher.Mono; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.loadbalancer.DefaultResponse; @@ -37,10 +42,6 @@ import org.springframework.cloud.client.loadbalancer.Response; import org.springframework.cloud.loadbalancer.core.NoopServiceInstanceListSupplier; import org.springframework.cloud.loadbalancer.core.ReactorServiceInstanceLoadBalancer; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; -import reactor.core.publisher.Mono; - -import java.util.List; -import java.util.stream.Collectors; /** * Abstract Loadbalancer of Polaris. @@ -88,7 +89,8 @@ public abstract class PolarisAbstractLoadBalancer implements ReactorServiceInsta try { ProcessLoadBalanceResponse response = routerAPI.processLoadBalance(req); return new DefaultResponse(new PolarisServiceInstance(response.getTargetInstance())); - } catch (Exception e) { + } + catch (Exception e) { log.warn("PolarisRoutingLoadbalancer error", e); return new EmptyResponse(); } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisRingHashLoadBalancer.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisRingHashLoadBalancer.java index 929f76368..c803522e0 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisRingHashLoadBalancer.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisRingHashLoadBalancer.java @@ -17,15 +17,16 @@ package com.tencent.cloud.polaris.loadbalancer; +import java.util.Optional; + import com.tencent.polaris.api.config.consumer.LoadBalanceConfig; import com.tencent.polaris.api.rpc.Criteria; import com.tencent.polaris.router.api.core.RouterAPI; import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceRequest; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; -import java.util.Optional; - /** * PolarisRingHashLoadBalancer. * @@ -35,10 +36,9 @@ import java.util.Optional; public class PolarisRingHashLoadBalancer extends PolarisAbstractLoadBalancer { public PolarisRingHashLoadBalancer(String serviceId, - ObjectProvider supplierObjectProvider, - RouterAPI routerAPI) { + ObjectProvider supplierObjectProvider, + RouterAPI routerAPI) { super(serviceId, supplierObjectProvider, routerAPI); - } @Override @@ -50,5 +50,4 @@ public class PolarisRingHashLoadBalancer extends PolarisAbstractLoadBalancer { req.setCriteria(criteria); return req; } - } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRandomLoadBalancer.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRandomLoadBalancer.java index 70d8765a1..bd65d3b6c 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRandomLoadBalancer.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRandomLoadBalancer.java @@ -21,6 +21,7 @@ import com.tencent.polaris.api.config.consumer.LoadBalanceConfig; import com.tencent.polaris.api.rpc.Criteria; import com.tencent.polaris.router.api.core.RouterAPI; import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceRequest; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancer.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancer.java index 76d599003..087237fb8 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancer.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancer.java @@ -21,6 +21,7 @@ import com.tencent.polaris.api.config.consumer.LoadBalanceConfig; import com.tencent.polaris.api.rpc.Criteria; import com.tencent.polaris.router.api.core.RouterAPI; import com.tencent.polaris.router.api.rpc.ProcessLoadBalanceRequest; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; @@ -33,7 +34,6 @@ public class PolarisWeightedRoundRobinLoadBalancer extends PolarisAbstractLoadBa public PolarisWeightedRoundRobinLoadBalancer(String serviceId, ObjectProvider supplierObjectProvider, RouterAPI routerAPI) { super(serviceId, supplierObjectProvider, routerAPI); - } @Override @@ -42,5 +42,4 @@ public class PolarisWeightedRoundRobinLoadBalancer extends PolarisAbstractLoadBa req.setCriteria(new Criteria()); return req; } - } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancerTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancerTest.java index 06d8c9b5a..70d5726ea 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancerTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisWeightedRoundRobinLoadBalancerTest.java @@ -18,6 +18,9 @@ package com.tencent.cloud.polaris.loadbalancer; +import java.util.ArrayList; +import java.util.List; + import com.tencent.cloud.common.pojo.PolarisServiceInstance; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.polaris.api.pojo.Instance; @@ -32,16 +35,14 @@ import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.loadbalancer.Request; import org.springframework.cloud.client.loadbalancer.Response; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -import java.util.ArrayList; -import java.util.List; import static com.tencent.cloud.common.metadata.MetadataContext.LOCAL_NAMESPACE; import static com.tencent.cloud.common.metadata.MetadataContext.LOCAL_SERVICE;