Skip to content

feat(clients): MemberToRemove accepting memberId field on constructor… #18738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat(clients): MemberToRemove accepting memberId field on constructor… #18738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion clients/src/main/java/org/apache/kafka/clients/admin/MemberToRemove.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@
*/
public class MemberToRemove {
private final String groupInstanceId;
private final String memberId;

public MemberToRemove(String groupInstanceId) {
this.groupInstanceId = groupInstanceId;
this.memberId = null;
}

public MemberToRemove(String groupInstanceId, String memberId) {
this.groupInstanceId = groupInstanceId;
this.memberId = memberId;
}

@Override
Expand All @@ -49,7 +56,7 @@ public int hashCode() {
MemberIdentity toMemberIdentity() {
return new MemberIdentity()
.setGroupInstanceId(groupInstanceId)
.setMemberId(JoinGroupRequest.UNKNOWN_MEMBER_ID);
.setMemberId(memberId != null ? memberId : JoinGroupRequest.UNKNOWN_MEMBER_ID);
}

public String groupInstanceId() {
Expand Down
10 changes: 9 additions & 1 deletion ...rc/test/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupResultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.message.LeaveGroupRequestData.MemberIdentity;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.JoinGroupRequest;
import org.apache.kafka.test.TestUtils;

import org.junit.jupiter.api.BeforeEach;
Expand All @@ -32,14 +33,15 @@
import java.util.Set;
import java.util.concurrent.ExecutionException;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;

public class RemoveMembersFromConsumerGroupResultTest {

private final MemberToRemove instanceOne = new MemberToRemove("instance-1");
private final MemberToRemove instanceTwo = new MemberToRemove("instance-2");
private final MemberToRemove instanceTwo = new MemberToRemove("instance-2", "member-id");
private Set<MemberToRemove> membersToRemove;
private Map<MemberIdentity, Errors> errorsMap;

Expand Down Expand Up @@ -105,6 +107,12 @@ public void testNoErrorConstructor() throws ExecutionException, InterruptedExcep
assertNull(noErrorResult.memberResult(instanceTwo).get());
}

@Test
public void testMemberIdentityMemberId() {
assertEquals(JoinGroupRequest.UNKNOWN_MEMBER_ID, instanceOne.toMemberIdentity().memberId());
assertEquals("member-id", instanceTwo.toMemberIdentity().memberId());
}

private RemoveMembersFromConsumerGroupResult createAndVerifyMemberLevelError() throws InterruptedException, ExecutionException {
memberFutures.complete(errorsMap);
assertFalse(memberFutures.isCompletedExceptionally());
Expand Down