From b4d76417bc7374df9089771e6c7901b80d4ac9a0 Mon Sep 17 00:00:00 2001 From: weihu Date: Fri, 4 Nov 2022 15:11:20 +0800 Subject: [PATCH] remote deprecated method --- .../scg/PolarisReactiveLoadBalancerClientFilter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/scg/PolarisReactiveLoadBalancerClientFilter.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/scg/PolarisReactiveLoadBalancerClientFilter.java index 1fd3e2186..2951383f0 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/scg/PolarisReactiveLoadBalancerClientFilter.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/scg/PolarisReactiveLoadBalancerClientFilter.java @@ -85,7 +85,6 @@ public class PolarisReactiveLoadBalancerClientFilter extends ReactiveLoadBalance private final LoadBalancerClientFactory clientFactory; private final GatewayLoadBalancerProperties gatewayLoadBalancerProperties; - private final LoadBalancerProperties loadBalancerProperties; private final StaticMetadataManager staticMetadataManager; private final RouterRuleLabelResolver routerRuleLabelResolver; private final List routerLabelResolvers; @@ -98,11 +97,10 @@ public class PolarisReactiveLoadBalancerClientFilter extends ReactiveLoadBalance RouterRuleLabelResolver routerRuleLabelResolver, List routerLabelResolvers, PolarisContextProperties polarisContextProperties) { - super(clientFactory, gatewayLoadBalancerProperties, loadBalancerProperties); + super(clientFactory, gatewayLoadBalancerProperties); this.clientFactory = clientFactory; this.gatewayLoadBalancerProperties = gatewayLoadBalancerProperties; - this.loadBalancerProperties = loadBalancerProperties; this.staticMetadataManager = staticMetadataManager; this.routerRuleLabelResolver = routerRuleLabelResolver; this.routerLabelResolvers = routerLabelResolvers; @@ -139,7 +137,7 @@ public class PolarisReactiveLoadBalancerClientFilter extends ReactiveLoadBalance RequestData requestData = new RequestData(request.getMethod(), request.getURI(), routerHttpHeaders, new HttpHeaders(), new HashMap<>()); DefaultRequest lbRequest = new DefaultRequest<>(new RequestDataContext( - requestData, getHint(serviceId, loadBalancerProperties.getHint()))); + requestData, getHint(serviceId))); return choose(lbRequest, serviceId, supportedLifecycleProcessors).doOnNext(response -> { @@ -200,7 +198,9 @@ public class PolarisReactiveLoadBalancerClientFilter extends ReactiveLoadBalance } // no actual used - private String getHint(String serviceId, Map hints) { + private String getHint(String serviceId) { + LoadBalancerProperties loadBalancerProperties = clientFactory.getProperties(serviceId); + Map hints = loadBalancerProperties.getHint(); String defaultHint = hints.getOrDefault("default", "default"); String hintPropertyValue = hints.get(serviceId); return hintPropertyValue != null ? hintPropertyValue : defaultHint;