Updated REST interface for TPS connectors.

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

Ticket #554

2 files changed, 36 insertions, 19 deletions

diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java
index 8662159ff..87323e92b 100644
--- a/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java
+++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java
@@ -22,15 +22,18 @@ public class TPSConnectorClient extends Client {
     }
 
     public TPSConnectorCollection findConnectors(Integer start, Integer size) {
-        return tpsConnectorClient.findConnectors(start, size);
+        Response response = tpsConnectorClient.findConnectors(start, size);
+        return client.getEntity(response, TPSConnectorCollection.class);
     }
 
     public TPSConnectorData getConnector(String id) {
-        return tpsConnectorClient.getConnector(id);
+        Response response = tpsConnectorClient.getConnector(id);
+        return client.getEntity(response, TPSConnectorData.class);
     }
 
     public TPSConnectorData getConnector(String host, String port) {
-        return tpsConnectorClient.getConnector(host, port);
+        Response response = tpsConnectorClient.getConnector(host, port);
+        return client.getEntity(response, TPSConnectorData.class);
     }
 
     public TPSConnectorData createConnector(String tpsHost, String tpsPort) {
@@ -44,27 +47,32 @@ public class TPSConnectorClient extends Client {
     }
 
     public void deleteConnector(String id) {
-        tpsConnectorClient.deleteConnector(id);
+        Response response = tpsConnectorClient.deleteConnector(id);
+        client.getEntity(response, Void.class);
     }
 
     public KeyData createSharedSecret(String id) {
-        return tpsConnectorClient.createSharedSecret(id);
+        Response response = tpsConnectorClient.createSharedSecret(id);
+        return client.getEntity(response, KeyData.class);
     }
 
     public KeyData replaceSharedSecret(String id) {
-        return tpsConnectorClient.replaceSharedSecret(id);
+        Response response = tpsConnectorClient.replaceSharedSecret(id);
+        return client.getEntity(response, KeyData.class);
     };
 
     public void deleteSharedSecret(String id) {
-        tpsConnectorClient.deleteSharedSecret(id);
+        Response response = tpsConnectorClient.deleteSharedSecret(id);
+        client.getEntity(response, Void.class);
     }
 
     public KeyData getSharedSecret(String id) {
-        return tpsConnectorClient.getSharedSecret(id);
+        Response response = tpsConnectorClient.getSharedSecret(id);
+        return client.getEntity(response, KeyData.class);
     }
 
     public void deleteConnector(String host, String port) {
-        tpsConnectorClient.deleteConnector(host, port);
+        Response response = tpsConnectorClient.deleteConnector(host, port);
+        client.getEntity(response, Void.class);
     }
-
 }
diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
index 441e6f303..43213d0f4 100644
--- a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
+++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
@@ -42,20 +42,23 @@ import com.netscape.certsrv.key.KeyData;
 @AuthMethodMapping("tpsconnectors")
 public interface TPSConnectorResource {
     @GET
+    @ClientResponseType(entityType=TPSConnectorCollection.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public TPSConnectorCollection findConnectors(
+    public Response findConnectors(
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
 
     @GET
     @Path("{id}")
+    @ClientResponseType(entityType=TPSConnectorData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public TPSConnectorData getConnector(@PathParam("id") String id);
+    public Response getConnector(@PathParam("id") String id);
 
     @GET
     @Path("search")
+    @ClientResponseType(entityType=TPSConnectorData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public TPSConnectorData getConnector(@QueryParam("host") String host,
+    public Response getConnector(@QueryParam("host") String host,
             @QueryParam("port") String port);
 
     @POST
@@ -73,33 +76,39 @@ public interface TPSConnectorResource {
 
     @DELETE
     @Path("{id}")
-    public void deleteConnector(@PathParam("id") String id);
+    @ClientResponseType(entityType=Void.class)
+    public Response deleteConnector(@PathParam("id") String id);
 
     @POST
     @Path("{id}/shared-secret")
+    @ClientResponseType(entityType=KeyData.class)
     @ACLMapping("admin.sharedsecret")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public KeyData createSharedSecret(@PathParam("id") String id);
+    public Response createSharedSecret(@PathParam("id") String id);
 
     @PUT
     @Path("{id}/shared-secret")
+    @ClientResponseType(entityType=KeyData.class)
     @ACLMapping("admin.sharedsecret")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public KeyData replaceSharedSecret(@PathParam("id") String id);
+    public Response replaceSharedSecret(@PathParam("id") String id);
 
     @DELETE
     @Path("{id}/shared-secret")
+    @ClientResponseType(entityType=Void.class)
     @ACLMapping("admin.sharedsecret")
-    public void deleteSharedSecret(@PathParam("id") String id);
+    public Response deleteSharedSecret(@PathParam("id") String id);
 
     @DELETE
+    @ClientResponseType(entityType=Void.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public void deleteConnector(@QueryParam("host") String host,
+    public Response deleteConnector(@QueryParam("host") String host,
             @QueryParam("port") String port);
 
     @GET
     @Path("{id}/shared-secret")
+    @ClientResponseType(entityType=KeyData.class)
     @ACLMapping("admin.sharedsecret")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public KeyData getSharedSecret(@PathParam("id") String id);
+    public Response getSharedSecret(@PathParam("id") String id);
 }