From e5c45ba2df75f7f77a806e8d1c1ab37f189c03d9 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 14 Nov 2019 12:59:38 -0500 Subject: [PATCH] Added proxyBeanMethods = false to configuration. Fixes #211 --- .../cloud/bus/BusAutoConfiguration.java | 10 +++++----- .../cloud/bus/BusPropertiesAutoConfiguration.java | 2 +- .../cloud/bus/BusRefreshAutoConfiguration.java | 4 ++-- .../bus/jackson/BusJacksonAutoConfiguration.java | 2 +- .../cloud/bus/BusAutoConfigurationTests.java | 12 ++++++------ .../cloud/bus/ConditionalOnBusEnabledTests.java | 2 +- .../bus/jackson/RemoteApplicationEventScanTests.java | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java index 501934d..61b0960 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java @@ -59,7 +59,7 @@ import org.springframework.util.PathMatcher; * @author Spencer Gibb * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBusEnabled @EnableBinding(SpringCloudBusClient.class) @EnableConfigurationProperties(BusProperties.class) @@ -178,7 +178,7 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware { } } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MatcherConfiguration { @BusPathMatcher @@ -201,7 +201,7 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Endpoint.class }) @ConditionalOnBean(HttpTraceRepository.class) @ConditionalOnProperty(value = "spring.cloud.bus.trace.enabled", @@ -216,7 +216,7 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnvironmentManager.class) @ConditionalOnBean(EnvironmentManager.class) protected static class BusEnvironmentConfiguration { @@ -228,7 +228,7 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware { return new EnvironmentChangeListener(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Endpoint.class) protected static class EnvironmentBusEndpointConfiguration { diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusPropertiesAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusPropertiesAutoConfiguration.java index 57587f1..eb226e6 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusPropertiesAutoConfiguration.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusPropertiesAutoConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration; * @author Spencer Gibb * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(BusProperties.class) public class BusPropertiesAutoConfiguration { diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java index d338ab6..7dc09f0 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Ryan Baxter */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBusEnabled @AutoConfigureAfter( name = { "org.springframework.cloud.autoconfigure.RefreshAutoConfiguration" }) @@ -45,7 +45,7 @@ public class BusRefreshAutoConfiguration { return new RefreshListener(contextRefresher); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(ContextRefresher.class) @ConditionalOnClass( name = { "org.springframework.boot.actuate.endpoint.annotation.Endpoint", diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/jackson/BusJacksonAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/jackson/BusJacksonAutoConfiguration.java index 11709f5..8023ca6 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/jackson/BusJacksonAutoConfiguration.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/jackson/BusJacksonAutoConfiguration.java @@ -55,7 +55,7 @@ import org.springframework.util.MimeTypeUtils; * @author Donovan Muller * @author Stefan Pfeiffer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBusEnabled @ConditionalOnClass({ RefreshBusEndpoint.class, ObjectMapper.class }) @AutoConfigureBefore({ BusAutoConfiguration.class, JacksonAutoConfiguration.class }) diff --git a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java index 64ec6d6..60658c4 100644 --- a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java +++ b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java @@ -310,13 +310,13 @@ public class BusAutoConfigurationTests { assertThat(newServiceId).isEqualTo(originalServiceId); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration protected static class RefreshConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import({ MessageConsumer.class, BusAutoConfiguration.class, TestSupportBinderAutoConfiguration.class, @@ -349,7 +349,7 @@ public class BusAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @MessageEndpoint protected static class MessageConsumer { @@ -359,7 +359,7 @@ public class BusAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import({ MessageConsumer.class, BusAutoConfiguration.class, TestSupportBinderAutoConfiguration.class, @@ -376,7 +376,7 @@ public class BusAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class SentMessageConfiguration implements ApplicationListener { @@ -392,7 +392,7 @@ public class BusAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class AckMessageConfiguration implements ApplicationListener { diff --git a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/ConditionalOnBusEnabledTests.java b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/ConditionalOnBusEnabledTests.java index 56ff56a..c49163e 100644 --- a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/ConditionalOnBusEnabledTests.java +++ b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/ConditionalOnBusEnabledTests.java @@ -76,7 +76,7 @@ public class ConditionalOnBusEnabledTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBusEnabled protected static class MyBusEnabledConfig { diff --git a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/jackson/RemoteApplicationEventScanTests.java b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/jackson/RemoteApplicationEventScanTests.java index 70e1645..6981f26 100644 --- a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/jackson/RemoteApplicationEventScanTests.java +++ b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/jackson/RemoteApplicationEventScanTests.java @@ -136,26 +136,26 @@ public class RemoteApplicationEventScanTests { expectedRegisterdClassesAsList.add(UnknownRemoteApplicationEvent.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @RemoteApplicationEventScan static class DefaultConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @RemoteApplicationEventScan({ "com.acme", "test.foo.bar" }) static class ValueConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @RemoteApplicationEventScan( basePackages = { "com.acme", "test.foo.bar", "fizz.buzz" }) static class BasePackagesConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @RemoteApplicationEventScan(basePackageClasses = TestRemoteApplicationEvent.class) static class BasePackageClassesConfig {