diff --git a/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java b/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java index 50e7c5f07..68da799b9 100644 --- a/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java +++ b/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) diff --git a/spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java b/spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java index a55e00ce9..ff4c8d792 100644 --- a/spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java index 8df2091e4..574e84ba1 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java b/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java index 5ac32f0fc..8061fdb34 100644 --- a/spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/AbstractConcurrencyLimitsTests.java b/spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/AbstractConcurrencyLimitsTests.java index 70a887510..5a8852baf 100644 --- a/spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/AbstractConcurrencyLimitsTests.java +++ b/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 { diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/core/CoreAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/core/CoreAutoConfiguration.java index bcb0db19b..0590b20e2 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/core/CoreAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java index e23f50899..b7dae2abf 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java index dfbd4ed36..90ed396d4 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java index 818043f7f..ccb5096e4 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java index 36d0f0f0e..e2e9396ae 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java +++ b/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 }) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java index 460d622b6..7f4678118 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java index db8405dcf..fcf5797c6 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java index 8d242edff..2dbb747fb 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java index f9f3e8b47..1c6b0fc71 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java +++ b/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) diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java index cdacd32f4..0cc722efc 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java index a52122a75..e4d9e8d85 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java index dc6a59345..85f8bbc03 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java index 400b906fc..dff3fd8f2 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactoryTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactoryTests.java index b092af24e..93823ed05 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactoryTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java index f6d3f86be..479006ee3 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java index 11109cd38..c6cb5f9f1 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java index e31bcfda9..5a02018b4 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java index 006d0c00d..cd4472ad9 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java index c58befb80..6a19414ca 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java index 038235279..d54ceca7c 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java +++ b/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) this.factory.getLoadBalancer("foo"); } - @Configuration + @Configuration(proxyBeanMethods = false) @RibbonClient("foo") @Import({ UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class, diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPreprocessorIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPreprocessorIntegrationTests.java index 77b86fe13..70b5e8811 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPreprocessorIntegrationTests.java +++ b/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) this.factory.getLoadBalancer("foo"); } - @Configuration + @Configuration(proxyBeanMethods = false) @RibbonClient("foo") @Import({ UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class, diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java index a1094f8ee..787c2dbba 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java +++ b/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) this.factory.getLoadBalancer(name); } - @Configuration + @Configuration(proxyBeanMethods = false) @RibbonClients @ImportAutoConfiguration({ UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class, diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonClientPreprocessorIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonClientPreprocessorIntegrationTests.java index defc123ac..d556c3d30 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonClientPreprocessorIntegrationTests.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java index 64e1c17f4..d0ff333be 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java index 1f6658b1a..7fbf7ec83 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.java index f64f008a6..05b14ee91 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java index 6552f3867..55a10fc61 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java index 46cbd7724..c0c460353 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java index 3f94a6694..cddc23c06 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaCustomPeerNodesTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaCustomPeerNodesTests.java index 39e793a13..02a075ff9 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaCustomPeerNodesTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryTests.java index eae0b5f72..68a43339a 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java index 4aa3f0c68..0fa5ba8c3 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesWithCustomFiltersTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesWithCustomFiltersTests.java index 5ffaea112..fc60e9137 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesWithCustomFiltersTests.java +++ b/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 { diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java index e5c1b98f7..08f426a24 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java b/spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java index 2d6ff02a2..6d6a78c42 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java index 3ba4b9c03..19aeebaa5 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java index 58dd457d0..9c3b36683 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java +++ b/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 diff --git a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java index 6ba23867f..907063f2a 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java +++ b/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("")).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableHystrixDashboard protected static class Application { diff --git a/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java b/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java index f78939545..0b0e6f522 100644 --- a/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java index 7f79b2572..49c9379c4 100644 --- a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java +++ b/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 }) diff --git a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java index 653cc6d90..a091f11d8 100644 --- a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java index b90edb40e..11dbc9f2a 100644 --- a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java index bd3ffbaa3..8d4bb55ba 100644 --- a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerIntegrationTest.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerIntegrationTest.java index c1c48199f..c29f55d1b 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerIntegrationTest.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java index 664614459..7a1ad2732 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java +++ b/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 diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java index 4ef86c4aa..bc0edf471 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java +++ b/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 diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/ReactiveHystrixCircuitBreakerIntegrationTest.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/ReactiveHystrixCircuitBreakerIntegrationTest.java index d0bdd85f4..b2c63d85c 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/ReactiveHystrixCircuitBreakerIntegrationTest.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityApplication.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityApplication.java index fee880f64..ff2904ca6 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityApplication.java +++ b/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 { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java index e3b0fcb10..9b990457f 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java +++ b/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; diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/NoSecurityConfiguration.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/NoSecurityConfiguration.java index 15d3852f6..889476863 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/NoSecurityConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java index c93803731..3b56a87b9 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RestClientRibbonConfiguration.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RestClientRibbonConfiguration.java index 537070f0b..4260027e6 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RestClientRibbonConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java index 30060225c..5082b4680 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClient.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClient.java index 73c5fb0d7..d2da7ae58 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClient.java +++ b/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) diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java index 2812b454b..91198a8f4 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClients.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClients.java index efbc00566..8843d4e3f 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClients.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientRibbonConfiguration.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientRibbonConfiguration.java index 508477109..cb1d8438f 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/apache/HttpClientRibbonConfiguration.java +++ b/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( diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonConfiguration.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonConfiguration.java index 9d771a44f..c67857a65 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonConfiguration.java +++ b/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; diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTests.java index aea928ca8..878c90d67 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTests.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTests.java index decc11f86..c8f290c4e 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTests.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/PlainRibbonClientPreprocessorIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/PlainRibbonClientPreprocessorIntegrationTests.java index 17ff1e7b8..be38fb5aa 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/PlainRibbonClientPreprocessorIntegrationTests.java +++ b/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 }) diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java index 54786b695..29e841bd8 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java index 7caa9fcbb..cdaccfc2e 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java +++ b/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 }) diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java index 57ae3b928..82220fe25 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java index 290745307..a34cfd8c0 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java +++ b/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 { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java index ea971468c..5307a7c4a 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java +++ b/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}") diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java index 3c0c9ecb3..28818327d 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java @@ -70,7 +70,7 @@ public class RibbonClientPreprocessorIntegrationTests { return (ZoneAwareLoadBalancer) this.factory.getLoadBalancer("foo"); } - @Configuration + @Configuration(proxyBeanMethods = false) @RibbonClient(name = "foo") @Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class, RibbonAutoConfiguration.class }) diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java index 1316ec638..a8df3d2a1 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java index 569f73007..c970f7437 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java index b7bc9b7fe..8420225bc 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java @@ -102,7 +102,7 @@ public class RibbonClientPreprocessorPropertiesOverridesIntegrationTests { return (ZoneAwareLoadBalancer) this.factory.getLoadBalancer(name); } - @Configuration + @Configuration(proxyBeanMethods = false) @RibbonClients @Import({ UtilAutoConfiguration.class, HttpClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class, diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsEagerInitializationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsEagerInitializationTests.java index 858d4b9e3..d615f29da 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsEagerInitializationTests.java +++ b/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), diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsPreprocessorIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsPreprocessorIntegrationTests.java index bdb083a32..ea58ac6f4 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientsPreprocessorIntegrationTests.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java index bcee41b3a..5bff783ce 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonLoadBalancingHttpClientTests.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java index 8b716ac67..6c142c9bc 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpLoadBalancingClientTests.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTestsConfig.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTestsConfig.java index 916b7c913..2c062223c 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTestsConfig.java +++ b/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 diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/TestAutoConfiguration.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/TestAutoConfiguration.java index 9457f1836..b03118c97 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/TestAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarAutoConfiguration.java b/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarAutoConfiguration.java index 49938dbf2..4211e06a8 100644 --- a/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarMarkerConfiguration.java b/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarMarkerConfiguration.java index 810a902bb..0c1fb02d1 100644 --- a/spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarMarkerConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java b/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java index a1105be33..6a7c222ee 100644 --- a/spring-cloud-netflix-sidecar/src/test/java/org/springframework/cloud/netflix/sidecar/SidecarApplicationTests.java +++ b/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 { diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineApplication.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineApplication.java index 971b3ff8d..de0219304 100644 --- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineApplication.java +++ b/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 { diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamAutoConfiguration.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamAutoConfiguration.java index ac11095b0..fbaa59616 100644 --- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamAutoConfiguration.java +++ b/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) diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java index 2cb48f9c1..e36fad900 100644 --- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java b/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java index 0cfaefbfd..8b2a00250 100644 --- a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java +++ b/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 { } diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineHttpConfiguration.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineHttpConfiguration.java index 28a8a5a38..e4affe6c7 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/TurbineHttpConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineAggregatorPropertiesTest.java b/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineAggregatorPropertiesTest.java index 129b2674e..39e4108ed 100644 --- a/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineAggregatorPropertiesTest.java +++ b/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 { diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/RibbonCommandFactoryConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/RibbonCommandFactoryConfiguration.java index d97092142..691344e27 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/RibbonCommandFactoryConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java index 028c2054a..17bcd1857 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java +++ b/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 { diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyMarkerConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyMarkerConfiguration.java index 9489178fa..aedf5e154 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyMarkerConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java index a474cafbe..79373a608 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerMarkerConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerMarkerConfiguration.java index 0e174bf22..c622fee9c 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulServerMarkerConfiguration.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ContextPathZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ContextPathZuulProxyApplicationTests.java index b37461c31..d4432ebc5 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ContextPathZuulProxyApplicationTests.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java index 687def412..a438143a6 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java index 9a3690676..c91dc8bab 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java index 4f05d4a34..0a69134f8 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java index bd25d62a1..4a397cc1d 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/RoutesEndpointIntegrationTests.java +++ b/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 diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ServletPathZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ServletPathZuulProxyApplicationTests.java index d28f78cea..77ad24e33 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ServletPathZuulProxyApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ServletPathZuulProxyApplicationTests.java @@ -147,7 +147,7 @@ public class ServletPathZuulProxyApplicationTests { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/SimpleZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/SimpleZuulProxyApplicationTests.java index fb8c3689f..0e6dec303 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/SimpleZuulProxyApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/SimpleZuulProxyApplicationTests.java @@ -145,7 +145,7 @@ public class SimpleZuulProxyApplicationTests { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java index a6d45d3b2..33ecf2deb 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyApplicationTests.java @@ -136,7 +136,7 @@ public class ZuulProxyApplicationTests { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy @@ -180,7 +180,7 @@ public class ZuulProxyApplicationTests { } // Load balancer with fixed server list for "simplezpat" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) static class TestRibbonClientConfiguration { @LocalServerPort diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfigurationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfigurationTests.java index 1ad00bd0a..d3a9b4c3f 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfigurationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfigurationTests.java @@ -55,7 +55,7 @@ public class ZuulProxyAutoConfigurationTests { assertThat(this.ribbonRoutingFilter).isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableZuulProxy static class TestConfig { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfigurationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfigurationTests.java index d9b17bccc..a61bbf53c 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfigurationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/ZuulServerAutoConfigurationTests.java @@ -53,7 +53,7 @@ public class ZuulServerAutoConfigurationTests { assertThat(ribbonRoutingFilter).isNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableZuulServer static class TestConfig { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java index 92f73249b..b80fb36bb 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java @@ -169,7 +169,7 @@ public class CustomHostRoutingFilterTests { assertThat(result2.getBody()).isEqualTo("GetCookie 1"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @Import(NoSecurityConfiguration.class) @@ -212,7 +212,7 @@ public class CustomHostRoutingFilterTests { SpringApplication.run(SampleCustomZuulProxyApplication.class, args); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableZuulProxy protected static class CustomZuulProxyConfig { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilterIntegrationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilterIntegrationTests.java index 3e01400d1..20a1b64eb 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilterIntegrationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilterIntegrationTests.java @@ -171,7 +171,7 @@ public class SendErrorFilterIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) private static class RibbonConfig { @LocalServerPort diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/EagerLoadOfZuulConfigurationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/EagerLoadOfZuulConfigurationTests.java index b97fa0836..eb9f69c69 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/EagerLoadOfZuulConfigurationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/EagerLoadOfZuulConfigurationTests.java @@ -60,7 +60,7 @@ public class EagerLoadOfZuulConfigurationTests { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) @EnableZuulProxy @RibbonClients(@RibbonClient(name = "eager", configuration = FooConfig.class)) static class TestConfig { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilterLoadBalancerKeyIntegrationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilterLoadBalancerKeyIntegrationTests.java index 440e62822..d75c123ec 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilterLoadBalancerKeyIntegrationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilterLoadBalancerKeyIntegrationTests.java @@ -101,7 +101,7 @@ public class RibbonRoutingFilterLoadBalancerKeyIntegrationTests { } -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy @@ -157,7 +157,7 @@ class CanaryTestZuulProxyApplication { } -@Configuration +@Configuration(proxyBeanMethods = false) class CanaryTestRibbonClientConfiguration { @LocalServerPort diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java index 93d04aa1f..9493c2e9d 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java @@ -342,7 +342,7 @@ public class SimpleHostRoutingFilterTests { return this.context.getBean(SimpleHostRoutingFilter.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties protected static class TestConfiguration { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommandIntegrationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommandIntegrationTests.java index d5af318b1..47713d11a 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommandIntegrationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommandIntegrationTests.java @@ -152,7 +152,7 @@ public class HttpClientRibbonCommandIntegrationTests extends ZuulProxyTestBase { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy @@ -202,7 +202,7 @@ public class HttpClientRibbonCommandIntegrationTests extends ZuulProxyTestBase { } // Load balancer with fixed server list and defined ribbon rest client - @Configuration + @Configuration(proxyBeanMethods = false) public static class SingletonRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandIntegrationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandIntegrationTests.java index 91d2527fd..e7dfc0194 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandIntegrationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandIntegrationTests.java @@ -106,7 +106,7 @@ public class OkHttpRibbonCommandIntegrationTests extends ZuulProxyTestBase { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/restclient/RestClientRibbonCommandIntegrationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/restclient/RestClientRibbonCommandIntegrationTests.java index ca505e94a..e18d625c8 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/restclient/RestClientRibbonCommandIntegrationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/restclient/RestClientRibbonCommandIntegrationTests.java @@ -284,7 +284,7 @@ public class RestClientRibbonCommandIntegrationTests extends ZuulProxyTestBase { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy @@ -418,7 +418,7 @@ public class RestClientRibbonCommandIntegrationTests extends ZuulProxyTestBase { } // Load balancer with fixed server list for "simple" pointing to bad host - @Configuration + @Configuration(proxyBeanMethods = false) static class BadHostRibbonClientConfiguration { @Bean @@ -430,7 +430,7 @@ public class RestClientRibbonCommandIntegrationTests extends ZuulProxyTestBase { } // This is needed to allow semicolon separators used in matrix variables - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomHttpFirewallConfig implements WebSecurityConfigurer { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonCommandFallbackTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonCommandFallbackTests.java index a682bdabb..5fc26c6ac 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonCommandFallbackTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonCommandFallbackTests.java @@ -81,7 +81,7 @@ public abstract class RibbonCommandFallbackTests { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonRetryIntegrationTestBase.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonRetryIntegrationTestBase.java index 511337b63..0189d5e00 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonRetryIntegrationTestBase.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/RibbonRetryIntegrationTestBase.java @@ -137,7 +137,7 @@ public abstract class RibbonRetryIntegrationTestBase { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableZuulProxy @@ -197,7 +197,7 @@ public abstract class RibbonRetryIntegrationTestBase { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class RibbonClientConfiguration { @Value("${local.server.port}") @@ -210,7 +210,7 @@ public abstract class RibbonRetryIntegrationTestBase { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class FourOFourRetryableRibbonConfiguration extends RibbonClientConfiguration { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/ZuulProxyTestBase.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/ZuulProxyTestBase.java index 13f420c20..b9ef63268 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/ZuulProxyTestBase.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/support/ZuulProxyTestBase.java @@ -496,7 +496,7 @@ public abstract class ZuulProxyTestBase { } - @Configuration + @Configuration(proxyBeanMethods = false) public class FormEncodedMessageConverterConfiguration extends WebMvcConfigurerAdapter { @@ -513,7 +513,7 @@ public abstract class ZuulProxyTestBase { } // Load balancer with fixed server list for "simple" pointing to localhost - @Configuration + @Configuration(proxyBeanMethods = false) public static class SimpleRibbonClientConfiguration { @Value("${local.server.port}") @@ -526,7 +526,7 @@ public abstract class ZuulProxyTestBase { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class AnotherRibbonClientConfiguration { @Value("${local.server.port}") diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulEmptyMetricsApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulEmptyMetricsApplicationTests.java index f50a1760d..a6ea4c1c4 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulEmptyMetricsApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulEmptyMetricsApplicationTests.java @@ -75,7 +75,7 @@ public class ZuulEmptyMetricsApplicationTests { } @EnableAutoConfiguration(exclude = TestAutoConfiguration.class) - @Configuration + @Configuration(proxyBeanMethods = false) // @Import(NoSecurityConfiguration.class) @EnableZuulServer @EnableConfigurationProperties(ServerProperties.class) diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulMetricsApplicationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulMetricsApplicationTests.java index 7dc23ac47..47a8aa88d 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulMetricsApplicationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/metrics/ZuulMetricsApplicationTests.java @@ -89,14 +89,14 @@ public class ZuulMetricsApplicationTests { } // Don't use @SpringBootApplication because we don't want to component scan - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableZuulServer static class ZuulConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ZuulMetricsApplicationTestsConfiguration { @Bean diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/NoSecurityConfiguration.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/NoSecurityConfiguration.java index 36f8463e6..f73bcdb9a 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/NoSecurityConfiguration.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/NoSecurityConfiguration.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -@Configuration +@Configuration(proxyBeanMethods = false) public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/TestAutoConfiguration.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/TestAutoConfiguration.java index 1d4ad40a1..516fcf2dd 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/TestAutoConfiguration.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/TestAutoConfiguration.java @@ -31,12 +31,12 @@ import org.springframework.security.web.firewall.StrictHttpFirewall; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ NoopDiscoveryClientAutoConfiguration.class }) @AutoConfigureBefore(SecurityAutoConfiguration.class) public class TestAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @Order(Ordered.HIGHEST_PRECEDENCE) protected static class TestSecurityConfiguration extends WebSecurityConfigurerAdapter {