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

Fix not found

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-25 13:27:24 +02:00
parent dda832775e
commit 0c88a03f27
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,9 +44,12 @@ public class GroupResource extends AbstractManagerResource<Group, GroupException
@ResponseCode(code = 500, condition = "internal server error")
})
public Response get(@Context Request request, @Context UriInfo uriInfo, @PathParam("id") String id) {
Group group = manager.get(id);
GroupDto groupDto = groupToGroupDtoMapper.map(group);
return Response.ok(groupDto).build();
Group group = manager.get(id);
if (group == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
GroupDto groupDto = groupToGroupDtoMapper.map(group);
return Response.ok(groupDto).build();
}
@Path("")

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

@@ -46,9 +46,12 @@ public class UserResource extends AbstractManagerResource<User, UserException> {
@ResponseCode(code = 500, condition = "internal server error")
})
public Response get(@Context Request request, @Context UriInfo uriInfo, @PathParam("id") String id) {
User user = manager.get(id);
UserDto userDto = userToDtoMapper.map(user);
return Response.ok(userDto).build();
User user = manager.get(id);
if (user == null) {
return Response.status(Response.Status.NOT_FOUND).build();
}
UserDto userDto = userToDtoMapper.map(user);
return Response.ok(userDto).build();
}
@PUT