Updated REST interface for TPS profiles.

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

Ticket #554

2 files changed, 12 insertions, 6 deletions

diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java
index bf06f1566..9ca571d19 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java
@@ -45,11 +45,13 @@ public class ProfileClient extends Client {
     }
 
     public ProfileCollection findProfiles(Integer start, Integer size) {
-        return resource.findProfiles(start, size);
+        Response response = resource.findProfiles(start, size);
+        return client.getEntity(response, ProfileCollection.class);
     }
 
     public ProfileData getProfile(String profileID) {
-        return resource.getProfile(profileID);
+        Response response = resource.getProfile(profileID);
+        return client.getEntity(response, ProfileData.class);
     }
 
     public ProfileData addProfile(ProfileData profileData) {
@@ -68,6 +70,7 @@ public class ProfileClient extends Client {
     }
 
     public void removeProfile(String profileID) {
-        resource.removeProfile(profileID);
+        Response response = resource.removeProfile(profileID);
+        client.getEntity(response, Void.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
index e8a33c18b..45e0520c4 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
@@ -44,15 +44,17 @@ import com.netscape.certsrv.authentication.AuthMethodMapping;
 public interface ProfileResource {
 
     @GET
+    @ClientResponseType(entityType=ProfileCollection.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ProfileCollection findProfiles(
+    public Response findProfiles(
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
 
     @GET
     @Path("{profileID}")
+    @ClientResponseType(entityType=ProfileData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ProfileData getProfile(@PathParam("profileID") String profileID);
+    public Response getProfile(@PathParam("profileID") String profileID);
 
     @POST
     @ACLMapping("profiles.add")
@@ -83,7 +85,8 @@ public interface ProfileResource {
 
     @DELETE
     @Path("{profileID}")
+    @ClientResponseType(entityType=Void.class)
     @ACLMapping("profiles.remove")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public void removeProfile(@PathParam("profileID") String profileID);
+    public Response removeProfile(@PathParam("profileID") String profileID);
 }