From fd083ca87478fcb2238722bd3d44b006152b2e91 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 14 Nov 2019 20:15:04 -0500 Subject: [PATCH] Added proxyBeanMethods = false to configuration classes. Fixes #596 --- .../consul/binder/config/ConsulBinderConfiguration.java | 2 +- .../cloud/consul/binder/ConsulBinderApplicationTests.java | 2 +- .../binder/config/ConsulBinderConfigurationTests.java | 2 +- .../cloud/consul/binder/test/consumer/TestConsumer.java | 2 +- .../cloud/consul/binder/test/producer/TestProducer.java | 2 +- .../cloud/consul/config/ConsulConfigAutoConfiguration.java | 4 ++-- .../consul/config/ConsulConfigBootstrapConfiguration.java | 4 ++-- .../ConsulPropertySourceLocatorAppNameCustomizedTests.java | 2 +- .../config/ConsulPropertySourceLocatorFailFastTests.java | 2 +- .../config/ConsulPropertySourceLocatorFilesTests.java | 2 +- .../consul/config/ConsulPropertySourceLocatorTests.java | 2 +- .../cloud/consul/ConsulAutoConfiguration.java | 6 +++--- .../discovery/ConsulCatalogWatchAutoConfiguration.java | 2 +- .../discovery/ConsulDiscoveryClientConfiguration.java | 2 +- .../consul/discovery/ConsulRibbonClientConfiguration.java | 2 +- .../consul/discovery/RibbonConsulAutoConfiguration.java | 2 +- .../configclient/ConsulConfigServerAutoConfiguration.java | 2 +- ...lDiscoveryClientConfigServiceBootstrapConfiguration.java | 2 +- .../ConsulReactiveDiscoveryClientConfiguration.java | 2 +- .../ConsulAutoServiceRegistrationAutoConfiguration.java | 4 ++-- .../ConsulServiceRegistryAutoConfiguration.java | 2 +- .../consul/support/ConsulHeartbeatAutoConfiguration.java | 2 +- .../consul/discovery/ConsulDiscoveryClientAclTests.java | 2 +- .../discovery/ConsulDiscoveryClientCustomizedTests.java | 2 +- .../ConsulDiscoveryClientDefaultQueryTagTests.java | 2 +- .../consul/discovery/ConsulDiscoveryClientHttpsTests.java | 2 +- .../cloud/consul/discovery/ConsulDiscoveryClientTests.java | 2 +- .../cloud/consul/discovery/ConsulServerListAclTests.java | 2 +- .../ConsulServerListConsistencyModeDefaultTests.java | 2 +- .../ConsulServerListConsistencyModeStaleTests.java | 2 +- .../cloud/consul/discovery/TtlSchedulerRemoveTests.java | 2 +- .../cloud/consul/discovery/TtlSchedulerTests.java | 2 +- .../DiscoveryClientConfigServiceAutoConfigurationTests.java | 2 +- .../TestConsulDiscoveryClientBootstrapConfiguration.java | 2 +- ...oRegistrationCheckTtlDeregisterCriticalServiceTests.java | 2 +- .../ConsulAutoRegistrationHealthCheckHeadersTests.java | 2 +- ...ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java | 2 +- ...sulAutoRegistrationIncludeHostnameInInstanceIdTests.java | 2 +- .../ConsulAutoServiceDeRegistrationDisabledTests.java | 2 +- ...lAutoServiceRegistrationCustomizedAgentAddressTests.java | 2 +- ...AutoServiceRegistrationCustomizedDiscoveryPortTests.java | 2 +- ...AutoServiceRegistrationCustomizedInstanceGroupTests.java | 2 +- ...lAutoServiceRegistrationCustomizedInstanceZoneTests.java | 2 +- ...iceRegistrationCustomizedManagementServicePortTests.java | 2 +- .../ConsulAutoServiceRegistrationCustomizedPropsTests.java | 2 +- ...ulAutoServiceRegistrationCustomizedServiceNameTests.java | 2 +- ...utoServiceRegistrationCustomizedServletContextTests.java | 2 +- .../ConsulAutoServiceRegistrationDefaultPortTests.java | 2 +- .../ConsulAutoServiceRegistrationDisabledTests.java | 2 +- ...sulAutoServiceRegistrationManagementCustomizerTests.java | 4 ++-- ...toServiceRegistrationManagementDisabledServiceTests.java | 2 +- ...ConsulAutoServiceRegistrationManagementServiceTests.java | 2 +- .../ConsulAutoServiceRegistrationNonWebTests.java | 2 +- .../serviceregistry/ConsulServiceRegistryCheckTtlTests.java | 2 +- 54 files changed, 60 insertions(+), 60 deletions(-) diff --git a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java index 52b51cc0..397abd9d 100644 --- a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java +++ b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import; * * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(Binder.class) @Import({ PropertyPlaceholderAutoConfiguration.class }) @ConditionalOnConsulEnabled diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java index 36dc5961..5c5cbc4c 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java @@ -107,7 +107,7 @@ public class ConsulBinderApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableBinding(Events.class) public static class Application { diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfigurationTests.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfigurationTests.java index d52b1319..51dfff6f 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfigurationTests.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfigurationTests.java @@ -61,7 +61,7 @@ public class ConsulBinderConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableBinding(Events.class) public static class Application { diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/consumer/TestConsumer.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/consumer/TestConsumer.java index 0e143d92..ba772322 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/consumer/TestConsumer.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/consumer/TestConsumer.java @@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Import(ConsulBinderConfiguration.class) -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration public class TestConsumer implements ApplicationRunner { diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java index d210c115..71c4847d 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java @@ -46,7 +46,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Import(ConsulBinderConfiguration.class) -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration public class TestProducer implements ApplicationRunner { diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java index 6d3c7dcc..1997c277 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnConsulEnabled @ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", matchIfMissing = true) public class ConsulConfigAutoConfiguration { @@ -41,7 +41,7 @@ public class ConsulConfigAutoConfiguration { */ public static final String CONFIG_WATCH_TASK_SCHEDULER_NAME = "configWatchTaskScheduler"; - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RefreshEndpoint.class) protected static class ConsulRefreshConfiguration { diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java index c468a05c..fe698973 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java @@ -32,11 +32,11 @@ import org.springframework.context.annotation.Import; * @author Spencer Gibb * @author Edvin Eriksson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnConsulEnabled public class ConsulConfigBootstrapConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @Import(ConsulAutoConfiguration.class) @ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java index dbb72fab..ea5e6d77 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java @@ -101,7 +101,7 @@ public class ConsulPropertySourceLocatorAppNameCustomizedTests { assertThat(testProp2).as("testProp2 was wrong").isEqualTo(VALUE2); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java index 8c94d1c5..c2c37586 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java @@ -43,7 +43,7 @@ public class ConsulPropertySourceLocatorFailFastTests { public void testFailFastFalse() { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java index 4648c871..ec887114 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java @@ -140,7 +140,7 @@ public class ConsulPropertySourceLocatorFilesTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java index d9dcfadb..a359d789 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java @@ -149,7 +149,7 @@ public class ConsulPropertySourceLocatorTests { .isEqualTo("testPropValInsert"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java index f7c14066..da6d2d86 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnConsulEnabled public class ConsulAutoConfiguration { @@ -68,7 +68,7 @@ public class ConsulAutoConfiguration { return new ConsulClient(agentHost, agentPort); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Endpoint.class) protected static class ConsulHealthConfig { @@ -89,7 +89,7 @@ public class ConsulAutoConfiguration { } @ConditionalOnClass({ Retryable.class, Aspect.class, AopAutoConfiguration.class }) - @Configuration + @Configuration(proxyBeanMethods = false) @EnableRetry(proxyTargetClass = true) @Import(AopAutoConfiguration.class) @EnableConfigurationProperties(RetryProperties.class) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java index dd21b831..deab32f1 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; * * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnConsulEnabled @ConditionalOnProperty( value = "spring.cloud.consul.discovery.catalog-services-watch.enabled", diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java index 1041426b..7bb5e2e4 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @author Olga Maciaszek-Sharma * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnBlockingDiscoveryEnabled @ConditionalOnConsulEnabled diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulRibbonClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulRibbonClientConfiguration.java index 5883db5c..cb6d07c5 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulRibbonClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulRibbonClientConfiguration.java @@ -45,7 +45,7 @@ import static com.netflix.client.config.CommonClientConfigKey.EnableZoneAffinity * @author Spencer Gibb * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ConsulRibbonClientConfiguration { protected static final String VALUE_NOT_SET = "__not__set__"; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java index 8b6f95ee..fa25ffab 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnConsulEnabled @ConditionalOnBean(SpringClientFactory.class) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java index 22d76bb3..a69c585a 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnClass({ ConsulDiscoveryProperties.class, ConsulClient.class, ConfigServerProperties.class }) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java index 4fa9fb0c..a870b224 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; */ @ConditionalOnClass(ConfigServicePropertySourceLocator.class) @ConditionalOnProperty("spring.cloud.config.discovery.enabled") -@Configuration +@Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class, ConsulReactiveDiscoveryClientConfiguration.class }) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java index 50d15e87..4c317d3b 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnReactiveDiscoveryEnabled @ConditionalOnConsulEnabled diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java index 4ea03318..3888503a 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(AutoServiceRegistrationProperties.class) @ConditionalOnMissingBean( type = "org.springframework.cloud.consul.discovery.ConsulLifecycle") @@ -83,7 +83,7 @@ public class ConsulAutoServiceRegistrationAutoConfiguration { managementRegistrationCustomizers.getIfAvailable(), heartbeatProperties); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ServletContext.class) protected static class ConsulServletConfiguration { diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java index c81e13bf..ff1a648f 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnConsulEnabled @ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", matchIfMissing = true) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java index 176adcdc..939355de 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnConsulEnabled @ConditionalOnProperty("spring.cloud.consul.discovery.heartbeat.enabled") @ConditionalOnDiscoveryEnabled diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java index 0b3d06ed..0e0d90a3 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java @@ -70,7 +70,7 @@ public class ConsulDiscoveryClientAclTests { .isFalse(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableDiscoveryClient public static class MyTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java index de963890..b63ed2fb 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java @@ -93,7 +93,7 @@ public class ConsulDiscoveryClientCustomizedTests { assertThat(foo2).as("metadata key foo2 was wrong").isEqualTo("bar2=baz2"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableDiscoveryClient public static class MyTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java index cd140865..164f3864 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java @@ -92,7 +92,7 @@ public class ConsulDiscoveryClientDefaultQueryTagTests { return service; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import({ ConsulDiscoveryClientConfiguration.class }) protected static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java index 9dee8d28..8363c3b5 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java @@ -58,7 +58,7 @@ public class ConsulDiscoveryClientHttpsTests { assertThat(instance.isSecure()).as("instance was not secure (https)").isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableDiscoveryClient public static class MyTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java index 719173ec..2e8154b8 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java @@ -87,7 +87,7 @@ public class ConsulDiscoveryClientTests { .as("host isn't an ip address").isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableDiscoveryClient public static class MyTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java index 20a9e89e..9716c127 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java @@ -62,7 +62,7 @@ public class ConsulServerListAclTests { assertThat(servers.isEmpty()).as("servers was empty").isFalse(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableDiscoveryClient public static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeDefaultTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeDefaultTests.java index 45b1272e..388373ba 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeDefaultTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeDefaultTests.java @@ -57,7 +57,7 @@ public class ConsulServerListConsistencyModeDefaultTests { .isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableDiscoveryClient public static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeStaleTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeStaleTests.java index f7338714..53f75c68 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeStaleTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeStaleTests.java @@ -57,7 +57,7 @@ public class ConsulServerListConsistencyModeStaleTests { .equals(ConsistencyMode.STALE)).as("ConsistencyMode is stale").isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableDiscoveryClient public static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java index 81f60403..fa8583e4 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java @@ -82,7 +82,7 @@ public class TtlSchedulerRemoveTests { return null; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java index b123ee8c..bd96a663 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java @@ -79,7 +79,7 @@ public class TtlSchedulerTests { return null; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java index 8da900f3..c8e0c1d5 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -87,7 +87,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { .run(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration protected static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java index dc0617a6..e106a981 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.mock; @ConditionalOnProperty(value = "spring.cloud.consul.discovery.test.enabled", matchIfMissing = false) -@Configuration +@Configuration(proxyBeanMethods = false) public class TestConsulDiscoveryClientBootstrapConfiguration { @Bean diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java index bf197275..ebe047ea 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java @@ -56,7 +56,7 @@ public class ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests { .isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java index 7f72f119..233ef495 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java @@ -65,7 +65,7 @@ public class ConsulAutoRegistrationHealthCheckHeadersTests { // unable to call consul api to get health check details } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java index 1e61db24..22b453c6 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java @@ -64,7 +64,7 @@ public class ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests { // unable to call consul api to get health check details } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java index f1f377cd..656a1464 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java @@ -65,7 +65,7 @@ public class ConsulAutoRegistrationIncludeHostnameInInstanceIdTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java index 4e2177d0..71d21461 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java @@ -84,7 +84,7 @@ public class ConsulAutoServiceDeRegistrationDisabledTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java index 3f4f2193..762027cd 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java @@ -68,7 +68,7 @@ public class ConsulAutoServiceRegistrationCustomizedAgentAddressTests { .as("service address must be empty").isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java index 07180a40..5b9e65c8 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java @@ -82,7 +82,7 @@ public class ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests { // unable to call consul api to get health check details } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java index 41634dc0..3ac0d72a 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java @@ -82,7 +82,7 @@ public class ConsulAutoServiceRegistrationCustomizedInstanceGroupTests { .as("service group was wrong").isEqualTo("test"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java index b322cd83..5c7769df 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java @@ -65,7 +65,7 @@ public class ConsulAutoServiceRegistrationCustomizedInstanceZoneTests { .as("service zone was wrong").isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java index acc8bd5f..2f384fdd 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java @@ -100,7 +100,7 @@ public class ConsulAutoServiceRegistrationCustomizedManagementServicePortTests { .isEqualTo(this.discoveryProperties.getHostname()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java index 1d125cc8..bb3013f4 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java @@ -94,7 +94,7 @@ public class ConsulAutoServiceRegistrationCustomizedPropsTests { .isFalse(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java index 5793cb2c..2723b214 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java @@ -64,7 +64,7 @@ public class ConsulAutoServiceRegistrationCustomizedServiceNameTests { .isEqualTo("myprefix-myTestService-CC"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java index b703520f..a43010d9 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java @@ -63,7 +63,7 @@ public class ConsulAutoServiceRegistrationCustomizedServletContextTests { } @EnableDiscoveryClient - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration public static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java index c1ce4523..c3711dca 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java @@ -58,7 +58,7 @@ public class ConsulAutoServiceRegistrationDefaultPortTests { assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java index a54db03d..415579be 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java @@ -63,7 +63,7 @@ public class ConsulAutoServiceRegistrationDisabledTests { assertThat(service).as("service was registered").isNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java index 46941eb5..6ae5fbc6 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java @@ -71,7 +71,7 @@ public class ConsulAutoServiceRegistrationManagementCustomizerTests { .isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class ManagementConfig { @Bean @@ -100,7 +100,7 @@ public class ConsulAutoServiceRegistrationManagementCustomizerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java index 53f047c1..9afa4ea3 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java @@ -81,7 +81,7 @@ public class ConsulAutoServiceRegistrationManagementDisabledServiceTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java index a630bf26..5b0343b0 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java @@ -90,7 +90,7 @@ public class ConsulAutoServiceRegistrationManagementServiceTests { .isEqualTo(this.discoveryProperties.getHostname()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java index 1aa7e69e..2fcf6fae 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java @@ -63,7 +63,7 @@ public class ConsulAutoServiceRegistrationNonWebTests { } @EnableDiscoveryClient - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration public static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java index 63061e3d..98e42e42 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java @@ -94,7 +94,7 @@ public class ConsulServiceRegistryCheckTtlTests { .as("Service with HTTP check registered in TTL scheduler").isFalse(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class,