diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapper.java index fd0d66660b..aa1c8711d0 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapper.java @@ -23,19 +23,15 @@ import static sonia.scm.api.v2.resources.ResourceLinks.userCollection; public class UserCollectionToDtoMapper { - @Inject - private UserToUserDtoMapper userToDtoMapper; - @Inject - private UriInfoStore uriInfoStore; + private final UserToUserDtoMapper userToDtoMapper; + private final UriInfoStore uriInfoStore; + @Inject public UserCollectionToDtoMapper(UserToUserDtoMapper userToDtoMapper, UriInfoStore uriInfoStore) { this.userToDtoMapper = userToDtoMapper; this.uriInfoStore = uriInfoStore; } - public UserCollectionToDtoMapper() { - } - public UserCollectionDto map(int pageNumber, int pageSize, PageResult pageResult) { NumberedPaging paging = zeroBasedNumberedPaging(pageNumber, pageSize, pageResult.getOverallCount()); List dtos = pageResult.getEntities().stream().map(userToDtoMapper::map).collect(toList()); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java index e987df3b29..2b00b32791 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java @@ -70,8 +70,8 @@ public class GroupCollectionToDtoMapperTest { @Test public void shouldCreateNextPageLink_whenHasMore() { PageResult pageResult = createPage(createGroups("nobodies", "bosses"), 0, 1); - GroupCollectionDto groupCollectionDto = mapper.map(1, 1, pageResult); - assertTrue(groupCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=2")); + GroupCollectionDto groupCollectionDto = mapper.map(0, 1, pageResult); + assertTrue(groupCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=1")); } @Test