diff options
author | Endi S. Dewata <edewata@redhat.com> | 2014-02-14 17:04:42 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2014-02-18 11:36:02 -0500 |
commit | 2d6958f97699d40fb945ef33dc4de7ae85677bc5 (patch) | |
tree | 7f5e894edcdf6d1964541ec69132c870b57ff315 /base/common/src/com/netscape/certsrv/tps | |
parent | 4e6bd3661910eae5670f9e029fe370c7c9138d83 (diff) | |
download | pki-2d6958f97699d40fb945ef33dc4de7ae85677bc5.tar.gz pki-2d6958f97699d40fb945ef33dc4de7ae85677bc5.tar.xz pki-2d6958f97699d40fb945ef33dc4de7ae85677bc5.zip |
Updated REST interface for TPS certificates.
The REST interface for TPS certificates has been modified to return
Response objects to allow better handling of server responses.
Ticket #554
Diffstat (limited to 'base/common/src/com/netscape/certsrv/tps')
-rw-r--r-- | base/common/src/com/netscape/certsrv/tps/cert/TPSCertClient.java | 8 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertClient.java b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertClient.java index 810c64758..e1e192557 100644 --- a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertClient.java +++ b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertClient.java @@ -19,6 +19,8 @@ package com.netscape.certsrv.tps.cert; 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 TPSCertClient extends Client { } public TPSCertCollection findCerts(Integer start, Integer size) { - return resource.findCerts(start, size); + Response response = resource.findCerts(start, size); + return client.getEntity(response, TPSCertCollection.class); } public TPSCertData getCert(String tokenID) { - return resource.getCert(tokenID); + Response response = resource.getCert(tokenID); + return client.getEntity(response, TPSCertData.class); } } diff --git a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java index d56cd4669..2ea24eed8 100644 --- a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java +++ b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.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 TPSCertResource { @GET + @ClientResponseType(entityType=TPSCertCollection.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public TPSCertCollection findCerts( + public Response findCerts( @QueryParam("start") Integer start, @QueryParam("size") Integer size); @GET @Path("{certID}") + @ClientResponseType(entityType=TPSCertData.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public TPSCertData getCert(@PathParam("certID") String certID); + public Response getCert(@PathParam("certID") String certID); } |