SpringCloud/spring-cloud-circuitbreaker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separate ConditionalOnProperty for blocking and reactive (#63)

Browse Source 
Signed-off-by: Srinivasa Vasu <srinivasan.surprise@gmail.com>

Co-authored-by: Spencer Gibb <sgibb@pivotal.io>
This commit is contained in:
Srinivasa Vasu
2020-11-03 05:28:21 +08:00
committed by GitHub
parent f99e6801da
commit e9dfea29a5
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-circuitbreaker-resilience4j/src/main/java/org/springframework/cloud/circuitbreaker/resilience4j/ReactiveResilience4JAutoConfiguration.java
View File

@@ -41,7 +41,10 @@ import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(name = { "reactor.core.publisher.Mono", "reactor.core.publisher.Flux",
"io.github.resilience4j.reactor.circuitbreaker.operator.CircuitBreakerOperator" })
@ConditionalOnProperty(name = "spring.cloud.circuitbreaker.resilience4j.enabled", matchIfMissing = true)
@ConditionalOnProperty(
name = { "spring.cloud.circuitbreaker.resilience4j.enabled",
"spring.cloud.circuitbreaker.resilience4j.reactive.enabled" },
matchIfMissing = true)
public class ReactiveResilience4JAutoConfiguration {
@Autowired(required = false)

5
spring-cloud-circuitbreaker-resilience4j/src/main/java/org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JAutoConfiguration.java
View File

@@ -39,7 +39,10 @@ import org.springframework.context.annotation.Configuration;
* @author Eric Bussieres
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(name = "spring.cloud.circuitbreaker.resilience4j.enabled", matchIfMissing = true)
@ConditionalOnProperty(
name = { "spring.cloud.circuitbreaker.resilience4j.enabled",
"spring.cloud.circuitbreaker.resilience4j.blocking.enabled" },
matchIfMissing = true)
public class Resilience4JAutoConfiguration {
@Autowired(required = false)

12
spring-cloud-circuitbreaker-resilience4j/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -5,6 +5,18 @@
"name": "spring.cloud.circuitbreaker.resilience4j.enabled",
"description": "Enables Resilience4J auto-configuration.",
"type": "java.lang.Boolean"
},
{
"defaultValue": "true",
"name": "spring.cloud.circuitbreaker.resilience4j.blocking.enabled",
"description": "Enables blocking Resilience4J auto-configuration.",
"type": "java.lang.Boolean"
},
{
"defaultValue": "true",
"name": "spring.cloud.circuitbreaker.resilience4j.reactive.enabled",
"description": "Enables ReactiveResilience4J auto-configuration.",
"type": "java.lang.Boolean"
}
]
}