(kafka) branch trunk updated: MINOR: Consumer tidying (#21832)

[schofielaj]

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

schofielaj 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 010f81bd75d MINOR: Consumer tidying (#21832)
010f81bd75d is described below

commit 010f81bd75d1f34bbc7b764f6e80806b7cdc3577
Author: Andrew Schofield <aschofi...@confluent.io>
AuthorDate: Fri Mar 20 14:29:46 2026 +0000

    MINOR: Consumer tidying (#21832)
    
    Resolves a couple of review comments from
    https://github.com/apache/kafka/pull/21711. The remaining comments are
    in `ShareConsumerTest` and will be addressed separately.
    
    Reviewers: Lianet Magrans <lmagr...@confluent.io>, Viktor Somogyi-Vass
     <viktorsomo...@gmail.com>, Chia-Ping Tsai <chia7...@gmail.com>
---
 .../apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java   | 4 ++--
 .../apache/kafka/clients/consumer/internals/ShareConsumerImpl.java    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java
 
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java
index 3176225c2d4..37829111fcb 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java
@@ -1824,7 +1824,7 @@ public class AsyncKafkaConsumer<K, V> implements 
ConsumerDelegate<K, V> {
     }
 
     /**
-     * Get the current subscription.  or an empty set if no such call has
+     * Get the current subscription, or an empty set if no such call has
      * been made.
      * @return The set of topics currently subscribed to
      */
@@ -1832,7 +1832,7 @@ public class AsyncKafkaConsumer<K, V> implements 
ConsumerDelegate<K, V> {
     public Set<String> subscription() {
         acquireAndEnsureOpen();
         try {
-            return Collections.unmodifiableSet(subscriptions.subscription());
+            return Set.copyOf(subscriptions.subscription());
         } finally {
             release();
         }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java
 
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java
index 6e221877609..7504eecf5bd 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java
@@ -81,6 +81,7 @@ import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -958,7 +959,7 @@ public class ShareConsumerImpl<K, V> implements 
ShareConsumerDelegate<K, V> {
      */
     @Override
     public Map<MetricName, ? extends Metric> metrics() {
-        return Map.copyOf(metrics.metrics());
+        return Collections.unmodifiableMap(metrics.metrics());
     }
 
     /**