From 4b8ce04bdc45c0e523a2b2e140cdc6b4f8db858a Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 28 May 2019 19:11:35 +0200 Subject: [PATCH] Mark Spring web config classes as proxyBeanMethods=false Closes gh-23004 --- .../web/reactive/config/DelegatingWebFluxConfiguration.java | 2 +- .../config/annotation/DelegatingWebMvcConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/DelegatingWebFluxConfiguration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/DelegatingWebFluxConfiguration.java index 3603ee2cdc..1374cc4f05 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/DelegatingWebFluxConfiguration.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/DelegatingWebFluxConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.web.reactive.result.method.annotation.ArgumentResolve * @author Brian Clozel * @since 5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class DelegatingWebFluxConfiguration extends WebFluxConfigurationSupport { private final WebFluxConfigurerComposite configurers = new WebFluxConfigurerComposite(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java index bcdc65c5b3..5970d26c75 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.web.servlet.HandlerExceptionResolver; * @author Rossen Stoyanchev * @since 3.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class DelegatingWebMvcConfiguration extends WebMvcConfigurationSupport { private final WebMvcConfigurerComposite configurers = new WebMvcConfigurerComposite();