Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

Use dedicated instead of generic Method for members

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-25 15:21:38 +02:00
parent 6476fe18cd
commit 20db836e6c
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
View File

@@ -25,8 +25,7 @@ public class GroupDto extends HalRepresentation {
return super.add(links); return super.add(links);
} }
@Override public HalRepresentation withMembers(List<MemberDto> members) {
protected HalRepresentation withEmbedded(String rel, List<? extends HalRepresentation> embeddedItems) { return super.withEmbedded("members", members);
return super.withEmbedded(rel, embeddedItems);
} }
} }

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

@@ -41,7 +41,7 @@ public abstract class GroupToGroupDtoMapper extends BaseMapper<Group, GroupDto>
@AfterMapping @AfterMapping
void mapMembers(Group group, @MappingTarget GroupDto target) { void mapMembers(Group group, @MappingTarget GroupDto target) {
List<MemberDto> memberDtos = group.getMembers().stream().map(this::createMember).collect(Collectors.toList()); List<MemberDto> memberDtos = group.getMembers().stream().map(this::createMember).collect(Collectors.toList());
target.withEmbedded("members", memberDtos); target.withMembers(memberDtos);
} }
private MemberDto createMember(String name) { private MemberDto createMember(String name) {

7
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupDtoToGroupMapperTest.java
View File

@@ -1,7 +1,6 @@
package sonia.scm.api.v2.resources; package sonia.scm.api.v2.resources;
import com.fasterxml.jackson.databind.node.TextNode; import com.fasterxml.jackson.databind.node.TextNode;
import de.otto.edison.hal.HalRepresentation;
import org.junit.Test; import org.junit.Test;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import sonia.scm.group.Group; import sonia.scm.group.Group;
@@ -23,12 +22,12 @@ public class GroupDtoToGroupMapperTest {
public void shouldMapMembers() { public void shouldMapMembers() {
GroupDto dto = new GroupDto(); GroupDto dto = new GroupDto();
HalRepresentation member1 = new HalRepresentation(); MemberDto member1 = new MemberDto();
member1.getAttributes().put("name", new TextNode("member1")); member1.getAttributes().put("name", new TextNode("member1"));
HalRepresentation member2 = new HalRepresentation(); MemberDto member2 = new MemberDto();
member2.getAttributes().put("name", new TextNode("member2")); member2.getAttributes().put("name", new TextNode("member2"));
dto.withEmbedded("members", asList(member1, member2)); dto.withMembers(asList(member1, member2));
Group group = Mappers.getMapper(GroupDtoToGroupMapper.class).map(dto); Group group = Mappers.getMapper(GroupDtoToGroupMapper.class).map(dto);