Move UriInfo to mappers

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapper.java

@@ -33,7 +33,7 @@ public class GroupCollectionToDtoMapper {
 
   public GroupCollectionDto map(int pageNumber, int pageSize, PageResult<Group> pageResult) {
     NumberedPaging paging = zeroBasedNumberedPaging(pageNumber, pageSize, pageResult.hasMore());
-    List<GroupDto> dtos = pageResult.getEntities().stream().map(user -> groupToDtoMapper.map(user, uriInfoStore.get())).collect(Collectors.toList());
+    List<GroupDto> dtos = pageResult.getEntities().stream().map(user -> groupToDtoMapper.map(user)).collect(Collectors.toList());
 
     GroupCollectionDto groupCollectionDto = new GroupCollectionDto(
       createLinks(paging),

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupSubResource.java

@@ -42,7 +42,7 @@ public class GroupSubResource extends AbstractManagerResource<Group, GroupExcept
       if (group == null) {
         return Response.status(Response.Status.NOT_FOUND).build();
       }
-      GroupDto groupDto = groupToGroupDtoMapper.map(group, uriInfo);
+      GroupDto groupDto = groupToGroupDtoMapper.map(group);
       return Response.ok(groupDto).build();
     }
     else

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java

@@ -1,14 +1,13 @@
 package sonia.scm.api.v2.resources;
 
+import com.google.inject.Inject;
 import de.otto.edison.hal.Links;
 import org.mapstruct.AfterMapping;
-import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupPermissions;
 
-import javax.ws.rs.core.UriInfo;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,28 +19,31 @@ import static sonia.scm.api.v2.resources.ResourceLinks.user;
 @Mapper
 public abstract class GroupToGroupDtoMapper extends BaseMapper {
 
-  public abstract GroupDto map(Group group, @Context UriInfo uriInfo);
+  @Inject
+  private UriInfoStore uriInfoStore;
+
+  public abstract GroupDto map(Group group);
 
   @AfterMapping
-  void appendLinks(Group group, @MappingTarget GroupDto target, @Context UriInfo uriInfo) {
+  void appendLinks(Group group, @MappingTarget GroupDto target) {
-    Links.Builder linksBuilder = linkingTo().self(group(uriInfo).self(target.getName()));
+    Links.Builder linksBuilder = linkingTo().self(group(uriInfoStore.get()).self(target.getName()));
     if (GroupPermissions.delete(group).isPermitted()) {
-      linksBuilder.single(link("delete", group(uriInfo).delete(target.getName())));
+      linksBuilder.single(link("delete", group(uriInfoStore.get()).delete(target.getName())));
     }
     if (GroupPermissions.modify(group).isPermitted()) {
-      linksBuilder.single(link("update", group(uriInfo).update(target.getName())));
+      linksBuilder.single(link("update", group(uriInfoStore.get()).update(target.getName())));
     }
     target.add(linksBuilder.build());
   }
 
   @AfterMapping
-  void mapMembers(Group group, @MappingTarget GroupDto target, @Context UriInfo uriInfo) {
+  void mapMembers(Group group, @MappingTarget GroupDto target) {
-    List<MemberDto> memberDtos = group.getMembers().stream().map(name -> this.createMember(name, uriInfo)).collect(Collectors.toList());
+    List<MemberDto> memberDtos = group.getMembers().stream().map(name -> this.createMember(name)).collect(Collectors.toList());
     target.withEmbedded("members", memberDtos);
   }
 
-  private MemberDto createMember(String name, UriInfo uriInfo) {
+  private MemberDto createMember(String name) {
-    Links.Builder linksBuilder = linkingTo().self(user(uriInfo).self(name));
+    Links.Builder linksBuilder = linkingTo().self(user(uriInfoStore.get()).self(name));
     MemberDto memberDto = new MemberDto(name);
     memberDto.add(linksBuilder.build());
     return memberDto;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java

@@ -34,12 +34,14 @@ public class UserCollectionResource extends AbstractManagerResource<User, UserEx
   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) {
+  public UserCollectionResource(UserManager manager, UserDtoToUserMapper dtoToUserMapper, UserToUserDtoMapper userToDtoMapper, UserCollectionToDtoMapper userCollectionToDtoMapper) {
     super(manager);
     this.dtoToUserMapper = dtoToUserMapper;
     this.userToDtoMapper = userToDtoMapper;
+    this.userCollectionToDtoMapper = userCollectionToDtoMapper;
   }
 
   /**
@@ -61,7 +63,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")
   })
-  public Response getAll(@Context Request request, @Context UriInfo uriInfo,
+  public Response getAll(@Context Request request,
     @DefaultValue("0") @QueryParam("page") int page,
     @DefaultValue("" + DEFAULT_PAGE_SIZE) @QueryParam("pageSize") int pageSize,
     @QueryParam("sortby") String sortby,
@@ -69,7 +71,7 @@ public class UserCollectionResource extends AbstractManagerResource<User, UserEx
     @QueryParam("desc") boolean desc) {
     PageResult<User> pageResult = fetchPage(sortby, desc, page, pageSize);
 
-    return Response.ok(new UserCollectionToDtoMapper(userToDtoMapper).map(uriInfo, page, pageSize, pageResult)).build();
+    return Response.ok(userCollectionToDtoMapper.map(page, pageSize, pageResult)).build();
   }
 
   /**

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapper.java

@@ -23,19 +23,27 @@ import static sonia.scm.api.v2.resources.ResourceLinks.userCollection;
 
 public class UserCollectionToDtoMapper {
 
-  private final UserToUserDtoMapper userToDtoMapper;
-
   @Inject
-  public UserCollectionToDtoMapper(UserToUserDtoMapper userToDtoMapper) {
+  private UserToUserDtoMapper userToDtoMapper;
+  @Inject
+  private UriInfoStore uriInfoStore;
+
+  public UserCollectionToDtoMapper(UserToUserDtoMapper userToDtoMapper, UriInfoStore uriInfoStore) {
     this.userToDtoMapper = userToDtoMapper;
+    this.uriInfoStore = uriInfoStore;
   }
 
-  public UserCollectionDto map(UriInfo uriInfo, int pageNumber, int pageSize, PageResult<User> pageResult) {
+  public UserCollectionToDtoMapper() {
+  }
+
+
+
+  public UserCollectionDto map(int pageNumber, int pageSize, PageResult<User> pageResult) {
     NumberedPaging paging = zeroBasedNumberedPaging(pageNumber, pageSize, pageResult.hasMore());
-    List<UserDto> dtos = pageResult.getEntities().stream().map(user -> userToDtoMapper.map(user, uriInfo)).collect(Collectors.toList());
+    List<UserDto> dtos = pageResult.getEntities().stream().map(userToDtoMapper::map).collect(Collectors.toList());
 
     UserCollectionDto userCollectionDto = new UserCollectionDto(
-      createLinks(uriInfo, paging),
+      createLinks(uriInfoStore.get(), paging),
       embedDtos(dtos)
     );
     userCollectionDto.setPage(pageNumber);

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java

@@ -52,7 +52,7 @@ public class UserSubResource extends AbstractManagerResource<User, UserException
     if (SecurityUtils.getSubject().hasRole(Role.ADMIN))
     {
       User user = manager.get(id);
-      UserDto userDto = userToDtoMapper.map(user, uriInfo);
+      UserDto userDto = userToDtoMapper.map(user);
       return Response.ok(userDto).build();
     }
     else

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java

@@ -1,16 +1,14 @@
 package sonia.scm.api.v2.resources;
 
+import com.google.inject.Inject;
 import de.otto.edison.hal.Links;
 import org.mapstruct.AfterMapping;
-import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import sonia.scm.api.rest.resources.UserResource;
 import sonia.scm.user.User;
 import sonia.scm.user.UserPermissions;
 
-import javax.ws.rs.core.UriInfo;
-
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
 import static sonia.scm.api.v2.resources.ResourceLinks.user;
@@ -18,7 +16,10 @@ import static sonia.scm.api.v2.resources.ResourceLinks.user;
 @Mapper
 public abstract class UserToUserDtoMapper extends BaseMapper {
 
-  public abstract UserDto map(User user, @Context UriInfo uriInfo);
+  @Inject
+  private UriInfoStore uriInfoStore;
+
+  public abstract UserDto map(User user);
 
   @AfterMapping
   void removePassword(@MappingTarget UserDto target) {
@@ -26,13 +27,13 @@ public abstract class UserToUserDtoMapper extends BaseMapper {
   }
 
   @AfterMapping
-  void appendLinks(User user, @MappingTarget UserDto target, @Context UriInfo uriInfo) {
+  void appendLinks(User user, @MappingTarget UserDto target) {
-    Links.Builder linksBuilder = linkingTo().self(user(uriInfo).self(target.getName()));
+    Links.Builder linksBuilder = linkingTo().self(user(uriInfoStore.get()).self(target.getName()));
     if (UserPermissions.delete(user).isPermitted()) {
-      linksBuilder.single(link("delete", user(uriInfo).delete(target.getName())));
+      linksBuilder.single(link("delete", user(uriInfoStore.get()).delete(target.getName())));
     }
     if (UserPermissions.modify(user).isPermitted()) {
-      linksBuilder.single(link("update", user(uriInfo).update(target.getName())));
+      linksBuilder.single(link("update", user(uriInfoStore.get()).update(target.getName())));
     }
     target.add(
       linksBuilder.build());

scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java

@@ -118,7 +118,7 @@ public class GroupCollectionToDtoMapperTest {
   private Group mockGroupWithDto(String groupName) {
     Group group = new Group();
     group.setName(groupName);
-    when(groupToDtoMapper.map(group, uriInfo)).thenReturn(createGroupDto(group));
+    when(groupToDtoMapper.map(group)).thenReturn(createGroupDto(group));
     return group;
   }
 

scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapperTest.java

@@ -7,7 +7,8 @@ import org.apache.shiro.util.ThreadState;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mapstruct.factory.Mappers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import sonia.scm.group.Group;
 
 import javax.ws.rs.core.UriInfo;
@@ -19,11 +20,18 @@ import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 public class GroupToGroupDtoMapperTest {
 
-  private final GroupToGroupDtoMapper mapper = Mappers.getMapper(GroupToGroupDtoMapper.class);
+  @Mock
-  private final UriInfo uriInfo = mock(UriInfo.class);
+  private UriInfo uriInfo;
+  @Mock
+  private UriInfoStore uriInfoStore;
+
+  @InjectMocks
+  private GroupToGroupDtoMapperImpl mapper;
+
   private final Subject subject = mock(Subject.class);
   private final ThreadState subjectThreadState = new SubjectThreadState(subject);
 
@@ -31,9 +39,11 @@ public class GroupToGroupDtoMapperTest {
 
   @Before
   public void init() throws URISyntaxException {
+    initMocks(this);
     URI baseUri = new URI("http://example.com/base/");
     expectedBaseUri = baseUri.resolve(GroupV2Resource.GROUPS_PATH_V2 + "/");
     when(uriInfo.getBaseUri()).thenReturn(baseUri);
+    when(uriInfoStore.get()).thenReturn(uriInfo);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
   }
@@ -47,7 +57,7 @@ public class GroupToGroupDtoMapperTest {
   public void shouldMapAttributes() {
     Group group = createDefaultGroup();
 
-    GroupDto groupDto = mapper.map(group, uriInfo);
+    GroupDto groupDto = mapper.map(group);
 
     assertEquals("abc", groupDto.getName());
     assertEquals("abc", groupDto.getName());
@@ -57,7 +67,7 @@ public class GroupToGroupDtoMapperTest {
   public void shouldMapSelfLink() {
     Group group = createDefaultGroup();
 
-    GroupDto groupDto = mapper.map(group, uriInfo);
+    GroupDto groupDto = mapper.map(group);
 
     assertEquals("expected self link", expectedBaseUri.resolve("abc").toString(), groupDto.getLinks().getLinkBy("self").get().getHref());
   }
@@ -67,7 +77,7 @@ public class GroupToGroupDtoMapperTest {
     Group group = createDefaultGroup();
     when(subject.isPermitted("group:modify:abc")).thenReturn(true);
 
-    GroupDto groupDto = mapper.map(group, uriInfo);
+    GroupDto groupDto = mapper.map(group);
 
     assertEquals("expected update link", expectedBaseUri.resolve("abc").toString(), groupDto.getLinks().getLinkBy("update").get().getHref());
   }
@@ -77,7 +87,7 @@ public class GroupToGroupDtoMapperTest {
     Group group = createDefaultGroup();
     group.setMembers(IntStream.range(0, 10).mapToObj(n -> "user" + n).collect(toList()));
 
-    GroupDto groupDto = mapper.map(group, uriInfo);
+    GroupDto groupDto = mapper.map(group);
 
     assertEquals(10, groupDto.getEmbedded().getItemsBy("members").size());
     MemberDto actualMember = (MemberDto) groupDto.getEmbedded().getItemsBy("members").iterator().next();

scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupV2ResourceTest.java

@@ -19,7 +19,9 @@ import sonia.scm.group.GroupManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collections;
@@ -45,7 +47,10 @@ public class GroupV2ResourceTest {
 
   @Mock
   private GroupManager groupManager;
-  private final UriInfoStore uriInfoStore = new UriInfoStore();
+  @Mock
+  private UriInfo uriInfo;
+  @Mock
+  private UriInfoStore uriInfoStore;
   @InjectMocks
   GroupDtoToGroupMapperImpl dtoToGroupMapper;
   @InjectMocks
@@ -72,6 +77,9 @@ public class GroupV2ResourceTest {
     GroupV2Resource groupV2Resource = new GroupV2Resource(groupCollectionResource, groupSubResource);
 
     dispatcher.getRegistry().addSingletonResource(groupV2Resource);
+
+    when(uriInfo.getBaseUri()).thenReturn(URI.create("/"));
+    when(uriInfoStore.get()).thenReturn(uriInfo);
   }
 
   @Test

scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java

@@ -4,10 +4,11 @@ import de.otto.edison.hal.HalRepresentation;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.support.SubjectThreadState;
 import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.util.ThreadState;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import sonia.scm.PageResult;
 import sonia.scm.user.User;
 
@@ -22,25 +23,34 @@ import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 public class UserCollectionToDtoMapperTest {
 
-  private final UriInfo uriInfo = mock(UriInfo.class);
+  @Mock
-  private final UserToUserDtoMapper userToDtoMapper = mock(UserToUserDtoMapper.class);
+  private  UriInfo uriInfo;
-  private final Subject subject = mock(Subject.class);
+  @Mock
-  private final ThreadState subjectThreadState = new SubjectThreadState(subject);
+  private  UriInfoStore uriInfoStore;
+  @Mock
+  private  UserToUserDtoMapper userToDtoMapper;
+  @Mock
+  private  Subject subject;
 
-  private final UserCollectionToDtoMapper mapper = new UserCollectionToDtoMapper(userToDtoMapper);
+  @InjectMocks
+  private SubjectThreadState subjectThreadState;
+  @InjectMocks
+  private UserCollectionToDtoMapper mapper;
 
   private URI expectedBaseUri;
 
   @Before
   public void init() throws URISyntaxException {
+    initMocks(this);
     URI baseUri = new URI("http://example.com/base/");
     expectedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
     when(uriInfo.getBaseUri()).thenReturn(baseUri);
+    when(uriInfoStore.get()).thenReturn(uriInfo);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
   }
@@ -53,28 +63,28 @@ public class UserCollectionToDtoMapperTest {
   @Test
   public void shouldSetPageNumber() {
     PageResult<User> pageResult = mockPageResult(true, "Hannes");
-    UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
+    UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
     assertEquals(1, userCollectionDto.getPage());
   }
 
   @Test
   public void shouldHaveSelfLink() {
     PageResult<User> pageResult = mockPageResult(true, "Hannes");
-    UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
+    UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
     assertTrue(userCollectionDto.getLinks().getLinkBy("self").get().getHref().startsWith(expectedBaseUri.toString()));
   }
 
   @Test
   public void shouldCreateNextPageLink_whenHasMore() {
     PageResult<User> pageResult = mockPageResult(true, "Hannes");
-    UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
+    UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
     assertTrue(userCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=2"));
   }
 
   @Test
   public void shouldNotCreateNextPageLink_whenNoMore() {
     PageResult<User> pageResult = mockPageResult(false, "Hannes");
-    UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
+    UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
     assertFalse(userCollectionDto.getLinks().stream().anyMatch(link -> link.getHref().contains("page=2")));
   }
 
@@ -83,7 +93,7 @@ public class UserCollectionToDtoMapperTest {
     PageResult<User> pageResult = mockPageResult(false, "Hannes");
     when(subject.isPermitted("user:create")).thenReturn(true);
 
-    UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
+    UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
 
     assertTrue(userCollectionDto.getLinks().getLinkBy("create").isPresent());
   }
@@ -93,7 +103,7 @@ public class UserCollectionToDtoMapperTest {
     PageResult<User> pageResult = mockPageResult(false, "Hannes");
     when(subject.isPermitted("user:create")).thenReturn(false);
 
-    UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 1, pageResult);
+    UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
 
     assertFalse(userCollectionDto.getLinks().getLinkBy("create").isPresent());
   }
@@ -101,7 +111,7 @@ public class UserCollectionToDtoMapperTest {
   @Test
   public void shouldMapUsers() {
     PageResult<User> pageResult = mockPageResult(false, "Hannes", "Wurst");
-    UserCollectionDto userCollectionDto = mapper.map(uriInfo, 1, 2, pageResult);
+    UserCollectionDto userCollectionDto = mapper.map(1, 2, pageResult);
     List<HalRepresentation> users = userCollectionDto.getEmbedded().getItemsBy("users");
     assertEquals(2, users.size());
     assertEquals("Hannes", ((UserDto) users.get(0)).getName());
@@ -116,7 +126,7 @@ public class UserCollectionToDtoMapperTest {
   private User mockUserWithDto(String userName) {
     User user = new User();
     user.setName(userName);
-    when(userToDtoMapper.map(user, uriInfo)).thenReturn(createUserDto(user));
+    when(userToDtoMapper.map(user)).thenReturn(createUserDto(user));
     return user;
   }
 

scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java

@@ -7,7 +7,8 @@ import org.apache.shiro.util.ThreadState;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mapstruct.factory.Mappers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import sonia.scm.api.rest.resources.UserResource;
 import sonia.scm.user.User;
 
@@ -20,11 +21,18 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 public class UserToUserDtoMapperTest {
 
-  private final UserToUserDtoMapper mapper = Mappers.getMapper(UserToUserDtoMapper.class);
+  @Mock
-  private final UriInfo uriInfo = mock(UriInfo.class);
+  private UriInfo uriInfo;
+  @Mock
+  private UriInfoStore uriInfoStore;
+
+  @InjectMocks
+  private UserToUserDtoMapperImpl mapper;
+
   private final Subject subject = mock(Subject.class);
   private final ThreadState subjectThreadState = new SubjectThreadState(subject);
 
@@ -32,9 +40,11 @@ public class UserToUserDtoMapperTest {
 
   @Before
   public void init() throws URISyntaxException {
+    initMocks(this);
     URI baseUri = new URI("http://example.com/base/");
     expectedBaseUri = baseUri.resolve(UserV2Resource.USERS_PATH_V2 + "/");
     when(uriInfo.getBaseUri()).thenReturn(baseUri);
+    when(uriInfoStore.get()).thenReturn(uriInfo);
     subjectThreadState.bind();
     ThreadContext.bind(subject);
   }
@@ -49,7 +59,7 @@ public class UserToUserDtoMapperTest {
     User user = createDefaultUser();
     when(subject.isPermitted("user:modify:abc")).thenReturn(true);
 
-    UserDto userDto = mapper.map(user, uriInfo);
+    UserDto userDto = mapper.map(user);
 
     assertEquals("expected self link",   expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("self").get().getHref());
     assertEquals("expected update link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("update").get().getHref());
@@ -60,7 +70,7 @@ public class UserToUserDtoMapperTest {
     User user = createDefaultUser();
     when(subject.isPermitted("user:delete:abc")).thenReturn(true);
 
-    UserDto userDto = mapper.map(user, uriInfo);
+    UserDto userDto = mapper.map(user);
 
     assertEquals("expected self link",   expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("self").get().getHref());
     assertEquals("expected delete link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("delete").get().getHref());
@@ -78,7 +88,7 @@ public class UserToUserDtoMapperTest {
     User user = createDefaultUser();
     when(subject.hasRole("user")).thenReturn(true);
 
-    UserDto userDto = mapper.map(user, uriInfo);
+    UserDto userDto = mapper.map(user);
 
     assertEquals("expected self link", expectedBaseUri.resolve("abc").toString(), userDto.getLinks().getLinkBy("self").get().getHref());
     assertFalse("expected no delete link", userDto.getLinks().getLinkBy("delete").isPresent());
@@ -89,7 +99,7 @@ public class UserToUserDtoMapperTest {
   public void shouldMapFields() {
     User user = createDefaultUser();
 
-    UserDto userDto = mapper.map(user, uriInfo);
+    UserDto userDto = mapper.map(user);
 
     assertEquals("abc", userDto.getName());
   }
@@ -99,7 +109,7 @@ public class UserToUserDtoMapperTest {
     User user = createDefaultUser();
     user.setPassword("password");
 
-    UserDto userDto = mapper.map(user, uriInfo);
+    UserDto userDto = mapper.map(user);
 
     assertEquals(UserResource.DUMMY_PASSWORT, userDto.getPassword());
   }
@@ -112,7 +122,7 @@ public class UserToUserDtoMapperTest {
     user.setCreationDate(expectedCreationDate.toEpochMilli());
     user.setLastModified(expectedModificationDate.toEpochMilli());
 
-    UserDto userDto = mapper.map(user, uriInfo);
+    UserDto userDto = mapper.map(user);
 
     assertEquals(expectedCreationDate, userDto.getCreationDate());
     assertEquals(expectedModificationDate, userDto.getLastModified().get());

scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserV2ResourceTest.java

@@ -21,7 +21,9 @@ import sonia.scm.user.UserManager;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collections;
@@ -48,16 +50,23 @@ public class UserV2ResourceTest {
 
   private Dispatcher dispatcher = MockDispatcherFactory.createDispatcher();
 
+  @Mock
+  private UriInfo uriInfo;
+  @Mock
+  private UriInfoStore uriInfoStore;
+
   @Mock
   private PasswordService passwordService;
   @Mock
   private UserManager userManager;
   @InjectMocks
-  UserDtoToUserMapperImpl dtoToUserMapper;
+  private UserDtoToUserMapperImpl dtoToUserMapper;
   @InjectMocks
-  UserToUserDtoMapperImpl userToDtoMapper;
+  private UserToUserDtoMapperImpl userToDtoMapper;
 
-  ArgumentCaptor<User> userCaptor = ArgumentCaptor.forClass(User.class);
+  private UserCollectionToDtoMapper userCollectionToDtoMapper;
+
+  private ArgumentCaptor<User> userCaptor = ArgumentCaptor.forClass(User.class);
 
   @Before
   public void prepareEnvironment() throws IOException, UserException {
@@ -67,11 +76,14 @@ public class UserV2ResourceTest {
     when(userManager.get("Neo")).thenReturn(dummyUser);
     doNothing().when(userManager).create(userCaptor.capture());
 
-    UserCollectionResource userCollectionResource = new UserCollectionResource(userManager, dtoToUserMapper, userToDtoMapper);
+    userCollectionToDtoMapper = new UserCollectionToDtoMapper(userToDtoMapper, uriInfoStore);
+    UserCollectionResource userCollectionResource = new UserCollectionResource(userManager, dtoToUserMapper, userToDtoMapper, userCollectionToDtoMapper);
     UserSubResource userSubResource = new UserSubResource(dtoToUserMapper, userToDtoMapper, userManager);
     UserV2Resource userV2Resource = new UserV2Resource(userCollectionResource, userSubResource);
 
     dispatcher.getRegistry().addSingletonResource(userV2Resource);
+    when(uriInfo.getBaseUri()).thenReturn(URI.create("/"));
+    when(uriInfoStore.get()).thenReturn(uriInfo);
   }
 
   @Test
@@ -82,6 +94,7 @@ public class UserV2ResourceTest {
     dispatcher.invoke(request, response);
 
     assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+    System.out.println(response.getContentAsString());
     assertTrue(response.getContentAsString().contains("\"name\":\"Neo\""));
     assertTrue(response.getContentAsString().contains("\"password\":\"__dummypassword__\""));
     assertTrue(response.getContentAsString().contains("\"self\":{\"href\":\"/v2/users/Neo\"}"));