From 0c8ec1577a46357bce06046d761db14e28b6f258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 25 Jun 2018 14:54:20 +0200 Subject: [PATCH 1/2] Remove unused fields --- .../sonia/scm/api/v2/resources/GroupCollectionResource.java | 4 +--- .../sonia/scm/api/v2/resources/UserCollectionResource.java | 4 +--- .../sonia/scm/api/v2/resources/GroupRootResourceTest.java | 2 +- .../java/sonia/scm/api/v2/resources/UserRootResourceTest.java | 4 ++-- 4 files changed, 5 insertions(+), 9 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 7f0a19ed5d..36213c81e0 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 @@ -34,14 +34,12 @@ import static sonia.scm.api.v2.resources.ResourceLinks.group; public class GroupCollectionResource extends AbstractManagerResource { public static final int DEFAULT_PAGE_SIZE = 10; private final GroupDtoToGroupMapper dtoToGroupMapper; - private final GroupToGroupDtoMapper groupToDtoMapper; private final GroupCollectionToDtoMapper groupCollectionToDtoMapper; @Inject - public GroupCollectionResource(GroupManager manager, GroupDtoToGroupMapper dtoToGroupMapper, GroupToGroupDtoMapper groupToDtoMapper, GroupCollectionToDtoMapper groupCollectionToDtoMapper) { + public GroupCollectionResource(GroupManager manager, GroupDtoToGroupMapper dtoToGroupMapper, GroupCollectionToDtoMapper groupCollectionToDtoMapper) { super(manager); this.dtoToGroupMapper = dtoToGroupMapper; - this.groupToDtoMapper = groupToDtoMapper; this.groupCollectionToDtoMapper = groupCollectionToDtoMapper; } 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 7d6ef89909..4d2024afdc 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 @@ -33,14 +33,12 @@ import static sonia.scm.api.v2.resources.ResourceLinks.user; public class UserCollectionResource extends AbstractManagerResource { public static final int DEFAULT_PAGE_SIZE = 10; private final UserDtoToUserMapper dtoToUserMapper; - private final UserToUserDtoMapper userToDtoMapper; private final UserCollectionToDtoMapper userCollectionToDtoMapper; @Inject - public UserCollectionResource(UserManager manager, UserDtoToUserMapper dtoToUserMapper, UserToUserDtoMapper userToDtoMapper, UserCollectionToDtoMapper userCollectionToDtoMapper) { + public UserCollectionResource(UserManager manager, UserDtoToUserMapper dtoToUserMapper, UserCollectionToDtoMapper userCollectionToDtoMapper) { super(manager); this.dtoToUserMapper = dtoToUserMapper; - this.userToDtoMapper = userToDtoMapper; this.userCollectionToDtoMapper = userCollectionToDtoMapper; } diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java index b4e8d167e1..b436722830 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java @@ -73,7 +73,7 @@ public class GroupRootResourceTest { when(groupManager.get("admin")).thenReturn(group); GroupCollectionToDtoMapper groupCollectionToDtoMapper = new GroupCollectionToDtoMapper(groupToDtoMapper, uriInfoStore); - GroupCollectionResource groupCollectionResource = new GroupCollectionResource(groupManager, dtoToGroupMapper, groupToDtoMapper, groupCollectionToDtoMapper); + GroupCollectionResource groupCollectionResource = new GroupCollectionResource(groupManager, dtoToGroupMapper, groupCollectionToDtoMapper); GroupResource groupResource = new GroupResource(groupManager, groupToDtoMapper); GroupRootResource groupRootResource = new GroupRootResource(MockProvider.of(groupCollectionResource), MockProvider.of(groupResource)); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java index c946077e0b..605d7b0db2 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java @@ -77,8 +77,8 @@ public class UserRootResourceTest { doNothing().when(userManager).delete(userCaptor.capture()); UserCollectionToDtoMapper userCollectionToDtoMapper = new UserCollectionToDtoMapper(userToDtoMapper, uriInfoStore); - UserCollectionResource userCollectionResource = new UserCollectionResource(userManager, dtoToUserMapper, userToDtoMapper, - userCollectionToDtoMapper); + UserCollectionResource userCollectionResource = new UserCollectionResource(userManager, dtoToUserMapper, + userCollectionToDtoMapper); UserResource userResource = new UserResource(dtoToUserMapper, userToDtoMapper, userManager); UserRootResource userRootResource = new UserRootResource(MockProvider.of(userCollectionResource), MockProvider.of(userResource)); From 8a9b17a550caab1e96fe390fe143a000ddbd5e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 25 Jun 2018 15:01:57 +0200 Subject: [PATCH 2/2] 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 AbstractManagerResourceNote: 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 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 AbstractManagerResourceNote: 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 pageResult = fetchPage(sortby, desc, page, pageSize); - - return Response.ok(groupCollectionToDtoMapper.map(page, pageSize, pageResult)).build(); - } - @Override protected GenericEntity> createGenericEntity(Collection 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