diff options
author | Ade Lee <alee@redhat.com> | 2012-01-20 09:32:39 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-02-08 16:03:25 -0500 |
commit | 0e00119c8947c65997505d36b6732df72867f868 (patch) | |
tree | 1471a37e30f5f22fd3ea070143cd755b72976f9f /pki/base/common/src/com | |
parent | 4b474730b874f159ff5af4c897c0fb3d0226508d (diff) | |
download | pki-0e00119c8947c65997505d36b6732df72867f868.tar.gz pki-0e00119c8947c65997505d36b6732df72867f868.tar.xz pki-0e00119c8947c65997505d36b6732df72867f868.zip |
Fix test client errors
Added ClientResponse annotation to SystemCertificateResource.
Added Consumes annotation to KeyResource, KeyRequestResource
Added checks for empty search results to test client, as well as stripping header, trailer
from transport cert.
Diffstat (limited to 'pki/base/common/src/com')
5 files changed, 11 insertions, 4 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java b/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java index 6c4c0bc54..d4cfcd296 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java @@ -6,6 +6,10 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.jboss.resteasy.annotations.ClientResponseType; + +import com.netscape.cms.servlet.cert.model.CertificateData; + @Path("/config/cert") public interface SystemCertificateResource { @@ -14,7 +18,7 @@ public interface SystemCertificateResource { */ @GET @Path("/transport") - //@ClientResponseType(CertificateData.class) + @ClientResponseType(entityType=CertificateData.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) public Response getTransportCert(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java index 74d847d0a..acddba559 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java @@ -35,8 +35,8 @@ import com.netscape.cms.servlet.cert.model.CertificateData; * */ public class CMSResourceService { - protected static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----"; - protected static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----"; + public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----"; + public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----"; // caching parameters protected static final int DEFAULT_LONG_CACHE_LIFETIME = 1000; diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java index c6ddda698..a47c46d86 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java @@ -28,5 +28,6 @@ public interface KeyResource { @POST @Path("retrieve") @Produces(MediaType.TEXT_XML) + @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) public KeyData retrieveKey(MultivaluedMap<String, String> form); } diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java index b5032fa86..471abc161 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java @@ -76,7 +76,7 @@ public class KeysResourceService extends CMSResourceService implements KeysResou } if (clientID != null) { - filter += "(clientID=" + clientID + ")"; + filter += "(clientID=\'" + clientID + "\')"; matches ++; } diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java b/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java index 0a476c49c..146b03d89 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java @@ -27,6 +27,7 @@ public interface KeyRequestResource { @POST @Path("archive") @Produces({ MediaType.TEXT_XML }) + @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) public KeyRequestInfo archiveKey(MultivaluedMap<String, String> form); @POST @@ -39,6 +40,7 @@ public interface KeyRequestResource { @POST @Path("recover") @Produces({ MediaType.TEXT_XML }) + @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) public KeyRequestInfo recoverKey(MultivaluedMap<String, String> form); @POST |