From a0659e5094a7361d36ce54e914ba5a1f7824a2bd Mon Sep 17 00:00:00 2001 From: seanyu Date: Thu, 2 Mar 2023 16:40:47 +0800 Subject: [PATCH] fix compile error --- .../gateway/PolarisCircuitBreakerFilterFactory.java | 10 +++++----- .../config/ReactivePolarisCircuitBreakerTest.java | 1 - .../config/RpcEnhancementAutoConfiguration.java | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/gateway/PolarisCircuitBreakerFilterFactory.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/gateway/PolarisCircuitBreakerFilterFactory.java index 874730ec4..90a9749fe 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/gateway/PolarisCircuitBreakerFilterFactory.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/gateway/PolarisCircuitBreakerFilterFactory.java @@ -85,7 +85,7 @@ public class PolarisCircuitBreakerFilterFactory extends SpringCloudCircuitBreake super(reactiveCircuitBreakerFactory, dispatcherHandlerProvider); this.reactiveCircuitBreakerFactory = reactiveCircuitBreakerFactory; this.dispatcherHandlerProvider = dispatcherHandlerProvider; - if (discoveryClient != null && properties!= null){ + if (discoveryClient != null && properties != null) { if (StringUtils.hasText(properties.getRouteIdPrefix())) { routeIdPrefix = properties.getRouteIdPrefix(); } @@ -107,9 +107,9 @@ public class PolarisCircuitBreakerFilterFactory extends SpringCloudCircuitBreake return dispatcherHandler; } - private String getCircuitBreakerId(Config config){ + private String getCircuitBreakerId(Config config) { if (!StringUtils.hasText(config.getName()) && StringUtils.hasText(config.getRouteId())) { - if (routeIdPrefix != null && config.getRouteId().startsWith(routeIdPrefix)){ + if (routeIdPrefix != null && config.getRouteId().startsWith(routeIdPrefix)) { return config.getRouteId().replace(routeIdPrefix, ""); } return config.getRouteId(); @@ -127,8 +127,8 @@ public class PolarisCircuitBreakerFilterFactory extends SpringCloudCircuitBreake } } - private List getSeriesStatus(String series){ - if (!Arrays.asList("1**","2**","3**","4**","5**").contains(series)){ + private List getSeriesStatus(String series) { + if (!Arrays.asList("1**", "2**", "3**", "4**", "5**").contains(series)) { throw new InvalidPropertyException(Config.class, "statusCodes", "polaris circuit breaker status code can only be a numeric http status, or a http series pattern, e.g. [\"1**\",\"2**\",\"3**\",\"4**\",\"5**\"]"); } HttpStatus[] allHttpStatus = HttpStatus.values(); diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/config/ReactivePolarisCircuitBreakerTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/config/ReactivePolarisCircuitBreakerTest.java index 5021bf016..dfd479f6d 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/config/ReactivePolarisCircuitBreakerTest.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/config/ReactivePolarisCircuitBreakerTest.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.Collections; import com.tencent.cloud.common.util.ApplicationContextAwareUtils; -import com.tencent.cloud.polaris.circuitbreaker.PolarisCircuitBreaker; import com.tencent.cloud.polaris.circuitbreaker.ReactivePolarisCircuitBreaker; import com.tencent.cloud.polaris.circuitbreaker.ReactivePolarisCircuitBreakerFactory; import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration; diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java index b9639b943..53bd5f414 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java @@ -137,5 +137,4 @@ public class RpcEnhancementAutoConfiguration { return new BlockingLoadBalancerClientAspect(); } } - }