From 657c8aac72581ba4a2061f2f330e1273ff2bf5b9 Mon Sep 17 00:00:00 2001 From: Freeman Lau Date: Sat, 26 Feb 2022 17:12:42 +0800 Subject: [PATCH] Make SentinelCircuitBreakerConfiguration deprecated. make BeanPostProcessor static update docs --- .../sentinel-example/sentinel-feign-example/readme-zh.md | 4 +--- .../sentinel-example/sentinel-feign-example/readme.md | 2 +- .../sentinel/feign/FeignClientCircuitNameResolver.java | 3 --- .../feign/SentinelFeignClientAutoConfiguration.java | 1 - .../cloud/sentinel/custom/SentinelAutoConfiguration.java | 3 ++- .../custom/SentinelCircuitBreakerConfiguration.java | 8 ++++++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme-zh.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme-zh.md index 06bc694e7..f260de52f 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme-zh.md @@ -16,19 +16,17 @@ 在启动示例进行演示之前，我们先了解一下 Feign 如何接入 Sentinel。 **注意 本章节只是为了便于您理解接入方式，本示例代码中已经完成接入工作，您无需再进行修改。** -1. 首先，修改 pom.xml 文件，引入 Sentinel starter 和 Dubbo starter。 +1. 首先，修改 pom.xml 文件，引入 Sentinel starter 和 Openfeign starter。 ```xml org.springframework.cloud spring-cloud-starter-openfeign - com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - ``` 2. 其次, 使用nacos 注册中心 diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme.md index 875c019e2..42d8f1ad1 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/readme.md @@ -16,7 +16,7 @@ Service consumer Before launching the example, let's see how Feign can access Sentinel. ** note that this section is for your convenience only. The access has been completed in this sample code and you do not need to modify it. * * -First, modify the pom.xml file to introduce Sentinel starter and Dubbo starter. +First, modify the pom.xml file to introduce Sentinel starter and Openfeign starter. ```xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitNameResolver.java b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitNameResolver.java index 368c42cc4..a38c517fe 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitNameResolver.java +++ b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/FeignClientCircuitNameResolver.java @@ -30,9 +30,6 @@ import static com.alibaba.cloud.circuitbreaker.sentinel.feign.CircuitBreakerRule /** * Feign client circuit breaker name resolver. * - *

- * note: spring cloud openfeign version need greater than 3.0.4. - * * @author freeman * @see CircuitBreakerNameResolver */ diff --git a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/SentinelFeignClientAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/SentinelFeignClientAutoConfiguration.java index f2e2d5e74..ef386af14 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/SentinelFeignClientAutoConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/src/main/java/com/alibaba/cloud/circuitbreaker/sentinel/feign/SentinelFeignClientAutoConfiguration.java @@ -61,7 +61,6 @@ public class SentinelFeignClientAutoConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnClass(CircuitBreakerNameResolver.class) public static class CircuitBreakerNameResolverConfiguration { @Bean diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java index b7c9e4e5c..1c64b7041 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java @@ -55,6 +55,7 @@ import static com.alibaba.csp.sentinel.config.SentinelConfig.setConfig; * @author xiaojing * @author jiashuai.xie * @author Jim + * @author freeman */ @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.sentinel.enabled", matchIfMissing = true) @@ -147,7 +148,7 @@ public class SentinelAutoConfiguration { @ConditionalOnClass(name = "org.springframework.web.client.RestTemplate") @ConditionalOnProperty(name = "resttemplate.sentinel.enabled", havingValue = "true", matchIfMissing = true) - public SentinelBeanPostProcessor sentinelBeanPostProcessor( + public static SentinelBeanPostProcessor sentinelBeanPostProcessor( ApplicationContext applicationContext) { return new SentinelBeanPostProcessor(applicationContext); } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java index efb962853..3df365645 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java @@ -19,11 +19,15 @@ package com.alibaba.cloud.sentinel.custom; import org.springframework.context.annotation.Configuration; /** + * Support @EnableCircuitBreaker, Do nothing. + * * @author lengleng - *

- * support @EnableCircuitBreaker ,Do nothing + * @author freeman + * @deprecated since 2021.0.1.0, see + * {@link org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker} */ @Configuration(proxyBeanMethods = false) +@Deprecated public class SentinelCircuitBreakerConfiguration { }