(kafka) branch trunk updated: KAFKA-19659: Wrong generic type for UnregisterBrokerOptions (#20490)

[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 af03353f718 KAFKA-19659: Wrong generic type for 
UnregisterBrokerOptions (#20490)
af03353f718 is described below

commit af03353f718249553b1d675a240eca06c8e7b5f1
Author: Kuan-Po Tseng <brandb...@gmail.com>
AuthorDate: Fri Sep 5 23:50:05 2025 +0800

    KAFKA-19659: Wrong generic type for UnregisterBrokerOptions (#20490)
    
    Fix wrong generic type for UnregisterBrokerOptions
    
    Reviewers: Andrew Schofield <aschofi...@confluent.io>
---
 .../java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java  | 2 +-
 .../java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
index bb814d51e74..63e0a06ea24 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
@@ -20,5 +20,5 @@ package org.apache.kafka.clients.admin;
 /**
  * Options for {@link Admin#unregisterBroker(int, UnregisterBrokerOptions)}.
  */
-public class UnregisterBrokerOptions extends 
AbstractOptions<UpdateFeaturesOptions> {
+public class UnregisterBrokerOptions extends 
AbstractOptions<UnregisterBrokerOptions> {
 }
diff --git 
a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java
 
b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java
index e7fa11177d3..9084a25836e 100644
--- 
a/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java
+++ 
b/clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java
@@ -9952,9 +9952,7 @@ public class KafkaAdminClientTest {
             env.kafkaClient().setNodeApiVersions(
                     NodeApiVersions.create(ApiKeys.UNREGISTER_BROKER.id, 
(short) 0, (short) 0));
 
-            UnregisterBrokerOptions options = new UnregisterBrokerOptions();
-            options.timeoutMs = 10;
-            UnregisterBrokerResult result = 
env.adminClient().unregisterBroker(nodeId, options);
+            UnregisterBrokerResult result = 
env.adminClient().unregisterBroker(nodeId, new 
UnregisterBrokerOptions().timeoutMs(10));
 
             // Validate response
             assertNotNull(result.all());