From a8c948a6b25699abfdededc42cf371970bdf04e4 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 21 Sep 2021 18:22:33 -0400 Subject: [PATCH] GH-1148: Native changes required KafkaBinderConfiguration class needs more pruning for native compilation Resolves https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/1148 --- .../config/KafkaBinderConfiguration.java | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java b/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java index 953bab7e1..b8d03225c 100644 --- a/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java +++ b/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java @@ -22,7 +22,6 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.binder.MeterBinder; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -81,22 +80,12 @@ import org.springframework.messaging.converter.MessageConverter; * @author Artem Bilan * @author Aldo Sinanaj */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(Binder.class) @Import({ KafkaAutoConfiguration.class, KafkaBinderHealthIndicatorConfiguration.class }) @EnableConfigurationProperties({ KafkaExtendedBindingProperties.class }) public class KafkaBinderConfiguration { - @Autowired - private KafkaExtendedBindingProperties kafkaExtendedBindingProperties; - - @SuppressWarnings("rawtypes") - @Autowired - private ProducerListener producerListener; - - @Autowired - private KafkaProperties kafkaProperties; - @Bean KafkaBinderConfigurationProperties configurationProperties( KafkaProperties kafkaProperties) { @@ -106,12 +95,12 @@ public class KafkaBinderConfiguration { @Bean KafkaTopicProvisioner provisioningProvider( KafkaBinderConfigurationProperties configurationProperties, - ObjectProvider adminClientConfigCustomizer) { + ObjectProvider adminClientConfigCustomizer, KafkaProperties kafkaProperties) { return new KafkaTopicProvisioner(configurationProperties, - this.kafkaProperties, adminClientConfigCustomizer.getIfUnique()); + kafkaProperties, adminClientConfigCustomizer.getIfUnique()); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"rawtypes", "unchecked"}) @Bean KafkaMessageChannelBinder kafkaMessageChannelBinder( KafkaBinderConfigurationProperties configurationProperties, @@ -125,16 +114,17 @@ public class KafkaBinderConfiguration { ObjectProvider dlqDestinationResolver, ObjectProvider clientFactoryCustomizer, ObjectProvider consumerConfigCustomizer, - ObjectProvider producerConfigCustomizer + ObjectProvider producerConfigCustomizer, + ProducerListener producerListener, KafkaExtendedBindingProperties kafkaExtendedBindingProperties ) { KafkaMessageChannelBinder kafkaMessageChannelBinder = new KafkaMessageChannelBinder( configurationProperties, provisioningProvider, listenerContainerCustomizer, sourceCustomizer, rebalanceListener.getIfUnique(), dlqPartitionFunction.getIfUnique(), dlqDestinationResolver.getIfUnique()); - kafkaMessageChannelBinder.setProducerListener(this.producerListener); + kafkaMessageChannelBinder.setProducerListener(producerListener); kafkaMessageChannelBinder - .setExtendedBindingProperties(this.kafkaExtendedBindingProperties); + .setExtendedBindingProperties(kafkaExtendedBindingProperties); kafkaMessageChannelBinder.setProducerMessageHandlerCustomizer(messageHandlerCustomizer); kafkaMessageChannelBinder.setConsumerEndpointCustomizer(consumerCustomizer); kafkaMessageChannelBinder.setClientFactoryCustomizer(clientFactoryCustomizer.getIfUnique());