Updated REST interface for TPS activities.

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

Ticket #554

2 files changed, 13 insertions, 4 deletions

diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityClient.java b/base/common/src/com/netscape/certsrv/logging/ActivityClient.java
index 48ecdd5c4..eae2f6f48 100644
--- a/base/common/src/com/netscape/certsrv/logging/ActivityClient.java
+++ b/base/common/src/com/netscape/certsrv/logging/ActivityClient.java
@@ -19,6 +19,8 @@ package com.netscape.certsrv.logging;
 
 import java.net.URISyntaxException;
 
+import javax.ws.rs.core.Response;
+
 import com.netscape.certsrv.client.Client;
 import com.netscape.certsrv.client.PKIClient;
 
@@ -39,10 +41,12 @@ public class ActivityClient extends Client {
     }
 
     public ActivityCollection findActivities(Integer start, Integer size) {
-        return resource.findActivities(start, size);
+        Response response = resource.findActivities(start, size);
+        return client.getEntity(response, ActivityCollection.class);
     }
 
     public ActivityData getActivity(String tokenID) {
-        return resource.getActivity(tokenID);
+        Response response = resource.getActivity(tokenID);
+        return client.getEntity(response, ActivityData.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityResource.java b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
index 6ecf41dd2..715233e63 100644
--- a/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
+++ b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
@@ -23,6 +23,9 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.ClientResponseType;
 
 
 /**
@@ -32,13 +35,15 @@ import javax.ws.rs.core.MediaType;
 public interface ActivityResource {
 
     @GET
+    @ClientResponseType(entityType=ActivityCollection.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ActivityCollection findActivities(
+    public Response findActivities(
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
 
     @GET
     @Path("{activityID}")
+    @ClientResponseType(entityType=ActivityData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ActivityData getActivity(@PathParam("activityID") String activityID);
+    public Response getActivity(@PathParam("activityID") String activityID);
 }