Merge branch '2021.0' into feature/20221104/revert_default_value_when_field_delete

CHANGELOG.md

@@ -6,3 +6,4 @@
 - [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/686)
 - [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/690)
 - [enhancement: revert default value when the field is deleted in @ConfigurationProperties bean](https://github.com/Tencent/spring-cloud-tencent/issues/681)
+- [Optimize: remote deprecated method](https://github.com/Tencent/spring-cloud-tencent/pull/697)

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/beanprocessor/ReactiveLoadBalancerClientFilterBeanPostProcessor.java

@@ -30,7 +30,6 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
 import org.springframework.cloud.gateway.config.GatewayLoadBalancerProperties;
 import org.springframework.cloud.gateway.filter.ReactiveLoadBalancerClientFilter;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
@@ -56,14 +55,13 @@ public class ReactiveLoadBalancerClientFilterBeanPostProcessor implements BeanPo
 		if (bean instanceof ReactiveLoadBalancerClientFilter) {
 			LoadBalancerClientFactory loadBalancerClientFactory = this.factory.getBean(LoadBalancerClientFactory.class);
 			GatewayLoadBalancerProperties gatewayLoadBalancerProperties = this.factory.getBean(GatewayLoadBalancerProperties.class);
-			LoadBalancerProperties loadBalancerProperties = this.factory.getBean(LoadBalancerProperties.class);
 			List<SpringWebRouterLabelResolver> routerLabelResolvers = BeanFactoryUtils.getBeans(factory, SpringWebRouterLabelResolver.class);
 			StaticMetadataManager staticMetadataManager = this.factory.getBean(StaticMetadataManager.class);
 			RouterRuleLabelResolver routerRuleLabelResolver = this.factory.getBean(RouterRuleLabelResolver.class);
 			PolarisContextProperties polarisContextProperties = this.factory.getBean(PolarisContextProperties.class);
 
 			return new PolarisReactiveLoadBalancerClientFilter(
-					loadBalancerClientFactory, gatewayLoadBalancerProperties, loadBalancerProperties,
+					loadBalancerClientFactory, gatewayLoadBalancerProperties,
 					staticMetadataManager, routerRuleLabelResolver, routerLabelResolvers, polarisContextProperties);
 		}
 		return bean;

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<SpringWebRouterLabelResolver> routerLabelResolvers;
@@ -93,16 +92,14 @@ public class PolarisReactiveLoadBalancerClientFilter extends ReactiveLoadBalance
 
 	public PolarisReactiveLoadBalancerClientFilter(LoadBalancerClientFactory clientFactory,
 			GatewayLoadBalancerProperties gatewayLoadBalancerProperties,
-			LoadBalancerProperties loadBalancerProperties,
 			StaticMetadataManager staticMetadataManager,
 			RouterRuleLabelResolver routerRuleLabelResolver,
 			List<SpringWebRouterLabelResolver> 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 +136,7 @@ public class PolarisReactiveLoadBalancerClientFilter extends ReactiveLoadBalance
 		RequestData requestData = new RequestData(request.getMethod(), request.getURI(), routerHttpHeaders,
 				new HttpHeaders(), new HashMap<>());
 		DefaultRequest<RequestDataContext> lbRequest = new DefaultRequest<>(new RequestDataContext(
-				requestData, getHint(serviceId, loadBalancerProperties.getHint())));
+				requestData, getHint(serviceId)));
 
 		return choose(lbRequest, serviceId, supportedLifecycleProcessors).doOnNext(response -> {
 
@@ -200,7 +197,9 @@ public class PolarisReactiveLoadBalancerClientFilter extends ReactiveLoadBalance
 	}
 
 	// no actual used
-	private String getHint(String serviceId, Map<String, String> hints) {
+	private String getHint(String serviceId) {
+		LoadBalancerProperties loadBalancerProperties = clientFactory.getProperties(serviceId);
+		Map<String, String> hints = loadBalancerProperties.getHint();
 		String defaultHint = hints.getOrDefault("default", "default");
 		String hintPropertyValue = hints.get(serviceId);
 		return hintPropertyValue != null ? hintPropertyValue : defaultHint;

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/beanprocessor/ReactiveLoadBalancerClientFilterBeanPostProcessorTest.java

@@ -64,7 +64,6 @@ public class ReactiveLoadBalancerClientFilterBeanPostProcessorTest {
 	public void testWrapReactiveLoadBalancerClientFilter() {
 		when(beanFactory.getBean(LoadBalancerClientFactory.class)).thenReturn(loadBalancerClientFactory);
 		when(beanFactory.getBean(GatewayLoadBalancerProperties.class)).thenReturn(gatewayLoadBalancerProperties);
-		when(beanFactory.getBean(LoadBalancerProperties.class)).thenReturn(loadBalancerProperties);
 		when(beanFactory.getBean(StaticMetadataManager.class)).thenReturn(staticMetadataManager);
 		when(beanFactory.getBean(RouterRuleLabelResolver.class)).thenReturn(routerRuleLabelResolver);
 

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/scg/PolarisReactiveLoadBalancerClientFilterTest.java

@@ -112,7 +112,7 @@ public class PolarisReactiveLoadBalancerClientFilterTest {
 	@Test
 	public void testGenRouterHttpHeaders() throws UnsupportedEncodingException {
 		PolarisReactiveLoadBalancerClientFilter filter = new PolarisReactiveLoadBalancerClientFilter(loadBalancerClientFactory,
-				gatewayLoadBalancerProperties, loadBalancerProperties, staticMetadataManager, routerRuleLabelResolver,
+				gatewayLoadBalancerProperties, staticMetadataManager, routerRuleLabelResolver,
 				Lists.newArrayList(routerLabelResolver), polarisContextProperties);
 
 		Map<String, String> localMetadata = new HashMap<>();