From 1f9cc848c47518d65399f1a5c3034e9d7ab46ca8 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 5 May 2021 17:02:34 +0200 Subject: [PATCH] GH-2153 Add proxyBeanMethods instruction to configuratioin classes Resolves #2153 --- .../springframework/cloud/stream/annotation/EnableBinding.java | 2 +- .../cloud/stream/config/BinderFactoryAutoConfiguration.java | 2 +- .../stream/config/BindersHealthIndicatorAutoConfiguration.java | 2 +- .../cloud/stream/config/BindingServiceConfiguration.java | 2 +- .../cloud/stream/config/BindingsEndpointAutoConfiguration.java | 2 +- .../cloud/stream/config/ChannelBindingAutoConfiguration.java | 2 +- .../cloud/stream/config/ChannelsEndpointAutoConfiguration.java | 2 +- .../cloud/stream/config/ContentTypeConfiguration.java | 2 +- .../stream/config/SpelExpressionConverterConfiguration.java | 2 +- .../cloud/stream/function/FunctionConfiguration.java | 2 +- .../DestinationPublishingMetricsAutoConfiguration.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java index c9b991c55..d69eac548 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java @@ -44,7 +44,7 @@ import org.springframework.integration.config.EnableIntegration; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ BindingBeansRegistrar.class, BinderFactoryAutoConfiguration.class }) @EnableIntegration @Deprecated diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryAutoConfiguration.java index 642333bdf..5f0451077 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryAutoConfiguration.java @@ -76,7 +76,7 @@ import org.springframework.validation.Validator; * @author Soby Chacko * @author David Harrigan */ -@Configuration +@Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @EnableConfigurationProperties({ BindingServiceProperties.class }) @Import(ContentTypeConfiguration.class) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindersHealthIndicatorAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindersHealthIndicatorAutoConfiguration.java index ff8a5f857..b757c6f4d 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindersHealthIndicatorAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindersHealthIndicatorAutoConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.context.annotation.Configuration; @AutoConfigureBefore(EndpointAutoConfiguration.class) @ConditionalOnBean(BinderFactory.class) @AutoConfigureAfter(BindingServiceConfiguration.class) -@Configuration +@Configuration(proxyBeanMethods = false) public class BindersHealthIndicatorAutoConfiguration { @Bean diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java index c7153cdae..837df7663 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java @@ -87,7 +87,7 @@ import org.springframework.util.ObjectUtils; * @author Soby Chacko */ @SuppressWarnings("deprecation") -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ BindingServiceProperties.class, SpringIntegrationProperties.class, StreamFunctionProperties.class }) @Import({ DestinationPublishingMetricsAutoConfiguration.class, diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java index a951ae82a..aed89be44 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * @author Oleg Zhurakousky * @since 2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = { "org.springframework.boot.actuate.endpoint.annotation.Endpoint" }) @ConditionalOnBean(BindingService.class) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java index 8845e9ba8..58dbd46cd 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.messaging.MessageChannel; * @author Marius Bogoevici * @author Ilayaperumal Gopinathan */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(BindingService.class) @EnableConfigurationProperties(DefaultPollerProperties.class) public class ChannelBindingAutoConfiguration { diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java index 907e26237..ae8741a14 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Marius Bogoevici * @author Ilayaperumal Gopinathan */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "org.springframework.boot.actuate.endpoint.annotation.Endpoint") @ConditionalOnBean(BindingService.class) @AutoConfigureAfter(EndpointAutoConfiguration.class) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ContentTypeConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ContentTypeConfiguration.java index 33ca78916..4113d909c 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ContentTypeConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ContentTypeConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.messaging.converter.MessageConverter; * @author Artem Bilan * @author Oleg Zhurakousky */ -@Configuration +@Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) class ContentTypeConfiguration { diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfiguration.java index b232c67c9..9f1a600a2 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.integration.json.JsonPropertyAccessor; * @author Eric Bottard * @author Artem Bilan */ -@Configuration +@Configuration(proxyBeanMethods = false) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class SpelExpressionConverterConfiguration { diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java index ea50c7092..c63219c57 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java @@ -119,7 +119,7 @@ import org.springframework.util.StringUtils; * @author Soby Chacko * @since 2.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(StreamFunctionProperties.class) @Import({ BindingBeansRegistrar.class, BinderFactoryAutoConfiguration.class }) @AutoConfigureBefore(BindingServiceConfiguration.class) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DestinationPublishingMetricsAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DestinationPublishingMetricsAutoConfiguration.java index 992cdab07..90f143db0 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DestinationPublishingMetricsAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DestinationPublishingMetricsAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.util.StringUtils; * @author Oleg Zhurakousky * @since 2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(SimpleMetricsExportAutoConfiguration.class) @AutoConfigureAfter(MetricsAutoConfiguration.class) @ConditionalOnClass({ Binder.class, MetricsAutoConfiguration.class })