Update auto-configuration to use @configuration(proxyBeanMethods=fals…

…e); fixes gh-236
spring-cloud · Nov 13, 2019 · 987a53a · 987a53a
1 parent f9f72fa
commit 987a53a
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 22 deletions.
diff --git a/...ain/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfiguration.java b/...ain/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfiguration.java
@@ -32,12 +32,12 @@
  * @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/...ava/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java b/...ava/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java
@@ -31,7 +31,7 @@
  * @author Spencer Gibb
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnZookeeperEnabled
 @Import(ZookeeperAutoConfiguration.class)
 public class ZookeeperConfigBootstrapConfiguration {

diff --git a/...er-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java b/...er-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java
@@ -37,7 +37,7 @@
  * @author Spencer Gibb
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnZookeeperEnabled
 @EnableConfigurationProperties
 public class ZookeeperAutoConfiguration {

diff --git a/...e/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java b/...e/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java
@@ -34,7 +34,7 @@
  * @author Tom Gianos
  * @since 2.0.1
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnZookeeperEnabled
 @ConditionalOnClass(Endpoint.class)
 @AutoConfigureAfter({ ZookeeperAutoConfiguration.class })

diff --git a/.../java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java b/.../java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java
@@ -32,7 +32,7 @@
  * @author Dave Syer
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnZookeeperEnabled
 @ConditionalOnBean(SpringClientFactory.class)

diff --git a/...va/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java b/...va/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java
@@ -39,7 +39,7 @@
  * @author Tim Ysewyn
  * @since 1.1.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnZookeeperDiscoveryEnabled
 @AutoConfigureBefore({ CommonsClientAutoConfiguration.class,
@@ -62,7 +62,7 @@ public ZookeeperServiceWatch zookeeperServiceWatch(
 		return new ZookeeperServiceWatch(curator, zookeeperDiscoveryProperties);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ Endpoint.class, HealthIndicator.class })
 	protected static class ZookeeperDiscoveryHealthConfig {
 

diff --git a/.../org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java b/.../org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java
@@ -35,7 +35,7 @@
  * @author Tim Ysewyn
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnBlockingDiscoveryEnabled
 @ConditionalOnZookeeperDiscoveryEnabled

diff --git a/...ava/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java b/...ava/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java
@@ -54,7 +54,7 @@
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class ZookeeperRibbonClientConfiguration {
 
 	private static final Log log = LogFactory

diff --git a/...mework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java b/...mework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java
@@ -33,7 +33,7 @@
  *
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass({ ZookeeperDiscoveryProperties.class, CuratorFramework.class,
 		ConfigServerProperties.class })

diff --git a/...r/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java b/...r/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java
@@ -40,7 +40,7 @@
  */
 @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/...ramework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java b/...ramework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java
@@ -48,7 +48,7 @@
  * @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/...amework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java b/...amework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java
@@ -45,7 +45,7 @@
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnZookeeperEnabled
 @ConditionalOnRibbonZookeeper
 @ConditionalOnDependenciesPassed

diff --git a/...ringframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java b/...ringframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java
@@ -43,7 +43,7 @@
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnZookeeperEnabled
 @ConditionalOnRibbonZookeeper
 @ConditionalOnDependenciesPassed

diff --git a/...ramework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java b/...ramework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java
@@ -30,7 +30,7 @@
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnZookeeperEnabled
 @ConditionalOnDependenciesPassed

diff --git a/...ork/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java b/...ork/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java
@@ -45,7 +45,7 @@
  * @author Tim Ysewyn
  * @since 2.2.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnReactiveDiscoveryEnabled
 @ConditionalOnZookeeperDiscoveryEnabled

diff --git a/...springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java b/...springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java
@@ -43,7 +43,7 @@
  * @since 1.0.0
  * @see ZookeeperDependencies
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnZookeeperEnabled
 @ConditionalOnDependenciesPassed

diff --git a/...rk/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java b/...rk/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java
@@ -34,7 +34,7 @@
 /**
  * @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/...gframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java b/...gframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java
@@ -37,7 +37,7 @@
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnZookeeperDiscoveryEnabled
 @ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", matchIfMissing = true)
 @AutoConfigureBefore(ServiceRegistryAutoConfiguration.class)

diff --git a/...org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java b/...org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java
@@ -36,7 +36,7 @@
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnZookeeperDiscoveryEnabled
 @AutoConfigureBefore({ ZookeeperDiscoveryAutoConfiguration.class,

diff --git a/.../src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java b/.../src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java
@@ -39,7 +39,7 @@
 /**
  * @author Spencer Gibb
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
 @RestController
 @EnableFeignClients