Updated REST interface for TPS tokens.

The REST interface for TPS tokens 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/token/TokenClient.java b/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
index 35f6e1675..98690cb99 100644
--- a/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
@@ -41,11 +41,13 @@ public class TokenClient extends Client {
     }
 
     public TokenCollection findTokens(Integer start, Integer size) {
-        return resource.findTokens(start, size);
+        Response response = resource.findTokens(start, size);
+        return client.getEntity(response, TokenCollection.class);
     }
 
     public TokenData getToken(String tokenID) {
-        return resource.getToken(tokenID);
+        Response response = resource.getToken(tokenID);
+        return client.getEntity(response, TokenData.class);
     }
 
     public TokenData addToken(TokenData tokenData) {
@@ -59,6 +61,7 @@ public class TokenClient extends Client {
     }
 
     public void removeToken(String tokenID) {
-        resource.removeToken(tokenID);
+        Response response = resource.removeToken(tokenID);
+        client.getEntity(response, Void.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java b/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
index 529efe8c0..294ace128 100644
--- a/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
@@ -45,15 +45,17 @@ import com.netscape.certsrv.base.PATCH;
 public interface TokenResource {
 
     @GET
+    @ClientResponseType(entityType=TokenCollection.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public TokenCollection findTokens(
+    public Response findTokens(
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
 
     @GET
     @Path("{tokenID}")
+    @ClientResponseType(entityType=TokenData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public TokenData getToken(@PathParam("tokenID") String tokenID);
+    public Response getToken(@PathParam("tokenID") String tokenID);
 
     @POST
     @ClientResponseType(entityType=TokenData.class)
@@ -84,7 +86,8 @@ public interface TokenResource {
 
     @DELETE
     @Path("{tokenID}")
+    @ClientResponseType(entityType=Void.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("tokens.remove")
-    public void removeToken(@PathParam("tokenID") String tokenID);
+    public Response removeToken(@PathParam("tokenID") String tokenID);
 }