Updated REST interface for TPS connections.

The REST interface for TPS connections 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/connection/ConnectionClient.java b/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java
index 8014e56b1..4ef59366c 100644
--- a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java
@@ -41,11 +41,13 @@ public class ConnectionClient extends Client {
     }
 
     public ConnectionCollection findConnections(Integer start, Integer size) {
-        return resource.findConnections(start, size);
+        Response response = resource.findConnections(start, size);
+        return client.getEntity(response, ConnectionCollection.class);
     }
 
     public ConnectionData getConnection(String connectionID) {
-        return resource.getConnection(connectionID);
+        Response response = resource.getConnection(connectionID);
+        return client.getEntity(response, ConnectionData.class);
     }
 
     public ConnectionData addConnection(ConnectionData connectionData) {
@@ -64,6 +66,7 @@ public class ConnectionClient extends Client {
     }
 
     public void removeConnection(String connectionID) {
-        resource.removeConnection(connectionID);
+        Response response = resource.removeConnection(connectionID);
+        client.getEntity(response, Void.class);
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionResource.java b/base/common/src/com/netscape/certsrv/tps/connection/ConnectionResource.java
index 21f4c08e5..72334a04b 100644
--- a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/connection/ConnectionResource.java
@@ -44,15 +44,17 @@ import com.netscape.certsrv.authentication.AuthMethodMapping;
 public interface ConnectionResource {
 
     @GET
+    @ClientResponseType(entityType=ConnectionCollection.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ConnectionCollection findConnections(
+    public Response findConnections(
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
 
     @GET
     @Path("{connectionID}")
+    @ClientResponseType(entityType=ConnectionData.class)
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public ConnectionData getConnection(@PathParam("connectionID") String connectionID);
+    public Response getConnection(@PathParam("connectionID") String connectionID);
 
     @POST
     @ACLMapping("connections.add")
@@ -83,7 +85,8 @@ public interface ConnectionResource {
 
     @DELETE
     @Path("{connectionID}")
+    @ClientResponseType(entityType=Void.class)
     @ACLMapping("connections.remove")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public void removeConnection(@PathParam("connectionID") String connectionID);
+    public Response removeConnection(@PathParam("connectionID") String connectionID);
 }