SpringCloud/spring-cloud-bus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added proxyBeanMethods = false to configuration. Fixes #211

Browse Source
This commit is contained in:
Ryan Baxter
2019-11-14 12:59:38 -05:00
parent 560b98df0b
commit e5c45ba2df
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
View File

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

2
spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusPropertiesAutoConfiguration.java
View File

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

4
spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java
View File

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

2
spring-cloud-bus/src/main/java/org/springframework/cloud/bus/jackson/BusJacksonAutoConfiguration.java
View File

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

12
spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java
View File

@@ -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<SentApplicationEvent> {
@@ -392,7 +392,7 @@ public class BusAutoConfigurationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class AckMessageConfiguration
implements ApplicationListener<AckRemoteApplicationEvent> {

2
spring-cloud-bus/src/test/java/org/springframework/cloud/bus/ConditionalOnBusEnabledTests.java
View File

@@ -76,7 +76,7 @@ public class ConditionalOnBusEnabledTests {
this.context.refresh();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnBusEnabled
protected static class MyBusEnabledConfig {

8
spring-cloud-bus/src/test/java/org/springframework/cloud/bus/jackson/RemoteApplicationEventScanTests.java
View File

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