Added proxyBeanMethods=false to @configuration. Fixes #477

spring-cloud · Nov 6, 2019 · 85ebe89 · 85ebe89
1 parent 6dc7869
commit 85ebe89
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 23 deletions.
diff --git a/...fig/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java b/...fig/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java
@@ -34,12 +34,12 @@
  *
  * @author Ioannis Canellos
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(value = "spring.cloud.kubernetes.enabled", matchIfMissing = true)
 @ConditionalOnClass({ ConfigMap.class, Secret.class })
 public class BootstrapConfiguration {
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Import(KubernetesAutoConfiguration.class)
 	@EnableConfigurationProperties({ ConfigMapConfigProperties.class,
 			SecretsConfigProperties.class })

diff --git a/...ava/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java b/...ava/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java
@@ -46,7 +46,7 @@
  *
  * @author Nicolla Ferraro
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(value = "spring.cloud.kubernetes.enabled", matchIfMissing = true)
 @ConditionalOnClass(EndpointAutoConfiguration.class)
 @AutoConfigureAfter({ InfoEndpointAutoConfiguration.class,

diff --git a/...t/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java b/...t/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java
@@ -73,7 +73,7 @@ private void setup(String... env) {
 						.properties(env).run();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class KubernetesClientTestConfiguration {
 
 		@Bean

diff --git a/...config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java b/...config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java
@@ -58,7 +58,7 @@ public void unknownClassProtected() {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	static class Config {
 

diff --git a/...-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java b/...-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java
@@ -40,7 +40,7 @@
  * @author Eddú Meléndez
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnKubernetesEnabled
 @EnableConfigurationProperties(KubernetesClientProperties.class)
 public class KubernetesAutoConfiguration {
@@ -155,7 +155,7 @@ public StandardPodUtils kubernetesPodUtils(KubernetesClient client) {
 		return new StandardPodUtils(client);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(HealthIndicator.class)
 	protected static class KubernetesActuatorConfiguration {
 

diff --git a/...g/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java b/...g/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java
@@ -31,7 +31,7 @@
  *
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnProperty(name = "spring.cloud.kubernetes.enabled", matchIfMissing = true)
 @AutoConfigureAfter({ KubernetesAutoConfiguration.class })

diff --git a/...pringframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/...pringframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java
@@ -38,7 +38,7 @@
  * @author Mauricio Salatino
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnKubernetesEnabled
 @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class,
@@ -92,7 +92,7 @@ public KubernetesDiscoveryProperties getKubernetesDiscoveryProperties() {
 		return new KubernetesDiscoveryProperties();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBlockingDiscoveryEnabled
 	@ConditionalOnKubernetesDiscoveryEnabled
 	public static class KubernetesDiscoveryClientConfiguration {

diff --git a/...oud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java b/...oud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java
@@ -26,7 +26,7 @@
  *
  * @author Zhanwei Wang
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty("spring.cloud.config.discovery.enabled")
 @Import({ KubernetesAutoConfiguration.class,
 		KubernetesDiscoveryClientAutoConfiguration.class })

diff --git a/...oud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java b/...oud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java
@@ -43,7 +43,7 @@
  *
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnReactiveDiscoveryEnabled
 @ConditionalOnKubernetesEnabled

diff --git a/...framework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java b/...framework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java
@@ -78,7 +78,7 @@ private void setup(String... env) {
 						.web(WebApplicationType.NONE).properties(env).run();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class KubernetesClientTestConfiguration {
 
 		@Bean

diff --git a/...cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java b/...cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java
@@ -82,7 +82,7 @@ private void setup(String... env) {
 						.properties(env).run();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class KubernetesClientTestConfiguration {
 
 		@Bean

diff --git a/...ubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java b/...ubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java
@@ -89,7 +89,7 @@ private void setup(String... env) {
 		this.context.refresh();
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class EnvironmentKnobbler {
 
 		@Bean

diff --git a/...load-example/src/main/java/org/springframework/cloud/kubernetes/examples/DummyConfig.java b/...load-example/src/main/java/org/springframework/cloud/kubernetes/examples/DummyConfig.java
@@ -19,7 +19,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConfigurationProperties(prefix = "dummy")
 public class DummyConfig {
 

diff --git a/...-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/MyConfig.java b/...-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/MyConfig.java
@@ -19,7 +19,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConfigurationProperties(prefix = "bean")
 public class MyConfig {
 

diff --git a/...stio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioAutoConfiguration.java b/...stio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioAutoConfiguration.java
@@ -30,7 +30,7 @@
  *
  * @author Mauricio Salatino
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(value = "spring.cloud.istio.enabled", matchIfMissing = true)
 public class IstioAutoConfiguration {
 

diff --git a/...src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java b/...src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java
@@ -37,7 +37,7 @@
  *
  * @author Mauricio Salatino
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(value = "spring.cloud.istio.enabled", matchIfMissing = true)
 @EnableConfigurationProperties(IstioClientProperties.class)
 public class IstioBootstrapConfiguration {

diff --git a/...istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioClientProperties.java b/...istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioClientProperties.java
@@ -24,7 +24,7 @@
  *
  * @author Mauricio Salatino
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConfigurationProperties("spring.cloud.istio.client")
 public class IstioClientProperties {
 

diff --git a/...er/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java b/...er/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java
@@ -38,7 +38,7 @@
 /**
  * @author Gytis Trikleris
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(LeaderProperties.class)
 @ConditionalOnBean(KubernetesClient.class)
 @ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled",

diff --git a/...java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java b/...java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java
@@ -30,7 +30,7 @@
  *
  * @author Ioannis Canellos
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(KubernetesRibbonProperties.class)
 public class KubernetesRibbonClientConfiguration {
 

diff --git a/...n/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java b/...n/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java
@@ -30,7 +30,7 @@
  *
  * @author Ioannis Canellos
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnBean(SpringClientFactory.class)
 @ConditionalOnProperty(value = "spring.cloud.kubernetes.ribbon.enabled",