From 26b7e3d1c307d05f3f9988417e3a232f652d7157 Mon Sep 17 00:00:00 2001 From: lepdou Date: Tue, 29 Nov 2022 14:08:19 +0800 Subject: [PATCH] change RouteArgument.buildCustom to RouteArgument.fromLabel (#749) * change RouteArgument.buildCustom to RouteArgument.fromLabel * add change log --- CHANGELOG.md | 1 + .../router/interceptor/MetadataRouterRequestInterceptor.java | 2 +- .../router/interceptor/RuleBasedRouterRequestInterceptor.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d79c8564..15640818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,3 +17,4 @@ - [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/722) - [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/730) - [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/746) +- [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/749) diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/MetadataRouterRequestInterceptor.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/MetadataRouterRequestInterceptor.java index 5a29a1ff..e8de0fa2 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/MetadataRouterRequestInterceptor.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/MetadataRouterRequestInterceptor.java @@ -60,7 +60,7 @@ public class MetadataRouterRequestInterceptor implements RouterRequestIntercepto Set routeArguments = new HashSet<>(); if (!CollectionUtils.isEmpty(metadataRouterKeys)) { for (Map.Entry entry : metadataRouterLabels.entrySet()) { - routeArguments.add(RouteArgument.buildCustom(entry.getKey(), entry.getValue())); + routeArguments.add(RouteArgument.fromLabel(entry.getKey(), entry.getValue())); } } request.putRouterArgument(MetadataRouter.ROUTER_TYPE_METADATA, routeArguments); diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/RuleBasedRouterRequestInterceptor.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/RuleBasedRouterRequestInterceptor.java index 78ec369c..c1db5f43 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/RuleBasedRouterRequestInterceptor.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/interceptor/RuleBasedRouterRequestInterceptor.java @@ -59,7 +59,7 @@ public class RuleBasedRouterRequestInterceptor implements RouterRequestIntercept Map ruleRouterLabels = routerContext.getLabels(RouterConstant.ROUTER_LABELS); if (!CollectionUtils.isEmpty(ruleRouterLabels)) { for (Map.Entry label : ruleRouterLabels.entrySet()) { - routeArguments.add(RouteArgument.buildCustom(label.getKey(), label.getValue())); + routeArguments.add(RouteArgument.fromLabel(label.getKey(), label.getValue())); } } }