From 94eef6725ebd623e2ce329c90ffe3948d51884fa Mon Sep 17 00:00:00 2001 From: Parker Date: Fri, 4 Apr 2025 23:24:17 +0800 Subject: [PATCH 1/4] MINOR: Clean up unreachable code in FetcherTest --- .../org/apache/kafka/clients/consumer/internals/FetcherTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index 483b54e5f430f..d110dde136c85 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -3664,7 +3664,6 @@ public void testFetcherDontCacheAnyData() { responseData.forEach((topicPartition, partitionData) -> assertEquals(records, partitionData.records())); LinkedHashMap nonResponseData = fetchResponse.responseData(emptyMap(), version); assertEquals(emptyMap().size(), nonResponseData.size()); - nonResponseData.forEach((topicPartition, partitionData) -> assertEquals(MemoryRecords.EMPTY, partitionData.records())); } private OffsetsForLeaderEpochResponse prepareOffsetsForLeaderEpochResponse( From ad710e75286832b3d51a6477f94e1483859d9202 Mon Sep 17 00:00:00 2001 From: Parker Date: Fri, 4 Apr 2025 23:33:27 +0800 Subject: [PATCH 2/4] Replace emptyMap with zero --- .../apache/kafka/clients/consumer/internals/FetcherTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index d110dde136c85..5227de8792386 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -3663,7 +3663,7 @@ public void testFetcherDontCacheAnyData() { assertEquals(topicNames.size(), responseData.size()); responseData.forEach((topicPartition, partitionData) -> assertEquals(records, partitionData.records())); LinkedHashMap nonResponseData = fetchResponse.responseData(emptyMap(), version); - assertEquals(emptyMap().size(), nonResponseData.size()); + assertEquals(0, nonResponseData.size()); } private OffsetsForLeaderEpochResponse prepareOffsetsForLeaderEpochResponse( From d823dc427c56218a45cb53a24c8f445217d4c88a Mon Sep 17 00:00:00 2001 From: Parker Date: Fri, 4 Apr 2025 23:57:14 +0800 Subject: [PATCH 3/4] Replace emptyMap with Map.of --- .../apache/kafka/clients/consumer/internals/FetcherTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index 5227de8792386..acbe050fcaa72 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -3662,7 +3662,7 @@ public void testFetcherDontCacheAnyData() { LinkedHashMap responseData = fetchResponse.responseData(topicNames, version); assertEquals(topicNames.size(), responseData.size()); responseData.forEach((topicPartition, partitionData) -> assertEquals(records, partitionData.records())); - LinkedHashMap nonResponseData = fetchResponse.responseData(emptyMap(), version); + LinkedHashMap nonResponseData = fetchResponse.responseData(Map.of(), version); assertEquals(0, nonResponseData.size()); } From 48eacc20e6e8d9628e8aaba0eb7ef48e3ac0556c Mon Sep 17 00:00:00 2001 From: Parker Date: Sat, 5 Apr 2025 00:12:16 +0800 Subject: [PATCH 4/4] Replace assert zero with assert isEmpty --- .../apache/kafka/clients/consumer/internals/FetcherTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java index acbe050fcaa72..45a747e04daa4 100644 --- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java +++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java @@ -3663,7 +3663,7 @@ public void testFetcherDontCacheAnyData() { assertEquals(topicNames.size(), responseData.size()); responseData.forEach((topicPartition, partitionData) -> assertEquals(records, partitionData.records())); LinkedHashMap nonResponseData = fetchResponse.responseData(Map.of(), version); - assertEquals(0, nonResponseData.size()); + assertTrue(nonResponseData.isEmpty()); } private OffsetsForLeaderEpochResponse prepareOffsetsForLeaderEpochResponse(