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

Use constructor injection

Browse Source
This commit is contained in:
Philipp Czora
2018-06-25 14:10:36 +02:00
parent 0985f76a8a
commit a85961ee57
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,16 @@ import static sonia.scm.api.v2.resources.ResourceLinks.user;
@Mapper @Mapper
public abstract class GroupToGroupDtoMapper extends BaseMapper<Group, GroupDto> { public abstract class GroupToGroupDtoMapper extends BaseMapper<Group, GroupDto> {
@Inject
private UriInfoStore uriInfoStore; private UriInfoStore uriInfoStore;
GroupToGroupDtoMapper() {
}
@Inject
public GroupToGroupDtoMapper(UriInfoStore uriInfoStore) {
this.uriInfoStore = uriInfoStore;
}
@AfterMapping @AfterMapping
void appendLinks(Group group, @MappingTarget GroupDto target) { void appendLinks(Group group, @MappingTarget GroupDto target) {
Links.Builder linksBuilder = linkingTo().self(group(uriInfoStore.get()).self(target.getName())); Links.Builder linksBuilder = linkingTo().self(group(uriInfoStore.get()).self(target.getName()));

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

@@ -1,11 +1,7 @@
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.Context; import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.Named;
import sonia.scm.user.User; import sonia.scm.user.User;
import javax.inject.Inject; import javax.inject.Inject;
@@ -15,9 +11,16 @@ import static sonia.scm.api.rest.resources.UserResource.DUMMY_PASSWORT;
@Mapper @Mapper
public abstract class UserDtoToUserMapper { public abstract class UserDtoToUserMapper {
@Inject
private PasswordService passwordService; private PasswordService passwordService;
UserDtoToUserMapper() {
}
@Inject
public UserDtoToUserMapper(PasswordService passwordService) {
this.passwordService = passwordService;
}
@Mappings({ @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),
@@ -28,12 +31,9 @@ public abstract class UserDtoToUserMapper {
@Named("encrypt") @Named("encrypt")
String encrypt(String password, @Context String originalPassword) { String encrypt(String password, @Context String originalPassword) {
if (DUMMY_PASSWORT.equals(password)) if (DUMMY_PASSWORT.equals(password)) {
{
return originalPassword; return originalPassword;
} } else {
else
{
return passwordService.encryptPassword(password); return passwordService.encryptPassword(password);
} }
} }