Removed @Consumes and @Provides.

The @Consumes and @Provides annotations have been removed from all
methods (except from methods that consume forms) to allow client
to use the default consumes and provides specified in the proxy.

Ticket #554

2 files changed, 0 insertions, 30 deletions

diff --git a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
index e1514293b..b9ae1f1fe 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
@@ -22,7 +22,6 @@ import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 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.MultivaluedMap;
@@ -42,15 +41,12 @@ public interface CertRequestResource {
     @POST
     @Path("certrequests")
     @ClientResponseType(entityType=CertRequestInfos.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Consumes({ MediaType.APPLICATION_FORM_URLENCODED })
     public Response enrollCert(MultivaluedMap<String, String> form);
 
     @POST
     @Path("certrequests")
     @ClientResponseType(entityType=CertRequestInfos.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response enrollCert(CertEnrollmentRequest data);
 
     /**
@@ -59,7 +55,6 @@ public interface CertRequestResource {
     @GET
     @Path("certrequests/{id}")
     @ClientResponseType(entityType=CertRequestInfo.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response getRequestInfo(@PathParam("id") RequestId id);
 
     /**
@@ -68,7 +63,6 @@ public interface CertRequestResource {
     @GET
     @Path("agent/certrequests")
     @ClientResponseType(entityType=CertRequestInfos.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response listRequests(@QueryParam("requestState") String requestState,
@@ -81,7 +75,6 @@ public interface CertRequestResource {
     @GET
     @Path("agent/certrequests/{id}")
     @ClientResponseType(entityType=CertReviewResponse.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response reviewRequest(@PathParam("id") RequestId id);
@@ -89,7 +82,6 @@ public interface CertRequestResource {
     @GET
     @Path("certrequests/profiles")
     @ClientResponseType(entityType=ProfileDataInfos.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response listEnrollmentTemplates(
             @QueryParam("start") Integer start,
             @QueryParam("size") Integer size);
@@ -97,13 +89,11 @@ public interface CertRequestResource {
     @GET
     @Path("certrequests/profiles/{id}")
     @ClientResponseType(entityType=CertEnrollmentRequest.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response getEnrollmentTemplate(@PathParam("id") String id);
 
     @POST
     @Path("agent/certrequests/{id}/approve")
     @ClientResponseType(entityType=Void.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response approveRequest(@PathParam("id") RequestId id, CertReviewResponse data);
@@ -111,7 +101,6 @@ public interface CertRequestResource {
     @POST
     @Path("agent/certrequests/{id}/reject")
     @ClientResponseType(entityType=Void.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response rejectRequest(@PathParam("id") RequestId id, CertReviewResponse data);
@@ -119,7 +108,6 @@ public interface CertRequestResource {
     @POST
     @Path("agent/certrequests/{id}/cancel")
     @ClientResponseType(entityType=Void.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response cancelRequest(@PathParam("id") RequestId id, CertReviewResponse data);
@@ -127,7 +115,6 @@ public interface CertRequestResource {
     @POST
     @Path("agent/certrequests/{id}/update")
     @ClientResponseType(entityType=Void.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response updateRequest(@PathParam("id") RequestId id, CertReviewResponse data);
@@ -135,7 +122,6 @@ public interface CertRequestResource {
     @POST
     @Path("agent/certrequests/{id}/validate")
     @ClientResponseType(entityType=Void.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response validateRequest(@PathParam("id") RequestId id, CertReviewResponse data);
@@ -143,7 +129,6 @@ public interface CertRequestResource {
     @POST
     @Path("agent/certrequests/{id}/unassign")
     @ClientResponseType(entityType=Void.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response unassignRequest(@PathParam("id") RequestId id, CertReviewResponse data);
@@ -151,7 +136,6 @@ public interface CertRequestResource {
     @POST
     @Path("agent/certrequests/{id}/assign")
     @ClientResponseType(entityType=Void.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certrequests")
     @AuthMethodMapping("certrequests")
     public Response assignRequest(@PathParam("id") RequestId id, CertReviewResponse data);
diff --git a/base/common/src/com/netscape/certsrv/cert/CertResource.java b/base/common/src/com/netscape/certsrv/cert/CertResource.java
index 23e898755..c5a5823ea 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertResource.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertResource.java
@@ -1,13 +1,10 @@
 package com.netscape.certsrv.cert;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 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;
@@ -22,7 +19,6 @@ public interface CertResource {
     @GET
     @Path("certs")
     @ClientResponseType(entityType=CertDataInfos.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response listCerts(
             @QueryParam("status") String status,
             @QueryParam("maxResults") Integer maxResults,
@@ -33,8 +29,6 @@ public interface CertResource {
     @POST
     @Path("certs/search")
     @ClientResponseType(entityType=CertDataInfos.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response searchCerts(
             CertSearchRequest data,
             @QueryParam("start") Integer start,
@@ -43,13 +37,11 @@ public interface CertResource {
     @GET
     @Path("certs/{id}")
     @ClientResponseType(entityType=CertData.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response getCert(@PathParam("id") CertId id);
 
     @GET
     @Path("agent/certs/{id}")
     @ClientResponseType(entityType=CertData.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certs")
     @AuthMethodMapping("certs")
     public Response reviewCert(@PathParam("id") CertId id);
@@ -57,8 +49,6 @@ public interface CertResource {
     @POST
     @Path("agent/certs/{id}/revoke-ca")
     @ClientResponseType(entityType=CertRequestInfo.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certs")
     @AuthMethodMapping("certs")
     public Response revokeCACert(@PathParam("id") CertId id, CertRevokeRequest request);
@@ -66,8 +56,6 @@ public interface CertResource {
     @POST
     @Path("agent/certs/{id}/revoke")
     @ClientResponseType(entityType=CertRequestInfo.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certs")
     @AuthMethodMapping("certs")
     public Response revokeCert(@PathParam("id") CertId id, CertRevokeRequest request);
@@ -75,8 +63,6 @@ public interface CertResource {
     @POST
     @Path("agent/certs/{id}/unrevoke")
     @ClientResponseType(entityType=CertRequestInfo.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @ACLMapping("certs")
     @AuthMethodMapping("certs")
     public Response unrevokeCert(@PathParam("id") CertId id, CertUnrevokeRequest request);