diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractResource.java index afd77b5488..ea50897f30 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractResource.java @@ -29,6 +29,8 @@ * */ + + package sonia.scm.api.rest.resources; //~--- JDK imports ------------------------------------------------------------ @@ -40,6 +42,7 @@ 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.WebApplicationException; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; @@ -195,13 +198,12 @@ public abstract class AbstractResource * @param name * @param item * - * @return */ @PUT @Path("{name}") @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public Response update(@Context UriInfo uriInfo, - @PathParam("name") String name, T item) + public void update(@Context UriInfo uriInfo, @PathParam("name") String name, + T item) { try { @@ -211,9 +213,6 @@ public abstract class AbstractResource { throw new WebApplicationException(ex); } - - return Response.created( - uriInfo.getAbsolutePath().resolve(getId(item))).build(); } //~--- get methods ---------------------------------------------------------- @@ -228,6 +227,7 @@ public abstract class AbstractResource */ @GET @Path("{name}") + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public T get(@PathParam("name") String name) { T item = getItem(name); @@ -247,6 +247,7 @@ public abstract class AbstractResource * @return */ @GET + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public T[] getAll() { return getAllItems(); diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java index d243404565..830b3b1127 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java @@ -63,7 +63,6 @@ import javax.ws.rs.core.MediaType; */ @Path("repositories") @Singleton -@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public class RepositoryResource extends AbstractResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java index 2e07ebd5d2..9a28538f7c 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java @@ -58,7 +58,6 @@ import javax.ws.rs.core.MediaType; */ @Path("users") @Singleton -@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public class UserResource extends AbstractResource {