Add proxyBeanMethod=false to configuration. Fixes #50

spring-cloud · Nov 13, 2019 · 318647c · 318647c
1 parent 51e7670
commit 318647c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/...ingframework/cloud/circuitbreaker/resilience4j/ReactiveResilience4JAutoConfiguration.java b/...ingframework/cloud/circuitbreaker/resilience4j/ReactiveResilience4JAutoConfiguration.java
@@ -38,7 +38,7 @@
 /**
  * @author Ryan Baxter
  */
-@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",
@@ -51,7 +51,7 @@ public ReactiveResilience4JCircuitBreakerFactory reactiveResilience4JCircuitBrea
 		return new ReactiveResilience4JCircuitBreakerFactory();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(
 			name = { "reactor.core.publisher.Mono", "reactor.core.publisher.Flux" })
 	@ConditionalOnMissingClass({
@@ -71,7 +71,7 @@ public void init() {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(name = { "reactor.core.publisher.Mono",
 			"reactor.core.publisher.Flux",
 			"io.github.resilience4j.micrometer.tagged.TaggedCircuitBreakerMetrics" })

diff --git a/.../org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JAutoConfiguration.java b/.../org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JAutoConfiguration.java
@@ -38,7 +38,7 @@
 /**
  * @author Ryan Baxter
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name = "spring.cloud.circuitbreaker.resilience4j.enabled",
 		matchIfMissing = true)
 public class Resilience4JAutoConfiguration {
@@ -49,7 +49,7 @@ public Resilience4JCircuitBreakerFactory resilience4jCircuitBreakerFactory() {
 		return new Resilience4JCircuitBreakerFactory();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingClass({
 			"io.github.resilience4j.micrometer.tagged.TaggedCircuitBreakerMetrics",
 			"io.micrometer.core.instrument.MeterRegistry" })
@@ -68,7 +68,7 @@ public void init() {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean({ MeterRegistry.class })
 	@ConditionalOnClass(name = {
 			"io.github.resilience4j.micrometer.tagged.TaggedCircuitBreakerMetrics" })

diff --git a/.../cloud/circuitbreaker/resilience4j/ReactiveResilience4JCircuitBreakerIntegrationTest.java b/.../cloud/circuitbreaker/resilience4j/ReactiveResilience4JCircuitBreakerIntegrationTest.java
@@ -130,7 +130,7 @@ public void test() {
 								.isTrue();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	protected static class Application {

diff --git a/...ramework/cloud/circuitbreaker/resilience4j/Resilience4JCircuitBreakerIntegrationTest.java b/...ramework/cloud/circuitbreaker/resilience4j/Resilience4JCircuitBreakerIntegrationTest.java
@@ -108,7 +108,7 @@ public void testResilience4JMetricsAvailable() {
 				.contains("resilience4j.circuitbreaker.calls")).isTrue();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	protected static class Application {

diff --git a/...va/org/springframework/cloud/circuitbreaker/springretry/SpringRetryAutoConfiguration.java b/...va/org/springframework/cloud/circuitbreaker/springretry/SpringRetryAutoConfiguration.java
@@ -33,7 +33,7 @@
 /**
  * @author Ryan Baxter
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(RetryTemplate.class)
 public class SpringRetryAutoConfiguration {
 
@@ -43,7 +43,7 @@ public CircuitBreakerFactory resilience4jCircuitBreakerFactory() {
 		return new SpringRetryCircuitBreakerFactory();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class SpringRetryCustomizerConfiguration {
 
 		@Autowired(required = false)

diff --git a/...gframework/cloud/circuitbreaker/springretry/SpringRetryCircuitBreakerIntegrationTest.java b/...gframework/cloud/circuitbreaker/springretry/SpringRetryCircuitBreakerIntegrationTest.java
@@ -72,7 +72,7 @@ public void testNormal() {
 		assertThat(service.normal()).isEqualTo("normal");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	protected static class Application {