inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some sonar issues from RoleService class

Browse Source
This commit is contained in:
cagache
2019-05-09 10:38:19 +03:00
parent 79448c3172
commit d6a84e814a
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java
View File

@@ -55,15 +55,29 @@ import org.springframework.stereotype.Service;
public class RoleService public class RoleService
{ {
@Autowired @Autowired
@Getter (value = PROTECTED)
private RMRolesAndActionsAPI rmRolesAndActionsAPI; private RMRolesAndActionsAPI rmRolesAndActionsAPI;
@Autowired @Autowired
@Getter (value = PROTECTED)
private DataUser dataUser; private DataUser dataUser;
@Autowired @Autowired
@Getter (value = PROTECTED) @Getter (value = PROTECTED)
private RestAPIFactory restAPIFactory; private RestAPIFactory restAPIFactory;
/**
* Get the capabilities for a role
*
* @param roleName the role name
* @return the list of capabilities
*/
public Set<String> getRoleCapabilities(String roleName)
{
return getRmRolesAndActionsAPI().getCapabilitiesForRole(getDataUser().getAdminUser().getUsername(),
getDataUser().getAdminUser().getPassword(), roleName);
}
/** /**
* Add capabilities to a role * Add capabilities to a role
* *
@@ -72,12 +86,10 @@ public class RoleService
*/ */
public void addCapabilitiesToRole(UserRoles role, Set<String> capabilities) public void addCapabilitiesToRole(UserRoles role, Set<String> capabilities)
{ {
Set<String> roleCapabilities = new HashSet<>(); Set<String> roleCapabilities = new HashSet<>(getRoleCapabilities(role.roleId));
roleCapabilities.addAll(rmRolesAndActionsAPI.getCapabilitiesForRole(dataUser.getAdminUser().getUsername(), roleCapabilities.addAll(capabilities);
dataUser.getAdminUser().getPassword(), role.roleId));
capabilities.stream().forEach(cap -> roleCapabilities.add(cap));
rmRolesAndActionsAPI.updateRole(dataUser.getAdminUser().getUsername(), dataUser.getAdminUser().getPassword(), getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(),
role.roleId, role.displayName, roleCapabilities); role.roleId, role.displayName, roleCapabilities);
} }
@@ -89,10 +101,9 @@ public class RoleService
*/ */
public void removeCapabilitiesFromRole(UserRoles role, Set<String> capabilities) public void removeCapabilitiesFromRole(UserRoles role, Set<String> capabilities)
{ {
Set<String> roleCapabilities = rmRolesAndActionsAPI.getCapabilitiesForRole(dataUser.getAdminUser().getUsername(), Set<String> roleCapabilities = getRoleCapabilities(role.roleId);
dataUser.getAdminUser().getPassword(), role.roleId);
roleCapabilities.removeAll(capabilities); roleCapabilities.removeAll(capabilities);
rmRolesAndActionsAPI.updateRole(dataUser.getAdminUser().getUsername(), dataUser.getAdminUser().getPassword(), getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(),
role.roleId, role.displayName, roleCapabilities); role.roleId, role.displayName, roleCapabilities);
} }
@@ -108,7 +119,7 @@ public class RoleService
String userRole) String userRole)
{ {
getRestAPIFactory().getRMUserAPI().addUserPermission(categoryId, user, userPermission); getRestAPIFactory().getRMUserAPI().addUserPermission(categoryId, user, userPermission);
rmRolesAndActionsAPI.assignRoleToUser(dataUser.getAdminUser().getUsername(), dataUser.getAdminUser().getPassword(), getRmRolesAndActionsAPI().assignRoleToUser(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(),
user.getUsername(), userRole); user.getUsername(), userRole);
} }
@@ -120,7 +131,7 @@ public class RoleService
*/ */
public UserModel createUserWithRMRole(String userRole) public UserModel createUserWithRMRole(String userRole)
{ {
UserModel rmUser = dataUser.createRandomTestUser(); final UserModel rmUser = getDataUser().createRandomTestUser();
getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), userRole); getRestAPIFactory().getRMUserAPI().assignRoleToUser(rmUser.getUsername(), userRole);
getRestAPIFactory().getRmRestWrapper().assertStatusCodeIs(OK); getRestAPIFactory().getRmRestWrapper().assertStatusCodeIs(OK);
return rmUser; return rmUser;
@@ -137,7 +148,7 @@ public class RoleService
public UserModel createUserWithRMRoleAndCategoryPermission(String userRole, RecordCategory recordCategory, public UserModel createUserWithRMRoleAndCategoryPermission(String userRole, RecordCategory recordCategory,
UserPermissions userPermission) UserPermissions userPermission)
{ {
UserModel rmUser = createUserWithRMRole(userRole); final UserModel rmUser = createUserWithRMRole(userRole);
getRestAPIFactory().getRMUserAPI().addUserPermission(recordCategory.getId(), rmUser, userPermission); getRestAPIFactory().getRMUserAPI().addUserPermission(recordCategory.getId(), rmUser, userPermission);
getRestAPIFactory().getRmRestWrapper().assertStatusCodeIs(OK); getRestAPIFactory().getRmRestWrapper().assertStatusCodeIs(OK);
return rmUser; return rmUser;
@@ -152,15 +163,13 @@ public class RoleService
* @param userRole the rm role * @param userRole the rm role
* @param userPermission the permissions over the recordCategory * @param userPermission the permissions over the recordCategory
* @return the created user model * @return the created user model
* @throws Exception
*/ */
public UserModel createCollaboratorWithRMRoleAndPermission(SiteModel siteModel, RecordCategory recordCategory, public UserModel createCollaboratorWithRMRoleAndPermission(SiteModel siteModel, RecordCategory recordCategory,
UserRoles userRole, UserPermissions userPermission) UserRoles userRole, UserPermissions userPermission)
{ {
UserModel rmUser = createUserWithRMRoleAndCategoryPermission(userRole.roleId, recordCategory, final UserModel rmUser = createUserWithRMRoleAndCategoryPermission(userRole.roleId, recordCategory,
userPermission); userPermission);
dataUser.addUserToSite(rmUser, siteModel, UserRole.SiteCollaborator); getDataUser().addUserToSite(rmUser, siteModel, UserRole.SiteCollaborator);
return rmUser; return rmUser;
} }
} }