Adding proxyBeanMethods = false to configuration files. Fixes #62

spring-cloud · Nov 14, 2019 · 001fc23 · 001fc23
1 parent 019251a
commit 001fc23
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/...main/java/org/springframework/cloud/cloudfoundry/CloudFoundryClientAutoConfiguration.java b/...main/java/org/springframework/cloud/cloudfoundry/CloudFoundryClientAutoConfiguration.java
@@ -46,7 +46,7 @@
  * @author Ben Hale
  * @author Scott Frederick
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(prefix = "spring.cloud.cloudfoundry",
 		name = { "username", "password" })
 @ConditionalOnClass(name = { "reactor.core.publisher.Flux",

diff --git a/...pringframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java b/...pringframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java
@@ -35,7 +35,7 @@
 /**
  * @author Josh Long
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(CloudFoundryOperations.class)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnBlockingDiscoveryEnabled
@@ -50,7 +50,7 @@ public CloudFoundryHeartbeatSender cloudFoundryHeartbeatSender(
 		return new CloudFoundryHeartbeatSender(client);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.use-dns",
 			havingValue = "false", matchIfMissing = true)
 	public static class CloudFoundryDiscoveryClientConfig {
@@ -66,7 +66,7 @@ public CloudFoundryDiscoveryClient cloudFoundryDiscoveryClient(
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.use-dns",
 			havingValue = "true")
 	public static class DnsBasedCloudFoundryDiscoveryClientConfig {

diff --git a/...g/springframework/cloud/cloudfoundry/discovery/CloudFoundryRibbonClientConfiguration.java b/...g/springframework/cloud/cloudfoundry/discovery/CloudFoundryRibbonClientConfiguration.java
@@ -31,7 +31,7 @@
 /**
  * @author Josh Long
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class CloudFoundryRibbonClientConfiguration {
 
 	@RibbonClientName

diff --git a/...org/springframework/cloud/cloudfoundry/discovery/RibbonCloudFoundryAutoConfiguration.java b/...org/springframework/cloud/cloudfoundry/discovery/RibbonCloudFoundryAutoConfiguration.java
@@ -33,7 +33,7 @@
  *
  * @author Josh Long
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnClass(IClient.class)
 @ConditionalOnBean(SpringClientFactory.class)

diff --git a/...oud/cloudfoundry/discovery/reactive/CloudFoundryReactiveDiscoveryClientConfiguration.java b/...oud/cloudfoundry/discovery/reactive/CloudFoundryReactiveDiscoveryClientConfiguration.java
@@ -44,7 +44,7 @@
  *
  * @author Tim Ysewyn
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(CloudFoundryOperations.class)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnReactiveDiscoveryEnabled
@@ -54,7 +54,7 @@
 @AutoConfigureBefore(ReactiveCommonsClientAutoConfiguration.class)
 public class CloudFoundryReactiveDiscoveryClientConfiguration {
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.use-dns",
 			havingValue = "false", matchIfMissing = true)
 	public static class CloudFoundryNativeReactiveDiscoveryClientConfig {
@@ -86,12 +86,12 @@ public CloudFoundryReactiveHeartbeatSender cloudFoundryHeartbeatSender(
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(value = "spring.cloud.cloudfoundry.discovery.use-dns",
 			havingValue = "true")
 	public static class DnsBasedCloudFoundryReactiveDiscoveryClientConfig {
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		@ConditionalOnProperty(
 				value = "spring.cloud.cloudfoundry.discovery.use-container-ip",
 				havingValue = "true")
@@ -126,7 +126,7 @@ public CloudFoundryReactiveHeartbeatSender cloudFoundryHeartbeatSender(
 
 		}
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		@ConditionalOnProperty(
 				value = "spring.cloud.cloudfoundry.discovery.use-container-ip",
 				havingValue = "false", matchIfMissing = true)

diff --git a/...gframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfigurationTest.java b/...gframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfigurationTest.java
@@ -101,7 +101,7 @@ public void testUseContainerIpTrue() {
 				});
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class CloudFoundryConfig {
 
 		@Bean

diff --git a/...c/main/java/org/springframework/cloud/cloudfoundry/session/StickyFilterConfiguration.java b/...c/main/java/org/springframework/cloud/cloudfoundry/session/StickyFilterConfiguration.java
@@ -36,7 +36,7 @@
 /**
  * @author Dave Syer
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @PropertySource("spring-cloud-cloudfoundry.properties")
 public class StickyFilterConfiguration {
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,7 +101,7 @@ public void testUseContainerIpTrue() { @@
     				});
     	}
-    	@Configuration
+    	@Configuration(proxyBeanMethods = false)
     	public static class CloudFoundryConfig {
     		@Bean
@@ Expand Down @@