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

Rename UserNewResource to UserV2Resource and add minimal test

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-01 12:58:43 +02:00
parent f614ee3bb4
commit cb4f2e49d9
5 changed files with 91 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/api/v2/resources/User2UserDtoMapper.java
View File

@@ -25,8 +25,8 @@ public abstract class User2UserDtoMapper {
@AfterMapping
void appendLinks(@MappingTarget UserDto target, @Context UriInfo uriInfo) {
LinkBuilder userLinkBuilder = new LinkBuilder(uriInfo, UserNewResource.class, UserSubResource.class);
LinkBuilder collectionLinkBuilder = new LinkBuilder(uriInfo, UserNewResource.class, UserCollectionResource.class);
LinkBuilder userLinkBuilder = new LinkBuilder(uriInfo, UserV2Resource.class, UserSubResource.class);
LinkBuilder collectionLinkBuilder = new LinkBuilder(uriInfo, UserV2Resource.class, UserCollectionResource.class);
Map<String, Link> links = new HashMap<>();
links.put("self", userLinkBuilder.method("getUserSubResource").parameters(target.getName()).method("get").parameters().create());
if (SecurityUtils.getSubject().hasRole(Role.ADMIN)) {

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

@@ -74,7 +74,7 @@ public class UserCollectionResource extends AbstractManagerResource<User, UserEx
User user = dtoToUserMapper.userDtoToUser(userDto, "");
manager.create(user);
LinkBuilder builder = new LinkBuilder(uriInfo, UserNewResource.class, UserSubResource.class);
LinkBuilder builder = new LinkBuilder(uriInfo, UserV2Resource.class, UserSubResource.class);
return Response.created(builder.method("getUserSubResource").parameters(user.getName()).method("get").parameters().create().getHref()).build();
}

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

@@ -6,15 +6,15 @@ import com.google.inject.Singleton;
import javax.ws.rs.Path;
@Singleton
@Path(UserNewResource.USERS_PATH_V2)
public class UserNewResource {
@Path(UserV2Resource.USERS_PATH_V2)
public class UserV2Resource {
public static final String USERS_PATH_V2 = "v2/users/";
private final UserCollectionResource userCollectionResource;
private final UserSubResource userSubResource;
@Inject
public UserNewResource(UserCollectionResource userCollectionResource, UserSubResource userSubResource) {
public UserV2Resource(UserCollectionResource userCollectionResource, UserSubResource userSubResource) {
this.userCollectionResource = userCollectionResource;
this.userSubResource = userSubResource;
}