(kafka) branch trunk updated: KAFKA-18079 consumer-config does not work with console-share-consumer (#17925)

[chia7712]

This is an automated email from the ASF dual-hosted git repository.

chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 70babd57167 KAFKA-18079 consumer-config does not work with 
console-share-consumer (#17925)
70babd57167 is described below

commit 70babd57167f09ec85d25cb92b93794f2bc33e9e
Author: PoAn Yang <pay...@apache.org>
AuthorDate: Sun Nov 24 20:13:14 2024 +0800

    KAFKA-18079 consumer-config does not work with console-share-consumer 
(#17925)
    
    Reviewers: Andrew Schofield <aschofi...@confluent.io>, Chia-Ping Tsai 
<chia7...@gmail.com>
---
 .../apache/kafka/tools/consumer/ConsoleShareConsumerOptions.java  | 3 ++-
 .../kafka/tools/consumer/ConsoleShareConsumerOptionsTest.java     | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/tools/src/main/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptions.java
 
b/tools/src/main/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptions.java
index ea0b36fedaf..d4b1ed6f3d3 100644
--- 
a/tools/src/main/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptions.java
+++ 
b/tools/src/main/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptions.java
@@ -182,7 +182,8 @@ public final class ConsoleShareConsumerOptions extends 
CommandDefaultOptions {
     }
 
     private Properties buildConsumerProps(Properties consumerPropsFromFile, 
Properties extraConsumerProps, Set<String> groupIdsProvided) {
-        Properties consumerProps = new Properties(consumerPropsFromFile);
+        Properties consumerProps = new Properties();
+        consumerProps.putAll(consumerPropsFromFile);
         consumerProps.putAll(extraConsumerProps);
         consumerProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, 
bootstrapServer());
         if (consumerProps.getProperty(ConsumerConfig.CLIENT_ID_CONFIG) == 
null) {
diff --git 
a/tools/src/test/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptionsTest.java
 
b/tools/src/test/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptionsTest.java
index 31db9bd82ab..62b1cc64861 100644
--- 
a/tools/src/test/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptionsTest.java
+++ 
b/tools/src/test/java/org/apache/kafka/tools/consumer/ConsoleShareConsumerOptionsTest.java
@@ -19,6 +19,7 @@ package org.apache.kafka.tools.consumer;
 import org.apache.kafka.clients.consumer.AcknowledgeType;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.utils.Exit;
+import org.apache.kafka.common.utils.Utils;
 import org.apache.kafka.tools.ToolsTestUtils;
 
 import org.junit.jupiter.api.Test;
@@ -101,8 +102,11 @@ public class ConsoleShareConsumerOptionsTest {
 
         ConsoleShareConsumerOptions config = new 
ConsoleShareConsumerOptions(args);
 
-        assertEquals("1000", 
config.consumerProps().getProperty("request.timeout.ms"));
-        assertEquals("group1", config.consumerProps().getProperty("group.id"));
+        // KafkaShareConsumer uses Utils.propsToMap to convert the properties 
to a map,
+        // so using the same method to check the map has the expected values
+        Map<String, Object> configMap = 
Utils.propsToMap(config.consumerProps());
+        assertEquals("1000", configMap.get("request.timeout.ms"));
+        assertEquals("group1", configMap.get("group.id"));
     }
 
     @Test