From 5c70e2df43e3bb59bda52ef6e66b6ecfbbd2a468 Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Tue, 16 May 2017 17:58:09 +0530 Subject: [PATCH] Binding properties should override boot properties - This is especially applicable to `group.id` and `auto.offset.reset` which get set when configuring the consumer properties - Spring Boot Kafka properties are updated as binder configuration properties which get the least precedence - Update test Resolves #122 --- .../cloud/stream/binder/kafka/KafkaMessageChannelBinder.java | 4 ++-- .../kafka/KafkaBinderAutoConfigurationPropertiesTest.java | 2 ++ .../src/test/resources/binder-config-autoconfig.properties | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java b/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java index e67a7e0c3..a25fc040d 100644 --- a/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java +++ b/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java @@ -324,8 +324,6 @@ public class KafkaMessageChannelBinder extends props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class); props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class); props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, false); - props.put(ConsumerConfig.GROUP_ID_CONFIG, consumerGroup); - props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, anonymous ? "latest" : "earliest"); props.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, 100); if (!ObjectUtils.isEmpty(configurationProperties.getConfiguration())) { props.putAll(configurationProperties.getConfiguration()); @@ -336,6 +334,8 @@ public class KafkaMessageChannelBinder extends if (!ObjectUtils.isEmpty(consumerProperties.getExtension().getConfiguration())) { props.putAll(consumerProperties.getExtension().getConfiguration()); } + props.put(ConsumerConfig.GROUP_ID_CONFIG, consumerGroup); + props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, anonymous ? "latest" : "earliest"); return new DefaultKafkaConsumerFactory<>(props); } diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java index 7d6eeffd8..6b03a3072 100644 --- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java +++ b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java @@ -86,6 +86,8 @@ public class KafkaBinderAutoConfigurationPropertiesTest { Map consumerConfigs = (Map) ReflectionUtils.getField(consumerFactoryConfigField, consumerFactory); assertTrue(consumerConfigs.get("key.deserializer").equals(LongDeserializer.class)); assertTrue(consumerConfigs.get("value.deserializer").equals(LongDeserializer.class)); + assertTrue(consumerConfigs.get("group.id").equals("test")); + assertTrue(consumerConfigs.get("auto.offset.reset").equals("latest")); assertTrue((((List) consumerConfigs.get("bootstrap.servers")).containsAll(bootstrapServers))); } diff --git a/spring-cloud-stream-binder-kafka/src/test/resources/binder-config-autoconfig.properties b/spring-cloud-stream-binder-kafka/src/test/resources/binder-config-autoconfig.properties index 8ac39c0e5..1a98eeee6 100644 --- a/spring-cloud-stream-binder-kafka/src/test/resources/binder-config-autoconfig.properties +++ b/spring-cloud-stream-binder-kafka/src/test/resources/binder-config-autoconfig.properties @@ -5,3 +5,6 @@ spring.kafka.consumer.valueDeserializer=org.apache.kafka.common.serialization.Lo spring.kafka.producer.batchSize=10 spring.kafka.bootstrapServers=10.98.09.199:9092,10.98.09.196:9092 spring.kafka.producer.compressionType=snappy +# Test consumer properties +spring.kafka.consumer.auto-offset-reset=earliest +spring.kafka.consumer.group-id=testEmbeddedKafkaApplication