From de3b6d87452daf205859c755475717b426c11e87 Mon Sep 17 00:00:00 2001 From: cheese8 Date: Sat, 18 Jun 2022 19:16:19 +0800 Subject: [PATCH] align to checkstyle --- .../polaris/router/feign/PolarisFeignLoadBalancer.java | 7 +++---- .../polaris/router/feign/RouterLabelFeignInterceptor.java | 4 ++-- .../router/feign/RouterLabelFeignInterceptorTest.java | 4 ++-- 3 files changed, 7 insertions(+), 8 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 ae7d81ec2..ecaa5b425 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 @@ -71,12 +71,11 @@ public class PolarisFeignLoadBalancer extends FeignLoadBalancer { routerContext.setLabels(PolarisRouterContext.TRANSITIVE_LABELS, MetadataContextHolder.get() .getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE)); - + Map labelHeaderValuesMap = new HashMap<>(); - try{ + try { String labelHeaderValuesContent = labelHeaderValues.stream().findFirst().get(); - labelHeaderValuesMap.putAll(JacksonUtils.deserialize2Map(URLDecoder.decode(labelHeaderValuesContent, - StandardCharsets.UTF_8.name()))); + labelHeaderValuesMap.putAll(JacksonUtils.deserialize2Map(URLDecoder.decode(labelHeaderValuesContent, StandardCharsets.UTF_8.name()))); } catch (UnsupportedEncodingException e) { throw new RuntimeException("unsupported charset exception " + StandardCharsets.UTF_8.name()); } 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 81c6bd536..0a7e641b4 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 @@ -109,9 +109,9 @@ public class RouterLabelFeignInterceptor implements RequestInterceptor, Ordered requestTemplate.header(RouterConstants.ROUTER_LABEL_HEADER); return; } - + String encodedLabelsContent; - try{ + try { encodedLabelsContent = URLEncoder.encode(JacksonUtils.serialize2Json(labels), StandardCharsets.UTF_8.name()); } catch (UnsupportedEncodingException e) { throw new RuntimeException("unsupported charset exception " + StandardCharsets.UTF_8.name()); 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 96327551c..36c944106 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 @@ -118,10 +118,10 @@ public class RouterLabelFeignInterceptorTest { when(metadataLocalProperties.getContent()).thenReturn(localMetadata); routerLabelFeignInterceptor.apply(requestTemplate); - + Collection routerLabels = requestTemplate.headers().get(RouterConstants.ROUTER_LABEL_HEADER); Map routerLabelsMap = new HashMap<>(); - try{ + try { String routerLabelContent = routerLabels.stream().findFirst().get(); routerLabelsMap.putAll(JacksonUtils.deserialize2Map(URLDecoder.decode(routerLabelContent, StandardCharsets.UTF_8.name()))); } catch (UnsupportedEncodingException e) {