From 8ab3078bba3148e01bc5a03a29e6de406f1876a3 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Fri, 5 Jul 2019 12:50:19 +0300 Subject: [PATCH] fix sonar final warning --- .../requests/gscore/api/RMUserAPI.java | 12 +++++----- .../rest/v0/RMRolesAndActionsAPI.java | 22 ++++++++++--------- .../alfresco/rest/v0/service/RoleService.java | 4 ++-- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java index aa78902cae..6cd2b7d0d4 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java @@ -166,12 +166,12 @@ public class RMUserAPI extends RMModelRequest */ public void setUserPermissionInheritance(String filePlanComponentId, Boolean isInherited) { - UserModel adminUser = getRmRestWrapper().getTestUser(); + final UserModel adminUser = getRmRestWrapper().getTestUser(); // get an "old-style" REST API client - AlfrescoHttpClient client = getAlfrescoHttpClient(); + final AlfrescoHttpClient client = getAlfrescoHttpClient(); - JsonObject bodyJson = buildObject() + final JsonObject bodyJson = buildObject() .addArray("permissions") .end() .add("isInherited", isInherited) @@ -184,7 +184,7 @@ public class RMUserAPI extends RMModelRequest .build(); // execute an "old-style" API call - Response response = given() + final Response response = given() .spec(spec) .auth().basic(adminUser.getUsername(), adminUser.getPassword()) .contentType(ContentType.JSON) @@ -210,7 +210,7 @@ public class RMUserAPI extends RMModelRequest public boolean createUser(String userName, String userPassword, String userEmail) { UserModel adminUser = getRmRestWrapper().getTestUser(); - AlfrescoHttpClient client = getAlfrescoHttpClient(); + final AlfrescoHttpClient client = getAlfrescoHttpClient(); JsonObject body = buildObject() .add("userName", userName) @@ -220,7 +220,7 @@ public class RMUserAPI extends RMModelRequest .add("email", userEmail) .getJson(); - RequestSpecification spec = new RequestSpecBuilder() + final RequestSpecification spec = new RequestSpecBuilder() .setBaseUri(client.getApiUrl()) .setBasePath("/") .setAuth(basic(adminUser.getUsername(), adminUser.getPassword())) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java index 5ca4b9c1ab..d57c16fabf 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java @@ -106,7 +106,8 @@ public class RMRolesAndActionsAPI extends BaseAPI public Set getConfiguredRoles(String adminUser, String adminPassword) { // 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(); } @@ -120,7 +121,8 @@ public class RMRolesAndActionsAPI extends BaseAPI */ public Set 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)); 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 capabilities) { - JSONObject requestBody = new JSONObject(); + final JSONObject requestBody = new JSONObject(); requestBody.put("name", roleName); requestBody.put("displayLabel", roleDisplayLabel); - JSONArray capabilitiesArray = new JSONArray(); + final JSONArray capabilitiesArray = new JSONArray(); capabilities.forEach(capabilitiesArray::put); requestBody.put("capabilities", capabilitiesArray); 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 capabilities) { - JSONObject requestBody = new JSONObject(); + final JSONObject requestBody = new JSONObject(); requestBody.put("name", roleName); requestBody.put("displayLabel", roleDisplayLabel); - JSONArray capabilitiesArray = new JSONArray(); + final JSONArray capabilitiesArray = new JSONArray(); capabilities.forEach(capabilitiesArray::put); requestBody.put("capabilities", capabilitiesArray); 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) { 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); } @@ -206,8 +208,8 @@ public class RMRolesAndActionsAPI extends BaseAPI */ public void assignRoleToUser(String adminUser, String adminPassword, String userName, String role) { - AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); - String reqURL = MessageFormat.format( + final AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + final String reqURL = MessageFormat.format( RM_ROLES_AUTHORITIES, client.getApiUrl(), role, @@ -456,7 +458,7 @@ public class RMRolesAndActionsAPI extends BaseAPI return null; } // retrieve the Holds container nodeRef - String parentNodeRef = getItemNodeRef(user, password, "/Holds"); + final String parentNodeRef = getItemNodeRef(user, password, "/Holds"); final JSONObject requestParams = new JSONObject(); requestParams.put("alf_destination", getNodeRefSpacesStore() + parentNodeRef); diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java index a5bdff72c0..c37dcc8541 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java @@ -86,7 +86,7 @@ public class RoleService */ public void addCapabilitiesToRole(UserRoles role, Set capabilities) { - Set roleCapabilities = new HashSet<>(getRoleCapabilities(role.roleId)); + final Set roleCapabilities = new HashSet<>(getRoleCapabilities(role.roleId)); roleCapabilities.addAll(capabilities); getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(), @@ -101,7 +101,7 @@ public class RoleService */ public void removeCapabilitiesFromRole(UserRoles role, Set capabilities) { - Set roleCapabilities = getRoleCapabilities(role.roleId); + final Set roleCapabilities = getRoleCapabilities(role.roleId); roleCapabilities.removeAll(capabilities); getRmRolesAndActionsAPI().updateRole(getDataUser().getAdminUser().getUsername(), getDataUser().getAdminUser().getPassword(), role.roleId, role.displayName, roleCapabilities);