From 18a4227c4ef1bdf86c3103e64bce75847a53073e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 14 Nov 2019 20:04:28 -0500 Subject: [PATCH] Added proxyBeanMethods = false to configuration classes. Fixes #623 --- .../cloud/client/CommonsClientAutoConfiguration.java | 6 +++--- .../client/ReactiveCommonsClientAutoConfiguration.java | 4 ++-- .../CompositeDiscoveryClientAutoConfiguration.java | 2 +- ...ctiveCompositeDiscoveryClientAutoConfiguration.java | 2 +- .../noop/NoopDiscoveryClientAutoConfiguration.java | 4 ++-- .../simple/SimpleDiscoveryClientAutoConfiguration.java | 2 +- ...SimpleReactiveDiscoveryClientAutoConfiguration.java | 4 ++-- .../hypermedia/CloudHypermediaAutoConfiguration.java | 2 +- .../AsyncLoadBalancerAutoConfiguration.java | 6 +++--- .../loadbalancer/LoadBalancerAutoConfiguration.java | 8 ++++---- ...LoadBalancerBeanPostProcessorAutoConfiguration.java | 6 +++--- .../ReactiveLoadBalancerAutoConfiguration.java | 2 +- .../ReactorLoadBalancerClientAutoConfiguration.java | 4 ++-- .../AutoServiceRegistrationAutoConfiguration.java | 2 +- .../AutoServiceRegistrationConfiguration.java | 2 +- .../ServiceRegistryAutoConfiguration.java | 2 +- .../commons/httpclient/HttpClientConfiguration.java | 6 +++--- .../cloud/commons/util/UtilAutoConfiguration.java | 2 +- .../CompatibilityVerifierAutoConfiguration.java | 2 +- .../cloud/client/actuator/FeaturesEndpointTests.java | 4 ++-- .../discovery/AutoRegisterPropertyFalseTests.java | 2 +- .../EnableDiscoveryClientAutoRegisterFalseTests.java | 2 +- .../EnableDiscoveryClientMissingImplTests.java | 2 +- ...CompositeDiscoveryClientAutoConfigurationTests.java | 2 +- .../composite/CompositeDiscoveryClientTestsConfig.java | 2 +- .../health/DiscoveryClientHealthIndicatorTests.java | 2 +- .../DiscoveryClientAutoConfigurationDefaultTests.java | 2 +- ...impleDiscoveryPropertiesAutoConfigurationTests.java | 2 +- ...impleDiscoveryPropertiesAutoConfigurationTests.java | 2 +- .../SimpleDiscoveryClientPropertiesMappingTests.java | 2 +- ...oudHypermediaAutoConfigurationIntegrationTests.java | 4 ++-- .../AbstractLoadBalancerAutoConfigurationTests.java | 6 +++--- .../AsyncLoadBalancerAutoConfigurationTests.java | 6 +++--- .../LoadBalancerRequestFactoryConfigurationTests.java | 6 +++--- ...stractAutoServiceRegistrationMgmtDisabledTests.java | 2 +- .../AbstractAutoServiceRegistrationTests.java | 2 +- .../AutoServiceRegistrationAutoConfigurationTests.java | 2 +- .../ServiceRegistryAutoConfigurationTests.java | 2 +- .../ServiceRegistryEndpointNoRegistrationTests.java | 2 +- .../CustomHttpClientBuilderConfigurationTests.java | 4 ++-- .../httpclient/CustomHttpClientConfigurationTests.java | 4 ++-- .../CustomOkHttpClientBuilderConfigurationTests.java | 4 ++-- .../DefaultHttpClientConfigurationTests.java | 2 +- .../CompatibilityVerifierAutoConfigurationTests.java | 2 +- ...tibilityVerifierDisabledAutoConfigurationTests.java | 2 +- ...atibilityVerifierFailureAutoConfigurationTests.java | 2 +- .../autoconfigure/RefreshScopeIntegrationTests.java | 2 +- ...nfigurationPropertiesRebinderAutoConfiguration.java | 2 +- .../LifecycleMvcEndpointAutoConfiguration.java | 2 +- .../cloud/autoconfigure/RefreshAutoConfiguration.java | 4 ++-- .../RefreshEndpointAutoConfiguration.java | 10 +++++----- .../WritableEnvironmentEndpointAutoConfiguration.java | 2 +- .../BootstrapImportSelectorConfiguration.java | 2 +- .../config/PropertySourceBootstrapConfiguration.java | 2 +- .../encrypt/EncryptionBootstrapConfiguration.java | 6 +++--- .../cloud/context/refresh/ContextRefresher.java | 2 +- .../LifecycleMvcAutoConfigurationTests.java | 2 +- .../RefreshAutoConfigurationClassPathTests.java | 2 +- .../RefreshAutoConfigurationMoreClassPathTests.java | 2 +- .../autoconfigure/RefreshAutoConfigurationTests.java | 2 +- ...strapDisabledAutoConfigurationIntegrationTests.java | 2 +- ...strapOrderingAutoConfigurationIntegrationTests.java | 2 +- ...apOrderingCustomPropertySourceIntegrationTests.java | 4 ++-- ...pOrderingSpringApplicationJsonIntegrationTests.java | 2 +- .../cloud/bootstrap/BootstrapSourcesOrderingTests.java | 2 +- .../bootstrap/MessageSourceConfigurationTests.java | 2 +- .../cloud/bootstrap/TestBootstrapConfiguration.java | 2 +- .../bootstrap/config/BootstrapConfigurationTests.java | 4 ++-- .../BootstrapListenerHierarchyIntegrationTests.java | 4 ++-- .../bootstrap/encrypt/EncryptionIntegrationTests.java | 2 +- .../EnvironmentManagerIntegrationTests.java | 2 +- ...onfigurationPropertiesRebinderIntegrationTests.java | 4 ++-- ...ionPropertiesRebinderLifecycleIntegrationTests.java | 4 ++-- ...gurationPropertiesRebinderListIntegrationTests.java | 4 ++-- ...urationPropertiesRebinderProxyIntegrationTests.java | 4 ++-- ...PropertiesRebinderRefreshScopeIntegrationTests.java | 2 +- .../refresh/ContextRefresherIntegrationTests.java | 2 +- .../cloud/context/refresh/ContextRefresherTests.java | 4 ++-- .../cloud/context/restart/RestartIntegrationTests.java | 2 +- .../refresh/ImportRefreshScopeIntegrationTests.java | 4 ++-- .../scope/refresh/RefreshEndpointIntegrationTests.java | 2 +- .../scope/refresh/RefreshScopeConcurrencyTests.java | 2 +- .../refresh/RefreshScopeConfigurationScaleTests.java | 2 +- .../scope/refresh/RefreshScopeConfigurationTests.java | 4 ++-- .../scope/refresh/RefreshScopeIntegrationTests.java | 2 +- .../refresh/RefreshScopeLazyIntegrationTests.java | 2 +- .../RefreshScopeListBindingIntegrationTests.java | 2 +- .../refresh/RefreshScopeNullBeanIntegrationTests.java | 4 ++-- .../scope/refresh/RefreshScopePureScaleTests.java | 2 +- .../context/scope/refresh/RefreshScopeScaleTests.java | 2 +- .../scope/refresh/RefreshScopeSerializationTests.java | 2 +- .../scope/refresh/RefreshScopeWebIntegrationTests.java | 2 +- .../cloud/endpoint/RefreshEndpointTests.java | 2 +- .../loadbalancer/annotation/LoadBalancerClient.java | 2 +- .../annotation/LoadBalancerClientConfiguration.java | 6 +++--- .../loadbalancer/annotation/LoadBalancerClients.java | 2 +- .../BlockingLoadBalancerClientAutoConfiguration.java | 4 ++-- .../config/LoadBalancerAutoConfiguration.java | 2 +- .../config/LoadBalancerCacheAutoConfiguration.java | 2 +- .../client/BlockingLoadBalancerClientTests.java | 2 +- 100 files changed, 147 insertions(+), 147 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java index 521e9b5e..e5a2e86e 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java @@ -47,10 +47,10 @@ import org.springframework.context.annotation.Configuration; * @author Olga Maciaszek-Sharma * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) public class CommonsClientAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HealthIndicator.class) @EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class) @ConditionalOnBean(DiscoveryClient.class) @@ -84,7 +84,7 @@ public class CommonsClientAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Endpoint.class) @ConditionalOnProperty(value = "spring.cloud.features.enabled", matchIfMissing = true) protected static class ActuatorConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java index f3902ff3..367a4888 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java @@ -40,10 +40,10 @@ import org.springframework.context.annotation.Configuration; * @author Tim Ysewyn * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ReactiveCommonsClientAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class) @ConditionalOnClass(ReactiveHealthIndicator.class) @ConditionalOnBean(ReactiveDiscoveryClient.class) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java index 8593523a..7fb6c7b2 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Primary; * @author Biju Kunjummen */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(SimpleDiscoveryClientAutoConfiguration.class) public class CompositeDiscoveryClientAutoConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfiguration.java index 1cae8b7f..b8e0bd1e 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Primary; * @author Tim Ysewyn * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnReactiveDiscoveryEnabled public class ReactiveCompositeDiscoveryClientAutoConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java index 030deb8d..a7163661 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.core.env.Environment; * instead}. * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnMissingBean(DiscoveryClient.class) @Deprecated @@ -120,7 +120,7 @@ public class NoopDiscoveryClientAutoConfiguration } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = { "org.springframework.web.context.support.GenericWebApplicationContext", "org.springframework.boot.context.embedded.EmbeddedWebApplicationContext" }) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java index 1fb375e8..05ae528f 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.core.annotation.Order; * * @author Biju Kunjummen */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class }) public class SimpleDiscoveryClientAutoConfiguration diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java index 23f9164f..8022e731 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.core.annotation.Order; * @author Tim Ysewyn * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnReactiveDiscoveryEnabled @EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class) @@ -101,7 +101,7 @@ public class SimpleReactiveDiscoveryClientAutoConfiguration } } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ReactiveHealthIndicator.class) protected static class HealthConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java index eeb65e5b..77125ff8 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * * @author Oliver Gierke */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(type = "org.springframework.cloud.client.hypermedia.RemoteResource") @EnableConfigurationProperties(CloudHypermediaProperties.class) public class CloudHypermediaAutoConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java index 42b01863..0af62aef 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java @@ -34,12 +34,12 @@ import org.springframework.web.client.AsyncRestTemplate; * * @author Rob Worsnop */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(LoadBalancerClient.class) @ConditionalOnClass(AsyncRestTemplate.class) public class AsyncLoadBalancerAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) static class AsyncRestTemplateCustomizerConfig { @LoadBalanced @@ -63,7 +63,7 @@ public class AsyncLoadBalancerAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class LoadBalancerInterceptorConfig { @Bean diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java index 0ae0c0d8..96e0dcd7 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.web.client.RestTemplate; * @author Will Tran * @author Gang Li */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RestTemplate.class) @ConditionalOnBean(LoadBalancerClient.class) @EnableConfigurationProperties(LoadBalancerRetryProperties.class) @@ -74,7 +74,7 @@ public class LoadBalancerAutoConfiguration { return new LoadBalancerRequestFactory(loadBalancerClient, this.transformers); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate") static class LoadBalancerInterceptorConfig { @@ -102,7 +102,7 @@ public class LoadBalancerAutoConfiguration { /** * Auto configuration for retry mechanism. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RetryTemplate.class) public static class RetryAutoConfiguration { @@ -118,7 +118,7 @@ public class LoadBalancerAutoConfiguration { /** * Auto configuration for retry intercepting mechanism. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RetryTemplate.class) public static class RetryInterceptorAutoConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java index 308e42d8..98aba0fa 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) @Conditional(LoadBalancerBeanPostProcessorAutoConfiguration.OnAnyLoadBalancerImplementationPresentCondition.class) public class LoadBalancerBeanPostProcessorAutoConfiguration { @@ -56,7 +56,7 @@ public class LoadBalancerBeanPostProcessorAutoConfiguration { deferringExchangeFilterFunction, context); } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(ReactorLoadBalancerClientAutoConfiguration.OnNoRibbonDefaultCondition.class) @ConditionalOnBean(ReactiveLoadBalancer.Factory.class) protected static class ReactorDeferringLoadBalancerFilterConfig { @@ -71,7 +71,7 @@ public class LoadBalancerBeanPostProcessorAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(LoadBalancerClient.class) @AutoConfigureAfter(ReactorDeferringLoadBalancerFilterConfig.class) @Deprecated diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancerAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancerAutoConfiguration.java index 5be33bd5..4db0ba17 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancerAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancerAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) @ConditionalOnBean(LoadBalancerClient.class) @AutoConfigureAfter(ReactorLoadBalancerClientAutoConfiguration.class) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java index f7108fbe..4c09b7f9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) @ConditionalOnBean(ReactiveLoadBalancer.Factory.class) public class ReactorLoadBalancerClientAutoConfiguration { @@ -54,7 +54,7 @@ public class ReactorLoadBalancerClientAutoConfiguration { return new ReactorLoadBalancerClientRibbonWarnLogger(); } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(OnNoRibbonDefaultCondition.class) protected static class ReactorLoadBalancerExchangeFilterFunctionConfig { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java index 96f5cbd8..62cd2a54 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import(AutoServiceRegistrationConfiguration.class) @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java index 75136eb6..b1d55df6 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(AutoServiceRegistrationProperties.class) @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java index d4aa28f9..4b71800f 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ServiceRegistryAutoConfiguration { @ConditionalOnBean(ServiceRegistry.class) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java index c09b1613..0c401f1a 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java @@ -29,10 +29,10 @@ import org.springframework.context.annotation.Configuration; /** * @author Ryan Baxter */ -@Configuration +@Configuration(proxyBeanMethods = false) public class HttpClientConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.apache.enabled", matchIfMissing = true) @ConditionalOnClass(HttpClient.class) @@ -59,7 +59,7 @@ public class HttpClientConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.ok.enabled", matchIfMissing = true) @ConditionalOnClass(OkHttpClient.class) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java index 875b3540..8fe64a54 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.util.enabled", matchIfMissing = true) @AutoConfigureOrder(0) @EnableConfigurationProperties diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java index 8230d4cd..0e9d7d3b 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 1.3.6 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.compatibility-verifier.enabled", matchIfMissing = true) @AutoConfigureOrder(0) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java index 9dba8123..4d28088b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java @@ -68,7 +68,7 @@ public class FeaturesEndpointTests { return new FeaturesEndpoint.Feature(name, type.getCanonicalName(), null, null); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class FeaturesConfig { @Bean @@ -87,7 +87,7 @@ public class FeaturesEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Config { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java index 9f27cb19..5270b4f2 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java @@ -60,7 +60,7 @@ public class AutoRegisterPropertyFalseTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class App { } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientAutoRegisterFalseTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientAutoRegisterFalseTests.java index 35bfda79..d9acb5ea 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientAutoRegisterFalseTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientAutoRegisterFalseTests.java @@ -59,7 +59,7 @@ public class EnableDiscoveryClientAutoRegisterFalseTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) @EnableDiscoveryClient(autoRegister = false) public static class App { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java index e5e8b433..a6f7d41b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java @@ -49,7 +49,7 @@ public class EnableDiscoveryClientMissingImplTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) @EnableDiscoveryClient // this will fail with @EnableDiscoveryClient and no implementation (nothing in // spring.factories) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java index acaa7b64..c5e207ee 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java @@ -65,7 +65,7 @@ public class CompositeDiscoveryClientAutoConfigurationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java index b53aa263..5b66ebd7 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java @@ -34,7 +34,7 @@ import static java.util.Collections.singletonList; * @author Olga Maciaszek-Sharma * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration public class CompositeDiscoveryClientTestsConfig { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java index 4b81bb30..308c74f9 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java @@ -87,7 +87,7 @@ public class DiscoveryClientHealthIndicatorTests { return status; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Config { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/DiscoveryClientAutoConfigurationDefaultTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/DiscoveryClientAutoConfigurationDefaultTests.java index 9393dae5..26afd9e3 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/DiscoveryClientAutoConfigurationDefaultTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/DiscoveryClientAutoConfigurationDefaultTests.java @@ -47,7 +47,7 @@ public class DiscoveryClientAutoConfigurationDefaultTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java index e247f84e..fc641a6c 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java @@ -50,7 +50,7 @@ public class ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java index fa448bdb..96ab76b4 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java @@ -49,7 +49,7 @@ public class ServletSimpleDiscoveryPropertiesAutoConfigurationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java index 1ac2f010..739cb0b7 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java @@ -93,7 +93,7 @@ public class SimpleDiscoveryClientPropertiesMappingTests { then(this.discoveryClient.getInstances("nonexistent")).isEmpty(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration public static class SampleConfig { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java index 1f7d9183..c103dc42 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java @@ -87,13 +87,13 @@ public class CloudHypermediaAutoConfigurationIntegrationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class ConfigWithRemoteResource { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java index 0aa63b3a..c4b12b13 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java @@ -84,7 +84,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { .sources(config, LoadBalancerAutoConfiguration.class).run(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class OneRestTemplate { @LoadBalanced @@ -100,7 +100,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TwoRestTemplates { @Primary @@ -120,7 +120,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { return new NoopLoadBalancerClient(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Two { @Autowired diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java index adf315bb..3a976b33 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java @@ -92,7 +92,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { .sources(config, AsyncLoadBalancerAutoConfiguration.class).run(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class OneRestTemplate { @LoadBalanced @@ -114,7 +114,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TwoRestTemplates { @Primary @@ -134,7 +134,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { return new NoopLoadBalancerClient(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Two { @Autowired diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java index 44325c85..6e4a39b5 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java @@ -133,7 +133,7 @@ public class LoadBalancerRequestFactoryConfigurationTests { .isEqualTo(this.transformedRequest2); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Transformer { @Bean @@ -148,7 +148,7 @@ public class LoadBalancerRequestFactoryConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TransformersAreOrdered { @Bean @@ -169,7 +169,7 @@ public class LoadBalancerRequestFactoryConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class NoTransformer { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java index d707d6fe..bb5f995d 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java @@ -53,7 +53,7 @@ public class AbstractAutoServiceRegistrationMgmtDisabledTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java index 8258c53e..fb2198ad 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java @@ -93,7 +93,7 @@ public class AbstractAutoServiceRegistrationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java index 1a4b2897..1f3646c7 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java @@ -94,7 +94,7 @@ public class AutoServiceRegistrationAutoConfigurationTests { return context; } - @Configuration + @Configuration(proxyBeanMethods = false) static class HasAutoServiceRegistrationConfiguration { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java index 040d765a..d1ae07e7 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java @@ -50,7 +50,7 @@ public class ServiceRegistryAutoConfigurationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfig { } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java index 89c7bd91..f5a00f2b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java @@ -67,7 +67,7 @@ public class ServiceRegistryEndpointNoRegistrationTests { WebMvcAutoConfiguration.class // ManagementServerPropertiesAutoConfiguration.class }) - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestConfiguration { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java index f425ba99..57f01277 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java @@ -50,7 +50,7 @@ public class CustomHttpClientBuilderConfigurationTests { } -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration class CustomHttpClientBuilderApplication { @@ -58,7 +58,7 @@ class CustomHttpClientBuilderApplication { SpringApplication.run(MyApplication.class, args); } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureBefore(HttpClientConfiguration.class) static class MyConfig { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java index f3ffcc69..6f2f8773 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java @@ -88,7 +88,7 @@ public class CustomHttpClientConfigurationTests { } -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration class CustomApplication { @@ -96,7 +96,7 @@ class CustomApplication { SpringApplication.run(MyApplication.class, args); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MyConfig { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomOkHttpClientBuilderConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomOkHttpClientBuilderConfigurationTests.java index 757ddfca..39288020 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomOkHttpClientBuilderConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomOkHttpClientBuilderConfigurationTests.java @@ -60,7 +60,7 @@ public class CustomOkHttpClientBuilderConfigurationTests { } -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration class CustomOkHttpClientBuilderApplication { @@ -68,7 +68,7 @@ class CustomOkHttpClientBuilderApplication { SpringApplication.run(MyApplication.class, args); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MyConfig { @Bean diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java index d0bfab6d..79feea39 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java @@ -80,7 +80,7 @@ public class DefaultHttpClientConfigurationTests { } -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration class MyApplication { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfigurationTests.java index 02efc9f1..ad3b110f 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfigurationTests.java @@ -43,7 +43,7 @@ public class CompatibilityVerifierAutoConfigurationTests { then(this.myMismatchVerifier.called).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class TestConfiguration { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierDisabledAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierDisabledAutoConfigurationTests.java index 0b652a83..dcfe0c86 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierDisabledAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierDisabledAutoConfigurationTests.java @@ -42,7 +42,7 @@ public class CompatibilityVerifierDisabledAutoConfigurationTests { then(this.compositeCompatibilityVerifier).isNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class TestConfiguration { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java index cf6b756c..a050b4c8 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierFailureAutoConfigurationTests.java @@ -50,7 +50,7 @@ public class CompatibilityVerifierFailureAutoConfigurationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class TestConfiguration { diff --git a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/autoconfigure/RefreshScopeIntegrationTests.java b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/autoconfigure/RefreshScopeIntegrationTests.java index ad41c2fe..028224a0 100644 --- a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/autoconfigure/RefreshScopeIntegrationTests.java +++ b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/autoconfigure/RefreshScopeIntegrationTests.java @@ -218,7 +218,7 @@ public class RefreshScopeIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) @EnableAutoConfiguration protected static class TestConfiguration { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java index 2b86a774..072e4321 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(ConfigurationPropertiesBindingPostProcessor.class) public class ConfigurationPropertiesRebinderAutoConfiguration implements ApplicationContextAware, SmartInitializingSingleton { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java index 76ffa968..1582a269 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * @author Dave Syer * */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(WebMvcAutoConfiguration.class) public class LifecycleMvcEndpointAutoConfiguration { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index 7247bfeb..c815bf48 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -61,7 +61,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Venil Noronha */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RefreshScope.class) @ConditionalOnProperty(name = RefreshAutoConfiguration.REFRESH_SCOPE_ENABLED, matchIfMissing = true) @@ -107,7 +107,7 @@ public class RefreshAutoConfiguration { return new RefreshEventListener(contextRefresher); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "javax.persistence.EntityManagerFactory") protected static class JpaInvokerConfiguration implements LoadTimeWeaverAware { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java index 8edff49f..ae895fdc 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.integration.monitor.IntegrationMBeanExporter; * @author Spencer Gibb * @author Venil Noronha */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EndpointAutoConfiguration.class, Health.class }) @AutoConfigureAfter({ LifecycleMvcEndpointAutoConfiguration.class, RefreshAutoConfiguration.class }) @@ -62,7 +62,7 @@ public class RefreshEndpointAutoConfiguration { return new RefreshScopeHealthIndicator(scope, rebinder); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(PropertySourceBootstrapConfiguration.class) protected static class RefreshEndpointConfiguration { @@ -78,7 +78,7 @@ public class RefreshEndpointAutoConfiguration { } -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(IntegrationMBeanExporter.class) class RestartEndpointWithIntegrationConfiguration { @@ -98,7 +98,7 @@ class RestartEndpointWithIntegrationConfiguration { } -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.integration.monitor.IntegrationMBeanExporter") class RestartEndpointWithoutIntegrationConfiguration { @@ -111,7 +111,7 @@ class RestartEndpointWithoutIntegrationConfiguration { } -@Configuration +@Configuration(proxyBeanMethods = false) class PauseResumeEndpointsConfiguration { @Bean diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java index e3794486..73a11ef7 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.core.env.Environment; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EnvironmentEndpoint.class, EnvironmentEndpointProperties.class }) @ConditionalOnBean(EnvironmentManager.class) @AutoConfigureBefore(EnvironmentEndpointAutoConfiguration.class) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelectorConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelectorConfiguration.java index 2cef39f1..f854902d 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelectorConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelectorConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import; * * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import(BootstrapImportSelector.class) public class BootstrapImportSelectorConfiguration { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java index 0b2188d3..a1b71392 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java @@ -57,7 +57,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(PropertySourceBootstrapProperties.class) public class PropertySourceBootstrapConfiguration implements ApplicationContextInitializer, Ordered { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java index 780f0e85..f216b363 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ TextEncryptor.class }) @EnableConfigurationProperties({ KeyProperties.class }) public class EncryptionBootstrapConfiguration { @@ -62,7 +62,7 @@ public class EncryptionBootstrapConfiguration { return listener; } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(KeyCondition.class) @ConditionalOnClass(RsaSecretEncryptor.class) @EnableConfigurationProperties({ RsaProperties.class }) @@ -97,7 +97,7 @@ public class EncryptionBootstrapConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(KeyCondition.class) @ConditionalOnMissingClass("org.springframework.security.rsa.crypto.RsaSecretEncryptor") protected static class VanillaEncryptionConfiguration { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java index 8856ea12..815d2ded 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java @@ -253,7 +253,7 @@ public class ContextRefresher { } } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Empty { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java index 22dc4a3a..07ae7bc6 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java @@ -166,7 +166,7 @@ public class LifecycleMvcAutoConfigurationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java index 12bafc72..e751a962 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java @@ -55,7 +55,7 @@ public class RefreshAutoConfigurationClassPathTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java index 5b4ff003..84ea03c5 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java @@ -59,7 +59,7 @@ public class RefreshAutoConfigurationMoreClassPathTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java index 1d112a0a..315b78bc 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java @@ -85,7 +85,7 @@ public class RefreshAutoConfigurationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class) @EnableConfigurationProperties(ConfigProps.class) static class Config { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java index 7bc37905..d8150a84 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java @@ -43,7 +43,7 @@ public class BootstrapDisabledAutoConfigurationIntegrationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Application { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java index c3f1100c..e8e2b9a1 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java @@ -59,7 +59,7 @@ public class BootstrapOrderingAutoConfigurationIntegrationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Application { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java index fd8e7e41..4e0b0e9b 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java @@ -63,12 +63,12 @@ public class BootstrapOrderingCustomPropertySourceIntegrationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Application { } - @Configuration + @Configuration(proxyBeanMethods = false) // This is added to bootstrap context as a source in bootstrap.properties protected static class PropertySourceConfiguration implements PropertySourceLocator { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java index 4054320b..33a3c2f0 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java @@ -55,7 +55,7 @@ public class BootstrapOrderingSpringApplicationJsonIntegrationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Application { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java index aaab5cd5..31417e7b 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java @@ -40,7 +40,7 @@ public class BootstrapSourcesOrderingTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Application { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java index bb03f112..48fa3538 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java @@ -49,7 +49,7 @@ public class MessageSourceConfigurationTests { .isEqualTo("Hello World!"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration protected static class TestApplication { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java index 05821134..b02a6ee2 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java @@ -36,7 +36,7 @@ import static org.springframework.cloud.bootstrap.TestHigherPriorityBootstrapCon * @author Spencer Gibb */ @Order(0) -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public class TestBootstrapConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java index 8cec3546..705e88ab 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java @@ -379,13 +379,13 @@ public class BootstrapConfigurationTests { .isEqualTo("Hello added!"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties protected static class BareConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConfigurationProperties("expected") // This is added to bootstrap context as a source in bootstrap.properties protected static class PropertySourceConfiguration implements PropertySourceLocator { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java index 90046124..080f0d10 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java @@ -85,12 +85,12 @@ public class BootstrapListenerHierarchyIntegrationTests { then(bootstrapContext.getParent()).isNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BasicConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RootConfiguration { @Bean diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java index 2811557d..17cdd947 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java @@ -49,7 +49,7 @@ public class EncryptionIntegrationTests { then(context.getBean(PasswordProperties.class).getPassword()).isEqualTo("test"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(PasswordProperties.class) protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java index 54fa17ba..dbc18adc 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java @@ -125,7 +125,7 @@ public class EnvironmentManagerIntegrationTests { .isInstanceOf(WritableEnvironmentEndpointWebExtension.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java index 6e1de1b3..2c2ec930 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java @@ -115,7 +115,7 @@ public class ConfigurationPropertiesRebinderIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ImportAutoConfiguration({ RefreshConfiguration.RebinderConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @@ -139,7 +139,7 @@ public class ConfigurationPropertiesRebinderIntegrationTests { // Hack out a protected inner class for testing protected static class RefreshConfiguration extends RefreshAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java index 47dd0476..9397f87b 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java @@ -65,7 +65,7 @@ public class ConfigurationPropertiesRebinderLifecycleIntegrationTests { then(this.properties.getCount()).isEqualTo(1); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @Import({ RefreshConfiguration.RebinderConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @@ -81,7 +81,7 @@ public class ConfigurationPropertiesRebinderLifecycleIntegrationTests { // Hack out a protected inner class for testing protected static class RefreshConfiguration extends RefreshAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java index 65612c16..028387d6 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java @@ -100,7 +100,7 @@ public class ConfigurationPropertiesRebinderListIntegrationTests { then(this.properties.getMessages().toString()).isEqualTo("[foo]"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @Import({ RefreshConfiguration.RebinderConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @@ -116,7 +116,7 @@ public class ConfigurationPropertiesRebinderListIntegrationTests { // Hack out a protected inner class for testing protected static class RefreshConfiguration extends RefreshAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java index 8d93fe72..938a5fc5 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java @@ -68,7 +68,7 @@ public class ConfigurationPropertiesRebinderProxyIntegrationTests { then(this.properties.getExpiry().get("one")).isEqualTo(new Integer(56)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @Import({ Interceptor.class, RefreshConfiguration.RebinderConfiguration.class, PropertyPlaceholderAutoConfiguration.class, AopAutoConfiguration.class }) @@ -94,7 +94,7 @@ public class ConfigurationPropertiesRebinderProxyIntegrationTests { // Hack out a protected inner class for testing protected static class RefreshConfiguration extends RefreshAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java index 065eda31..3f427536 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java @@ -86,7 +86,7 @@ public class ConfigurationPropertiesRebinderRefreshScopeIntegrationTests { then(this.properties.getCount()).isEqualTo(1); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @Import({ RefreshAutoConfiguration.class, ConfigurationPropertiesRebinderAutoConfiguration.class, diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java index 9a2c9dae..a2064144 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java @@ -81,7 +81,7 @@ public class ContextRefresherIntegrationTests { then(this.properties.getMessage()).isEqualTo("Hello scope!"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) @EnableAutoConfiguration protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java index 9b74838d..70185189 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java @@ -160,12 +160,12 @@ public class ContextRefresherTests { return list; } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Empty { } - @Configuration + @Configuration(proxyBeanMethods = false) // This is added to bootstrap context as a source in bootstrap.properties protected static class PropertySourceConfiguration implements PropertySourceLocator { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java index 6474efb3..13004f72 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java @@ -72,7 +72,7 @@ public class RestartIntegrationTests { then(json).containsOnlyOnce("parent\": null"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java index 87ff273d..71775d09 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java @@ -52,7 +52,7 @@ public class ImportRefreshScopeIntegrationTests { then(this.service.getMessage()).isEqualTo("Hello scope!"); } - @Configuration("service") + @Configuration(value = "service", proxyBeanMethods = false) @RefreshScope public static class ExampleService { @@ -62,7 +62,7 @@ public class ImportRefreshScopeIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ RefreshAutoConfiguration.class, ExampleService.class }) protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java index 06194f60..f349b6ba 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java @@ -87,7 +87,7 @@ public class RefreshEndpointIntegrationTests { return entity; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration protected static class ClientApp { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java index cbc88d9f..f2783e26 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java @@ -150,7 +150,7 @@ public class RefreshScopeConcurrencyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java index f83d042d..8f511d5b 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java @@ -169,7 +169,7 @@ public class RefreshScopeConfigurationScaleTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java index 41b8b3f1..d4169717 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java @@ -133,7 +133,7 @@ public class RefreshScopeConfigurationTests { } - @Configuration("application") + @Configuration(value = "application", proxyBeanMethods = false) @RefreshScope protected static class Application { @@ -151,7 +151,7 @@ public class RefreshScopeConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ClientApp { public static void main(String[] args) { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java index 7d56428d..7e509b3c 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java @@ -216,7 +216,7 @@ public class RefreshScopeIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) @EnableAutoConfiguration protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java index 47d54d14..b0577785 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java @@ -199,7 +199,7 @@ public class RefreshScopeLazyIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) @ImportAutoConfiguration({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java index 64955c00..39e14c39 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java @@ -91,7 +91,7 @@ public class RefreshScopeListBindingIntegrationTests { throw new IllegalStateException("Could not find test property source"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java index 40cf64ba..fd53a020 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java @@ -66,7 +66,7 @@ public class RefreshScopeNullBeanIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class OptionalConfiguration { @Bean @@ -77,7 +77,7 @@ public class RefreshScopeNullBeanIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, OptionalConfiguration.class }) protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java index 7f5003dc..baeeb46d 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java @@ -158,7 +158,7 @@ public class RefreshScopePureScaleTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java index 85d645aa..e02d6ef4 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java @@ -153,7 +153,7 @@ public class RefreshScopeScaleTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java index 2c724771..1f49da6a 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java @@ -56,7 +56,7 @@ public class RefreshScopeSerializationTests { return factory; } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration { @Bean diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java index b8d79052..6c743f32 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java @@ -71,7 +71,7 @@ public class RefreshScopeWebIntegrationTests { then(message).isEqualTo("Hello Dave!"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration protected static class Application { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java index f5bf865a..25517faa 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java @@ -169,7 +169,7 @@ public class RefreshEndpointTests { return map.size(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Empty implements SmartApplicationListener { private List events = new ArrayList(); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClient.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClient.java index f1add92e..ffce7f31 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClient.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClient.java @@ -34,7 +34,7 @@ import org.springframework.core.annotation.AliasFor; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import(LoadBalancerClientConfigurationRegistrar.class) @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java index 1480ceee..71873dd6 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.core.env.Environment; * @author Olga Maciaszek-Sharma * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnDiscoveryEnabled public class LoadBalancerClientConfiguration { @@ -63,7 +63,7 @@ public class LoadBalancerClientConfiguration { ServiceInstanceListSupplier.class), name); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnReactiveDiscoveryEnabled @Order(REACTIVE_SERVICE_INSTANCE_SUPPLIER_ORDER) public static class ReactiveSupportConfiguration { @@ -100,7 +100,7 @@ public class LoadBalancerClientConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBlockingDiscoveryEnabled @Order(REACTIVE_SERVICE_INSTANCE_SUPPLIER_ORDER + 1) public static class BlockingSupportConfiguration { diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClients.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClients.java index 7c94fd00..c8a334c5 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClients.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClients.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Import; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) @Documented diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java index 15911890..95fb15eb 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.web.client.RestTemplate; * @author Olga Maciaszek-Sharma * @since 2.1.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @LoadBalancerClients @AutoConfigureAfter(LoadBalancerAutoConfiguration.class) @AutoConfigureBefore({ @@ -61,7 +61,7 @@ public class BlockingLoadBalancerClientAutoConfiguration { return new BlockingLoadBalancerClientRibbonWarnLogger(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RestTemplate.class) @Conditional(OnNoRibbonDefaultCondition.class) protected static class BlockingLoadbalancerClientConfig { diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java index 6ac05a8e..fb31c401 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb * @author Olga Maciaszek-Sharma */ -@Configuration +@Configuration(proxyBeanMethods = false) @LoadBalancerClients @AutoConfigureBefore({ ReactorLoadBalancerClientAutoConfiguration.class, LoadBalancerBeanPostProcessorAutoConfiguration.class, diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java index 2e5ccc7e..b2f81aa3 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; * @see CacheAutoConfiguration * @see CacheAspectSupport */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ CacheManager.class, CacheAutoConfiguration.class }) @ConditionalOnMissingBean(CacheAspectSupport.class) @EnableCaching diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java index 025105d0..93cdc1b0 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java @@ -141,7 +141,7 @@ class BlockingLoadBalancerClientTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @SpringBootConfiguration @LoadBalancerClients({