Skip to content

RATIS-2610. -groupid should check for non-empty ID #1523

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

Merged
szetszwo merged 2 commits into from
Jul 20, 2026
+26 −1
Merged

RATIS-2610. -groupid should check for non-empty ID #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e37b53f
RATIS-2610. -groupid should check for non-empty ID
spacemonkd Jul 20, 2026
d7d0fc9
Add tests for -groupid
spacemonkd Jul 20, 2026
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
2 changes: 1 addition & 1 deletion ratis-shell/src/main/java/org/apache/ratis/shell/cli/CliUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static List<RaftPeer> parseRaftPeers(String peers) {

/** Parse the given string as a {@link RaftGroupId}. */
public static RaftGroupId parseRaftGroupId(String groupId) {
return groupId != null && groupId.isEmpty() ? RaftGroupId.valueOf(UUID.fromString(groupId)) : null;
return groupId != null && !groupId.isEmpty() ? RaftGroupId.valueOf(UUID.fromString(groupId)) : null;
}

/**
Expand Down
25 changes: 25 additions & 0 deletions ratis-test/src/test/java/org/apache/ratis/shell/cli/TestCliUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.ratis.shell.cli;

import org.apache.ratis.protocol.RaftGroupId;
import org.apache.ratis.protocol.RaftPeer;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand All @@ -25,6 +26,7 @@
import java.net.Inet6Address;
import java.net.InetSocketAddress;
import java.util.List;
import java.util.UUID;

public class TestCliUtils {

Expand Down Expand Up @@ -61,4 +63,27 @@ public void testParseRejectsScheme() {
Assertions.assertThrows(IllegalArgumentException.class,
() -> CliUtils.parseInetSocketAddress("http://127.0.0.1:6000"));
}

@Test
public void testParseRaftGroupIdNull() {
Assertions.assertNull(CliUtils.parseRaftGroupId(null));
}

@Test
public void testParseRaftGroupIdEmpty() {
Assertions.assertNull(CliUtils.parseRaftGroupId(""));
}

@Test
public void testParseRaftGroupIdValid() {
final UUID uuid = UUID.randomUUID();
final RaftGroupId groupId = CliUtils.parseRaftGroupId(uuid.toString());
Assertions.assertEquals(RaftGroupId.valueOf(uuid), groupId);
}

@Test
public void testParseRaftGroupIdInvalid() {
Assertions.assertThrows(IllegalArgumentException.class,
() -> CliUtils.parseRaftGroupId("not-a-uuid"));
}
}
Loading