From 0eb57277337dcd5e7058913827b64ad6939e8cf4 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 14 Nov 2019 16:31:37 -0500 Subject: [PATCH] Adding proxyBeanMethods = false to configuration. Fixes #1362 --- .../cloud/gateway/config/GatewayAutoConfiguration.java | 8 ++++---- .../config/GatewayCircuitBreakerAutoConfiguration.java | 6 +++--- .../config/GatewayClassPathWarningAutoConfiguration.java | 6 +++--- .../GatewayLoadBalancerClientAutoConfiguration.java | 2 +- .../gateway/config/GatewayMetricsAutoConfiguration.java | 2 +- .../GatewayNoLoadBalancerClientAutoConfiguration.java | 2 +- ...atewayReactiveLoadBalancerClientAutoConfiguration.java | 2 +- .../gateway/config/GatewayRedisAutoConfiguration.java | 2 +- ...impleUrlHandlerMappingGlobalCorsAutoConfiguration.java | 2 +- .../GatewayDiscoveryClientAutoConfiguration.java | 6 +++--- .../cloud/gateway/filter/factory/HystrixTestConfig.java | 2 +- .../cloud/gateway/route/builder/RouteBuilderTests.java | 2 +- .../cloud/gateway/test/BaseWebClientTests.java | 2 +- .../cloud/gateway/test/GatewayTestApplication.java | 2 +- .../gateway/test/PermitAllSecurityConfiguration.java | 2 +- .../cloud/gateway/test/sse/SseIntegrationTests.java | 4 ++-- .../gateway/test/websocket/WebSocketIntegrationTests.java | 4 ++-- .../cloud/gateway/route/builder/RouteDslTests.kt | 2 +- .../mvc/config/ProxyResponseAutoConfiguration.java | 2 +- .../cloud/gateway/sample/AdditionalRoutes.kt | 2 +- .../gateway/sample/GatewaySampleApplicationTests.java | 2 +- .../webflux/config/ProxyResponseAutoConfiguration.java | 2 +- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index 702db08d..b5dfcec0 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -153,7 +153,7 @@ import static org.springframework.cloud.gateway.config.HttpClientProperties.Pool /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true) @EnableConfigurationProperties @AutoConfigureBefore({ HttpHandlerAutoConfiguration.class, @@ -554,7 +554,7 @@ public class GatewayAutoConfiguration { return new RequestHeaderSizeGatewayFilterFactory(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HttpClient.class) protected static class NettyConfiguration { @@ -699,7 +699,7 @@ public class GatewayAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ HystrixObservableCommand.class, RxReactiveStreams.class }) protected static class HystrixConfiguration { @@ -717,7 +717,7 @@ public class GatewayAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Health.class) protected static class GatewayActuatorConfiguration { diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayCircuitBreakerAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayCircuitBreakerAutoConfiguration.java index 39861bd9..7f16c9bf 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayCircuitBreakerAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayCircuitBreakerAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.web.reactive.DispatcherHandler; /** * @author Ryan Baxter */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true) @AutoConfigureAfter({ ReactiveResilience4JAutoConfiguration.class, HystrixCircuitBreakerAutoConfiguration.class }) @@ -46,7 +46,7 @@ import org.springframework.web.reactive.DispatcherHandler; HystrixCircuitBreakerAutoConfiguration.class }) public class GatewayCircuitBreakerAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveCircuitBreakerFactory.class, ReactiveHystrixCircuitBreakerFactory.class }) protected static class SpringCloudCircuitBreakerHystrixConfiguration { @@ -68,7 +68,7 @@ public class GatewayCircuitBreakerAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveCircuitBreakerFactory.class, ReactiveResilience4JCircuitBreakerFactory.class }) protected static class Resilience4JConfiguration { diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayClassPathWarningAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayClassPathWarningAutoConfiguration.java index 3f2e8f26..859d0138 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayClassPathWarningAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayClassPathWarningAutoConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(GatewayAutoConfiguration.class) public class GatewayClassPathWarningAutoConfiguration { @@ -33,7 +33,7 @@ public class GatewayClassPathWarningAutoConfiguration { private static final String BORDER = "\n\n**********************************************************\n\n"; - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "org.springframework.web.servlet.DispatcherServlet") protected static class SpringMvcFoundOnClasspathConfiguration { @@ -45,7 +45,7 @@ public class GatewayClassPathWarningAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.web.reactive.DispatcherHandler") protected static class WebfluxMissingFromClasspathConfiguration { diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayLoadBalancerClientAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayLoadBalancerClientAutoConfiguration.java index 5e74a372..7567e812 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayLoadBalancerClientAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.web.reactive.DispatcherHandler; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ LoadBalancerClient.class, RibbonAutoConfiguration.class, DispatcherHandler.class }) @AutoConfigureAfter(RibbonAutoConfiguration.class) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfiguration.java index 4bf8a0b7..35387e19 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.reactive.DispatcherHandler; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true) @EnableConfigurationProperties(GatewayMetricsProperties.class) @AutoConfigureBefore(HttpHandlerAutoConfiguration.class) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfiguration.java index 79ad84b2..b51db395 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayNoLoadBalancerClientAutoConfiguration.java @@ -41,7 +41,7 @@ import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.G /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration") @ConditionalOnMissingBean(LoadBalancerClient.class) @EnableConfigurationProperties(LoadBalancerProperties.class) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayReactiveLoadBalancerClientAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayReactiveLoadBalancerClientAutoConfiguration.java index 12133361..20d0bdfd 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayReactiveLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayReactiveLoadBalancerClientAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.web.reactive.DispatcherHandler; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveLoadBalancer.class, LoadBalancerAutoConfiguration.class, DispatcherHandler.class }) @AutoConfigureBefore(GatewayLoadBalancerClientAutoConfiguration.class) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java index 24b048d0..28d55a4f 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.data.redis.core.script.RedisScript; import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.web.reactive.DispatcherHandler; -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(RedisReactiveAutoConfiguration.class) @AutoConfigureBefore(GatewayAutoConfiguration.class) @ConditionalOnBean(ReactiveRedisTemplate.class) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/SimpleUrlHandlerMappingGlobalCorsAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/SimpleUrlHandlerMappingGlobalCorsAutoConfiguration.java index b6a2f2e5..1d8abbf5 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/SimpleUrlHandlerMappingGlobalCorsAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/SimpleUrlHandlerMappingGlobalCorsAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping; * */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SimpleUrlHandlerMapping.class) @ConditionalOnProperty( name = "spring.cloud.gateway.globalcors.add-to-simple-url-handler-mapping", diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java index 2a5de564..da70da1e 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfiguration.java @@ -45,7 +45,7 @@ import static org.springframework.cloud.gateway.support.NameUtils.normalizeRoute /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true) @AutoConfigureBefore(GatewayAutoConfiguration.class) @AutoConfigureAfter(CompositeDiscoveryClientAutoConfiguration.class) @@ -88,7 +88,7 @@ public class GatewayDiscoveryClientAutoConfiguration { return properties; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.discovery.reactive.enabled", matchIfMissing = true) public static class ReactiveDiscoveryClientRouteDefinitionLocatorConfiguration { @@ -106,7 +106,7 @@ public class GatewayDiscoveryClientAutoConfiguration { /** * @deprecated In favor of the native reactive service discovery capability. */ - @Configuration + @Configuration(proxyBeanMethods = false) @Deprecated @ConditionalOnProperty(value = "spring.cloud.discovery.reactive.enabled", havingValue = "false") diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/HystrixTestConfig.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/HystrixTestConfig.java index d80d3990..e8c1888d 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/HystrixTestConfig.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/HystrixTestConfig.java @@ -114,7 +114,7 @@ class ExceptionFallbackHandler { } -@Configuration +@Configuration(proxyBeanMethods = false) class TestBadRibbonConfig { @LocalServerPort diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/route/builder/RouteBuilderTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/route/builder/RouteBuilderTests.java index 09550ded..42e7033b 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/route/builder/RouteBuilderTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/route/builder/RouteBuilderTests.java @@ -92,7 +92,7 @@ public class RouteBuilderTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class SpringConfig { } diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java index 6dec855f..83d453f8 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java @@ -77,7 +77,7 @@ public class BaseWebClientTests { .build(); } - @Configuration + @Configuration(proxyBeanMethods = false) @RibbonClients({ @RibbonClient(name = "testservice", configuration = TestRibbonConfig.class) }) @Import(PermitAllSecurityConfiguration.class) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java index af616e47..9a3769f2 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java @@ -42,7 +42,7 @@ public class GatewayTestApplication { * `--spring.profiles.active=discovery` should be able to hit * http://localhost:8008/configserver/foo/default a normal configserver api */ - @Configuration + @Configuration(proxyBeanMethods = false) @EnableDiscoveryClient @Profile("discovery") protected static class GatewayDiscoveryConfiguration { diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PermitAllSecurityConfiguration.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PermitAllSecurityConfiguration.java index 936b789c..fbab8f08 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PermitAllSecurityConfiguration.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PermitAllSecurityConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.server.SecurityWebFilterChain; -@Configuration +@Configuration(proxyBeanMethods = false) public class PermitAllSecurityConfiguration { @Bean diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java index 53b41b97..546267ae 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java @@ -220,7 +220,7 @@ public class SseIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebFlux @SuppressWarnings("unused") static class TestConfiguration { @@ -232,7 +232,7 @@ public class SseIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import(PermitAllSecurityConfiguration.class) protected static class GatewayConfig { diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java index abacc1ad..695ed5a0 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java @@ -261,7 +261,7 @@ public class WebSocketIntegrationTests { }).block(Duration.ofMillis(5000)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class WebSocketTestConfig { @Bean @@ -355,7 +355,7 @@ public class WebSocketIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import(PermitAllSecurityConfiguration.class) @RibbonClient(name = "wsservice", diff --git a/spring-cloud-gateway-core/src/test/kotlin/org/springframework/cloud/gateway/route/builder/RouteDslTests.kt b/spring-cloud-gateway-core/src/test/kotlin/org/springframework/cloud/gateway/route/builder/RouteDslTests.kt index 1121f023..2e0217e6 100644 --- a/spring-cloud-gateway-core/src/test/kotlin/org/springframework/cloud/gateway/route/builder/RouteDslTests.kt +++ b/spring-cloud-gateway-core/src/test/kotlin/org/springframework/cloud/gateway/route/builder/RouteDslTests.kt @@ -118,6 +118,6 @@ class RouteDslTests { } } -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration open class Config {} \ No newline at end of file diff --git a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java index b9ef1aff..fc521fa2 100644 --- a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java +++ b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnClass({ HandlerMethodReturnValueHandler.class }) @EnableConfigurationProperties(ProxyProperties.class) diff --git a/spring-cloud-gateway-sample/src/main/kotlin/org/springframework/cloud/gateway/sample/AdditionalRoutes.kt b/spring-cloud-gateway-sample/src/main/kotlin/org/springframework/cloud/gateway/sample/AdditionalRoutes.kt index 27c15233..779d15e6 100644 --- a/spring-cloud-gateway-sample/src/main/kotlin/org/springframework/cloud/gateway/sample/AdditionalRoutes.kt +++ b/spring-cloud-gateway-sample/src/main/kotlin/org/springframework/cloud/gateway/sample/AdditionalRoutes.kt @@ -23,7 +23,7 @@ import org.springframework.cloud.gateway.route.builder.routes import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -@Configuration +@Configuration(proxyBeanMethods = false) open class AdditionalRoutes { @Value("\${test.uri:http://httpbin.org:80}") diff --git a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java index 50d89c36..f2e7f599 100644 --- a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java +++ b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java @@ -178,7 +178,7 @@ public class GatewaySampleApplicationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RibbonClient(name = "httpbin", configuration = RibbonConfig.class) @Import(GatewaySampleApplication.class) diff --git a/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyResponseAutoConfiguration.java b/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyResponseAutoConfiguration.java index b6d32dfc..18722916 100644 --- a/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyResponseAutoConfiguration.java +++ b/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyResponseAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.web.reactive.result.method.annotation.ArgumentResolve * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnClass({ HandlerMethodReturnValueHandler.class }) @EnableConfigurationProperties(ProxyProperties.class)