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

Replace static access to ResourceLinks with injection

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-28 11:58:48 +02:00
parent 8eb544c966
commit dd72a00308
15 changed files with 128 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,25 +18,24 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
import static sonia.scm.api.v2.resources.ResourceLinks.group;
public class GroupCollectionResource {
private static final int DEFAULT_PAGE_SIZE = 10;
private final GroupDtoToGroupMapper dtoToGroupMapper;
private final GroupCollectionToDtoMapper groupCollectionToDtoMapper;
private final ResourceLinks resourceLinks;
private final ResourceManagerAdapter<Group, GroupDto, GroupException> adapter;
@Inject
public GroupCollectionResource(GroupManager manager, GroupDtoToGroupMapper dtoToGroupMapper, GroupCollectionToDtoMapper groupCollectionToDtoMapper) {
public GroupCollectionResource(GroupManager manager, GroupDtoToGroupMapper dtoToGroupMapper, GroupCollectionToDtoMapper groupCollectionToDtoMapper, ResourceLinks resourceLinks) {
this.dtoToGroupMapper = dtoToGroupMapper;
this.groupCollectionToDtoMapper = groupCollectionToDtoMapper;
this.resourceLinks = resourceLinks;
this.adapter = new ResourceManagerAdapter<>(manager);
}
@@ -85,9 +84,9 @@ public class GroupCollectionResource {
})
@TypeHint(TypeHint.NO_CONTENT.class)
@ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created group"))
public Response create(@Context UriInfo uriInfo, GroupDto groupDto) throws IOException, GroupException {
public Response create(GroupDto groupDto) throws IOException, GroupException {
return adapter.create(groupDto,
() -> dtoToGroupMapper.map(groupDto),
group -> group(uriInfo).self(group.getName()));
group -> resourceLinks.group().self(group.getName()));
}
}

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

