From e7add7115b1ad6eb2c0395e661e397fee3b60dae Mon Sep 17 00:00:00 2001 From: cheese8 Date: Sat, 18 Jun 2022 16:35:17 +0800 Subject: [PATCH] add auther and revert ExpressionLabelUtils --- .../cloud/polaris/router/feign/PolarisFeignLoadBalancer.java | 4 ++-- .../polaris/router/feign/RouterLabelFeignInterceptor.java | 3 ++- .../polaris/router/feign/RouterLabelFeignInterceptorTest.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/PolarisFeignLoadBalancer.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/PolarisFeignLoadBalancer.java index d6e45f854..ae7d81ec2 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/PolarisFeignLoadBalancer.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/PolarisFeignLoadBalancer.java @@ -23,7 +23,6 @@ import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.reactive.LoadBalancerCommand; import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.metadata.MetadataContextHolder; -import com.tencent.cloud.common.util.ExpressionLabelUtils; import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.polaris.router.PolarisRouterContext; import com.tencent.cloud.polaris.router.RouterConstants; @@ -41,7 +40,8 @@ import java.util.Map; /** * In order to pass router context for {@link com.tencent.cloud.polaris.router.PolarisLoadBalancerCompositeRule}. * - *@author lepdou 2022-05-16 + * @author lepdou 2022-05-16 + * @author cheese8 2022-06-18 */ public class PolarisFeignLoadBalancer extends FeignLoadBalancer { diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptor.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptor.java index 346a7b09d..0c14832d8 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptor.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptor.java @@ -45,7 +45,8 @@ import java.util.Set; /** * Resolver labels from request. * - *@author lepdou 2022-05-12 + * @author lepdou 2022-05-12 + * @author cheese8 2022-06-18 */ public class RouterLabelFeignInterceptor implements RequestInterceptor, Ordered { private static final Logger LOGGER = LoggerFactory.getLogger(RouterLabelFeignInterceptor.class); diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptorTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptorTest.java index 6035bb558..96327551c 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptorTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/RouterLabelFeignInterceptorTest.java @@ -53,6 +53,7 @@ import static org.mockito.Mockito.when; /** * test for {@link RouterLabelFeignInterceptor} * @author lepdou 2022-05-26 + * @author cheese8 2022-06-18 */ @RunWith(MockitoJUnitRunner.class) public class RouterLabelFeignInterceptorTest {