Refactored GroupMemberProcessor.

The GroupMemberProcessor.addGroupMember() has been modified such that it returns
the newly created group member data. This way the GroupService can use the common
method to create the response object.

Ticket #554

2 files changed, 5 insertions, 7 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
index 429fbea17..ff56c2139 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
@@ -23,7 +23,6 @@ import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 import org.jboss.resteasy.plugins.providers.atom.Link;
@@ -184,7 +183,7 @@ public class GroupMemberProcessor extends Processor {
         }
     }
 
-    public Response addGroupMember(GroupMemberData groupMemberData) {
+    public GroupMemberData addGroupMember(GroupMemberData groupMemberData) {
         String groupID = groupMemberData.getGroupID();
         try {
             if (groupID == null) {
@@ -241,10 +240,7 @@ public class GroupMemberProcessor extends Processor {
             // read the data back
             groupMemberData = getGroupMember(groupID, memberID);
 
-            return Response
-                    .created(groupMemberData.getLink().getHref())
-                    .entity(groupMemberData)
-                    .build();
+            return groupMemberData;
 
         } catch (PKIException e) {
             auditAddGroupMember(groupID, groupMemberData, ILogger.FAILURE);
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
index 4fc4a7cfc..3af4bae43 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
@@ -390,7 +390,9 @@ public class GroupService extends PKIService implements GroupResource {
         try {
             GroupMemberProcessor processor = new GroupMemberProcessor(getLocale(headers));
             processor.setUriInfo(uriInfo);
-            return processor.addGroupMember(groupMemberData);
+            groupMemberData = processor.addGroupMember(groupMemberData);
+
+            return createCreatedResponse(groupMemberData, groupMemberData.getLink().getHref());
 
         } catch (PKIException e) {
             throw e;