From f9a094e1b9da66841faba002e7460951142a1c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 25 Jun 2018 09:40:18 +0200 Subject: [PATCH] Use field variables --- .../scm/api/v2/resources/UserCollectionToDtoMapper.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 aa1c8711d0..9cfdfff87d 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 @@ -9,7 +9,6 @@ import sonia.scm.user.User; import sonia.scm.user.UserPermissions; import javax.inject.Inject; -import javax.ws.rs.core.UriInfo; import java.util.EnumSet; import java.util.List; @@ -37,22 +36,22 @@ public class UserCollectionToDtoMapper { List dtos = pageResult.getEntities().stream().map(userToDtoMapper::map).collect(toList()); UserCollectionDto userCollectionDto = new UserCollectionDto( - createLinks(uriInfoStore.get(), paging), + createLinks(paging), embedDtos(dtos) ); userCollectionDto.setPage(pageNumber); return userCollectionDto; } - private static Links createLinks(UriInfo uriInfo, NumberedPaging page) { - String baseUrl = userCollection(uriInfo).self(); + private Links createLinks(NumberedPaging page) { + String baseUrl = userCollection(uriInfoStore.get()).self(); Links.Builder linksBuilder = linkingTo() .with(page.links( fromTemplate(baseUrl + "{?page,pageSize}"), EnumSet.allOf(PagingRel.class))); if (UserPermissions.create().isPermitted()) { - linksBuilder.single(link("create", userCollection(uriInfo).create())); + linksBuilder.single(link("create", userCollection(uriInfoStore.get()).create())); } return linksBuilder.build(); }