From 19d2c1691b81826fda4d3d5e4158071087e4fea2 Mon Sep 17 00:00:00 2001 From: cheese8 Date: Mon, 20 Jun 2022 12:57:26 +0800 Subject: [PATCH] remove escape & unescape related code --- .../RouterLabelFeignInterceptorTest.java | 9 ----- .../common/util/ExpressionLabelUtils.java | 19 ++-------- .../common/util/ExpressionLabelUtilsTest.java | 36 ++----------------- 3 files changed, 4 insertions(+), 60 deletions(-) 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 f16a9100e..16f15c372 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 @@ -32,7 +32,6 @@ import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.metadata.MetadataContextHolder; import com.tencent.cloud.common.metadata.config.MetadataLocalProperties; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; -import com.tencent.cloud.common.util.ExpressionLabelUtils; import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.polaris.router.RouterConstants; import com.tencent.cloud.polaris.router.RouterRuleLabelResolver; @@ -140,12 +139,4 @@ public class RouterLabelFeignInterceptorTest { } } } - - private Map unescape(Map labels) { - Map result = new HashMap<>(); - for (Map.Entry entry : labels.entrySet()) { - result.put(ExpressionLabelUtils.unescape(entry.getKey()), ExpressionLabelUtils.unescape(entry.getValue())); - } - return result; - } } diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ExpressionLabelUtils.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ExpressionLabelUtils.java index 41d70abd7..a4c53ccc1 100644 --- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ExpressionLabelUtils.java +++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ExpressionLabelUtils.java @@ -40,7 +40,8 @@ import org.springframework.web.server.ServerWebExchange; /** * the utils for parse label expression. * - *@author lepdou 2022-05-13 + * @author lepdou 2022-05-13 + * @author cheese8 2022-06-20 */ public class ExpressionLabelUtils { @@ -76,18 +77,10 @@ public class ExpressionLabelUtils { * the expression of uri. */ public static final String LABEL_URI = "${http.uri}"; - /** - * the prefix of expression. - */ - public static final String LABEL_PREFIX = "${"; /** * the suffix of expression. */ public static final String LABEL_SUFFIX = "}"; - /** - * the escape prefix of label. - */ - public static final String LABEL_ESCAPE_PREFIX = "##@$@##"; public static boolean isExpressionLabel(String labelKey) { if (StringUtils.isEmpty(labelKey)) { @@ -103,14 +96,6 @@ public class ExpressionLabelUtils { && StringUtils.endsWith(labelKey, LABEL_SUFFIX); } - public static String escape(String str) { - return StringUtils.replace(str, LABEL_PREFIX, LABEL_ESCAPE_PREFIX); - } - - public static String unescape(String str) { - return StringUtils.replace(str, LABEL_ESCAPE_PREFIX, LABEL_PREFIX); - } - public static Map resolve(HttpServletRequest request, Set labelKeys) { if (CollectionUtils.isEmpty(labelKeys)) { return Collections.emptyMap(); diff --git a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ExpressionLabelUtilsTest.java b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ExpressionLabelUtilsTest.java index 3c7eabed7..0dedc4698 100644 --- a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ExpressionLabelUtilsTest.java +++ b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ExpressionLabelUtilsTest.java @@ -38,7 +38,8 @@ import org.springframework.mock.web.server.MockServerWebExchange; /** * test for {@link ExpressionLabelUtils} - *@author lepdou 2022-05-27 + * @author lepdou 2022-05-27 + * @auther cheese8 2022-06-20 */ @RunWith(MockitoJUnitRunner.class) public class ExpressionLabelUtilsTest { @@ -76,39 +77,6 @@ public class ExpressionLabelUtilsTest { Assert.assertFalse(ExpressionLabelUtils.isExpressionLabel(invalidLabel9)); } - @Test - public void testEscape() { - String validLabel1 = "${http.query.uid}"; - String validLabel2 = "${http.header.uid}"; - String validLabel3 = "${http.cookie.uid}"; - String validLabel4 = "${http.method}"; - String validLabel5 = "${http.uri}"; - String invalidLabel1 = "${http.queryuid}"; - String invalidLabel2 = "{http.query.uid}"; - String invalidLabel3 = "${http.query.uid"; - String invalidLabel4 = "$ {http.query.uid}"; - String invalidLabel5 = "${ http.query.uid}"; - String invalidLabel6 = "${query.uid}"; - String invalidLabel7 = "http.query.uid"; - String invalidLabel8 = "$${http.uri}"; - String invalidLabel9 = "#{http.uri}"; - - Assert.assertEquals(validLabel1, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(validLabel1))); - Assert.assertEquals(validLabel2, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(validLabel2))); - Assert.assertEquals(validLabel3, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(validLabel3))); - Assert.assertEquals(validLabel4, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(validLabel4))); - Assert.assertEquals(validLabel5, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(validLabel5))); - Assert.assertEquals(invalidLabel1, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel1))); - Assert.assertEquals(invalidLabel2, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel2))); - Assert.assertEquals(invalidLabel3, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel3))); - Assert.assertEquals(invalidLabel4, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel4))); - Assert.assertEquals(invalidLabel5, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel5))); - Assert.assertEquals(invalidLabel6, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel6))); - Assert.assertEquals(invalidLabel7, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel7))); - Assert.assertEquals(invalidLabel8, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel8))); - Assert.assertEquals(invalidLabel9, ExpressionLabelUtils.unescape(ExpressionLabelUtils.escape(invalidLabel9))); - } - @Test public void testResolveHttpServletRequest() { String validLabel1 = "${http.query.uid}";