(kafka) branch trunk updated: MINOR: Replace Collections factory methods with Java 11+ equivalents in storage and metadata (#21659)

[clolov]

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

clolov 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 4796f46f5eb MINOR: Replace Collections factory methods with Java 11+ 
equivalents in storage and metadata (#21659)
4796f46f5eb is described below

commit 4796f46f5ebc85c3c43c691acd67025b9b4da354
Author: Maros Orsak <maros.orsak...@gmail.com>
AuthorDate: Thu Mar 19 14:00:39 2026 +0100

    MINOR: Replace Collections factory methods with Java 11+ equivalents in 
storage and metadata (#21659)
    
    This PR is another one with changing old JDK 8 API to JDK 11.
    
    Question: I wonder if we should add also parts in test code or simply
    divide it? I didn't cover tests in my previous PR so maybe to stay
    consistent just make changes to production code and then we can simply
    add into tests multiple modules?
    Reviewers: Christo Lolov <lol...@amazon.com>, Ken Huang
    <s7133...@gmail.com>, Nilesh Kumar
    <nileshkum...@gmail.com>
    
    ---------
    
    Signed-off-by: see-quick <maros.orsak...@gmail.com>
---
 metadata/src/main/java/org/apache/kafka/metadata/MetadataCache.java    | 3 +--
 .../java/org/apache/kafka/storage/internals/log/LogCleanerManager.java | 3 +--
 .../main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/metadata/src/main/java/org/apache/kafka/metadata/MetadataCache.java 
b/metadata/src/main/java/org/apache/kafka/metadata/MetadataCache.java
index 9fb3ec24640..555f1866bd8 100644
--- a/metadata/src/main/java/org/apache/kafka/metadata/MetadataCache.java
+++ b/metadata/src/main/java/org/apache/kafka/metadata/MetadataCache.java
@@ -36,7 +36,6 @@ import org.apache.kafka.server.common.MetadataVersion;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -188,7 +187,7 @@ public interface MetadataCache extends ConfigRepository {
             clusterId,
             
brokerToNodes.values().stream().flatMap(Collection::stream).collect(Collectors.toList()),
             partitionInfos,
-            Collections.emptySet(),
+            Set.of(),
             internalTopics,
             controllerNode
         );
diff --git 
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleanerManager.java
 
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleanerManager.java
index d7781a30254..ba64c1d07b8 100644
--- 
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleanerManager.java
+++ 
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogCleanerManager.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -521,7 +520,7 @@ public class LogCleanerManager {
                 LOG.error("Failed to access checkpoint file in dir {}", 
sourceLogDir.getAbsolutePath(), e);
             }
 
-            Set<TopicPartition> logUncleanablePartitions = 
uncleanablePartitions.getOrDefault(sourceLogDir.toString(), 
Collections.emptySet());
+            Set<TopicPartition> logUncleanablePartitions = 
uncleanablePartitions.getOrDefault(sourceLogDir.toString(), Set.of());
             if (logUncleanablePartitions.contains(topicPartition)) {
                 logUncleanablePartitions.remove(topicPartition);
                 markPartitionUncleanable(destLogDir.toString(), 
topicPartition);
diff --git 
a/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java 
b/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java
index ef5cc755937..e523a3218c3 100644
--- 
a/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java
+++ 
b/storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java
@@ -70,7 +70,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -1588,7 +1587,7 @@ public class UnifiedLog implements AutoCloseable {
 
         return new LogAppendInfo(firstOffset, lastOffset, lastLeaderEpochOpt, 
maxTimestamp,
                 RecordBatch.NO_TIMESTAMP, logStartOffset, 
RecordValidationStats.EMPTY, sourceCompression,
-                validBytesCount, lastOffsetOfFirstBatch, 
Collections.emptyList(), LeaderHwChange.NONE);
+                validBytesCount, lastOffsetOfFirstBatch, List.of(), 
LeaderHwChange.NONE);
     }
 
     /**