From 1ce5ca1ba83a96036efa105d1fedfb1a72f0303f Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 14 Nov 2019 12:42:43 -0500 Subject: [PATCH] Add proxyBeanMethods = false to configuration. Fixes #233 --- .../cloud/openfeign/FeignAutoConfiguration.java | 10 +++++----- .../openfeign/FeignClientsConfiguration.java | 4 ++-- .../HttpClientFeignConfiguration.java | 2 +- .../clientconfig/OkHttpFeignConfiguration.java | 2 +- .../FeignAcceptGzipEncodingAutoConfiguration.java | 2 +- ...FeignContentGzipEncodingAutoConfiguration.java | 2 +- .../hateoas/FeignHalAutoConfiguration.java | 2 +- .../DefaultFeignLoadBalancerConfiguration.java | 2 +- .../FeignLoadBalancerAutoConfiguration.java | 2 +- .../HttpClientFeignLoadBalancerConfiguration.java | 2 +- .../OkHttpFeignLoadBalancerConfiguration.java | 2 +- .../DefaultFeignLoadBalancedConfiguration.java | 2 +- .../FeignRibbonClientAutoConfiguration.java | 2 +- .../HttpClientFeignLoadBalancedConfiguration.java | 2 +- .../OkHttpFeignLoadBalancedConfiguration.java | 2 +- .../support/DefaultGzipDecoderConfiguration.java | 2 +- .../cloud/openfeign/DefaultGzipDecoderTests.java | 2 +- .../EnableFeignClientsSpringDataTests.java | 2 +- .../cloud/openfeign/EnableFeignClientsTests.java | 2 +- .../FeignClientOverrideDefaultsTests.java | 2 +- .../FeignClientUsingPropertiesTests.java | 2 +- .../openfeign/FeignClientsRegistrarTests.java | 4 ++-- .../cloud/openfeign/FeignCompressionTests.java | 2 +- .../cloud/openfeign/FeignHttpClientUrlTests.java | 2 +- .../cloud/openfeign/FeignLoggerFactoryTests.java | 6 +++--- .../cloud/openfeign/SpringDecoderTests.java | 2 +- .../cloud/openfeign/beans/FeignClientTests.java | 4 ++-- .../encoding/FeignAcceptEncodingTests.java | 2 +- .../encoding/FeignContentEncodingTests.java | 2 +- .../encoding/FeignPageableEncodingTests.java | 2 +- .../security/HystrixSecurityApplication.java | 2 +- .../invalid/FeignClientValidationTests.java | 15 +++++++-------- .../ribbon/FeignRibbonClientPathTests.java | 4 ++-- .../ribbon/FeignRibbonClientRetryTests.java | 4 ++-- .../FeignRibbonHttpClientConfigurationTests.java | 2 +- ...FeignRibbonOkHttpClientConfigurationTests.java | 2 +- .../LoadBalancerFeignClientOverrideTests.java | 2 +- .../support/FeignHttpClientPropertiesTests.java | 2 +- .../openfeign/support/SpringEncoderTests.java | 2 +- .../test/ApacheHttpClientConfigurationTests.java | 2 +- .../openfeign/test/NoSecurityConfiguration.java | 2 +- .../openfeign/test/TestAutoConfiguration.java | 4 ++-- .../valid/FeignClientNotPrimaryTests.java | 6 +++--- .../cloud/openfeign/valid/FeignClientTests.java | 6 +++--- .../valid/FeignClientValidationTests.java | 6 +++--- .../openfeign/valid/FeignHttpClientTests.java | 4 ++-- .../cloud/openfeign/valid/FeignOkHttpTests.java | 4 ++-- .../openfeign/valid/IterableParameterTests.java | 2 +- .../valid/scanning/FeignClientEnvVarTests.java | 4 ++-- .../valid/scanning/FeignClientScanningTests.java | 4 ++-- 50 files changed, 78 insertions(+), 79 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java index f05e63e7..a76f6832 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java @@ -56,7 +56,7 @@ import org.springframework.context.annotation.Import; * @author Spencer Gibb * @author Julien Roy */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Feign.class) @EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class }) @@ -78,7 +78,7 @@ public class FeignAutoConfiguration { return context; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "feign.hystrix.HystrixFeign") protected static class HystrixFeignTargeterConfiguration { @@ -90,7 +90,7 @@ public class FeignAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("feign.hystrix.HystrixFeign") protected static class DefaultFeignTargeterConfiguration { @@ -106,7 +106,7 @@ public class FeignAutoConfiguration { // ribbon is not on the class path. // see corresponding configurations in FeignRibbonClientAutoConfiguration // for load balanced ribbon clients. - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ApacheHttpClient.class) @ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer") @ConditionalOnMissingBean(CloseableHttpClient.class) @@ -172,7 +172,7 @@ public class FeignAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(OkHttpClient.class) @ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer") @ConditionalOnMissingBean(okhttp3.OkHttpClient.class) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java index e44970ab..e01d709f 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java @@ -55,7 +55,7 @@ import org.springframework.format.support.FormattingConversionService; * @author Dave Syer * @author Venil Noronha */ -@Configuration +@Configuration(proxyBeanMethods = false) public class FeignClientsConfiguration { @Autowired @@ -144,7 +144,7 @@ public class FeignClientsConfiguration { return new PageJacksonModule(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class }) protected static class HystrixFeignConfiguration { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClientFeignConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClientFeignConfiguration.java index 65dbdd23..cb465248 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClientFeignConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClientFeignConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(CloseableHttpClient.class) public class HttpClientFeignConfiguration { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java index 8d7006d4..8a72348f 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(okhttp3.OkHttpClient.class) public class OkHttpFeignConfiguration { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java index 845f69a2..97453739 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Jakub Narloch * @see FeignAcceptGzipEncodingInterceptor */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(FeignClientEncodingProperties.class) @ConditionalOnClass(Feign.class) @ConditionalOnBean(Client.class) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java index efe68b27..3567827f 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Jakub Narloch * @see FeignContentGzipEncodingInterceptor */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(FeignClientEncodingProperties.class) @ConditionalOnClass(Feign.class) @ConditionalOnBean(Client.class) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java index abedaeb4..d9a314c5 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java @@ -48,7 +48,7 @@ import static org.springframework.hateoas.MediaTypes.HAL_JSON; /** * @author Hector Espert */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnClass(RepresentationModel.class) @AutoConfigureAfter({ JacksonAutoConfiguration.class, diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.java index a576deb0..e148e9ab 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) class DefaultFeignLoadBalancerConfiguration { @Bean diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfiguration.java index 9ee0c3c2..16f46f8b 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.context.annotation.Import; @AutoConfigureBefore(FeignAutoConfiguration.class) @AutoConfigureAfter(FeignRibbonClientAutoConfiguration.class) @EnableConfigurationProperties(FeignHttpClientProperties.class) -@Configuration +@Configuration(proxyBeanMethods = false) // Order is important here, last should be the default, first should be optional // see // https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653 diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java index c8adaa41..b87a05e3 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Import; * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ApacheHttpClient.class) @ConditionalOnBean(BlockingLoadBalancerClient.class) @ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java index 9091252b..bbf12495 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import; * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(OkHttpClient.class) @ConditionalOnProperty("feign.okhttp.enabled") @ConditionalOnBean(BlockingLoadBalancerClient.class) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/DefaultFeignLoadBalancedConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/DefaultFeignLoadBalancedConfiguration.java index d3ac4280..156b517e 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/DefaultFeignLoadBalancedConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/DefaultFeignLoadBalancedConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) class DefaultFeignLoadBalancedConfiguration { @Bean diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientAutoConfiguration.java index 9442f27e..77a3a32c 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.context.annotation.Primary; @ConditionalOnClass({ ILoadBalancer.class, Feign.class }) @ConditionalOnProperty(value = "spring.cloud.loadbalancer.ribbon.enabled", matchIfMissing = true) -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(FeignAutoConfiguration.class) @EnableConfigurationProperties({ FeignHttpClientProperties.class }) // Order is important here, last should be the default, first should be optional diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/HttpClientFeignLoadBalancedConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/HttpClientFeignLoadBalancedConfiguration.java index d95709e9..d6703682 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/HttpClientFeignLoadBalancedConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/HttpClientFeignLoadBalancedConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Import; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ApacheHttpClient.class) @ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true) @Import(HttpClientFeignConfiguration.class) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/OkHttpFeignLoadBalancedConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/OkHttpFeignLoadBalancedConfiguration.java index 7aae4aeb..171b2872 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/OkHttpFeignLoadBalancedConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/OkHttpFeignLoadBalancedConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Import; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(OkHttpClient.class) @ConditionalOnProperty("feign.okhttp.enabled") @Import(OkHttpFeignConfiguration.class) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java index 5c0af2de..4604e76b 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * * @author Jaesik Kim */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty("feign.compression.response.enabled") // The OK HTTP client uses "transparent" compression. // If the accept-encoding header is present, it disables transparent compression diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java index 55f4af4c..294eeeef 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java @@ -138,7 +138,7 @@ public class DefaultGzipDecoderTests extends FeignClientFactoryBean { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @Import(NoSecurityConfiguration.class) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsSpringDataTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsSpringDataTests.java index 3073e03e..94bdd280 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsSpringDataTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsSpringDataTests.java @@ -48,7 +48,7 @@ public class EnableFeignClientsSpringDataTests { .cast(this.feignContext.getInstance("foo", Encoder.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class }) protected static class PlainConfiguration { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsTests.java index 90002b2a..a85e61be 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsTests.java @@ -87,7 +87,7 @@ public class EnableFeignClientsTests { Feign.Builder.class.cast(this.context.getBeansOfType(Feign.Builder.class).get(0)); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class }) protected static class PlainConfiguration { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java index 9b1730af..fe21f2e4 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java @@ -169,7 +169,7 @@ public class FeignClientOverrideDefaultsTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableFeignClients(clients = { FooClient.class, BarClient.class }) @Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class, FeignAutoConfiguration.class }) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java index adb3dd83..762e5b93 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java @@ -153,7 +153,7 @@ public class FeignClientUsingPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @Import(NoSecurityConfiguration.class) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java index 62ee09fa..9a3ed334 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java @@ -107,14 +107,14 @@ public class FeignClientsRegistrarTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class }) protected static class FallbackTestConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableFeignClients( clients = { FeignClientsRegistrarTests.FallbackFactoryClient.class }) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignCompressionTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignCompressionTests.java index a4bd30c6..0dfb5542 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignCompressionTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignCompressionTests.java @@ -71,7 +71,7 @@ public class FeignCompressionTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class PlainConfig { @Autowired diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java index 23b553d2..1597caf6 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java @@ -129,7 +129,7 @@ public class FeignHttpClientUrlTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { UrlClient.class, BeanUrlClient.class, diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignLoggerFactoryTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignLoggerFactoryTests.java index e8bcec8b..fa2fb9dd 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignLoggerFactoryTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignLoggerFactoryTests.java @@ -69,13 +69,13 @@ public class FeignLoggerFactoryTests { context.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignClientsConfiguration.class) protected static class SampleConfiguration1 { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignClientsConfiguration.class) protected static class SampleConfiguration2 { @@ -95,7 +95,7 @@ public class FeignLoggerFactoryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignClientsConfiguration.class) protected static class SampleConfiguration3 { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java index 54863b41..2b3b0d92 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java @@ -215,7 +215,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @Import(NoSecurityConfiguration.class) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/beans/FeignClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/beans/FeignClientTests.java index ff5d9ca1..e2d5b8a4 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/beans/FeignClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/beans/FeignClientTests.java @@ -112,7 +112,7 @@ public class FeignClientTests { assertThat(invocationHandler).as("invocationHandler was null").isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients @@ -170,7 +170,7 @@ public class FeignClientTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestDefaultFeignConfig { } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java index 2f971ab1..79c5b86c 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java @@ -83,7 +83,7 @@ public class FeignAcceptEncodingTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java index a276d188..0a761672 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java @@ -87,7 +87,7 @@ public class FeignContentEncodingTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java index 7d20923f..76ff5fb1 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java @@ -95,7 +95,7 @@ public class FeignPageableEncodingTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java index 058d01a3..82af0240 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import; /** * @author Daniel Lavoie */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableFeignClients(clients = UsernameClient.class) @Import(NoSecurityConfiguration.class) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java index 41ac84aa..82e847ca 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/invalid/FeignClientValidationTests.java @@ -122,7 +122,7 @@ public class FeignClientValidationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class }) @EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class) protected static class NameAndServiceIdConfiguration { @@ -137,8 +137,7 @@ public class FeignClientValidationTests { } - @Configuration - + @Configuration(proxyBeanMethods = false) @Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class }) @EnableFeignClients( clients = { DuplicatedFeignClientNamesConfiguration.FooClient.class, @@ -163,7 +162,7 @@ public class FeignClientValidationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignAutoConfiguration.class) @EnableFeignClients(clients = BadHostnameConfiguration.Client.class) protected static class BadHostnameConfiguration { @@ -178,7 +177,7 @@ public class FeignClientValidationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignAutoConfiguration.class) @EnableFeignClients(clients = MissingFallbackConfiguration.Client.class) protected static class MissingFallbackConfiguration { @@ -208,7 +207,7 @@ public class FeignClientValidationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignAutoConfiguration.class) @EnableFeignClients(clients = WrongFallbackTypeConfiguration.Client.class) protected static class WrongFallbackTypeConfiguration { @@ -237,7 +236,7 @@ public class FeignClientValidationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignAutoConfiguration.class) @EnableFeignClients(clients = MissingFallbackFactoryConfiguration.Client.class) protected static class MissingFallbackFactoryConfiguration { @@ -267,7 +266,7 @@ public class FeignClientValidationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FeignAutoConfiguration.class) @EnableFeignClients(clients = WrongFallbackFactoryTypeConfiguration.Client.class) protected static class WrongFallbackFactoryTypeConfiguration { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java index b141d209..b8aecde5 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java @@ -139,7 +139,7 @@ public class FeignRibbonClientPathTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @RequestMapping("/base/path") @@ -177,7 +177,7 @@ public class FeignRibbonClientPathTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java index 5ab5e86f..96f4cbee 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java @@ -95,7 +95,7 @@ public class FeignRibbonClientRetryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(clients = TestClient.class) @@ -142,7 +142,7 @@ public class FeignRibbonClientRetryTests { // Load balancer with fixed server list for "local" pointing to localhost // some bogus servers are thrown in to test retry -@Configuration +@Configuration(proxyBeanMethods = false) class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonHttpClientConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonHttpClientConfigurationTests.java index 56d36ae1..11d1cf71 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonHttpClientConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonHttpClientConfigurationTests.java @@ -88,7 +88,7 @@ public class FeignRibbonHttpClientConfigurationTests { return value; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class FeignRibbonHttpClientConfigurationTestsApplication { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonOkHttpClientConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonOkHttpClientConfigurationTests.java index d320661f..db525784 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonOkHttpClientConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonOkHttpClientConfigurationTests.java @@ -67,7 +67,7 @@ public class FeignRibbonOkHttpClientConfigurationTests { return value; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class FeignRibbonOkHttpClientConfigurationTestsApplication { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClientOverrideTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClientOverrideTests.java index 391d643f..4c340203 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClientOverrideTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClientOverrideTests.java @@ -108,7 +108,7 @@ public class LoadBalancerFeignClientOverrideTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableFeignClients(clients = { FooClient.class, BarClient.class, BazClient.class }) @EnableAutoConfiguration protected static class TestConfiguration { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java index 99bdcb5c..bc9c0b9c 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java @@ -91,7 +91,7 @@ public class FeignHttpClientPropertiesTests { return this.context.getBean(FeignHttpClientProperties.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties protected static class TestConfiguration { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringEncoderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringEncoderTests.java index 0214a869..1ae4db0a 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringEncoderTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringEncoderTests.java @@ -169,7 +169,7 @@ public class SpringEncoderTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController protected static class Application implements TestClient { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java index 83c73c0b..b537943a 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/ApacheHttpClientConfigurationTests.java @@ -160,7 +160,7 @@ public class ApacheHttpClientConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MyConfig { @Bean diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/NoSecurityConfiguration.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/NoSecurityConfiguration.java index 1283c2f0..4ff76edf 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/NoSecurityConfiguration.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/NoSecurityConfiguration.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -@Configuration +@Configuration(proxyBeanMethods = false) public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/TestAutoConfiguration.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/TestAutoConfiguration.java index 49e1494b..e30b42ce 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/TestAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/TestAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ NoopDiscoveryClientAutoConfiguration.class }) @AutoConfigureBefore(SecurityAutoConfiguration.class) public class TestAutoConfiguration { @@ -42,7 +42,7 @@ public class TestAutoConfiguration { public static final String PASSWORD = "{noop}password"; - @Configuration + @Configuration(proxyBeanMethods = false) @Order(Ordered.HIGHEST_PRECEDENCE) protected static class TestSecurityConfiguration extends WebSecurityConfigurerAdapter { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientNotPrimaryTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientNotPrimaryTests.java index cc123d29..c6c2d71b 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientNotPrimaryTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientNotPrimaryTests.java @@ -99,7 +99,7 @@ public class FeignClientNotPrimaryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { TestClient.class }, @@ -150,7 +150,7 @@ public class FeignClientNotPrimaryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestDefaultFeignConfig { @Bean @@ -161,7 +161,7 @@ public class FeignClientNotPrimaryTests { } // Load balancer with fixed server list for "local" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) public static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java index 5788abc1..ab4502b1 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java @@ -699,7 +699,7 @@ public class FeignClientTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { TestClientServiceId.class, TestClient.class, @@ -924,7 +924,7 @@ public class FeignClientTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestDefaultFeignConfig { @Bean @@ -935,7 +935,7 @@ public class FeignClientTests { } // Load balancer with fixed server list for "local" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) public static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientValidationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientValidationTests.java index 3e97b413..a64ae07c 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientValidationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientValidationTests.java @@ -64,7 +64,7 @@ public class FeignClientValidationTests { context.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class }) @EnableFeignClients(clients = GoodUrlConfiguration.Client.class) protected static class GoodUrlConfiguration { @@ -80,7 +80,7 @@ public class FeignClientValidationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class }) @EnableFeignClients(clients = PlaceholderUrlConfiguration.Client.class) protected static class PlaceholderUrlConfiguration { @@ -96,7 +96,7 @@ public class FeignClientValidationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ FeignAutoConfiguration.class, HttpClientConfiguration.class }) @EnableFeignClients(clients = GoodServiceIdConfiguration.Client.class) protected static class GoodServiceIdConfiguration { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java index 8267c67d..e0034741 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java @@ -137,7 +137,7 @@ public class FeignHttpClientTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { TestClient.class, UserClient.class }) @@ -252,7 +252,7 @@ public class FeignHttpClientTests { } // Load balancer with fixed server list for "local" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) static class LocalRibbonClientConfiguration { @LocalServerPort diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java index 62feb91b..eacf2ea9 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java @@ -136,7 +136,7 @@ public class FeignOkHttpTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { TestClient.class, UserClient.class }) @@ -251,7 +251,7 @@ public class FeignOkHttpTests { } // Load balancer with fixed server list for "local" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/IterableParameterTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/IterableParameterTests.java index 975b819a..1d269a92 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/IterableParameterTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/IterableParameterTests.java @@ -75,7 +75,7 @@ public class IterableParameterTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(clients = TestClient.class) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java index 68b3921c..ec5a917e 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java @@ -64,7 +64,7 @@ public class FeignClientEnvVarTests { assertThat(hello).as("first hello didn't match").isEqualTo("hello world 1"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients(basePackages = { "${basepackage}" }) @@ -80,7 +80,7 @@ public class FeignClientEnvVarTests { } // Load balancer with fixed server list for "local" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) public static class LocalRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java index 0fa4a115..17c31dfa 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java @@ -96,7 +96,7 @@ public class FeignClientScanningTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients // NO clients attribute. That's what this class is testing! @@ -112,7 +112,7 @@ public class FeignClientScanningTests { } // Load balancer with fixed server list for "local" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) public static class LocalRibbonClientConfiguration { @Value("${local.server.port}")