Updated REST interface for groups.

The REST interface for groups has been modified to return Response
objects to allow better handling of server responses.

Ticket #554

2 files changed, 24 insertions, 12 deletions

diff --git a/base/common/src/com/netscape/certsrv/group/GroupClient.java b/base/common/src/com/netscape/certsrv/group/GroupClient.java
index c5ff9796a..4823d4ed0 100644
--- a/base/common/src/com/netscape/certsrv/group/GroupClient.java
+++ b/base/common/src/com/netscape/certsrv/group/GroupClient.java
@@ -41,11 +41,13 @@ public class GroupClient extends Client {
     }
 
     public GroupCollection findGroups(String groupIDFilter, Integer start, Integer size) {
-        return groupClient.findGroups(groupIDFilter, start, size);
+        Response response = groupClient.findGroups(groupIDFilter, start, size);
+        return client.getEntity(response, GroupCollection.class);
     }
 
     public GroupData getGroup(String groupID) {
-        return groupClient.getGroup(groupID);
+        Response response = groupClient.getGroup(groupID);
+        return client.getEntity(response, GroupData.class);
     }
 
     public GroupData addGroup(GroupData groupData) {
@@ -59,15 +61,18 @@ public class GroupClient extends Client {
     }
 
     public void removeGroup(String groupID) {
-        groupClient.removeGroup(groupID);
+        Response response = groupClient.removeGroup(groupID);
+        client.getEntity(response, Void.class);
     }
 
     public GroupMemberCollection findGroupMembers(String groupID, Integer start, Integer size) {
-        return groupClient.findGroupMembers(groupID, start, size);
+        Response response = groupClient.findGroupMembers(groupID, start, size);
+        return client.getEntity(response, GroupMemberCollection.class);
     }
 
     public GroupMemberData getGroupMember(String groupID, String memberID) {
-        return groupClient.getGroupMember(groupID, memberID);
+        Response response = groupClient.getGroupMember(groupID, memberID);
+        return client.getEntity(response, GroupMemberData.class);
     }
 
     public GroupMemberData addGroupMember(String groupID, String memberID) {
@@ -76,6 +81,7 @@ public class GroupClient extends Client {
     }
 
     public void removeGroupMember(String groupID, String memberID) {
-        groupClient.removeGroupMember(groupID, memberID);
+        Response response = groupClient.removeGroupMember(groupID, memberID);
+        client.getEntity(response, Void.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/group/GroupResource.java b/base/common/src/com/netscape/certsrv/group/GroupResource.java
index aa26bebb1..f1dfe4026 100644
--- a/base/common/src/com/netscape/certsrv/group/GroupResource.java
+++ b/base/common/src/com/netscape/certsrv/group/GroupResource.java
@@ -44,8 +44,9 @@ import com.netscape.certsrv.base.PATCH;
 public interface GroupResource {
 
     @GET
+    @ClientResponseType(entityType=GroupCollection.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public GroupCollection findGroups(
+    public Response findGroups(
             @QueryParam("filter") String filter,
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
@@ -58,8 +59,9 @@ public interface GroupResource {
 
     @GET
     @Path("{groupID}")
+    @ClientResponseType(entityType=GroupData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public GroupData getGroup(@PathParam("groupID") String groupID);
+    public Response getGroup(@PathParam("groupID") String groupID);
 
     @PATCH
     @Path("{groupID}")
@@ -70,13 +72,15 @@ public interface GroupResource {
 
     @DELETE
     @Path("{groupID}")
+    @ClientResponseType(entityType=Void.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public void removeGroup(@PathParam("groupID") String groupID);
+    public Response removeGroup(@PathParam("groupID") String groupID);
 
     @GET
     @Path("{groupID}/members")
+    @ClientResponseType(entityType=GroupMemberCollection.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public GroupMemberCollection findGroupMembers(
+    public Response findGroupMembers(
             @PathParam("groupID") String groupID,
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
@@ -90,11 +94,13 @@ public interface GroupResource {
 
     @GET
     @Path("{groupID}/members/{memberID}")
+    @ClientResponseType(entityType=GroupMemberData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public GroupMemberData getGroupMember(@PathParam("groupID") String groupID, @PathParam("memberID") String memberID);
+    public Response getGroupMember(@PathParam("groupID") String groupID, @PathParam("memberID") String memberID);
 
     @DELETE
     @Path("{groupID}/members/{memberID}")
+    @ClientResponseType(entityType=Void.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public void removeGroupMember(@PathParam("groupID") String groupID, @PathParam("memberID") String memberID);
+    public Response removeGroupMember(@PathParam("groupID") String groupID, @PathParam("memberID") String memberID);
 }