From 8a9b17a550caab1e96fe390fe143a000ddbd5e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 25 Jun 2018 15:01:57 +0200
Subject: [PATCH] Fix overridden method annotations

---
 .../v2/resources/GroupCollectionResource.java | 61 ++++++++++---------
 .../v2/resources/UserCollectionResource.java  |  1 +
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
index 36213c81e0..3f728fab5a 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
@@ -43,6 +43,37 @@ public class GroupCollectionResource extends AbstractManagerResource<Group, Grou
     this.groupCollectionToDtoMapper = groupCollectionToDtoMapper;
   }
 
+  /**
+   * Returns all groups for a given page number with a given page size (default page size is {@value DEFAULT_PAGE_SIZE}).
+   * <strong>Note:</strong> This method requires admin privileges.
+   *
+   * @param request  the current request
+   * @param page     the number of the requested page
+   * @param pageSize the page size (default page size is {@value DEFAULT_PAGE_SIZE})
+   * @param sortby   sort parameter
+   * @param desc     sort direction desc or aesc
+   * @return
+   */
+  @GET
+  @Path("")
+  @TypeHint(GroupDto[].class)
+  @StatusCodes({
+    @ResponseCode(code = 200, condition = "success"),
+    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
+    @ResponseCode(code = 500, condition = "internal server error")
+  })
+  @Override
+  public Response getAll(@Context Request request,
+    @DefaultValue("0") @QueryParam("page") int page,
+    @DefaultValue("" + DEFAULT_PAGE_SIZE) @QueryParam("pageSize") int pageSize,
+    @QueryParam("sortby") String sortby,
+    @DefaultValue("false")
+    @QueryParam("desc") boolean desc) {
+    PageResult<Group> pageResult = fetchPage(sortby, desc, page, pageSize);
+
+    return Response.ok(groupCollectionToDtoMapper.map(page, pageSize, pageResult)).build();
+  }
+
   /**
    * Creates a new group.
    * @param groupDto The group to be created.
@@ -68,36 +99,6 @@ public class GroupCollectionResource extends AbstractManagerResource<Group, Grou
     return Response.created(URI.create(group(uriInfo).self(group.getName()))).build();
   }
 
-  /**
-   * Returns all groups for a given page number with a given page size (default page size is {@value DEFAULT_PAGE_SIZE}).
-   * <strong>Note:</strong> This method requires admin privileges.
-   *
-   * @param request  the current request
-   * @param page     the number of the requested page
-   * @param pageSize the page size (default page size is {@value DEFAULT_PAGE_SIZE})
-   * @param sortby   sort parameter
-   * @param desc     sort direction desc or aesc
-   * @return
-   */
-  @GET
-  @Path("")
-  @TypeHint(GroupDto[].class)
-  @StatusCodes({
-    @ResponseCode(code = 200, condition = "success"),
-    @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
-    @ResponseCode(code = 500, condition = "internal server error")
-  })
-  public Response getAll(@Context Request request, @Context UriInfo uriInfo,
-    @DefaultValue("0") @QueryParam("page") int page,
-    @DefaultValue("" + DEFAULT_PAGE_SIZE) @QueryParam("pageSize") int pageSize,
-    @QueryParam("sortby") String sortby,
-    @DefaultValue("false")
-    @QueryParam("desc") boolean desc) {
-    PageResult<Group> pageResult = fetchPage(sortby, desc, page, pageSize);
-
-    return Response.ok(groupCollectionToDtoMapper.map(page, pageSize, pageResult)).build();
-  }
-
   @Override
   protected GenericEntity<Collection<Group>> createGenericEntity(Collection<Group> items) {
     throw new UnsupportedOperationException();
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index 4d2024afdc..e336ef302d 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -61,6 +61,7 @@ public class UserCollectionResource extends AbstractManagerResource<User, UserEx
     @ResponseCode(code = 403, condition = "forbidden, the current user has no admin privileges"),
     @ResponseCode(code = 500, condition = "internal server error")
   })
+  @Override
   public Response getAll(@Context Request request,
     @DefaultValue("0") @QueryParam("page") int page,
     @DefaultValue("" + DEFAULT_PAGE_SIZE) @QueryParam("pageSize") int pageSize,