@@ -5,26 +5,24 @@ import sonia.scm.group.GroupPermissions;
import javax.inject.Inject;
import static sonia.scm.api.v2.resources.ResourceLinks.groupCollection;
public class GroupCollectionToDtoMapper extends BasicCollectionToDtoMapper<Group, GroupDto> {
private final UriInfoStore uriInfoStore;
private final ResourceLinks resourceLinks;
@Inject
public GroupCollectionToDtoMapper(GroupToGroupDtoMapper groupToDtoMapper, UriInfoStore uriInfoStore) {
public GroupCollectionToDtoMapper(GroupToGroupDtoMapper groupToDtoMapper, ResourceLinks resourceLinks) {
super("groups", groupToDtoMapper);
this.uriInfoStore = uriInfoStore;
this.resourceLinks = resourceLinks;
}
@Override
String createCreateLink() {
return groupCollection(uriInfoStore.get()).create();
return resourceLinks.groupCollection().create();
}
@Override
String createSelfLink() {
return groupCollection(uriInfoStore.get()).self();
return resourceLinks.groupCollection().self();
}
@Override

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

@@ -13,8 +13,6 @@ import java.util.stream.Collectors;
import static de.otto.edison.hal.Link.link;
import static de.otto.edison.hal.Links.linkingTo;
import static sonia.scm.api.v2.resources.ResourceLinks.group;
import static sonia.scm.api.v2.resources.ResourceLinks.user;
// Mapstruct does not support parameterized (i.e. non-default) constructors. Thus, we need to use field injection.
@SuppressWarnings("squid:S3306")
@@ -22,16 +20,16 @@ import static sonia.scm.api.v2.resources.ResourceLinks.user;
public abstract class GroupToGroupDtoMapper extends BaseMapper<Group, GroupDto> {
@Inject
private UriInfoStore uriInfoStore;
private ResourceLinks resourceLinks;
@AfterMapping
void appendLinks(Group group, @MappingTarget GroupDto target) {
Links.Builder linksBuilder = linkingTo().self(group(uriInfoStore.get()).self(target.getName()));
Links.Builder linksBuilder = linkingTo().self(resourceLinks.group().self(target.getName()));
if (GroupPermissions.delete(group).isPermitted()) {
linksBuilder.single(link("delete", group(uriInfoStore.get()).delete(target.getName())));
linksBuilder.single(link("delete", resourceLinks.group().delete(target.getName())));
}
if (GroupPermissions.modify(group).isPermitted()) {
linksBuilder.single(link("update", group(uriInfoStore.get()).update(target.getName())));
linksBuilder.single(link("update", resourceLinks.group().update(target.getName())));
}
target.add(linksBuilder.build());
}
@@ -43,7 +41,7 @@ public abstract class GroupToGroupDtoMapper extends BaseMapper<Group, GroupDto>
}
private MemberDto createMember(String name) {
Links.Builder linksBuilder = linkingTo().self(user(uriInfoStore.get()).self(name));
Links.Builder linksBuilder = linkingTo().self(resourceLinks.user().self(name));
MemberDto memberDto = new MemberDto(name);
memberDto.add(linksBuilder.build());
return memberDto;

24
scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
View File

@@ -1,14 +1,20 @@
package sonia.scm.api.v2.resources;
import javax.inject.Inject;
import javax.ws.rs.core.UriInfo;
class ResourceLinks {
private ResourceLinks() {
private final UriInfoStore uriInfoStore;
@Inject
ResourceLinks(UriInfoStore uriInfoStore) {
this.uriInfoStore = uriInfoStore;
}
static GroupLinks group(UriInfo uriInfo) {
return new GroupLinks(uriInfo);
GroupLinks group() {
return new GroupLinks(uriInfoStore.get());
}
static class GroupLinks {
@@ -31,8 +37,8 @@ class ResourceLinks {
}
}
static GroupCollectionLinks groupCollection(UriInfo uriInfo) {
return new GroupCollectionLinks(uriInfo);
GroupCollectionLinks groupCollection() {
return new GroupCollectionLinks(uriInfoStore.get());
}
static class GroupCollectionLinks {
@@ -51,8 +57,8 @@ class ResourceLinks {
}
}
static UserLinks user(UriInfo uriInfo) {
return new UserLinks(uriInfo);
UserLinks user() {
return new UserLinks(uriInfoStore.get());
}
static class UserLinks {
@@ -75,8 +81,8 @@ class ResourceLinks {
}
}
static UserCollectionLinks userCollection(UriInfo uriInfo) {
return new UserCollectionLinks(uriInfo);
UserCollectionLinks userCollection() {
return new UserCollectionLinks(uriInfoStore.get());
}
static class UserCollectionLinks {

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

@@ -18,27 +18,25 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
import static sonia.scm.api.v2.resources.ResourceLinks.user;
public class UserCollectionResource {
private static final int DEFAULT_PAGE_SIZE = 10;
private final UserDtoToUserMapper dtoToUserMapper;
private final UserCollectionToDtoMapper userCollectionToDtoMapper;
private final ResourceLinks resourceLinks;
private final ResourceManagerAdapter<User, UserDto, UserException> adapter;
@Inject
public UserCollectionResource(UserManager manager, UserDtoToUserMapper dtoToUserMapper,
UserCollectionToDtoMapper userCollectionToDtoMapper) {
UserCollectionToDtoMapper userCollectionToDtoMapper, ResourceLinks resourceLinks) {
this.dtoToUserMapper = dtoToUserMapper;
this.userCollectionToDtoMapper = userCollectionToDtoMapper;
this.adapter = new ResourceManagerAdapter<>(manager);
this.resourceLinks = resourceLinks;
}
/**
@@ -88,9 +86,9 @@ public class UserCollectionResource {
})
@TypeHint(TypeHint.NO_CONTENT.class)
@ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created user"))
public Response create(@Context UriInfo uriInfo, UserDto userDto) throws IOException, UserException {
public Response create(UserDto userDto) throws IOException, UserException {
return adapter.create(userDto,
() -> dtoToUserMapper.map(userDto, ""),
user -> user(uriInfo).self(user.getName()));
user -> resourceLinks.user().self(user.getName()));
}
}

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

@@ -5,28 +5,26 @@ import sonia.scm.user.UserPermissions;
import javax.inject.Inject;
import static sonia.scm.api.v2.resources.ResourceLinks.userCollection;
// Mapstruct does not support parameterized (i.e. non-default) constructors. Thus, we need to use field injection.
@SuppressWarnings("squid:S3306")
public class UserCollectionToDtoMapper extends BasicCollectionToDtoMapper<User, UserDto> {
private final UriInfoStore uriInfoStore;
private final ResourceLinks resourceLinks;
@Inject
public UserCollectionToDtoMapper(UserToUserDtoMapper userToDtoMapper, UriInfoStore uriInfoStore) {
public UserCollectionToDtoMapper(UserToUserDtoMapper userToDtoMapper, ResourceLinks resourceLinks) {
super("users", userToDtoMapper);
this.uriInfoStore = uriInfoStore;
this.resourceLinks = resourceLinks;
}
@Override
String createCreateLink() {
return userCollection(uriInfoStore.get()).create();
return resourceLinks.userCollection().create();
}
@Override
String createSelfLink() {
return userCollection(uriInfoStore.get()).self();
return resourceLinks.userCollection().self();
}
@Override

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

@@ -12,7 +12,6 @@ import javax.inject.Inject;
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;
// Mapstruct does not support parameterized (i.e. non-default) constructors. Thus, we need to use field injection.
@SuppressWarnings("squid:S3306")
@@ -20,7 +19,7 @@ import static sonia.scm.api.v2.resources.ResourceLinks.user;
public abstract class UserToUserDtoMapper extends BaseMapper<User, UserDto> {
@Inject
private UriInfoStore uriInfoStore;
private ResourceLinks resourceLinks;
@AfterMapping
void removePassword(@MappingTarget UserDto target) {
@@ -29,13 +28,14 @@ public abstract class UserToUserDtoMapper extends BaseMapper<User, UserDto> {
@AfterMapping
void appendLinks(User user, @MappingTarget UserDto target) {
Links.Builder linksBuilder = linkingTo().self(user(uriInfoStore.get()).self(target.getName()));
Links.Builder linksBuilder = linkingTo().self(resourceLinks.user().self(target.getName()));
if (UserPermissions.delete(user).isPermitted()) {
linksBuilder.single(link("delete", user(uriInfoStore.get()).delete(target.getName())));
linksBuilder.single(link("delete", resourceLinks.user().delete(target.getName())));
}
if (UserPermissions.modify(user).isPermitted()) {
linksBuilder.single(link("update", user(uriInfoStore.get()).update(target.getName())));
linksBuilder.single(link("update", resourceLinks.user().update(target.getName())));
}
target.add(linksBuilder.build());
}
}