Added proxyBeanMethods = false to configuration classes. Fixes #623

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 {

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)

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 {
 

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 {

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" })

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

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 {
 

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 {

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

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 {
 

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

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)

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 {
 

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)

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)

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)

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)

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

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)

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 {
 

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 {
 
 	}

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 {
 

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)

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

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 {
 

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 {
 

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 {
 
 	}

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 {
 
 	}

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 {
 
 	}

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 {
 

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 {
 

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

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

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

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

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

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

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 {
 
 	}

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

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 {
 

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

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

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 {
 

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 {
 

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 {
 

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 {
 

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 {

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 {

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 {
 

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 {
 

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

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)

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 {
 

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<ConfigurableApplicationContext>, Ordered {

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 {

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 {
 
 	}

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 {
 

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 {
 

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 {
 

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 {

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 {
 
 	}

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 {
 
 	}

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 {
 

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 {
 
 	}

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 {
 
 	}

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 {
 

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 {
 

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 {

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

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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,

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 })

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 })

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) {

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 {

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 })

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 })

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 {

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 {

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 })

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

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 {
 

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<ApplicationEvent> events = new ArrayList<ApplicationEvent>();

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)

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 {

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

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 {

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,

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

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({