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

Use Java 8 style annotations

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-25 15:31:42 +02:00
parent 20db836e6c
commit a083d3d596
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,17 +5,15 @@ import org.mapstruct.AfterMapping;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget; import org.mapstruct.MappingTarget;
import org.mapstruct.Mappings;
import sonia.scm.group.Group; import sonia.scm.group.Group;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Mapper @Mapper
public abstract class GroupDtoToGroupMapper { public abstract class GroupDtoToGroupMapper {
@Mappings({
@Mapping(target = "creationDate", ignore = true), @Mapping(target = "creationDate", ignore = true)
@Mapping(target = "lastModified", ignore = true) @Mapping(target = "lastModified", ignore = true)
})
public abstract Group map(GroupDto groupDto); public abstract Group map(GroupDto groupDto);
@AfterMapping @AfterMapping

13
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java
View File

@@ -1,7 +1,10 @@
package sonia.scm.api.v2.resources; package sonia.scm.api.v2.resources;
import org.apache.shiro.authc.credential.PasswordService; import org.apache.shiro.authc.credential.PasswordService;
import org.mapstruct.*; import org.mapstruct.Context;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Named;
import sonia.scm.user.User; import sonia.scm.user.User;
import javax.inject.Inject; import javax.inject.Inject;
@@ -18,11 +21,9 @@ public abstract class UserDtoToUserMapper {
@Inject @Inject
private PasswordService passwordService; private PasswordService passwordService;
@Mappings({ @Mapping(source = "password", target = "password", qualifiedByName = "encrypt")
@Mapping(source = "password", target = "password", qualifiedByName = "encrypt"), @Mapping(target = "creationDate", ignore = true)
@Mapping(target = "creationDate", ignore = true), @Mapping(target = "lastModified", ignore = true)
@Mapping(target = "lastModified", ignore = true)
})
public abstract User map(UserDto userDto, @Context String originalPassword); public abstract User map(UserDto userDto, @Context String originalPassword);
@Named("encrypt") @Named("encrypt")