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

1 files changed, 0 insertions, 21 deletions

diff --git a/base/common/src/com/netscape/certsrv/user/UserResource.java b/base/common/src/com/netscape/certsrv/user/UserResource.java
index cbda69a4c..771750f31 100644
--- a/base/common/src/com/netscape/certsrv/user/UserResource.java
+++ b/base/common/src/com/netscape/certsrv/user/UserResource.java
@@ -18,16 +18,13 @@
 
 package com.netscape.certsrv.user;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 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;
@@ -49,7 +46,6 @@ public interface UserResource {
 
     @GET
     @ClientResponseType(entityType=UserCollection.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response findUsers(
             @QueryParam("filter") String filter,
             @QueryParam("start") Integer start,
@@ -57,40 +53,31 @@ public interface UserResource {
 
     @POST
     @ClientResponseType(entityType=UserData.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response addUser(UserData userData);
 
     @GET
     @Path("{userID}")
     @ClientResponseType(entityType=UserData.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response getUser(@PathParam("userID") String userID);
 
     @PUT
     @Path("{userID}")
     @ClientResponseType(entityType=UserData.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response replaceUser(@PathParam("userID") String userID, UserData userData);
 
     @PATCH
     @Path("{userID}")
     @ClientResponseType(entityType=UserData.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response modifyUser(@PathParam("userID") String userID, UserData userData);
 
     @DELETE
     @Path("{userID}")
     @ClientResponseType(entityType=Void.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response removeUser(@PathParam("userID") String userID);
 
     @GET
     @Path("{userID}/certs")
     @ClientResponseType(entityType=UserCertCollection.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response findUserCerts(
             @PathParam("userID") String userID,
             @QueryParam("start") Integer start,
@@ -100,26 +87,21 @@ public interface UserResource {
     @POST
     @Path("{userID}/certs")
     @ClientResponseType(entityType=UserCertData.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response addUserCert(@PathParam("userID") String userID, UserCertData userCertData);
 
     @GET
     @Path("{userID}/certs/{certID}")
     @ClientResponseType(entityType=UserCertData.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response getUserCert(@PathParam("userID") String userID, @PathParam("certID") String certID);
 
     @DELETE
     @Path("{userID}/certs/{certID}")
     @ClientResponseType(entityType=Void.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response removeUserCert(@PathParam("userID") String userID, @PathParam("certID") String certID);
 
     @GET
     @Path("{userID}/memberships")
     @ClientResponseType(entityType=UserMembershipCollection.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response findUserMemberships(
             @PathParam("userID") String userID,
             @QueryParam("start") Integer start,
@@ -128,13 +110,10 @@ public interface UserResource {
     @POST
     @Path("{userID}/memberships")
     @ClientResponseType(entityType=UserMembershipData.class)
-    @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response addUserMembership(@PathParam("userID") String userID, String groupID);
 
     @DELETE
     @Path("{userID}/memberships/{groupID}")
     @ClientResponseType(entityType=Void.class)
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     public Response removeUserMembership(@PathParam("userID") String userID, @PathParam("groupID") String groupID);
 }