From 2e6eadefa35d13981f8064894b5da79ca455f031 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 5 Oct 2022 13:27:07 +0200 Subject: [PATCH] Set more 'proxyBeanMethods' to false --- .../streams/GlobalKTableBinderConfiguration.java | 2 +- ...aStreamsBinderHealthIndicatorConfiguration.java | 2 +- ...KafkaStreamsBinderSupportAutoConfiguration.java | 6 +++--- ...kaStreamsTopologyEndpointAutoConfiguration.java | 2 +- .../KafkaStreamsFunctionAutoConfiguration.java | 2 +- .../kafka/config/KafkaBinderConfiguration.java | 4 ++-- ...indingHandlerMappingsProviderConfiguration.java | 2 +- .../rabbit/config/RabbitBinderConfiguration.java | 14 +++++++------- .../stream/binder/rabbit/RabbitTestBinder.java | 2 +- .../stream/binder/tck/ContentTypeTckTests.java | 2 +- .../AvroMessageConverterAutoConfiguration.java | 2 +- .../config/SchemaRegistryClientConfiguration.java | 2 +- .../registry/config/SchemaServerConfiguration.java | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/GlobalKTableBinderConfiguration.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/GlobalKTableBinderConfiguration.java index f315b4116..8a6cc6d55 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/GlobalKTableBinderConfiguration.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/GlobalKTableBinderConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Import; * @author Chris Bono * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ MultiBinderPropertiesConfiguration.class, KafkaStreamsBinderHealthIndicatorConfiguration.class, KafkaStreamsJaasConfiguration.class}) diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderHealthIndicatorConfiguration.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderHealthIndicatorConfiguration.java index 9a00526d9..20fc76085 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderHealthIndicatorConfiguration.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderHealthIndicatorConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * * @author Arnaud Jardiné */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator") @ConditionalOnEnabledHealthIndicator("binders") public class KafkaStreamsBinderHealthIndicatorConfiguration { diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java index 195a8c401..7690b8963 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java @@ -82,7 +82,7 @@ import org.springframework.util.StringUtils; * @author Soby Chacko * @author Gary Russell */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ KafkaProperties.class, KafkaStreamsExtendedBindingProperties.class }) @ConditionalOnBean(BindingService.class) @AutoConfigureAfter(BindingServiceConfiguration.class) @@ -388,7 +388,7 @@ public class KafkaStreamsBinderSupportAutoConfiguration { return new EncodingDecodingBindAdviceHandler(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(value = KafkaStreamsBinderMetrics.class, name = "outerContext") @ConditionalOnClass(name = "io.micrometer.core.instrument.MeterRegistry") protected class KafkaStreamsBinderMetricsConfiguration { @@ -414,7 +414,7 @@ public class KafkaStreamsBinderSupportAutoConfiguration { } } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(name = "outerContext") @ConditionalOnMissingBean(KafkaStreamsBinderMetrics.class) @ConditionalOnClass(name = "io.micrometer.core.instrument.MeterRegistry") diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/endpoint/KafkaStreamsTopologyEndpointAutoConfiguration.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/endpoint/KafkaStreamsTopologyEndpointAutoConfiguration.java index a3c9f7763..2d3439c42 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/endpoint/KafkaStreamsTopologyEndpointAutoConfiguration.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/endpoint/KafkaStreamsTopologyEndpointAutoConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; * @author Soby Chacko * @since 3.0.4 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = { "org.springframework.boot.actuate.endpoint.annotation.Endpoint" }) @AutoConfigureAfter({EndpointAutoConfiguration.class, KafkaStreamsBinderSupportAutoConfiguration.class}) diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionAutoConfiguration.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionAutoConfiguration.java index 10588ccc7..12311fd5d 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionAutoConfiguration.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/function/KafkaStreamsFunctionAutoConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration; * @author Soby Chacko * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(StreamFunctionProperties.class) public class KafkaStreamsFunctionAutoConfiguration { diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java index a9313ed9e..d63a5cb01 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java @@ -170,7 +170,7 @@ public class KafkaBinderConfiguration { return kafkaJaasLoginModuleInitializer; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(value = KafkaBinderMetrics.class, name = "outerContext") @ConditionalOnClass(name = "io.micrometer.core.instrument.MeterRegistry") protected class KafkaBinderMetricsConfiguration { @@ -221,7 +221,7 @@ public class KafkaBinderConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(name = "outerContext") @ConditionalOnMissingBean(KafkaBinderMetrics.class) @ConditionalOnClass(name = "io.micrometer.core.instrument.MeterRegistry") diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ExtendedBindingHandlerMappingsProviderConfiguration.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ExtendedBindingHandlerMappingsProviderConfiguration.java index 6f626f62f..fd196153c 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ExtendedBindingHandlerMappingsProviderConfiguration.java +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/ExtendedBindingHandlerMappingsProviderConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * @author Oleg Zhurakousky * */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ExtendedBindingHandlerMappingsProviderConfiguration { @Bean diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java index 90af07463..9a6a92ed3 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java @@ -102,7 +102,7 @@ public class RabbitBinderConfiguration { /** * Configuration to be used when the cloud profile is set. */ - @Configuration + @Configuration(proxyBeanMethods = false) @Profile("cloud") protected static class CloudProfile { @@ -110,7 +110,7 @@ public class RabbitBinderConfiguration { * Configuration to be used when the cloud profile is set, and Cloud Connectors * are found on the classpath. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Cloud.class) protected static class CloudConnectors { @@ -125,7 +125,7 @@ public class RabbitBinderConfiguration { * set to {@code true}. */ // @checkstyle:off - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.stream.override-cloud-connectors", havingValue = "false", matchIfMissing = true) // @checkstyle:on // Required to parse Rabbit properties which are passed to the binder for @@ -176,7 +176,7 @@ public class RabbitBinderConfiguration { * {@code spring.cloud.stream.override-cloud-connectors} is set to * {@code true}. Defers to Spring Boot auto-configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty("spring.cloud.stream.override-cloud-connectors") @Import(RabbitConfiguration.class) protected static class OverrideCloudConnectors { @@ -185,7 +185,7 @@ public class RabbitBinderConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.cloud.Cloud") @Import(RabbitConfiguration.class) protected static class NoCloudConnectors { @@ -198,7 +198,7 @@ public class RabbitBinderConfiguration { * Configuration to be used when the cloud profile is not set. Defer to Spring Boot * auto-configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @Profile("!cloud") @Import(RabbitConfiguration.class) protected static class NoCloudProfile { @@ -209,7 +209,7 @@ public class RabbitBinderConfiguration { * Configuration for Rabbit health indicator. * */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator") @ConditionalOnEnabledHealthIndicator("binders") public static class RabbitHealthIndicatorConfiguration { diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitTestBinder.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitTestBinder.java index f68c8fd50..f9ad11295 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitTestBinder.java +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitTestBinder.java @@ -179,7 +179,7 @@ public class RabbitTestBinder extends this.applicationContext.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableIntegration static class Config { diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java index 823756368..5cf816e4b 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java @@ -725,7 +725,7 @@ public class ContentTypeTckTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomConverters { @Bean diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java index 154ac60cd..971825a98 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java +++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/avro/AvroMessageConverterAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.util.ReflectionUtils; * @author Ish Mahajan * @author Christian Tzolov */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "org.apache.avro.Schema") @ConditionalOnProperty(value = "spring.cloud.schemaRegistryClient.enabled", matchIfMissing = true) @ConditionalOnBean(type = "org.springframework.cloud.stream.schema.registry.client.SchemaRegistryClient") diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/client/config/SchemaRegistryClientConfiguration.java b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/client/config/SchemaRegistryClientConfiguration.java index 5173255a0..12e840bba 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/client/config/SchemaRegistryClientConfiguration.java +++ b/schema-registry/spring-cloud-stream-schema-registry-client/src/main/java/org/springframework/cloud/stream/schema/registry/client/config/SchemaRegistryClientConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.util.StringUtils; * @author Vinicius Carvalho * @author Soby Chacko */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SchemaRegistryClientProperties.class) public class SchemaRegistryClientConfiguration { diff --git a/schema-registry/spring-cloud-stream-schema-registry-core/src/main/java/org/springframework/cloud/stream/schema/registry/config/SchemaServerConfiguration.java b/schema-registry/spring-cloud-stream-schema-registry-core/src/main/java/org/springframework/cloud/stream/schema/registry/config/SchemaServerConfiguration.java index 92e80abbc..53b0fcb84 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-core/src/main/java/org/springframework/cloud/stream/schema/registry/config/SchemaServerConfiguration.java +++ b/schema-registry/spring-cloud-stream-schema-registry-core/src/main/java/org/springframework/cloud/stream/schema/registry/config/SchemaServerConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; * @author Vinicius Carvalho * @author Soby Chacko */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableJpaRepositories(basePackageClasses = SchemaRepository.class) @EnableConfigurationProperties(SchemaServerProperties.class) @Import(ServerController.class)