Skip to content

NPE correction when informing removed project in the listProjectRoles #13022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tonitzpp wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −8
Open

NPE correction when informing removed project in the listProjectRoles #13022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e0552
NPE correction when informing removed project in the 'listProjectRoles'
Mar 17, 2026
3f86092
Refactor ListProjectRolesCmd to improve project handling
Tonitzpp Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions ...rc/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Collections;
import java.util.List;

import com.cloud.exception.InvalidParameterValueException;
import org.apache.cloudstack.acl.ProjectRole;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
Expand Down Expand Up @@ -55,7 +56,6 @@ public class ListProjectRolesCmd extends BaseListCmd {
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////


public Long getProjectRoleId() { return projectRoleId; }

public Long getProjectId() {
Expand All @@ -72,7 +72,15 @@ public String getRoleName() {

@Override
public void execute() {
List<ProjectRole> projectRoles = new ArrayList<>();
Project project = null;
if (getProjectId() != null && getProjectId() > 0) {
project = _projectService.getProject(getProjectId());
if (project == null) {
throw new InvalidParameterValueException("Unable to find project by ID.");
}
}
final String projectUuid = project != null ? project.getUuid() : null;
List<ProjectRole> projectRoles;
if (getProjectId() != null && getProjectRoleId() != null) {
projectRoles = Collections.singletonList(projRoleService.findProjectRole(getProjectRoleId(), getProjectId()));
} else if (StringUtils.isNotBlank(getRoleName())) {
Expand All @@ -86,17 +94,17 @@ public void execute() {
if (role == null) {
continue;
}
roleResponses.add(setupProjectRoleResponse(role));
roleResponses.add(setupProjectRoleResponse(role, projectUuid));
}
response.setResponses(roleResponses);
response.setResponseName(getCommandName());
setResponseObject(response);
}

private ProjectRoleResponse setupProjectRoleResponse(final ProjectRole role) {
private ProjectRoleResponse setupProjectRoleResponse(final ProjectRole role, final String projectUuid) {
final ProjectRoleResponse response = new ProjectRoleResponse();
response.setId(role.getUuid());
response.setProjectId(_projectService.getProject(role.getProjectId()).getUuid());
response.setProjectId(projectUuid);
response.setRoleName(role.getName());
response.setDescription(role.getDescription());
response.setObjectName("projectrole");
Expand All @@ -108,3 +116,4 @@ public long getEntityOwnerId() {
return CallContext.current().getCallingAccountId();
}
}
}
6 changes: 3 additions & 3 deletions server/src/main/java/org/apache/cloudstack/acl/ProjectRoleManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ public ProjectRole findProjectRole(Long roleId, Long projectId) {

@Override
public List<ProjectRole> findProjectRoles(Long projectId, String keyword) {
if (projectId == null || projectId < 1L || projectDao.findById(projectId) == null) {
logger.warn("Invalid project ID provided");
return null;
if (projectId == null) {
logger.warn("Invalid project ID provided; thus, an empty list is being returned.");
return Collections.emptyList();
}
return ListUtils.toListOfInterface(projRoleDao.findAllRoles(projectId, keyword));
}
Expand Down