From 143b96f79d944d9d5ee8e5a05f5cf24783a9b842 Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Thu, 1 Jun 2017 15:35:23 +0530 Subject: [PATCH] Allow consumer group.id to be overridden - This change will allow consumer's group.id to be overridden from possible options (Spring Boot Kafka properties, binder configuration properties etc.,) Resolves #149 --- .../cloud/stream/binder/kafka/KafkaMessageChannelBinder.java | 3 +-- .../kafka/KafkaBinderAutoConfigurationPropertiesTest.java | 2 +- .../src/test/resources/binder-config-autoconfig.properties | 2 +- 3 files changed, 3 insertions(+), 4 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 0caf07795..ec32fc27a 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 @@ -335,6 +335,7 @@ public class KafkaMessageChannelBinder extends props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, false); props.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, 100); props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, anonymous ? "latest" : "earliest"); + props.put(ConsumerConfig.GROUP_ID_CONFIG, consumerGroup); if (!ObjectUtils.isEmpty(configurationProperties.getConfiguration())) { props.putAll(configurationProperties.getConfiguration()); @@ -345,8 +346,6 @@ public class KafkaMessageChannelBinder extends if (!ObjectUtils.isEmpty(consumerProperties.getExtension().getConfiguration())) { props.putAll(consumerProperties.getExtension().getConfiguration()); } - - props.put(ConsumerConfig.GROUP_ID_CONFIG, consumerGroup); if (!ObjectUtils.isEmpty(consumerProperties.getExtension().getStartOffset())) { props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, consumerProperties.getExtension().getStartOffset().name()); 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 aba1cc370..a26665bee 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 @@ -97,7 +97,7 @@ public class KafkaBinderAutoConfigurationPropertiesTest { 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("group.id").equals("groupIdFromBootConfig")); assertTrue(consumerConfigs.get("auto.offset.reset").equals("earliest")); 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 1a98eeee6..38d0d9f2a 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 @@ -7,4 +7,4 @@ 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 +spring.kafka.consumer.group-id=groupIdFromBootConfig