diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtils.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtils.java index d61a9be96..0eab41fa0 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtils.java +++ b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtils.java @@ -18,11 +18,6 @@ package com.tencent.cloud.polaris.router.feign; -import com.tencent.cloud.common.util.expresstion.ExpressionLabelUtils; -import feign.RequestTemplate; -import org.apache.commons.lang.StringUtils; -import org.springframework.util.CollectionUtils; - import java.net.URI; import java.util.Collection; import java.util.Collections; @@ -30,6 +25,12 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import com.tencent.cloud.common.util.expresstion.ExpressionLabelUtils; +import feign.RequestTemplate; +import org.apache.commons.lang.StringUtils; + +import org.springframework.util.CollectionUtils; + /** * Resolve rule expression label from feign request. * diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtilsTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtilsTest.java index 0e21d3d35..dc1410f5d 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtilsTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtilsTest.java @@ -18,15 +18,15 @@ package com.tencent.cloud.polaris.router.feign; -import feign.Request; -import feign.RequestTemplate; -import org.junit.jupiter.api.Test; - import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.stream.Stream; +import feign.Request; +import feign.RequestTemplate; +import org.junit.jupiter.api.Test; + import static java.util.stream.Collectors.toSet; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionLabelUtils.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionLabelUtils.java index bd008758e..c7029deff 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionLabelUtils.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionLabelUtils.java @@ -186,11 +186,11 @@ public final class ExpressionLabelUtils { for (String value : values) { String[] cookieArray = StringUtils.split(value, ";"); for (String cookieValue : cookieArray) { - String[] cookieKV = StringUtils.split(cookieValue, "="); - if (cookieKV != null && cookieKV.length == 2 && StringUtils.equals(cookieKV[0], key)) { - return cookieKV[1]; - } - } + String[] cookieKV = StringUtils.split(cookieValue, "="); + if (cookieKV != null && cookieKV.length == 2 && StringUtils.equals(cookieKV[0], key)) { + return cookieKV[1]; + } + } } return StringUtils.EMPTY; } diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/SpringWebExpressionLabelUtils.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/SpringWebExpressionLabelUtils.java index 31be7550b..b8b1a59ad 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/SpringWebExpressionLabelUtils.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/SpringWebExpressionLabelUtils.java @@ -18,14 +18,11 @@ package com.tencent.cloud.common.util.expresstion; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Set; -import io.netty.handler.codec.http.HttpHeaderNames; import org.apache.commons.lang.StringUtils; import org.springframework.http.HttpCookie; @@ -115,11 +112,11 @@ public final class SpringWebExpressionLabelUtils { } else if (ExpressionLabelUtils.isCookieLabel(labelKey)) { String cookieKey = ExpressionLabelUtils.parseCookieKey(labelKey); - if (StringUtils.isBlank(cookieKey)) { - continue; - } - labels.put(labelKey, getCookieValue(request, cookieKey)); - } + if (StringUtils.isBlank(cookieKey)) { + continue; + } + labels.put(labelKey, getCookieValue(request, cookieKey)); + } else if (ExpressionLabelUtils.isMethodLabel(labelKey)) { labels.put(labelKey, request.getMethodValue()); } @@ -174,7 +171,7 @@ public final class SpringWebExpressionLabelUtils { if (StringUtils.isEmpty(first)) { return StringUtils.EMPTY; } - String[] cookieArray = StringUtils.split(first,";"); + String[] cookieArray = StringUtils.split(first, ";"); for (String cookieItem : cookieArray) { String[] cookieKv = StringUtils.split(cookieItem, "="); if (cookieKv != null && cookieKv.length == 2 && StringUtils.equals(cookieKv[0], key)) {