From f8fa0e35a1f9020c60890870c9e9a526e280bb26 Mon Sep 17 00:00:00 2001 From: misselvexu Date: Tue, 5 Jul 2022 19:48:18 +0800 Subject: [PATCH] Optimize circuit breaker auto-configuration s ConditionOnBean annotation . --- .../config/PolarisCircuitBreakerAutoConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerAutoConfiguration.java index 7b8f058aa..ff2ca94a7 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerAutoConfiguration.java @@ -82,18 +82,17 @@ public class PolarisCircuitBreakerAutoConfiguration { */ @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(PolarisContextAutoConfiguration.class) + @ConditionalOnBean(RestTemplate.class) @ConditionalOnProperty(value = "spring.cloud.polaris.circuitbreaker.enabled", havingValue = "true", matchIfMissing = true) protected static class PolarisRestTemplateAutoConfiguration { @Bean - @ConditionalOnBean(RestTemplate.class) public PolarisRestTemplateResponseErrorHandler polarisRestTemplateResponseErrorHandler( ConsumerAPI consumerAPI, @Autowired(required = false) PolarisResponseErrorHandler polarisResponseErrorHandler) { return new PolarisRestTemplateResponseErrorHandler(consumerAPI, polarisResponseErrorHandler); } @Bean - @ConditionalOnBean(RestTemplate.class) public PolarisRestTemplateModifier polarisRestTemplateBeanPostProcessor( PolarisRestTemplateResponseErrorHandler restTemplateResponseErrorHandler) { return new PolarisRestTemplateModifier(restTemplateResponseErrorHandler);