diff options
author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2020-05-01 11:17:38 -0500 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2020-05-25 20:05:21 +0000 |
commit | 16b2b85fc200856e65175663bbe2477012be9275 (patch) | |
tree | fb11f07b89e3c20da338cfa980d70b4a8d716609 /server/sonar-webserver-auth | |
parent | 85b940dd935f57860f26dff7f1bfaa9de1ba8af2 (diff) | |
download | sonarqube-16b2b85fc200856e65175663bbe2477012be9275.tar.gz sonarqube-16b2b85fc200856e65175663bbe2477012be9275.zip |
SONAR-13221 Update method and var names
Diffstat (limited to 'server/sonar-webserver-auth')
2 files changed, 5 insertions, 5 deletions
diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganisationSupport.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganisationSupport.java index bd9fe0a571b..af94ddf34b7 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganisationSupport.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/organization/OrganisationSupport.java @@ -76,10 +76,10 @@ public class OrganisationSupport { } private void createDefaultMembersGroup(DbSession dbSession, String defaultOrganizationUuid) { - GroupDto sonarUsersGroupId = defaultGroupFinder.findDefaultGroup(dbSession, defaultOrganizationUuid); + GroupDto sonarUsersGroup = defaultGroupFinder.findDefaultGroup(dbSession, defaultOrganizationUuid); GroupDto members = defaultGroupCreator.create(dbSession, defaultOrganizationUuid); - copySonarUsersGroupPermissionsToMembersGroup(dbSession, defaultOrganizationUuid, sonarUsersGroupId, members); - copySonarUsersGroupPermissionTemplatesToMembersGroup(dbSession, sonarUsersGroupId, members); + copySonarUsersGroupPermissionsToMembersGroup(dbSession, defaultOrganizationUuid, sonarUsersGroup, members); + copySonarUsersGroupPermissionTemplatesToMembersGroup(dbSession, sonarUsersGroup, members); associateMembersOfDefaultOrganizationToGroup(dbSession, defaultOrganizationUuid, members); } diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java index 9cc440cd51b..169eada1b8a 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/qualityprofile/RuleActivationContext.java @@ -102,9 +102,9 @@ class RuleActivationContext { } private void register(Collection<ActiveRuleDto> activeRules, Collection<ActiveRuleParamDto> activeRuleParams) { - ListMultimap<String, ActiveRuleParamDto> paramsByActiveRuleId = activeRuleParams.stream().collect(index(ActiveRuleParamDto::getActiveRuleUuid)); + ListMultimap<String, ActiveRuleParamDto> paramsByActiveRuleUuid = activeRuleParams.stream().collect(index(ActiveRuleParamDto::getActiveRuleUuid)); for (ActiveRuleDto activeRule : activeRules) { - ActiveRuleWrapper wrapper = new ActiveRuleWrapper(activeRule, paramsByActiveRuleId.get(activeRule.getUuid())); + ActiveRuleWrapper wrapper = new ActiveRuleWrapper(activeRule, paramsByActiveRuleUuid.get(activeRule.getUuid())); this.activeRulesByKey.put(activeRule.getKey(), wrapper); } } |