msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

fix: dynamic routing using cookies - fix codestyle

Browse Source
pull/1097/head
jealhuang 2 years ago
parent f1e71da689
commit c3ae2841f8
4 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File

11
spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtils.java
Unescape View File

@ -18,11 +18,6 @@
package com.tencent.cloud.polaris.router.feign; 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.net.URI;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -30,6 +25,12 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; 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. * Resolve rule expression label from feign request.
* *

8
spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/feign/FeignExpressionLabelUtilsTest.java
Unescape View File

@ -18,15 +18,15 @@
package com.tencent.cloud.polaris.router.feign; 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.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.stream.Stream; 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 java.util.stream.Collectors.toSet;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;

10
spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionLabelUtils.java
Unescape View File

@ -186,11 +186,11 @@ public final class ExpressionLabelUtils {
for (String value : values) { for (String value : values) {
String[] cookieArray = StringUtils.split(value, ";"); String[] cookieArray = StringUtils.split(value, ";");
for (String cookieValue : cookieArray) { for (String cookieValue : cookieArray) {
String[] cookieKV = StringUtils.split(cookieValue, "="); String[] cookieKV = StringUtils.split(cookieValue, "=");
if (cookieKV != null && cookieKV.length == 2 && StringUtils.equals(cookieKV[0], key)) { if (cookieKV != null && cookieKV.length == 2 && StringUtils.equals(cookieKV[0], key)) {
return cookieKV[1]; return cookieKV[1];
} }
} }
} }
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }

15
spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/SpringWebExpressionLabelUtils.java
Unescape View File

@ -18,14 +18,11 @@
package com.tencent.cloud.common.util.expresstion; package com.tencent.cloud.common.util.expresstion;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import io.netty.handler.codec.http.HttpHeaderNames;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.http.HttpCookie; import org.springframework.http.HttpCookie;
@ -115,11 +112,11 @@ public final class SpringWebExpressionLabelUtils {
} }
else if (ExpressionLabelUtils.isCookieLabel(labelKey)) { else if (ExpressionLabelUtils.isCookieLabel(labelKey)) {
String cookieKey = ExpressionLabelUtils.parseCookieKey(labelKey); String cookieKey = ExpressionLabelUtils.parseCookieKey(labelKey);
if (StringUtils.isBlank(cookieKey)) { if (StringUtils.isBlank(cookieKey)) {
continue; continue;
} }
labels.put(labelKey, getCookieValue(request, cookieKey)); labels.put(labelKey, getCookieValue(request, cookieKey));
} }
else if (ExpressionLabelUtils.isMethodLabel(labelKey)) { else if (ExpressionLabelUtils.isMethodLabel(labelKey)) {
labels.put(labelKey, request.getMethodValue()); labels.put(labelKey, request.getMethodValue());
} }
@ -174,7 +171,7 @@ public final class SpringWebExpressionLabelUtils {
if (StringUtils.isEmpty(first)) { if (StringUtils.isEmpty(first)) {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
String[] cookieArray = StringUtils.split(first,";"); String[] cookieArray = StringUtils.split(first, ";");
for (String cookieItem : cookieArray) { for (String cookieItem : cookieArray) {
String[] cookieKv = StringUtils.split(cookieItem, "="); String[] cookieKv = StringUtils.split(cookieItem, "=");
if (cookieKv != null && cookieKv.length == 2 && StringUtils.equals(cookieKv[0], key)) { if (cookieKv != null && cookieKv.length == 2 && StringUtils.equals(cookieKv[0], key)) {

Write Preview
Loading…
Cancel
Save