Merge pull request #3605 from ingef/fix/clean-up-resources

Clean up resources
ingef · Dec 4, 2024 · d44859e · d44859e
2 parents 6e7652f + 29cb0f4
commit d44859e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 30 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/GroupResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/GroupResource.java
@@ -45,9 +45,8 @@ public Response getGroup(@PathParam(GROUP_ID) Group group) {
 
 	@Path("{" + GROUP_ID + "}")
 	@DELETE
-	public Response deleteGroup(@PathParam(GROUP_ID) Group group) {
+	public void deleteGroup(@PathParam(GROUP_ID) Group group) {
 		processor.deleteGroup(group);
-		return Response.ok().build();
 	}
 
 	@POST
@@ -57,29 +56,25 @@ public void postGroups(@NotEmpty List<Group> groups) {
 
 	@Path("{" + GROUP_ID + "}/" + USERS_PATH_ELEMENT + "/{" + USER_ID + "}")
 	@POST
-	public Response addUserToGroup(@PathParam(GROUP_ID) Group group, @PathParam(USER_ID) User user) {
+	public void addUserToGroup(@PathParam(GROUP_ID) Group group, @PathParam(USER_ID) User user) {
 		processor.addUserToGroup(group, user);
-		return Response.ok().build();
 	}
 
 	@Path("{" + GROUP_ID + "}/" + USERS_PATH_ELEMENT + "/{" + USER_ID + "}")
 	@DELETE
-	public Response deleteUserFromGroup(@PathParam(GROUP_ID) Group group, @PathParam(USER_ID) UserId user) {
+	public void deleteUserFromGroup(@PathParam(GROUP_ID) Group group, @PathParam(USER_ID) UserId user) {
 		processor.deleteUserFromGroup(group, user);
-		return Response.ok().build();
 	}
 
 	@Path("{" + GROUP_ID + "}/" + ROLES_PATH_ELEMENT + "/{" + ROLE_ID + "}")
 	@DELETE
-	public Response deleteRoleFromUser(@PathParam(GROUP_ID) Group group, @PathParam(ROLE_ID) RoleId role) {
+	public void deleteRoleFromUser(@PathParam(GROUP_ID) Group group, @PathParam(ROLE_ID) RoleId role) {
 		processor.deleteRoleFrom(group, role);
-		return Response.ok().build();
 	}
 
 	@Path("{" + GROUP_ID + "}/" + ROLES_PATH_ELEMENT + "/{" + ROLE_ID + "}")
 	@POST
-	public Response addRoleToUser(@PathParam(GROUP_ID) Group group, @PathParam(ROLE_ID) Role role) {
+	public void addRoleToUser(@PathParam(GROUP_ID) Group group, @PathParam(ROLE_ID) Role role) {
 		processor.addRoleTo(group, role);
-		return Response.ok().build();
 	}
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/RoleResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/RoleResource.java
@@ -13,7 +13,6 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
 
 import com.bakdata.conquery.models.auth.entities.Role;
 import com.bakdata.conquery.models.exceptions.JSONException;
@@ -29,9 +28,8 @@ public class RoleResource {
 	private final AdminProcessor processor;
 
 	@POST
-	public Response postRole(Role role) throws JSONException {
+	public void postRole(Role role) throws JSONException {
 		processor.addRole(role);
-		return Response.ok().build();
 	}
 
 	@GET
@@ -41,14 +39,13 @@ public Collection<Role> getRoles() {
 
 	@Path("{" + ROLE_ID + "}")
 	@GET
-	public Response getRole(@PathParam(ROLE_ID) Role role) throws JSONException {
-		return Response.ok(role).build();
+	public Role getRole(@PathParam(ROLE_ID) Role role) throws JSONException {
+		return role;
 	}
 
 	@Path("{" + ROLE_ID + "}")
 	@DELETE
-	public Response deleteRole(@PathParam(ROLE_ID) RoleId role) throws JSONException {
+	public void deleteRole(@PathParam(ROLE_ID) RoleId role) {
 		processor.deleteRole(role);
-		return Response.ok().build();
 	}
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java
@@ -139,6 +139,15 @@ private FrontendRoleContent getFrontendRoleContent(RoleId id) {
 		return FrontendRoleContent.builder().id(id).build();
 	}
 
+
+	public FrontendUserContent getUserContent(UserId id) {
+		User user = getStorage().getUser(id);
+		if (user != null) {
+			return getUserContent(user);
+		}
+		return FrontendUserContent.builder().id(id).build();
+	}
+
 	public FrontendUserContent getUserContent(User user) {
 		final Collection<Group> availableGroups = new ArrayList<>(getStorage().getAllGroups().toList());
 		availableGroups.removeIf(g -> g.containsMember(user));

diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserResource.java
@@ -14,7 +14,6 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
 
 import com.bakdata.conquery.models.auth.entities.Role;
 import com.bakdata.conquery.models.auth.entities.User;
@@ -35,42 +34,37 @@ public Collection<User> getUsers() {
 	}
 
 	@POST
-	public Response postUser(@Valid User user) {
+	public void postUser(@Valid User user) {
 		processor.addUser(user);
-		return Response.ok().build();
 	}
 
 	@POST
 	@Path("upload")
-	public Response postUsers(@NotEmpty List<User> users) {
+	public void postUsers(@NotEmpty List<User> users) {
 		processor.addUsers(users);
-		return Response.ok().build();
 	}
 
 	@Path("{" + USER_ID + "}")
 	@GET
-	public Response getUser(@PathParam(USER_ID) User user) {
-		return Response.ok(user).build();
+	public User getUser(@PathParam(USER_ID) User user) {
+		return user;
 	}
 
 	@Path("{" + USER_ID + "}")
 	@DELETE
-	public Response deleteUser(@PathParam(USER_ID) UserId user) {
+	public void deleteUser(@PathParam(USER_ID) UserId user) {
 		processor.deleteUser(user);
-		return Response.ok().build();
 	}
 
 	@Path("{" + USER_ID + "}/" + ROLES_PATH_ELEMENT + "/{" + ROLE_ID + "}")
 	@DELETE
-	public Response deleteRoleFromUser(@PathParam(USER_ID) User user, @PathParam(ROLE_ID) RoleId role) {
+	public void deleteRoleFromUser(@PathParam(USER_ID) User user, @PathParam(ROLE_ID) RoleId role) {
 		processor.deleteRoleFrom(user, role);
-		return Response.ok().build();
 	}
 
 	@Path("{" + USER_ID + "}/" + ROLES_PATH_ELEMENT + "/{" + ROLE_ID + "}")
 	@POST
-	public Response addRoleToUser(@PathParam(USER_ID) User user, @PathParam(ROLE_ID) Role role) {
+	public void addRoleToUser(@PathParam(USER_ID) User user, @PathParam(ROLE_ID) Role role) {
 		processor.addRoleTo(user, role);
-		return Response.ok().build();
 	}
 }