root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: Convert streams group options to consumer group options in Admin APIs (#19583) 

This PR is fixing the issue introduced in #19120
The input `StreamsGroup`-options must not be ignored, but it must be
converted to `ConsumerGroup`-options.

Reviewers: Lucas Brutschy <lbrutschy@confluent.io>
This commit is contained in:
Alieh Saeedi 2025-05-06 13:26:56 +02:00 committed by GitHub
parent d2bd68d50c
commit 54b3b3debc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
View File

@ -3779,7 +3779,10 @@ public class KafkaAdminClient extends AdminClient {
Map.Entry::getKey, Map.Entry::getKey,
entry -> new ListConsumerGroupOffsetsSpec().topicPartitions(entry.getValue().topicPartitions()) entry -> new ListConsumerGroupOffsetsSpec().topicPartitions(entry.getValue().topicPartitions())
)); ));
return new ListStreamsGroupOffsetsResult(listConsumerGroupOffsets(consumerGroupSpecs, new ListConsumerGroupOffsetsOptions())); ListConsumerGroupOffsetsOptions consumerGroupOptions = new ListConsumerGroupOffsetsOptions()
.requireStable(options.requireStable())
.timeoutMs(options.timeoutMs());
return new ListStreamsGroupOffsetsResult(listConsumerGroupOffsets(consumerGroupSpecs, consumerGroupOptions));
} }
@Override @Override
@ -3794,7 +3797,9 @@ public class KafkaAdminClient extends AdminClient {
@Override @Override
public DeleteStreamsGroupsResult deleteStreamsGroups(Collection<String> groupIds, DeleteStreamsGroupsOptions options) { public DeleteStreamsGroupsResult deleteStreamsGroups(Collection<String> groupIds, DeleteStreamsGroupsOptions options) {
return new DeleteStreamsGroupsResult(deleteConsumerGroups(groupIds, new DeleteConsumerGroupsOptions())); DeleteConsumerGroupsOptions consumerGroupOptions = new DeleteConsumerGroupsOptions()
.timeoutMs(options.timeoutMs());
return new DeleteStreamsGroupsResult(deleteConsumerGroups(groupIds, consumerGroupOptions));
} }
@Override @Override
@ -3814,7 +3819,9 @@ public class KafkaAdminClient extends AdminClient {
String groupId, String groupId,
Set<TopicPartition> partitions, Set<TopicPartition> partitions,
DeleteStreamsGroupOffsetsOptions options) { DeleteStreamsGroupOffsetsOptions options) {
return new DeleteStreamsGroupOffsetsResult(deleteConsumerGroupOffsets(groupId, partitions, new DeleteConsumerGroupOffsetsOptions())); DeleteConsumerGroupOffsetsOptions consumerGroupOptions = new DeleteConsumerGroupOffsetsOptions()
.timeoutMs(options.timeoutMs());
return new DeleteStreamsGroupOffsetsResult(deleteConsumerGroupOffsets(groupId, partitions, consumerGroupOptions));
} }
@Override @Override
@ -4273,7 +4280,9 @@ public class KafkaAdminClient extends AdminClient {
Map<TopicPartition, OffsetAndMetadata> offsets, Map<TopicPartition, OffsetAndMetadata> offsets,
AlterStreamsGroupOffsetsOptions options AlterStreamsGroupOffsetsOptions options
) { ) {
return new AlterStreamsGroupOffsetsResult(alterConsumerGroupOffsets(groupId, offsets, new AlterConsumerGroupOffsetsOptions())); AlterConsumerGroupOffsetsOptions consumerGroupOptions = new AlterConsumerGroupOffsetsOptions()
.timeoutMs(options.timeoutMs());
return new AlterStreamsGroupOffsetsResult(alterConsumerGroupOffsets(groupId, offsets, consumerGroupOptions));
} }
@Override @Override

2
clients/src/main/java/org/apache/kafka/clients/admin/ListStreamsGroupOffsetsOptions.java
View File

@ -21,7 +21,7 @@ import org.apache.kafka.common.annotation.InterfaceStability;
/** /**
* Options for {@link Admin#listStreamsGroupOffsets(Map, ListStreamsGroupOffsetsOptions)}. * Options for {@link Admin#listStreamsGroupOffsets(java.util.Map, ListStreamsGroupOffsetsOptions)}.
* <p> * <p>
* The API of this class is evolving, see {@link Admin} for details. * The API of this class is evolving, see {@link Admin} for details.
*/ */