Update configuration to use proxyBeanMethods=false. Fixes #3677

spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java

@@ -66,7 +66,7 @@ import static com.netflix.config.ConfigurationManager.URL_CONFIG_NAME;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ ConcurrentCompositeConfiguration.class,
 		ConfigurationBuilder.class })
 @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
@@ -194,7 +194,7 @@ public class ArchaiusAutoConfiguration {
 		ReflectionUtils.setField(field, null, value);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(Health.class)
 	protected static class ArchaiusEndpointConfiguration {
 
@@ -206,7 +206,7 @@ public class ArchaiusAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(value = "archaius.propagate.environmentChangedEvent",
 			matchIfMissing = true)
 	@ConditionalOnClass(EnvironmentChangeEvent.class)

spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Alexandru-George Burghelea
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class TestArchaiusExternalConfiguration {
 
 	@Bean

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.web.server.WebFilter;
  *
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.REACTIVE)
 @ConditionalOnClass({ WebFilter.class, Mono.class })
 public class ReactiveConcurrencyLimitsAutoConfiguration {

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java

@@ -40,7 +40,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  *
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnClass({ HttpServletRequest.class, HandlerInterceptor.class })
 public class MvcConcurrencyLimitsAutoConfiguration implements WebMvcConfigurer {
@@ -62,7 +62,7 @@ public class MvcConcurrencyLimitsAutoConfiguration implements WebMvcConfigurer {
 		return builder.build();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class HandlerInterceptorConfiguration implements WebMvcConfigurer {
 
 		@Autowired

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/AbstractConcurrencyLimitsTests.java

@@ -66,7 +66,7 @@ public class AbstractConcurrencyLimitsTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RestController
 	protected static class HelloControllerConfiguration {
 

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/core/CoreAutoConfiguration.java

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
  * @deprecated Module spring-cloud-netflix-core is deprecated as of 2.1.0, use
  * spring-cloud-netflix-hystrix instead.
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Deprecated
 public class CoreAutoConfiguration {
 

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java

@@ -84,7 +84,7 @@ import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceI
  * @author Olga Maciaszek-Sharma
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass(EurekaClientConfig.class)
 @Import(DiscoveryClientOptionalArgsConfiguration.class)
@@ -246,7 +246,7 @@ public class EurekaClientAutoConfiguration {
 		return new EurekaAutoServiceRegistration(context, registry, registration);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingRefreshScope
 	protected static class EurekaClientConfiguration {
 
@@ -289,7 +289,7 @@ public class EurekaClientAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnRefreshScope
 	protected static class RefreshableEurekaClientConfiguration {
 
@@ -397,7 +397,7 @@ public class EurekaClientAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(Health.class)
 	protected static class EurekaHealthIndicatorConfiguration {
 

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java

@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Olga Maciaszek-Sharma
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass(EurekaClientConfig.class)
 @ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
@@ -69,7 +69,7 @@ public class EurekaDiscoveryClientConfiguration {
 		return new EurekaDiscoveryClient(client, clientConfig);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(value = "eureka.client.healthcheck.enabled",
 			matchIfMissing = false)
 	protected static class EurekaHealthCheckHandlerConfiguration {
@@ -95,7 +95,7 @@ public class EurekaDiscoveryClientConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(RefreshScopeRefreshedEvent.class)
 	protected static class EurekaClientConfigurationRefresher
 			implements ApplicationListener<RefreshScopeRefreshedEvent> {

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java

@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Daniel Lavoie
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class DiscoveryClientOptionalArgsConfiguration {
 
 	@Bean

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass({ EurekaInstanceConfigBean.class, EurekaClient.class,
 		ConfigServerProperties.class })

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Import;
 @ConditionalOnClass(ConfigServicePropertySourceLocator.class)
 @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled",
 		matchIfMissing = false)
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ EurekaDiscoveryClientConfiguration.class, // this emulates
 		// @EnableDiscoveryClient, the import
 		// selector doesn't run before the

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java

@@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(EurekaClientConfig.class)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnReactiveDiscoveryEnabled

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java

@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Ryan Baxter
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class EurekaRibbonClientConfiguration {
 
 	private static final Log log = LogFactory

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Dave Syer
  * @author Biju Kunjummen
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnRibbonAndEurekaEnabled
 @AutoConfigureAfter(RibbonAutoConfiguration.class)

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java

@@ -72,7 +72,7 @@ public class ConditionalOnRefreshScopeTests {
 				});
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class Beans {
 
 		@Bean

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java

@@ -640,7 +640,7 @@ public class EurekaClientAutoConfigurationTests {
 				EurekaClient.class)).getTargetSource().getTarget();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	@Import({ UtilAutoConfiguration.class, EurekaClientAutoConfiguration.class })
 	protected static class TestConfiguration {
@@ -674,7 +674,7 @@ public class EurekaClientAutoConfigurationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class MockClientConfiguration {
 
 		@Bean
@@ -698,7 +698,7 @@ public class EurekaClientAutoConfigurationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties(AutoServiceRegistrationProperties.class)
 	public static class AutoServiceRegistrationConfiguration {
 

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java

@@ -129,7 +129,7 @@ public class EurekaClientConfigBeanTests {
 				.getEurekaServerServiceUrls(myZone).toString();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties(EurekaClientConfigBean.class)
 	protected static class TestConfiguration {
 

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java

@@ -263,7 +263,7 @@ public class EurekaInstanceConfigBeanTests {
 		return this.context.getBean(EurekaInstanceConfigBean.class);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	protected static class TestConfiguration {
 

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactoryTests.java

@@ -72,7 +72,7 @@ public class InstanceInfoFactoryTests {
 		return this.context.getBean(EurekaInstanceConfigBean.class);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	protected static class TestConfiguration {
 

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java

@@ -97,7 +97,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests {
 		this.context.refresh();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class EnvironmentKnobbler {
 
 		@Bean

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java

@@ -59,7 +59,7 @@ public class EurekaHealthCheckTests {
 		assertThat(status).isEqualTo(InstanceInfo.InstanceStatus.OUT_OF_SERVICE);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	protected static class EurekaHealthCheckApplication {
 

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java

@@ -58,7 +58,7 @@ import static org.springframework.util.Assert.isTrue;
  *
  * @author Daniel Lavoie
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @RestController
 @SpringBootApplication
 public class EurekaServerMockApplication {
@@ -171,7 +171,7 @@ public class EurekaServerMockApplication {
 		return INFO;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Order(Ordered.HIGHEST_PRECEDENCE)
 	protected static class TestSecurityConfiguration
 			extends WebSecurityConfigurerAdapter {

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java

@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ComponentScan
 @EnableAutoConfiguration
 @RestController

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java

@@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock;
 /**
  * @author Ryan Baxter
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ComponentScan
 @EnableAutoConfiguration
 @RestController

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java

@@ -83,7 +83,7 @@ public class EurekaDisabledRibbonClientIntegrationTests {
 		return (ZoneAwareLoadBalancer<Server>) this.factory.getLoadBalancer("foo");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient("foo")
 	@Import({ UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
 			ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class,

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPreprocessorIntegrationTests.java

@@ -77,7 +77,7 @@ public class EurekaRibbonClientPreprocessorIntegrationTests {
 		return (ZoneAwareLoadBalancer<Server>) this.factory.getLoadBalancer("foo");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient("foo")
 	@Import({ UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
 			ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class,

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java

@@ -71,7 +71,7 @@ public class EurekaRibbonClientPropertyOverrideIntegrationTests {
 		return (ZoneAwareLoadBalancer<Server>) this.factory.getLoadBalancer(name);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClients
 	@ImportAutoConfiguration({ UtilAutoConfiguration.class,
 			PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonClientPreprocessorIntegrationTests.java

@@ -80,7 +80,7 @@ public class RibbonClientPreprocessorIntegrationTests {
 				.getZone()).isEqualTo("myTestZone");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient("foo")
 	@ImportAutoConfiguration({ PropertyPlaceholderAutoConfiguration.class,
 			ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class })
@@ -88,7 +88,7 @@ public class RibbonClientPreprocessorIntegrationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient(name = "foo", configuration = FooConfiguration.class)
 	@ImportAutoConfiguration({ PropertyPlaceholderAutoConfiguration.class,
 			ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class,
@@ -102,7 +102,7 @@ public class RibbonClientPreprocessorIntegrationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class FooConfiguration {
 
 		@Bean

spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java

@@ -74,7 +74,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @author Biju Kunjummen
  * @author Fahim Farook
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import(EurekaServerInitializerConfiguration.class)
 @ConditionalOnBean(EurekaServerMarkerConfiguration.Marker.class)
 @EnableConfigurationProperties({ EurekaDashboardProperties.class,
@@ -254,7 +254,7 @@ public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
 		return bean;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class EurekaServerConfigBeanConfiguration {
 
 		@Bean

spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.web.context.ServletContextAware;
 /**
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class EurekaServerInitializerConfiguration
 		implements ServletContextAware, SmartLifecycle, Ordered {
 

spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Biju Kunjummen
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class EurekaServerMarkerConfiguration {
 
 	@Bean

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java

@@ -104,7 +104,7 @@ public class ApplicationContextTests {
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class Application {

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java

@@ -103,7 +103,7 @@ public class ApplicationServletPathTests {
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class Application {

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java

@@ -115,7 +115,7 @@ public class ApplicationTests {
 		assertThat(decoded.getInstanceId()).as("instanceId was wrong").isEqualTo("foo");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class Application {

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaCustomPeerNodesTests.java

@@ -50,7 +50,7 @@ public class EurekaCustomPeerNodesTests {
 				.as("PeerEurekaNodes should be the user created one").isTrue();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class Application {

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryTests.java

@@ -183,7 +183,7 @@ public class InstanceRegistryTests {
 		return builder.build();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class TestApplication {

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java

@@ -260,7 +260,7 @@ public class RefreshablePeerEurekaNodesTests {
 	}
 
 	@EnableEurekaServer
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class })
 	protected static class Application {
 

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesWithCustomFiltersTests.java

@@ -79,7 +79,7 @@ public class RefreshablePeerEurekaNodesWithCustomFiltersTests {
 		return value;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class Application {

spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java

@@ -152,7 +152,7 @@ public abstract class AbstractDocumentationTests {
 		return RestAssured.given(spec(filter)).filter(filter);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class Application {

spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java

@@ -54,7 +54,7 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
  * @author Roy Clarkson
  * @author Fahim Farook
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(HystrixDashboardProperties.class)
 public class HystrixDashboardConfiguration {
 

spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java

@@ -93,7 +93,7 @@ public class HystrixDashboardContextTests {
 				.as("wrong base path rendered in template").isTrue();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableHystrixDashboard
 	protected static class Application {

spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java

@@ -69,7 +69,7 @@ public class HystrixDashboardHomePageTests {
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableHystrixDashboard
 	@Controller

spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java

@@ -71,7 +71,7 @@ public class HystrixDashboardTests {
 		assertThat(body.contains("<base href=\"/hystrix/monitor\">")).isTrue();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableHystrixDashboard
 	protected static class Application {

spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java

@@ -50,7 +50,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @author Spencer Gibb
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ HystrixCircuitBreaker.class, EnableBinding.class })
 @ConditionalOnProperty(value = "hystrix.stream.queue.enabled", matchIfMissing = true)
 @EnableConfigurationProperties

spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java

@@ -50,7 +50,7 @@ import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebA
  * @author Christian Dupuis
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ Hystrix.class, HealthIndicator.class,
 		HealthIndicatorAutoConfiguration.class })
 @AutoConfigureAfter({ HealthIndicatorAutoConfiguration.class })
@@ -62,7 +62,7 @@ public class HystrixAutoConfiguration {
 		return new HystrixHealthIndicator();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(value = "management.metrics.binders.hystrix.enabled",
 			matchIfMissing = true)
 	@ConditionalOnClass({ HystrixMetricsBinder.class })
@@ -79,7 +79,7 @@ public class HystrixAutoConfiguration {
 	 * See original
 	 * {@link org.springframework.boot.actuate.autoconfigure.jolokia.JolokiaEndpointAutoConfiguration}.
 	 */
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = SERVLET)
 	@ConditionalOnBean(HystrixCommandAspect.class) // only install the stream if enabled
 	@ConditionalOnClass({ HystrixMetricsStreamServlet.class })
@@ -100,7 +100,7 @@ public class HystrixAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = REACTIVE)
 	@ConditionalOnBean(HystrixCommandAspect.class) // only install the stream if enabled
 	@ConditionalOnClass({ DispatcherHandler.class })

spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Ryan Baxter
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ Hystrix.class })
 @ConditionalOnProperty(name = "spring.cloud.circuitbreaker.hystrix.enabled",
 		matchIfMissing = true)
@@ -56,7 +56,7 @@ public class HystrixCircuitBreakerAutoConfiguration {
 		return new ReactiveHystrixCircuitBreakerFactory();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class HystrixCircuitBreakerCustomizerConfiguration {
 
 		@Autowired(required = false)
@@ -72,7 +72,7 @@ public class HystrixCircuitBreakerAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(
 			name = { "reactor.core.publisher.Mono", "reactor.core.publisher.Flux" })
 	protected static class ReactiveHystrixCircuitBreakerCustomizerConfiguration {

spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java

@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Christian Dupuis
  * @author Venil Noronha
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class HystrixCircuitBreakerConfiguration {
 
 	@Bean

spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java

@@ -41,7 +41,7 @@ import org.springframework.security.core.context.SecurityContext;
 /**
  * @author Daniel Lavoie
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Conditional(HystrixSecurityCondition.class)
 @ConditionalOnClass({ Hystrix.class, SecurityContext.class })
 public class HystrixSecurityAutoConfiguration {

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerIntegrationTest.java

@@ -65,7 +65,7 @@ public class HystrixCircuitBreakerIntegrationTest {
 		assertThat(service.normal()).isEqualTo("normal");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	protected static class Application {

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java

@@ -176,7 +176,7 @@ class Service {
 }
 
 // Don't use @SpringBootApplication because we don't want to component scan
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
 @EnableCircuitBreaker
 @RestController

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java

@@ -98,7 +98,7 @@ public class HystrixStreamEndpointTests {
 		fail("/hystrix.stream didn't contain 'data:' was " + data);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@EnableCircuitBreaker

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/ReactiveHystrixCircuitBreakerIntegrationTest.java

@@ -78,7 +78,7 @@ public class ReactiveHystrixCircuitBreakerIntegrationTest {
 		assertThat(service.normal().block()).isEqualTo("normal");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	protected static class Application {

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityApplication.java

@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Daniel Lavoie
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @SpringBootApplication
 public class HystrixSecurityApplication {
 

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java

@@ -207,7 +207,7 @@ public class RestTemplateRetryTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@RibbonClient(name = "badClients", configuration = LocalBadClientConfiguration.class)
@@ -255,7 +255,7 @@ public class RestTemplateRetryTests {
 
 	// Load balancer with fixed server list for "local" pointing to localhost
 	// and some bogus servers are thrown in to test retry
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class LocalBadClientConfiguration {
 
 		static BaseLoadBalancer balancer;

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/NoSecurityConfiguration.java

@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter {
 
 	@Override

spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ NoopDiscoveryClientAutoConfiguration.class })
 @AutoConfigureBefore(SecurityAutoConfiguration.class)
 public class TestAutoConfiguration {
@@ -42,7 +42,7 @@ public class TestAutoConfiguration {
 
 	public static final String PASSWORD = "{noop}password";
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Order(Ordered.HIGHEST_PRECEDENCE)
 	protected static class TestSecurityConfiguration
 			extends WebSecurityConfigurerAdapter {

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RestClientRibbonConfiguration.java

@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Lazy;
  * @author Spencer Gibb
  */
 @SuppressWarnings("deprecation")
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @RibbonAutoConfiguration.ConditionalOnRibbonRestClient
 class RestClientRibbonConfiguration {
 

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java

@@ -112,7 +112,7 @@ public class RibbonAutoConfiguration {
 				ribbonEagerLoadProperties.getClients());
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(HttpRequest.class)
 	@ConditionalOnRibbonRestClient
 	protected static class RibbonClientHttpRequestFactoryConfiguration {

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClient.java

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import;
  *
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import(RibbonClientConfigurationRegistrar.class)
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java

@@ -62,7 +62,7 @@ import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecur
  * @author Tim Ysewyn
  */
 @SuppressWarnings("deprecation")
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 // Order is important here, last should be the default, first should be optional
 // see

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClients.java

@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import;
  *
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
 @Documented

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientRibbonConfiguration.java

@@ -50,7 +50,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = "org.apache.http.client.HttpClient")
 @ConditionalOnProperty(name = "ribbon.httpclient.enabled", matchIfMissing = true)
 public class HttpClientRibbonConfiguration {
@@ -91,7 +91,7 @@ public class HttpClientRibbonConfiguration {
 		return client;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class ApacheHttpClientConfiguration {
 
 		private final Timer connectionManagerTimer = new Timer(

spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonConfiguration.java

@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty("ribbon.okhttp.enabled")
 @ConditionalOnClass(name = "okhttp3.OkHttpClient")
 public class OkHttpRibbonConfiguration {
@@ -84,7 +84,7 @@ public class OkHttpRibbonConfiguration {
 		return client;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class OkHttpClientConfiguration {
 
 		private OkHttpClient httpClient;

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTests.java

@@ -53,7 +53,7 @@ public class DefaultServerIntrospectorDefaultTests {
 		assertThat(serverIntrospector.isSecure(serverMock)).isFalse();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties(ServerIntrospectorProperties.class)
 	protected static class TestConfiguration {
 

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTests.java

@@ -54,7 +54,7 @@ public class DefaultServerIntrospectorTests {
 		assertThat(serverIntrospector.isSecure(serverMock)).isFalse();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties(ServerIntrospectorProperties.class)
 	protected static class TestConfiguration {
 

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/PlainRibbonClientPreprocessorIntegrationTests.java

@@ -51,7 +51,7 @@ public class PlainRibbonClientPreprocessorIntegrationTests {
 		ConfigurationBasedServerList.class.cast(loadBalancer.getServerListImpl());
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient("foo")
 	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 			RibbonAutoConfiguration.class })

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java

@@ -68,7 +68,7 @@ public class RibbonApplicationContextInitializerTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient(name = "testspec", configuration = FooConfig.class)
 	static class RibbonInitializerConfig {
 

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java

@@ -53,7 +53,7 @@ public class RibbonAutoConfigurationIntegrationTests {
 						.isEqualTo(25000);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient("client")
 	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 			RibbonAutoConfiguration.class })

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java

@@ -62,7 +62,7 @@ public class RibbonClientConfigurationIntegrationTests {
 		assertThat(updater).isSameAs(serverListUpdater);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	protected static class TestLBConfig {
 

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java

@@ -190,7 +190,7 @@ public class RibbonClientConfigurationTests {
 				requiredType).length > 0;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	protected static class TestLBConfig {
 

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java

@@ -154,7 +154,7 @@ public class RibbonClientHttpRequestFactoryTests {
 		this.restTemplate.getForEntity("https://simple_bad", String.class);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@RibbonClient(value = "simple", configuration = SimpleRibbonClientConfiguration.class)
@@ -203,7 +203,7 @@ public class RibbonClientHttpRequestFactoryTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class SimpleRibbonClientConfiguration {
 
 		@Value("${local.server.port}")

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java

@@ -70,7 +70,7 @@ public class RibbonClientPreprocessorIntegrationTests {
 		return (ZoneAwareLoadBalancer<Server>) this.factory.getLoadBalancer("foo");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient(name = "foo")
 	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 			RibbonAutoConfiguration.class })

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java

@@ -86,7 +86,7 @@ public class RibbonClientPreprocessorOverridesIntegrationTests {
 				.isEqualTo("FooTestZone");
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClients({ @RibbonClient(name = "foo", configuration = FooConfiguration.class),
 			@RibbonClient(name = "bar", configuration = BarConfiguration.class) })
 	@Import({ UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
@@ -95,7 +95,7 @@ public class RibbonClientPreprocessorOverridesIntegrationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class FooConfiguration {
 
 		@Bean
@@ -130,7 +130,7 @@ public class RibbonClientPreprocessorOverridesIntegrationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class BarConfiguration {
 
 		@Bean

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java

@@ -67,7 +67,7 @@ public class RibbonClientPreprocessorOverridesRetryTests {
 				.isCircuitTrippingException(new UnknownHostException("Unknown Host")));
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClient(name = "customRetry", configuration = RetryRibbonConfiguration.class)
 	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 			RibbonAutoConfiguration.class })
@@ -77,7 +77,7 @@ public class RibbonClientPreprocessorOverridesRetryTests {
 
 }
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class RetryRibbonConfiguration {
 
 	@Bean

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java

@@ -102,7 +102,7 @@ public class RibbonClientPreprocessorPropertiesOverridesIntegrationTests {
 		return (ZoneAwareLoadBalancer<Server>) this.factory.getLoadBalancer(name);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClients
 	@Import({ UtilAutoConfiguration.class, HttpClientConfiguration.class,
 			PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsEagerInitializationTests.java

@@ -54,7 +54,7 @@ public class RibbonClientsEagerInitializationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RibbonClients({ @RibbonClient(name = "testspec1", configuration = FooConfig.class),
 			@RibbonClient(name = "testspec2", configuration = FooConfig.class),

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsPreprocessorIntegrationTests.java

@@ -71,7 +71,7 @@ public class RibbonClientsPreprocessorIntegrationTests {
 		assertThat(getLoadBalancer().getPing()).isInstanceOf(PingUrl.class);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@RibbonClients(@RibbonClient(name = "foo", configuration = FooConfiguration.class))
 	@Import({ UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
 			ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class,
@@ -81,7 +81,7 @@ public class RibbonClientsPreprocessorIntegrationTests {
 	}
 
 	// tag::sample_override_ribbon_config[]
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class FooConfiguration {
 
 		@Bean

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java

@@ -1029,7 +1029,7 @@ public class RibbonLoadBalancingHttpClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class DoNotFollowRedirects {
 
 		@Bean
@@ -1041,7 +1041,7 @@ public class RibbonLoadBalancingHttpClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class Connections {
 
 		@Bean
@@ -1054,7 +1054,7 @@ public class RibbonLoadBalancingHttpClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class Timeouts {
 
 		@Bean
@@ -1067,12 +1067,12 @@ public class RibbonLoadBalancingHttpClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class UseDefaults {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class FollowRedirects {
 
 		@Bean

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java

@@ -140,7 +140,7 @@ public class OkHttpLoadBalancingClientTests {
 		return client.getOkHttpClient(configOverride, false);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class OkHttpClientConfiguration {
 
 		@Autowired(required = false)
@@ -157,12 +157,12 @@ public class OkHttpLoadBalancingClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class UseDefaults {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class FollowRedirects {
 
 		@Bean
@@ -174,7 +174,7 @@ public class OkHttpLoadBalancingClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class DoNotFollowRedirects {
 
 		@Bean
@@ -186,7 +186,7 @@ public class OkHttpLoadBalancingClientTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class Timeouts {
 
 		@Bean

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTestsConfig.java

@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Import;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
 		UtilAutoConfiguration.class, RibbonAutoConfiguration.class,
 		HttpClientConfiguration.class })
@@ -57,7 +57,7 @@ public class RibbonClientDefaultConfigurationTestsConfig {
 
 }
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class DefaultRibbonConfig {
 
 	@Bean

spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/TestAutoConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ NoopDiscoveryClientAutoConfiguration.class })
 @AutoConfigureBefore(SecurityAutoConfiguration.class)
 public class TestAutoConfiguration {
@@ -48,7 +48,7 @@ public class TestAutoConfiguration {
 	 */
 	public static final String PASSWORD = "{noop}password";
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Order(Ordered.HIGHEST_PRECEDENCE)
 	static class TestSecurityConfiguration extends WebSecurityConfigurerAdapter {
 

spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarAutoConfiguration.java

@@ -70,7 +70,7 @@ import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceI
  * @author Fabrizio Di Napoli
  * @see EurekaInstanceConfigBeanConfiguration
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(SidecarMarkerConfiguration.Marker.class)
 @EnableConfigurationProperties(SidecarProperties.class)
 @AutoConfigureBefore(EurekaClientAutoConfiguration.class)
@@ -114,7 +114,7 @@ public class SidecarAutoConfiguration {
 		return new SidecarController();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(EurekaClientConfig.class)
 	protected static class EurekaInstanceConfigBeanConfiguration {
 

spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarMarkerConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Greg Adams
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class SidecarMarkerConfiguration {
 
 	@Bean

spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java

@@ -210,7 +210,7 @@ public class SidecarApplicationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableSidecar
 	protected static class EurekaInstanceConfigBeanOverrideApplication {

spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineApplication.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Dave Syer
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
 @EnableTurbineStream
 public class TurbineApplication {

spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamAutoConfiguration.java

@@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Spencer Gibb
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(EnableBinding.class)
 @ConditionalOnProperty(value = "turbine.stream.enabled", matchIfMissing = true)
 @EnableBinding(TurbineStreamClient.class)

spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Spencer Gibb
  * @author Daniel Lavoie
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(TurbineStreamProperties.class)
 public class TurbineStreamConfiguration {
 

spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java

@@ -141,7 +141,7 @@ public class TurbineStreamTests {
 
 	@EnableAutoConfiguration
 	@EnableTurbineStream
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class TestConfig {
 
 	}

spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineHttpConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 public class TurbineHttpConfiguration {
 
@@ -96,7 +96,7 @@ public class TurbineHttpConfiguration {
 		return new ConfigurationBasedTurbineClustersProvider(turbineAggregatorProperties);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(EurekaClient.class)
 	protected static class EurekaTurbineConfiguration {
 
@@ -109,7 +109,7 @@ public class TurbineHttpConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingClass("com.netflix.discovery.EurekaClient")
 	protected static class DiscoveryClientTurbineConfiguration {
 

spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineAggregatorPropertiesTest.java

@@ -66,7 +66,7 @@ public class TurbineAggregatorPropertiesTest {
 		return this.context.getBean(TurbineAggregatorProperties.class);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties(TurbineAggregatorProperties.class)
 	static class TestConfiguration {
 

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/RibbonCommandFactoryConfiguration.java

@@ -46,7 +46,7 @@ import org.springframework.context.annotation.Configuration;
  */
 public class RibbonCommandFactoryConfiguration {
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnRibbonRestClient
 	protected static class RestClientRibbonConfiguration {
 
@@ -92,7 +92,7 @@ public class RibbonCommandFactoryConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnRibbonOkHttpClient
 	@ConditionalOnClass(name = "okhttp3.OkHttpClient")
 	protected static class OkHttpRibbonConfiguration {
@@ -110,7 +110,7 @@ public class RibbonCommandFactoryConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnRibbonHttpClient
 	protected static class HttpClientRibbonConfiguration {
 

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java

@@ -57,7 +57,7 @@ import org.springframework.context.annotation.Import;
  * @author Dave Syer
  * @author Biju Kunjummen
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Import({ RibbonCommandFactoryConfiguration.RestClientRibbonConfiguration.class,
 		RibbonCommandFactoryConfiguration.OkHttpRibbonConfiguration.class,
 		RibbonCommandFactoryConfiguration.HttpClientRibbonConfiguration.class,
@@ -136,7 +136,7 @@ public class ZuulProxyAutoConfiguration extends ZuulServerAutoConfiguration {
 		return new SimpleServiceRouteMapper();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingClass("org.springframework.boot.actuate.health.Health")
 	protected static class NoActuatorConfiguration {
 
@@ -148,7 +148,7 @@ public class ZuulProxyAutoConfiguration extends ZuulServerAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(Health.class)
 	protected static class EndpointConfiguration {
 

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyMarkerConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Biju Kunjummen
  */
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class ZuulProxyMarkerConfiguration {
 
 	@Bean

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java

@@ -82,7 +82,7 @@ import static java.util.Collections.emptyList;
  * @author Dave Syer
  * @author Biju Kunjummen
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties({ ZuulProperties.class })
 @ConditionalOnClass({ ZuulServlet.class, ZuulServletFilter.class })
 @ConditionalOnBean(ZuulServerMarkerConfiguration.Marker.class)
@@ -130,8 +130,9 @@ public class ZuulServerAutoConfiguration {
 	}
 
 	@Bean
-	public ZuulHandlerMapping zuulHandlerMapping(RouteLocator routes) {
-		ZuulHandlerMapping mapping = new ZuulHandlerMapping(routes, zuulController());
+	public ZuulHandlerMapping zuulHandlerMapping(RouteLocator routes,
+			ZuulController zuulController) {
+		ZuulHandlerMapping mapping = new ZuulHandlerMapping(routes, zuulController);
 		mapping.setErrorController(this.errorController);
 		mapping.setCorsConfigurations(getCorsConfigurations());
 		return mapping;
@@ -230,7 +231,7 @@ public class ZuulServerAutoConfiguration {
 				zuulProperties);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class ZuulFilterConfiguration {
 
 		@Autowired
@@ -247,7 +248,7 @@ public class ZuulServerAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(MeterRegistry.class)
 	protected static class ZuulCounterFactoryConfiguration {
 
@@ -260,7 +261,7 @@ public class ZuulServerAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class ZuulMetricsConfiguration {
 
 		@Bean

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerMarkerConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Biju Kunjummen
  */
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class ZuulServerMarkerConfiguration {
 
 	@Bean

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ContextPathZuulProxyApplicationTests.java

@@ -102,7 +102,7 @@ public class ContextPathZuulProxyApplicationTests {
 	}
 
 	// Don't use @SpringBootApplication because we don't want to component scan
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@EnableZuulProxy

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java

@@ -222,7 +222,7 @@ public class FormZuulProxyApplicationTests {
 }
 
 // Don't use @SpringBootApplication because we don't want to component scan
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
 @RestController
 @EnableZuulProxy
@@ -304,7 +304,7 @@ class FormZuulProxyApplication {
 }
 
 // Load balancer with fixed server list for "simplefzpat" pointing to localhost
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class FormRibbonClientConfiguration {
 
 	@LocalServerPort

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java

@@ -147,7 +147,7 @@ public class FormZuulServletProxyApplicationTests {
 }
 
 // Don't use @SpringBootApplication because we don't want to component scan
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
 @RestController
 @EnableZuulProxy
@@ -222,7 +222,7 @@ class FormZuulServletProxyApplication {
 }
 
 // Load balancer with fixed server list for "simplefzspat" pointing to localhost
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class ServletFormRibbonClientConfiguration {
 
 	@LocalServerPort

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java

@@ -104,7 +104,7 @@ public class RetryableZuulProxyApplicationTests {
 }
 
 // Don't use @SpringBootApplication because we don't want to component scan
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
 @RestController
 @EnableZuulProxy
@@ -146,7 +146,7 @@ class RetryableZuulProxyApplication {
 }
 
 // Load balancer with fixed server list for "simplerzpat" pointing to localhost
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class RetryableRibbonClientConfiguration {
 
 	@LocalServerPort

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java

@@ -102,7 +102,7 @@ public class RoutesEndpointIntegrationTests {
 		assertThat(details.isPrefixStripped()).isTrue();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
 	@EnableZuulProxy