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 sonar final warning

Browse Source
This commit is contained in:
Rodica Sutu
2019-07-05 12:50:19 +03:00
parent 5a30bb57d1
commit 8ab3078bba
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
View File

@@ -166,12 +166,12 @@ public class RMUserAPI extends RMModelRequest
*/ */
public void setUserPermissionInheritance(String filePlanComponentId, Boolean isInherited) public void setUserPermissionInheritance(String filePlanComponentId, Boolean isInherited)
{ {
UserModel adminUser = getRmRestWrapper().getTestUser(); final UserModel adminUser = getRmRestWrapper().getTestUser();
// get an "old-style" REST API client // get an "old-style" REST API client
AlfrescoHttpClient client = getAlfrescoHttpClient(); final AlfrescoHttpClient client = getAlfrescoHttpClient();
JsonObject bodyJson = buildObject() final JsonObject bodyJson = buildObject()
.addArray("permissions") .addArray("permissions")
.end() .end()
.add("isInherited", isInherited) .add("isInherited", isInherited)
@@ -184,7 +184,7 @@ public class RMUserAPI extends RMModelRequest
.build(); .build();
// execute an "old-style" API call // execute an "old-style" API call
Response response = given() final Response response = given()
.spec(spec) .spec(spec)
.auth().basic(adminUser.getUsername(), adminUser.getPassword()) .auth().basic(adminUser.getUsername(), adminUser.getPassword())
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
@@ -210,7 +210,7 @@ public class RMUserAPI extends RMModelRequest
public boolean createUser(String userName, String userPassword, String userEmail) public boolean createUser(String userName, String userPassword, String userEmail)
{ {
UserModel adminUser = getRmRestWrapper().getTestUser(); UserModel adminUser = getRmRestWrapper().getTestUser();
AlfrescoHttpClient client = getAlfrescoHttpClient(); final AlfrescoHttpClient client = getAlfrescoHttpClient();
JsonObject body = buildObject() JsonObject body = buildObject()
.add("userName", userName) .add("userName", userName)
@@ -220,7 +220,7 @@ public class RMUserAPI extends RMModelRequest
.add("email", userEmail) .add("email", userEmail)
.getJson(); .getJson();
RequestSpecification spec = new RequestSpecBuilder() final RequestSpecification spec = new RequestSpecBuilder()
.setBaseUri(client.getApiUrl()) .setBaseUri(client.getApiUrl())
.setBasePath("/") .setBasePath("/")
.setAuth(basic(adminUser.getUsername(), adminUser.getPassword())) .setAuth(basic(adminUser.getUsername(), adminUser.getPassword()))

22
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
View File

@@ -106,7 +106,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
public Set<String> getConfiguredRoles(String adminUser, String adminPassword) public Set<String> getConfiguredRoles(String adminUser, String adminPassword)
{ {
// Using "is=true" includes the in-place readers and writers. // Using "is=true" includes the in-place readers and writers.
JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject("data"); final JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject
("data");
return jsonObject.toMap().keySet(); return jsonObject.toMap().keySet();
} }
@@ -120,7 +121,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
*/ */
public Set<String> getCapabilitiesForRole(String adminUser, String adminPassword, String role) public Set<String> getCapabilitiesForRole(String adminUser, String adminPassword, String role)
{ {
JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject("data"); final JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject
("data");
assertTrue("Could not find role '" + role + "' in " + jsonObject.keySet(), jsonObject.has(role)); assertTrue("Could not find role '" + role + "' in " + jsonObject.keySet(), jsonObject.has(role));
return jsonObject.getJSONObject(role).getJSONObject("capabilities").keySet(); return jsonObject.getJSONObject(role).getJSONObject("capabilities").keySet();
} }
@@ -136,10 +138,10 @@ public class RMRolesAndActionsAPI extends BaseAPI
*/ */
public void createRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities) public void createRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities)
{ {
JSONObject requestBody = new JSONObject(); final JSONObject requestBody = new JSONObject();
requestBody.put("name", roleName); requestBody.put("name", roleName);
requestBody.put("displayLabel", roleDisplayLabel); requestBody.put("displayLabel", roleDisplayLabel);
JSONArray capabilitiesArray = new JSONArray(); final JSONArray capabilitiesArray = new JSONArray();
capabilities.forEach(capabilitiesArray::put); capabilities.forEach(capabilitiesArray::put);
requestBody.put("capabilities", capabilitiesArray); requestBody.put("capabilities", capabilitiesArray);
doPostJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, requestBody, RM_ROLES); doPostJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, requestBody, RM_ROLES);
@@ -156,10 +158,10 @@ public class RMRolesAndActionsAPI extends BaseAPI
*/ */
public void updateRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities) public void updateRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities)
{ {
JSONObject requestBody = new JSONObject(); final JSONObject requestBody = new JSONObject();
requestBody.put("name", roleName); requestBody.put("name", roleName);
requestBody.put("displayLabel", roleDisplayLabel); requestBody.put("displayLabel", roleDisplayLabel);
JSONArray capabilitiesArray = new JSONArray(); final JSONArray capabilitiesArray = new JSONArray();
capabilities.forEach(capabilitiesArray::put); capabilities.forEach(capabilitiesArray::put);
requestBody.put("capabilities", capabilitiesArray); requestBody.put("capabilities", capabilitiesArray);
doPutJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, requestBody, RM_ROLES_ROLE, roleName); doPutJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, requestBody, RM_ROLES_ROLE, roleName);
@@ -175,7 +177,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
public void deleteRole(String adminUser, String adminPassword, String roleName) public void deleteRole(String adminUser, String adminPassword, String roleName)
{ {
doDeleteRequest(adminUser, adminPassword, MessageFormat.format(RM_ROLES_ROLE, "{0}", roleName)); doDeleteRequest(adminUser, adminPassword, MessageFormat.format(RM_ROLES_ROLE, "{0}", roleName));
boolean success = !getConfiguredRoles(adminUser, adminPassword).contains(roleName); final boolean success = !getConfiguredRoles(adminUser, adminPassword).contains(roleName);
assertTrue("Failed to delete role " + roleName + " with " + adminUser, success); assertTrue("Failed to delete role " + roleName + " with " + adminUser, success);
} }
@@ -206,8 +208,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
*/ */
public void assignRoleToUser(String adminUser, String adminPassword, String userName, String role) public void assignRoleToUser(String adminUser, String adminPassword, String userName, String role)
{ {
AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); final AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
String reqURL = MessageFormat.format( final String reqURL = MessageFormat.format(
RM_ROLES_AUTHORITIES, RM_ROLES_AUTHORITIES,
client.getApiUrl(), client.getApiUrl(),
role, role,
@@ -456,7 +458,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
return null; return null;
} }
// retrieve the Holds container nodeRef // retrieve the Holds container nodeRef
String parentNodeRef = getItemNodeRef(user, password, "/Holds"); final String parentNodeRef = getItemNodeRef(user, password, "/Holds");
final JSONObject requestParams = new JSONObject(); final JSONObject requestParams = new JSONObject();
requestParams.put("alf_destination", getNodeRefSpacesStore() + parentNodeRef); requestParams.put("alf_destination", getNodeRefSpacesStore() + parentNodeRef);

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

@@ -86,7 +86,7 @@ public class RoleService
*/ */
public void addCapabilitiesToRole(UserRoles role, Set<String> capabilities) public void addCapabilitiesToRole(UserRoles role, Set<String> capabilities)
{ {
Set<String> roleCapabilities = new HashSet<>(getRoleCapabilities(role.roleId)); final Set<String> roleCapabilities = new HashSet<>(getRoleCapabilities(role.roleId));
roleCapabilities.addAll(capabilities); roleCapabilities.addAll(capabilities);
getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(), getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(),
@@ -101,7 +101,7 @@ public class RoleService
*/ */
public void removeCapabilitiesFromRole(UserRoles role, Set<String> capabilities) public void removeCapabilitiesFromRole(UserRoles role, Set<String> capabilities)
{ {
Set<String> roleCapabilities = getRoleCapabilities(role.roleId); final Set<String> roleCapabilities = getRoleCapabilities(role.roleId);
roleCapabilities.removeAll(capabilities); roleCapabilities.removeAll(capabilities);
getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(), getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(),
role.roleId, role.displayName, roleCapabilities); role.roleId, role.displayName, roleCapabilities);