From 85ebe8906537b2b77d82ca401548bd45ddae6f70 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 6 Nov 2019 12:05:09 -0500 Subject: [PATCH] Added proxyBeanMethods=false to @Configuration. Fixes #477 --- .../cloud/kubernetes/config/BootstrapConfiguration.java | 4 ++-- .../config/reload/ConfigReloadAutoConfiguration.java | 2 +- .../kubernetes/config/KubernetesConfigConfigurationTest.java | 2 +- .../cloud/kubernetes/config/MissingActuatorTest.java | 2 +- .../cloud/kubernetes/KubernetesAutoConfiguration.java | 4 ++-- .../discovery/KubernetesCatalogWatchAutoConfiguration.java | 2 +- .../discovery/KubernetesDiscoveryClientAutoConfiguration.java | 4 ++-- ...etesDiscoveryClientConfigClientBootstrapConfiguration.java | 2 +- .../KubernetesReactiveDiscoveryClientAutoConfiguration.java | 2 +- .../KubernetesCatalogServicesWatchConfigurationTest.java | 2 +- ...rnetesDiscoveryClientAutoConfigurationPropertiesTests.java | 2 +- ...iscoveryClientConfigClientBootstrapConfigurationTests.java | 2 +- .../cloud/kubernetes/examples/DummyConfig.java | 2 +- .../springframework/cloud/kubernetes/examples/MyConfig.java | 2 +- .../cloud/kubernetes/istio/IstioAutoConfiguration.java | 2 +- .../cloud/kubernetes/istio/IstioBootstrapConfiguration.java | 2 +- .../cloud/kubernetes/istio/IstioClientProperties.java | 2 +- .../cloud/kubernetes/leader/LeaderAutoConfiguration.java | 2 +- .../ribbon/KubernetesRibbonClientConfiguration.java | 2 +- .../kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java index e421e915..9b6d72c6 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java @@ -34,12 +34,12 @@ import org.springframework.context.annotation.Import; * * @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/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java index 55928328..670ab96e 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; * * @author Nicolla Ferraro */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.kubernetes.enabled", matchIfMissing = true) @ConditionalOnClass(EndpointAutoConfiguration.class) @AutoConfigureAfter({ InfoEndpointAutoConfiguration.class, diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java index 40469d11..c3c36f36 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java @@ -73,7 +73,7 @@ public class KubernetesConfigConfigurationTest { .properties(env).run(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class KubernetesClientTestConfiguration { @Bean diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java index d838dc40..dd7695a3 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java @@ -58,7 +58,7 @@ public class MissingActuatorTest { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java index 077db0dc..b9dd95c6 100644 --- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Eddú Meléndez * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnKubernetesEnabled @EnableConfigurationProperties(KubernetesClientProperties.class) public class KubernetesAutoConfiguration { @@ -155,7 +155,7 @@ public class KubernetesAutoConfiguration { return new StandardPodUtils(client); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HealthIndicator.class) protected static class KubernetesActuatorConfiguration { diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java index 6921a5d2..7fd8b229 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnProperty(name = "spring.cloud.kubernetes.enabled", matchIfMissing = true) @AutoConfigureAfter({ KubernetesAutoConfiguration.class }) diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java index ede5d769..c6a4b774 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @author Mauricio Salatino * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnKubernetesEnabled @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, @@ -92,7 +92,7 @@ public class KubernetesDiscoveryClientAutoConfiguration { return new KubernetesDiscoveryProperties(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBlockingDiscoveryEnabled @ConditionalOnKubernetesDiscoveryEnabled public static class KubernetesDiscoveryClientConfiguration { diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java index 36772d54..16d20225 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import; * * @author Zhanwei Wang */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty("spring.cloud.config.discovery.enabled") @Import({ KubernetesAutoConfiguration.class, KubernetesDiscoveryClientAutoConfiguration.class }) diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java index 2e38c3ca..55eba6e4 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * * @author Tim Ysewyn */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnReactiveDiscoveryEnabled @ConditionalOnKubernetesEnabled diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java index 8b160a41..20fa5725 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java @@ -78,7 +78,7 @@ public class KubernetesCatalogServicesWatchConfigurationTest { .web(WebApplicationType.NONE).properties(env).run(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class KubernetesClientTestConfiguration { @Bean diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java index 835c2f3f..c3732d60 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java @@ -82,7 +82,7 @@ public class KubernetesDiscoveryClientAutoConfigurationPropertiesTests { .properties(env).run(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class KubernetesClientTestConfiguration { @Bean diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java index a57fc2b9..61ef0d99 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java @@ -89,7 +89,7 @@ public class KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class EnvironmentKnobbler { @Bean diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/DummyConfig.java b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/DummyConfig.java index 5c6a1a25..90969249 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/DummyConfig.java +++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/DummyConfig.java @@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.examples; 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/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/MyConfig.java b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/MyConfig.java index 974cce79..7b17d61e 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/MyConfig.java +++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/src/main/java/org/springframework/cloud/kubernetes/examples/MyConfig.java @@ -19,7 +19,7 @@ package org.springframework.cloud.kubernetes.examples; 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/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioAutoConfiguration.java b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioAutoConfiguration.java index 66518148..2603e3b1 100644 --- a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioAutoConfiguration.java +++ b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * * @author Mauricio Salatino */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.istio.enabled", matchIfMissing = true) public class IstioAutoConfiguration { diff --git a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java index 1fea6f1c..3754cfac 100644 --- a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.core.env.Environment; * * @author Mauricio Salatino */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.istio.enabled", matchIfMissing = true) @EnableConfigurationProperties(IstioClientProperties.class) public class IstioBootstrapConfiguration { diff --git a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioClientProperties.java b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioClientProperties.java index 366ef4cf..4aa8d0e7 100644 --- a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioClientProperties.java +++ b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioClientProperties.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration; * * @author Mauricio Salatino */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConfigurationProperties("spring.cloud.istio.client") public class IstioClientProperties { diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java index e4bb868b..05cf01f0 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.integration.leader.event.LeaderEventPublisher; /** * @author Gytis Trikleris */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(LeaderProperties.class) @ConditionalOnBean(KubernetesClient.class) @ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled", diff --git a/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java index 904e9c46..dfaefb43 100644 --- a/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java +++ b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesRibbonClientConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * * @author Ioannis Canellos */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(KubernetesRibbonProperties.class) public class KubernetesRibbonClientConfiguration { diff --git a/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java index c56a7195..d10c1e9d 100644 --- a/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java +++ b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/RibbonKubernetesAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * * @author Ioannis Canellos */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConditionalOnBean(SpringClientFactory.class) @ConditionalOnProperty(value = "spring.cloud.kubernetes.ribbon.enabled",