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

Mob review

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-14 08:26:09 +02:00
parent c50a3fb2e2
commit 53690bf701
17 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java
View File

@@ -25,11 +25,11 @@ import java.util.Collection;
@Produces(VndMediaType.GROUP_COLLECTION)
public class GroupCollectionResource extends AbstractManagerResource<Group, GroupException> {
public static final int DEFAULT_PAGE_SIZE = 10;
private final GroupDto2GroupMapper dtoToGroupMapper;
private final Group2GroupDtoMapper groupToDtoMapper;
private final GroupDtoToGroupMapper dtoToGroupMapper;
private final GroupToGroupDtoMapper groupToDtoMapper;
@Inject
public GroupCollectionResource(GroupManager manager, GroupDto2GroupMapper dtoToGroupMapper, Group2GroupDtoMapper groupToDtoMapper) {
public GroupCollectionResource(GroupManager manager, GroupDtoToGroupMapper dtoToGroupMapper, GroupToGroupDtoMapper groupToDtoMapper) {
super(manager);
this.dtoToGroupMapper = dtoToGroupMapper;
this.groupToDtoMapper = groupToDtoMapper;
@@ -53,7 +53,7 @@ public class GroupCollectionResource extends AbstractManagerResource<Group, Grou
@TypeHint(TypeHint.NO_CONTENT.class)
@Consumes(VndMediaType.GROUP)
public Response create(@Context UriInfo uriInfo, GroupDto groupDto) throws IOException, GroupException {
Group group = dtoToGroupMapper.groupDtoToGroup(groupDto);
Group group = dtoToGroupMapper.map(groupDto);
System.out.println(group);
manager.create(group);

4
scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto2GroupMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDtoToGroupMapper.java
View File

@@ -10,12 +10,12 @@ import sonia.scm.group.Group;
import java.util.stream.Collectors;
@Mapper
public abstract class GroupDto2GroupMapper {
public abstract class GroupDtoToGroupMapper {
@Mappings({
@Mapping(target = "creationDate", ignore = true),
@Mapping(target = "lastModified", ignore = true)
})
public abstract Group groupDtoToGroup(GroupDto groupDto);
public abstract Group map(GroupDto groupDto);
@AfterMapping
void mapMembers(GroupDto dto, @MappingTarget Group target) {

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

@@ -25,10 +25,10 @@ import java.util.Collection;
@Produces(VndMediaType.GROUP)
public class GroupSubResource extends AbstractManagerResource<Group, GroupException> {
private final Group2GroupDtoMapper groupToGroupDtoMapper;
private final GroupToGroupDtoMapper groupToGroupDtoMapper;
@Inject
public GroupSubResource(GroupManager manager, Group2GroupDtoMapper groupToGroupDtoMapper) {
public GroupSubResource(GroupManager manager, GroupToGroupDtoMapper groupToGroupDtoMapper) {
super(manager);
this.groupToGroupDtoMapper = groupToGroupDtoMapper;
}
@@ -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.groupToGroupDto(group, uriInfo);
GroupDto groupDto = groupToGroupDtoMapper.map(group, uriInfo);
return Response.ok(groupDto).build();
}
else

4
scm-webapp/src/main/java/sonia/scm/api/v2/resources/Group2GroupDtoMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java
View File

@@ -20,9 +20,9 @@ import static de.otto.edison.hal.Link.link;
import static de.otto.edison.hal.Links.linkingTo;
@Mapper
public abstract class Group2GroupDtoMapper {
public abstract class GroupToGroupDtoMapper {
public abstract GroupDto groupToGroupDto(Group group, @Context UriInfo uriInfo);
public abstract GroupDto map(Group group, @Context UriInfo uriInfo);
@AfterMapping
void appendLinks(Group group, @MappingTarget GroupDto target, @Context UriInfo uriInfo) {

8
scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
View File

@@ -6,10 +6,10 @@ import org.mapstruct.factory.Mappers;
public class MapperModule extends AbstractModule {
@Override
protected void configure() {
bind(UserDto2UserMapper.class).to(Mappers.getMapper(UserDto2UserMapper.class).getClass());
bind(User2UserDtoMapper.class).to(Mappers.getMapper(User2UserDtoMapper.class).getClass());
bind(UserDtoToUserMapper.class).to(Mappers.getMapper(UserDtoToUserMapper.class).getClass());
bind(UserToUserDtoMapper.class).to(Mappers.getMapper(UserToUserDtoMapper.class).getClass());
bind(Group2GroupDtoMapper.class).to(Mappers.getMapper(Group2GroupDtoMapper.class).getClass());
bind(GroupDto2GroupMapper.class).to(Mappers.getMapper(GroupDto2GroupMapper.class).getClass());
bind(GroupToGroupDtoMapper.class).to(Mappers.getMapper(GroupToGroupDtoMapper.class).getClass());
bind(GroupDtoToGroupMapper.class).to(Mappers.getMapper(GroupDtoToGroupMapper.class).getClass());
}
}

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

@@ -29,11 +29,11 @@ import java.util.Collection;
@Produces(VndMediaType.USER_COLLECTION)
public class UserCollectionResource extends AbstractManagerResource<User, UserException> {
public static final int DEFAULT_PAGE_SIZE = 10;
private final UserDto2UserMapper dtoToUserMapper;
private final User2UserDtoMapper userToDtoMapper;
private final UserDtoToUserMapper dtoToUserMapper;
private final UserToUserDtoMapper userToDtoMapper;
@Inject
public UserCollectionResource(UserManager manager, UserDto2UserMapper dtoToUserMapper, User2UserDtoMapper userToDtoMapper) {
public UserCollectionResource(UserManager manager, UserDtoToUserMapper dtoToUserMapper, UserToUserDtoMapper userToDtoMapper) {
super(manager);
this.dtoToUserMapper = dtoToUserMapper;
this.userToDtoMapper = userToDtoMapper;
@@ -66,7 +66,7 @@ public class UserCollectionResource extends AbstractManagerResource<User, UserEx
@QueryParam("desc") boolean desc) {
PageResult<User> pageResult = fetchPage(sortby, desc, page, pageSize);
return Response.ok(new UserCollection2DtoMapper(userToDtoMapper).map(uriInfo, page, pageSize, pageResult)).build();
return Response.ok(new UserCollectionToDtoMapper(userToDtoMapper).map(uriInfo, page, pageSize, pageResult)).build();
}
/**

6
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollection2DtoMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapper.java
View File

@@ -20,12 +20,12 @@ import static de.otto.edison.hal.Link.link;
import static de.otto.edison.hal.Links.linkingTo;
import static de.otto.edison.hal.paging.NumberedPaging.zeroBasedNumberedPaging;
public class UserCollection2DtoMapper {
public class UserCollectionToDtoMapper {
private final User2UserDtoMapper userToDtoMapper;
private final UserToUserDtoMapper userToDtoMapper;
@Inject
public UserCollection2DtoMapper(User2UserDtoMapper userToDtoMapper) {
public UserCollectionToDtoMapper(UserToUserDtoMapper userToDtoMapper) {
this.userToDtoMapper = userToDtoMapper;
}

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto2UserMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java
View File

@@ -12,7 +12,7 @@ import sonia.scm.user.User;
import static sonia.scm.api.rest.resources.UserResource.DUMMY_PASSWORT;
@Mapper
public abstract class UserDto2UserMapper {
public abstract class UserDtoToUserMapper {
@Inject
private PasswordService passwordService;

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

@@ -28,11 +28,11 @@ import java.util.Collection;
@Produces(VndMediaType.USER)
public class UserSubResource extends AbstractManagerResource<User, UserException> {
private final UserDto2UserMapper dtoToUserMapper;
private final User2UserDtoMapper userToDtoMapper;
private final UserDtoToUserMapper dtoToUserMapper;
private final UserToUserDtoMapper userToDtoMapper;
@Inject
public UserSubResource(UserDto2UserMapper dtoToUserMapper, User2UserDtoMapper userToDtoMapper, UserManager manager) {
public UserSubResource(UserDtoToUserMapper dtoToUserMapper, UserToUserDtoMapper userToDtoMapper, UserManager manager) {
super(manager);
this.dtoToUserMapper = dtoToUserMapper;
this.userToDtoMapper = userToDtoMapper;

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/User2UserDtoMapper.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java
View File

@@ -18,7 +18,7 @@ import static de.otto.edison.hal.Link.link;
import static de.otto.edison.hal.Links.linkingTo;
@Mapper
public abstract class User2UserDtoMapper {
public abstract class UserToUserDtoMapper {
public abstract UserDto map(User user, @Context UriInfo uriInfo);