From 48fb4f11b8696194d06f7a7e57d57b7f3d11e00c Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Tue, 5 Nov 2013 15:42:35 -0500 Subject: Fix KeyRequest and Key Resources to return correct exit codes Also added some missing checks, and some missing options in the Key Request CLI --- .../src/com/netscape/certsrv/key/KeyRequestResource.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'base/common/src/com/netscape/certsrv/key') diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java index 6fc12d5ee..b7bea7057 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java +++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java @@ -9,6 +9,9 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Response; + +import org.jboss.resteasy.annotations.ClientResponseType; import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.authentication.AuthMethodMapping; @@ -48,28 +51,32 @@ public interface KeyRequestResource { // Archiving - used to test integration with a browser @POST @Path("archive") + @ClientResponseType(entityType=KeyRequestInfo.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) - public KeyRequestInfo archiveKey(MultivaluedMap form); + public Response archiveKey(MultivaluedMap form); @POST @Path("archive") + @ClientResponseType(entityType=KeyRequestInfo.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public KeyRequestInfo archiveKey(KeyArchivalRequest data); + public Response archiveKey(KeyArchivalRequest data); //Recovery - used to test integration with a browser @POST @Path("recover") + @ClientResponseType(entityType=KeyRequestInfo.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) - public KeyRequestInfo recoverKey(MultivaluedMap form); + public Response recoverKey(MultivaluedMap form); @POST @Path("recover") + @ClientResponseType(entityType=KeyRequestInfo.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public KeyRequestInfo recoverKey(KeyRecoveryRequest data); + public Response recoverKey(KeyRecoveryRequest data); @POST @Path("{id}/approve") -- cgit