From 987a53a850633b42ee1284f0dc90b2f0ad4dc2d3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 13 Nov 2019 14:08:46 +0100 Subject: [PATCH] Update auto-configuration to use @Configuration(proxyBeanMethods=false); fixes gh-236 --- .../zookeeper/config/ZookeeperConfigAutoConfiguration.java | 4 ++-- .../config/ZookeeperConfigBootstrapConfiguration.java | 2 +- .../cloud/zookeeper/ZookeeperAutoConfiguration.java | 2 +- .../cloud/zookeeper/ZookeeperHealthAutoConfiguration.java | 2 +- .../zookeeper/discovery/RibbonZookeeperAutoConfiguration.java | 2 +- .../discovery/ZookeeperDiscoveryAutoConfiguration.java | 4 ++-- .../discovery/ZookeeperDiscoveryClientConfiguration.java | 2 +- .../discovery/ZookeeperRibbonClientConfiguration.java | 2 +- .../configclient/ZookeeperConfigServerAutoConfiguration.java | 2 +- ...perDiscoveryClientConfigServiceBootstrapConfiguration.java | 2 +- .../dependency/DependencyFeignClientAutoConfiguration.java | 2 +- .../dependency/DependencyRestTemplateAutoConfiguration.java | 2 +- .../dependency/DependencyRibbonAutoConfiguration.java | 2 +- .../dependency/ZookeeperDependenciesAutoConfiguration.java | 2 +- .../ZookeeperReactiveDiscoveryClientConfiguration.java | 2 +- .../discovery/watcher/DependencyWatcherAutoConfiguration.java | 2 +- .../ZookeeperAutoServiceRegistrationAutoConfiguration.java | 2 +- .../ZookeeperServiceRegistryAutoConfiguration.java | 2 +- .../support/CuratorServiceDiscoveryAutoConfiguration.java | 2 +- .../cloud/zookeeper/sample/SampleZookeeperApplication.java | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfiguration.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfiguration.java index 05ab4954..8822eaf0 100644 --- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfiguration.java +++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfiguration.java @@ -32,12 +32,12 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnZookeeperEnabled @ConditionalOnProperty(value = "spring.cloud.zookeeper.config.enabled", matchIfMissing = true) public class ZookeeperConfigAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RefreshEndpoint.class) protected static class ZkRefreshConfiguration { diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java index 9742c61d..a34d60d1 100644 --- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java +++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import; * @author Spencer Gibb * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnZookeeperEnabled @Import(ZookeeperAutoConfiguration.class) public class ZookeeperConfigBootstrapConfiguration { diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java index c90a2e5d..407fa3d5 100644 --- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java +++ b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnZookeeperEnabled @EnableConfigurationProperties public class ZookeeperAutoConfiguration { diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java index 446627bf..bdc430b5 100644 --- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java +++ b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; * @author Tom Gianos * @since 2.0.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnZookeeperEnabled @ConditionalOnClass(Endpoint.class) @AutoConfigureAfter({ ZookeeperAutoConfiguration.class }) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java index c85ca236..0317e0e2 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * @author Dave Syer * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnZookeeperEnabled @ConditionalOnBean(SpringClientFactory.class) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java index 8e2d83c3..ee1189f1 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; * @author Tim Ysewyn * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnZookeeperDiscoveryEnabled @AutoConfigureBefore({ CommonsClientAutoConfiguration.class, @@ -62,7 +62,7 @@ public class ZookeeperDiscoveryAutoConfiguration { return new ZookeeperServiceWatch(curator, zookeeperDiscoveryProperties); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Endpoint.class, HealthIndicator.class }) protected static class ZookeeperDiscoveryHealthConfig { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java index c5eac59a..d9b4bf28 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Tim Ysewyn * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnBlockingDiscoveryEnabled @ConditionalOnZookeeperDiscoveryEnabled diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java index fd200b45..42ddb699 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java @@ -54,7 +54,7 @@ import static com.netflix.client.config.CommonClientConfigKey.EnableZoneAffinity * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ZookeeperRibbonClientConfiguration { private static final Log log = LogFactory diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java index 245ab142..82c8ee7a 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnClass({ ZookeeperDiscoveryProperties.class, CuratorFramework.class, ConfigServerProperties.class }) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java index 95b8e635..c0962a07 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.core.annotation.Order; */ @ConditionalOnClass(ConfigServicePropertySourceLocator.class) @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ ZookeeperAutoConfiguration.class, ZookeeperDiscoveryClientConfiguration.class, CuratorServiceDiscoveryAutoConfiguration.class, ZookeeperDiscoveryAutoConfiguration.class }) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java index 097b6c5a..eee181a1 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java @@ -48,7 +48,7 @@ import org.springframework.context.annotation.Primary; * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDependenciesPassed @ConditionalOnZookeeperEnabled @ConditionalOnProperty(value = "spring.cloud.zookeeper.dependency.headers.enabled", matchIfMissing = true) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java index 1f3da38e..47ce7853 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.web.client.RestTemplate; * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnZookeeperEnabled @ConditionalOnRibbonZookeeper @ConditionalOnDependenciesPassed diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java index 803b3030..f659fcca 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnZookeeperEnabled @ConditionalOnRibbonZookeeper @ConditionalOnDependenciesPassed diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java index 63a4bd64..6c01b51f 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * @author Marcin Grzejszczak * @since 1.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnZookeeperEnabled @ConditionalOnDependenciesPassed diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java index 0ab45e9d..cf506faf 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.context.annotation.Configuration; * @author Tim Ysewyn * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnReactiveDiscoveryEnabled @ConditionalOnZookeeperDiscoveryEnabled diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java index f5e6c436..e3dbd661 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @since 1.0.0 * @see ZookeeperDependencies */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnZookeeperEnabled @ConditionalOnDependenciesPassed diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java index 93cdb0e6..e8a97881 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.util.StringUtils; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(type = "org.springframework.cloud.zookeeper.discovery.ZookeeperLifecycle") @ConditionalOnZookeeperDiscoveryEnabled @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java index 54145305..eeecb9e4 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnZookeeperDiscoveryEnabled @ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", matchIfMissing = true) @AutoConfigureBefore(ServiceRegistryAutoConfiguration.class) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java index 5ae4fd4f..c3bd12e3 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnZookeeperDiscoveryEnabled @AutoConfigureBefore({ ZookeeperDiscoveryAutoConfiguration.class, diff --git a/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java b/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java index 04761576..3038718f 100644 --- a/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java +++ b/spring-cloud-zookeeper-sample/src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java @@ -39,7 +39,7 @@ import org.springframework.web.client.RestTemplate; /** * @author Spencer Gibb */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController @EnableFeignClients