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

2 files changed, 7 insertions, 2 deletions

diff --git a/base/common/src/com/netscape/certsrv/group/GroupClient.java b/base/common/src/com/netscape/certsrv/group/GroupClient.java
index f516e9842..80e48e809 100644
--- a/base/common/src/com/netscape/certsrv/group/GroupClient.java
+++ b/base/common/src/com/netscape/certsrv/group/GroupClient.java
@@ -65,8 +65,12 @@ public class GroupClient extends Client {
         client.getEntity(response, Void.class);
     }
 
-    public GroupMemberCollection findGroupMembers(String groupID, Integer start, Integer size) {
-        Response response = groupClient.findGroupMembers(groupID, start, size);
+    public GroupMemberCollection findGroupMembers(
+            String groupID,
+            String filter,
+            Integer start,
+            Integer size) {
+        Response response = groupClient.findGroupMembers(groupID, filter, start, size);
         return client.getEntity(response, GroupMemberCollection.class);
     }
 
diff --git a/base/common/src/com/netscape/certsrv/group/GroupResource.java b/base/common/src/com/netscape/certsrv/group/GroupResource.java
index aff584fe6..27fa90b75 100644
--- a/base/common/src/com/netscape/certsrv/group/GroupResource.java
+++ b/base/common/src/com/netscape/certsrv/group/GroupResource.java
@@ -71,6 +71,7 @@ public interface GroupResource {
     @ClientResponseType(entityType=GroupMemberCollection.class)
     public Response findGroupMembers(
             @PathParam("groupID") String groupID,
+            @QueryParam("filter") String filter,
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);