From 3edc5eb16bd71aa770f827dc1051fe39e54d9264 Mon Sep 17 00:00:00 2001 From: chuntaojun Date: Sun, 14 Nov 2021 16:29:21 +0800 Subject: [PATCH 1/2] fix: fix build issue --- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../PolarisFeignClientAutoConfiguration.java | 2 +- .../feign/PolarisFeignBeanPostProcessor.java | 7 ---- ...olarisFeignBlockingLoadBalancerClient.java | 36 ------------------- .../feign/PolarisFeignClientTest.java | 7 ++-- .../spring-cloud-tencent-commons/pom.xml | 6 ++++ .../PolarisGatewayAutoConfiguration.java | 4 +-- 7 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index c84cb376c..ce6dbed1f 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 2.3.1.RELEASE + 2.1.11.RELEASE 4.0.0 diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfiguration.java index f5b67702d..86c79fa1d 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfiguration.java @@ -43,7 +43,7 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE; value = "spring.cloud.polaris.circuitbreaker.enabled", havingValue = "true", matchIfMissing = true) -@Configuration(proxyBeanMethods = false) +@Configuration() @AutoConfigureAfter(PolarisContextConfiguration.class) @AutoConfigureBefore(FeignAutoConfiguration.class) public class PolarisFeignClientAutoConfiguration { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java index 339f3a589..a5c5ad220 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBeanPostProcessor.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; -import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient; import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; @@ -56,11 +55,6 @@ public class PolarisFeignBeanPostProcessor implements BeanPostProcessor, BeanFac return new PolarisLoadBalancerFeignClient(createPolarisFeignClient(client.getDelegate()), factory(), clientFactory()); } - if (bean instanceof FeignBlockingLoadBalancerClient) { - FeignBlockingLoadBalancerClient client = (FeignBlockingLoadBalancerClient) bean; - return new PolarisFeignBlockingLoadBalancerClient(createPolarisFeignClient(client.getDelegate()), - factory.getBean(BlockingLoadBalancerClient.class)); - } return createPolarisFeignClient((Client) bean); } return bean; @@ -68,7 +62,6 @@ public class PolarisFeignBeanPostProcessor implements BeanPostProcessor, BeanFac private boolean isNeedWrap(Object bean) { return bean instanceof Client && !(bean instanceof PolarisFeignClient) - && !(bean instanceof PolarisFeignBlockingLoadBalancerClient) && !(bean instanceof PolarisLoadBalancerFeignClient); } diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java deleted file mode 100644 index 076e269e6..000000000 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making Spring Cloud Tencent available. - * - * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the BSD 3-Clause License (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://opensource.org/licenses/BSD-3-Clause - * - * Unless required by applicable law or agreed to in writing, software distributed - * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package com.tencent.cloud.polaris.circuitbreaker.feign; - -import feign.Client; -import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; -import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient; - -/** - * Wrap for {@link FeignBlockingLoadBalancerClient} - * - * @author Haotian Zhang - */ -public class PolarisFeignBlockingLoadBalancerClient extends FeignBlockingLoadBalancerClient { - - public PolarisFeignBlockingLoadBalancerClient(Client delegate, - BlockingLoadBalancerClient loadBalancerClient) { - super(delegate, loadBalancerClient); - } - -} diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClientTest.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClientTest.java index a6a15d19e..6148a7829 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClientTest.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignClientTest.java @@ -19,8 +19,8 @@ package com.tencent.cloud.polaris.circuitbreaker.feign; import com.tencent.cloud.polaris.circuitbreaker.PolarisFeignClientAutoConfiguration; import feign.Client; +import org.junit.Assert; import org.junit.Test; -import org.junit.jupiter.api.Assertions; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -42,7 +42,7 @@ public class PolarisFeignClientTest { @Test public void testPolarisFeignBeanPostProcessor() { final PolarisFeignBeanPostProcessor postProcessor = springCtx.getBean(PolarisFeignBeanPostProcessor.class); - Assertions.assertNotNull(postProcessor, "PolarisFeignBeanPostProcessor"); + Assert.assertNotNull("PolarisFeignBeanPostProcessor", postProcessor); } @Test @@ -54,9 +54,6 @@ public class PolarisFeignClientTest { if (client instanceof PolarisLoadBalancerFeignClient) { return; } - if (client instanceof PolarisFeignBlockingLoadBalancerClient) { - return; - } throw new IllegalStateException("Polaris burying failed"); } } diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml index 66d33281f..95ac52522 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml @@ -69,6 +69,12 @@ commons-io ${commons.io.version} + + com.github.spotbugs + spotbugs-annotations + RELEASE + compile + \ No newline at end of file diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/config/PolarisGatewayAutoConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/config/PolarisGatewayAutoConfiguration.java index cf8c17430..93c707c32 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/config/PolarisGatewayAutoConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/config/PolarisGatewayAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; @Configuration public class PolarisGatewayAutoConfiguration { - @Configuration(proxyBeanMethods = false) + @Configuration() @ConditionalOnClass(ZuulServlet.class) static class PolarisGatewayZuulAutoConfiguration { @Bean @@ -56,7 +56,7 @@ public class PolarisGatewayAutoConfiguration { } } - @Configuration(proxyBeanMethods = false) + @Configuration() @ConditionalOnClass(GlobalFilter.class) static class PolarisGatewayScgAutoConfiguration { @Bean From 19d0d768e1aeae1b8c9cfd7bc931b53e8afd9020 Mon Sep 17 00:00:00 2001 From: chuntaojun Date: Sun, 14 Nov 2021 16:30:57 +0800 Subject: [PATCH 2/2] fix: remove unless package --- .../spring-cloud-tencent-commons/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml index 95ac52522..66d33281f 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml @@ -69,12 +69,6 @@ commons-io ${commons.io.version} - - com.github.spotbugs - spotbugs-annotations - RELEASE - compile - \ No newline at end of file