From a090614709628e760103b6b7b3ae6a4c6a84462a Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 14 Aug 2018 10:30:52 -0400 Subject: [PATCH] kafka Streams binder configuration fix (to address core changes made in regards to Boot 2.1) Ensure that KafkaStreamsBinderSupportAutoConfiguration runs after BindingServiceConfiguration from core. --- .../streams/KafkaStreamsBinderSupportAutoConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java index b3fdaf8fe..d938404db 100644 --- a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java +++ b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderSupportAutoConfiguration.java @@ -27,6 +27,7 @@ import org.apache.kafka.streams.errors.LogAndFailExceptionHandler; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.kafka.KafkaProperties; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -35,6 +36,7 @@ import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStr import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsExtendedBindingProperties; import org.springframework.cloud.stream.binding.BindingService; import org.springframework.cloud.stream.binding.StreamListenerResultAdapter; +import org.springframework.cloud.stream.config.BindingServiceConfiguration; import org.springframework.cloud.stream.config.BindingServiceProperties; import org.springframework.cloud.stream.converter.CompositeMessageConverterFactory; import org.springframework.context.annotation.Bean; @@ -48,6 +50,7 @@ import org.springframework.util.ObjectUtils; */ @EnableConfigurationProperties(KafkaStreamsExtendedBindingProperties.class) @ConditionalOnBean(BindingService.class) +@AutoConfigureAfter(BindingServiceConfiguration.class) public class KafkaStreamsBinderSupportAutoConfiguration { @Bean