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

Rename group resource classes

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-22 08:28:18 +02:00
parent ed1417b2ea
commit 5836688f30
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,12 +23,12 @@ import javax.ws.rs.core.UriInfo;
import java.util.Collection;
@Produces(VndMediaType.GROUP)
public class GroupSubResource extends AbstractManagerResource<Group, GroupException> {
public class GroupResource extends AbstractManagerResource<Group, GroupException> {
private final GroupToGroupDtoMapper groupToGroupDtoMapper;
@Inject
public GroupSubResource(GroupManager manager, GroupToGroupDtoMapper groupToGroupDtoMapper) {
public GroupResource(GroupManager manager, GroupToGroupDtoMapper groupToGroupDtoMapper) {
super(manager);
this.groupToGroupDtoMapper = groupToGroupDtoMapper;
}

14
scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupV2Resource.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupRootResource.java
View File

@@ -3,18 +3,18 @@ package sonia.scm.api.v2.resources;
import javax.inject.Inject;
import javax.ws.rs.Path;
@Path(GroupV2Resource.GROUPS_PATH_V2)
public class GroupV2Resource {
@Path(GroupRootResource.GROUPS_PATH_V2)
public class GroupRootResource {
public static final String GROUPS_PATH_V2 = "v2/groups/";
private final GroupCollectionResource groupCollectionResource;
private final GroupSubResource groupSubResource;
private final GroupResource groupResource;
@Inject
public GroupV2Resource(GroupCollectionResource groupCollectionResource, GroupSubResource groupSubResource) {
public GroupRootResource(GroupCollectionResource groupCollectionResource, GroupResource groupResource) {
this.groupCollectionResource = groupCollectionResource;
this.groupSubResource = groupSubResource;
this.groupResource = groupResource;
}
@Path("")
@@ -23,7 +23,7 @@ public class GroupV2Resource {
}
@Path("{id}")
public GroupSubResource getGroupSubResource() {
return groupSubResource;
public GroupResource getGroupResource() {
return groupResource;
}
}

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

@@ -15,19 +15,19 @@ class ResourceLinks {
private final LinkBuilder groupLinkBuilder;
private GroupLinks(UriInfo uriInfo) {
groupLinkBuilder = new LinkBuilder(uriInfo, GroupV2Resource.class, GroupSubResource.class);
groupLinkBuilder = new LinkBuilder(uriInfo, GroupRootResource.class, GroupResource.class);
}
String self(String name) {
return groupLinkBuilder.method("getGroupSubResource").parameters(name).method("get").parameters().href();
return groupLinkBuilder.method("getGroupResource").parameters(name).method("get").parameters().href();
}
String delete(String name) {
return groupLinkBuilder.method("getGroupSubResource").parameters(name).method("delete").parameters().href();
return groupLinkBuilder.method("getGroupResource").parameters(name).method("delete").parameters().href();
}
String update(String name) {
return groupLinkBuilder.method("getGroupSubResource").parameters(name).method("update").parameters().href();
return groupLinkBuilder.method("getGroupResource").parameters(name).method("update").parameters().href();
}
}
@@ -39,7 +39,7 @@ class ResourceLinks {
private final LinkBuilder collectionLinkBuilder;
private GroupCollectionLinks(UriInfo uriInfo) {
collectionLinkBuilder = new LinkBuilder(uriInfo, GroupV2Resource.class, GroupCollectionResource.class);
collectionLinkBuilder = new LinkBuilder(uriInfo, GroupRootResource.class, GroupCollectionResource.class);
}
String self() {