(kafka) branch trunk updated: MINOR: Add topicId parameter to OffsetAndMetadata.fromRequest for TxnOffsetCommit (#22159)

[dajac]

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

dajac 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 82d0c12e26c MINOR: Add topicId parameter to 
OffsetAndMetadata.fromRequest for TxnOffsetCommit (#22159)
82d0c12e26c is described below

commit 82d0c12e26c7c68f6188c8a5a808e1548b11a119
Author: David Jacot <david.ja...@gmail.com>
AuthorDate: Tue Apr 28 17:58:08 2026 +0200

    MINOR: Add topicId parameter to OffsetAndMetadata.fromRequest for 
TxnOffsetCommit (#22159)
    
    This patch adds a `topicId` parameter to the
    `TxnOffsetCommitRequestPartition` overload of
    `OffsetAndMetadata.fromRequest`, mirroring the existing
    `OffsetCommitRequestPartition` overload. The single caller in
    `OffsetMetadataManager.commitTransactionalOffset` passes
    `Uuid.ZERO_UUID` to preserve the current behavior.
    
    The `testFromTransactionalRequest` test is converted to a parameterized
    test that covers both `Uuid.ZERO_UUID` and a random topic ID.
    
    Reviewers: Andrew Schofield <aschofi...@confluent.io>
---
 .../org/apache/kafka/coordinator/group/OffsetAndMetadata.java |  3 ++-
 .../apache/kafka/coordinator/group/OffsetMetadataManager.java |  1 +
 .../apache/kafka/coordinator/group/OffsetAndMetadataTest.java | 11 +++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetAndMetadata.java
 
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetAndMetadata.java
index b8c8ee28238..8ec931013b0 100644
--- 
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetAndMetadata.java
+++ 
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetAndMetadata.java
@@ -190,6 +190,7 @@ public class OffsetAndMetadata {
      * @return An OffsetAndMetadata created from an 
OffsetCommitRequestPartition request.
      */
     public static OffsetAndMetadata fromRequest(
+        Uuid topicId,
         TxnOffsetCommitRequestData.TxnOffsetCommitRequestPartition partition,
         long currentTimeMs
     ) {
@@ -200,7 +201,7 @@ public class OffsetAndMetadata {
                 OffsetAndMetadata.NO_METADATA : partition.committedMetadata(),
             currentTimeMs,
             OptionalLong.empty(),
-            Uuid.ZERO_UUID
+            topicId
         );
     }
 }
diff --git 
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java
 
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java
index 10ff727e637..9ed21e4798e 100644
--- 
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java
+++ 
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java
@@ -737,6 +737,7 @@ public class OffsetMetadataManager {
                         .setErrorCode(Errors.NONE.code()));
 
                     final OffsetAndMetadata offsetAndMetadata = 
OffsetAndMetadata.fromRequest(
+                        Uuid.ZERO_UUID,
                         partition,
                         currentTimeMs
                     );
diff --git 
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetAndMetadataTest.java
 
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetAndMetadataTest.java
index 2cc585b06af..6739551640d 100644
--- 
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetAndMetadataTest.java
+++ 
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetAndMetadataTest.java
@@ -161,8 +161,9 @@ public class OffsetAndMetadataTest {
         );
     }
 
-    @Test
-    public void testFromTransactionalRequest() {
+    @ParameterizedTest
+    @MethodSource("uuids")
+    public void testFromTransactionalRequest(Uuid uuid) {
         MockTime time = new MockTime();
 
         TxnOffsetCommitRequestData.TxnOffsetCommitRequestPartition partition =
@@ -179,8 +180,9 @@ public class OffsetAndMetadataTest {
                 "",
                 time.milliseconds(),
                 OptionalLong.empty(),
-                Uuid.ZERO_UUID
+                uuid
             ), OffsetAndMetadata.fromRequest(
+                uuid,
                 partition,
                 time.milliseconds()
             )
@@ -197,8 +199,9 @@ public class OffsetAndMetadataTest {
                 "hello",
                 time.milliseconds(),
                 OptionalLong.empty(),
-                Uuid.ZERO_UUID
+                uuid
             ), OffsetAndMetadata.fromRequest(
+                uuid,
                 partition,
                 time.milliseconds()
             )