From 47724f3c91e124f1856e4b4f3bbd0068d6ca6ff6 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Sun, 4 May 2014 18:22:37 -0400 Subject: Added filter to GroupService.findGroupMembers(). The GroupService.findGroupMembers() has been modified to accept an additional parameter to filter the group members to be returned. The CLI has been modified accordingly. Ticket #920 --- .../src/com/netscape/cmstools/group/GroupMemberFindCLI.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'base/java-tools/src/com') diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java index 41f310a5f..7a4f217f0 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java @@ -44,7 +44,7 @@ public class GroupMemberFindCLI extends CLI { } public void printHelp() { - formatter.printHelp(getFullName() + " [OPTIONS...]", options); + formatter.printHelp(getFullName() + " [FILTER] [OPTIONS...]", options); } public void createOptions() { @@ -78,13 +78,14 @@ public class GroupMemberFindCLI extends CLI { String[] cmdArgs = cmd.getArgs(); - if (cmdArgs.length != 1) { - System.err.println("Error: No Group ID specified."); + if (cmdArgs.length < 1 || cmdArgs.length > 2) { + System.err.println("Error: Incorrect number of arguments specified."); printHelp(); System.exit(-1); } String groupID = cmdArgs[0]; + String filter = cmdArgs.length < 2 ? null : cmdArgs[1]; String s = cmd.getOptionValue("start"); Integer start = s == null ? null : Integer.valueOf(s); @@ -92,7 +93,7 @@ public class GroupMemberFindCLI extends CLI { s = cmd.getOptionValue("size"); Integer size = s == null ? null : Integer.valueOf(s); - GroupMemberCollection response = groupMemberCLI.groupClient.findGroupMembers(groupID, start, size); + GroupMemberCollection response = groupMemberCLI.groupClient.findGroupMembers(groupID, filter, start, size); MainCLI.printMessage(response.getTotal() + " entries matched"); if (response.getTotal() == 0) return; -- cgit