Added proxyBeanMethods=false to @Configuration. Fixes #477

This commit is contained in:
Ryan Baxter
2019-11-06 12:05:09 -05:00
parent 6dc786931b
commit 85ebe89065
20 changed files with 23 additions and 23 deletions

View File

@@ -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 })

View File

@@ -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,

View File

@@ -73,7 +73,7 @@ public class KubernetesConfigConfigurationTest {
.properties(env).run();
}
@Configuration
@Configuration(proxyBeanMethods = false)
static class KubernetesClientTestConfiguration {
@Bean

View File

@@ -58,7 +58,7 @@ public class MissingActuatorTest {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
static class Config {

View File

@@ -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 {

View File

@@ -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 })

View File

@@ -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 {

View File

@@ -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 })

View File

@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
*
* @author Tim Ysewyn
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnDiscoveryEnabled
@ConditionalOnReactiveDiscoveryEnabled
@ConditionalOnKubernetesEnabled

View File

@@ -78,7 +78,7 @@ public class KubernetesCatalogServicesWatchConfigurationTest {
.web(WebApplicationType.NONE).properties(env).run();
}
@Configuration
@Configuration(proxyBeanMethods = false)
static class KubernetesClientTestConfiguration {
@Bean

View File

@@ -82,7 +82,7 @@ public class KubernetesDiscoveryClientAutoConfigurationPropertiesTests {
.properties(env).run();
}
@Configuration
@Configuration(proxyBeanMethods = false)
static class KubernetesClientTestConfiguration {
@Bean

View File

@@ -89,7 +89,7 @@ public class KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests {
this.context.refresh();
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class EnvironmentKnobbler {
@Bean

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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",

View File

@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
*
* @author Ioannis Canellos
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(KubernetesRibbonProperties.class)
public class KubernetesRibbonClientConfiguration {

View File

@@ -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",