You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jy...@apache.org on 2026/10/01 06:32:23 UTC

(kafka) branch trunk updated: MINOR: Replace Collections factory methods with Java 9+ equivalents in server tests (#23652)

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

m1a2st 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 3aead3797e6 MINOR: Replace Collections factory methods with Java 9+ equivalents in server tests (#23652)
3aead3797e6 is described below

commit 3aead3797e6d0aa60d17b6b20e22d8c647351aa5
Author: SunMin Lee <su...@gmail.com>
AuthorDate: Thu Oct 1 15:32:15 2026 +0900

    MINOR: Replace Collections factory methods with Java 9+ equivalents in server tests (#23652)
    
    Follow-up to #23617 (storage tests). This applies the same replacement
    to
    the server tests, in line with #23242 (streams) and #23344 (tools).
    The server production code has no remaining uses of these methods.
    
    Collections.singletonList and singleton become List.of and Set.of, and
    Collections.emptyList and emptyMap become List.of() and Map.of().
    
    **Not changed**
    - Collections.singletonMap(SSL_CIPHER_SUITES_CONFIG, null) in
    RequestTest
      passes a null value on purpose, and Map.of rejects null values.
    - ClientQuotasRequestTest keeps Collections.singletonMap because the
    user,
    client-id and IP values can be null. The existing comments in that file
      explain this.
    - Arrays.asList in ShareGroupDLQStateManagerTest is out of scope here.
    One
      of its two uses holds a null element, which List.of rejects.
    
    **Verification**
    - ./gradlew server:checkstyleTest server:spotlessCheck: passed
    - KRaftTopicCreatorTest, AbstractKafkaConfigTest, MetadataRequestTest
    and
      ProduceRequestTest: all passed
    
    Reviewers: Ken Huang <s7...@gmail.com>
---
 .../apache/kafka/server/KRaftTopicCreatorTest.java |  4 ++--
 .../apache/kafka/server/MetadataRequestTest.java   |  5 ++---
 .../server/config/AbstractKafkaConfigTest.java     |  3 +--
 .../kafka/server/requests/ProduceRequestTest.java  | 25 +++++++++++-----------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java b/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java
index d1b728b94a1..9f4e9a866b9 100644
--- a/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java
+++ b/server/src/test/java/org/apache/kafka/server/KRaftTopicCreatorTest.java
@@ -54,9 +54,9 @@ import org.mockito.ArgumentCaptor;
 
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -88,7 +88,7 @@ public class KRaftTopicCreatorTest {
             .setMaxVersion(ApiKeys.CREATE_TOPICS.latestVersion());
 
         when(brokerToController.controllerApiVersions())
-            .thenReturn(Optional.of(NodeApiVersions.create(Collections.singleton(createTopicApiVersion))));
+            .thenReturn(Optional.of(NodeApiVersions.create(Set.of(createTopicApiVersion))));
 
         kraftTopicCreator = new KRaftTopicCreator(brokerToController);
     }
diff --git a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java
index 95b157001da..d14a6560322 100644
--- a/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java
+++ b/server/src/test/java/org/apache/kafka/server/MetadataRequestTest.java
@@ -43,7 +43,6 @@ import org.apache.kafka.test.TestUtils;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -183,7 +182,7 @@ public class MetadataRequestTest {
         clusterInstance.createTopic("t1", 3, (short) 2);
         clusterInstance.createTopic("t2", 3, (short) 2);
 
-        MetadataResponse metadataResponse = sendMetadataRequest(new MetadataRequest.Builder(Collections.emptyList(), true, (short) 4).build());
+        MetadataResponse metadataResponse = sendMetadataRequest(new MetadataRequest.Builder(List.of(), true, (short) 4).build());
         assertTrue(metadataResponse.errors().isEmpty(), "Response should have no errors");
         assertTrue(metadataResponse.topicMetadata().isEmpty(), "Response should have no topics");
     }
@@ -240,7 +239,7 @@ public class MetadataRequestTest {
         clusterInstance.createTopic("t2", 3, (short) 2);
 
         // v0, Empty list represents all topics
-        MetadataResponse metadataResponseV0 = sendMetadataRequest(new MetadataRequest(requestData(Collections.emptyList(), true), (short) 0));
+        MetadataResponse metadataResponseV0 = sendMetadataRequest(new MetadataRequest(requestData(List.of(), true), (short) 0));
         assertTrue(metadataResponseV0.errors().isEmpty(), "V0 Response should have no errors");
         assertEquals(2, metadataResponseV0.topicMetadata().size(), "V0 Response should have 2 (all) topics");
 
diff --git a/server/src/test/java/org/apache/kafka/server/config/AbstractKafkaConfigTest.java b/server/src/test/java/org/apache/kafka/server/config/AbstractKafkaConfigTest.java
index 6661d2db593..eba619d4325 100644
--- a/server/src/test/java/org/apache/kafka/server/config/AbstractKafkaConfigTest.java
+++ b/server/src/test/java/org/apache/kafka/server/config/AbstractKafkaConfigTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -49,7 +48,7 @@ public class AbstractKafkaConfigTest {
 
     @Test
     public void testPopulateSynonymsOnEmptyMap() {
-        assertEquals(Collections.emptyMap(), AbstractKafkaConfig.populateSynonyms(Collections.emptyMap()));
+        assertEquals(Map.of(), AbstractKafkaConfig.populateSynonyms(Map.of()));
     }
 
     @SuppressWarnings("removal") // this test sets broker.id, which is deprecated (KIP-1232) but still works until 5.0
diff --git a/server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java b/server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java
index 9f141a8a4c1..ec1b6e36566 100644
--- a/server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java
+++ b/server/src/test/java/org/apache/kafka/server/requests/ProduceRequestTest.java
@@ -52,7 +52,6 @@ import com.yammer.metrics.core.Meter;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -127,10 +126,10 @@ public class ProduceRequestTest {
         MemoryRecords records = MemoryRecords.withRecords(Compression.NONE,
             new SimpleRecord("key".getBytes(), "value".getBytes()));
         ProduceRequest request = ProduceRequest.builder(new ProduceRequestData()
-            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList(
+            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(List.of(
                 new ProduceRequestData.TopicProduceData()
                     .setTopicId(topicId)
-                    .setPartitionData(Collections.singletonList(
+                    .setPartitionData(List.of(
                         new ProduceRequestData.PartitionProduceData()
                             .setIndex(0)
                             .setRecords(records))))
@@ -162,10 +161,10 @@ public class ProduceRequestTest {
         memoryRecords.buffer().array()[DefaultRecordBatch.RECORD_BATCH_OVERHEAD + lz4ChecksumOffset] = 0;
 
         ProduceRequest request = ProduceRequest.builder(new ProduceRequestData()
-            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList(
+            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(List.of(
                 new ProduceRequestData.TopicProduceData()
                     .setTopicId(topicId)
-                    .setPartitionData(Collections.singletonList(
+                    .setPartitionData(List.of(
                         new ProduceRequestData.PartitionProduceData()
                             .setIndex(partition)
                             .setRecords(memoryRecords))))
@@ -208,10 +207,10 @@ public class ProduceRequestTest {
 
         // v7 uses topic name rather than topic ID
         ProduceRequestData data = new ProduceRequestData()
-            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList(
+            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(List.of(
                 new ProduceRequestData.TopicProduceData()
                     .setName(TOPIC)
-                    .setPartitionData(Collections.singletonList(
+                    .setPartitionData(List.of(
                         new ProduceRequestData.PartitionProduceData()
                             .setIndex(0)
                             .setRecords(memoryRecords))))
@@ -390,10 +389,10 @@ public class ProduceRequestTest {
 
     private ProduceRequest produceRequest(Uuid topicId, MemoryRecords records) {
         return ProduceRequest.builder(new ProduceRequestData()
-            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList(
+            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(List.of(
                 new ProduceRequestData.TopicProduceData()
                     .setTopicId(topicId)
-                    .setPartitionData(Collections.singletonList(
+                    .setPartitionData(List.of(
                         new ProduceRequestData.PartitionProduceData()
                             .setIndex(0)
                             .setRecords(records))))
@@ -425,10 +424,10 @@ public class ProduceRequestTest {
                                              MemoryRecords records, long expectedOffset, Errors expectedError) throws IOException, ExecutionException, InterruptedException {
         Uuid topicId = getTopicId();
         ProduceRequest request = ProduceRequest.builder(new ProduceRequestData()
-            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList(
+            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(List.of(
                 new ProduceRequestData.TopicProduceData()
                     .setTopicId(topicId)
-                    .setPartitionData(Collections.singletonList(
+                    .setPartitionData(List.of(
                         new ProduceRequestData.PartitionProduceData()
                             .setIndex(partition)
                             .setRecords(records))))
@@ -465,10 +464,10 @@ public class ProduceRequestTest {
         MemoryRecords records = builder.build();
 
         ProduceResponse response = sendProduceRequest(leaderId, ProduceRequest.builder(new ProduceRequestData()
-            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(Collections.singletonList(
+            .setTopicData(new ProduceRequestData.TopicProduceDataCollection(List.of(
                 new ProduceRequestData.TopicProduceData()
                     .setTopicId(topicId)
-                    .setPartitionData(Collections.singletonList(
+                    .setPartitionData(List.of(
                         new ProduceRequestData.PartitionProduceData()
                             .setIndex(0)
                             .setRecords(records))))