From c4170582180ef8dc3e2d1d0e889c9db7dd85e80a Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 6 Sep 2012 10:11:24 +0200 Subject: [PATCH] Fix quality flaw --- .../server/startup/SetDefaultProjectPermissions.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/startup/SetDefaultProjectPermissions.java b/sonar-server/src/main/java/org/sonar/server/startup/SetDefaultProjectPermissions.java index dc4d24d4b8f..ce589a79bf9 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/SetDefaultProjectPermissions.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/SetDefaultProjectPermissions.java @@ -32,6 +32,7 @@ import java.util.Map; public class SetDefaultProjectPermissions { private static final String SONAR_ADMINISTRATORS = "sonar-administrators"; private static final String ANYONE_AND_USERS = "Anyone,sonar-users"; + private static final String SUFFIX = ".defaultGroups"; private final PersistentSettings persistentSettings; @@ -55,15 +56,15 @@ public class SetDefaultProjectPermissions { private Map missingProperties(String qualifier) { Map props = Maps.newHashMap(); - if (StringUtils.isBlank(persistentSettings.getSettings().getString("sonar.role.user." + qualifier + ".defaultGroups"))) { + if (StringUtils.isBlank(persistentSettings.getSettings().getString("sonar.role.user." + qualifier + SUFFIX))) { completeDefaultRoles(qualifier, props); } return props; } private void completeDefaultRoles(String qualifier, Map props) { - props.put("sonar.role.admin." + qualifier + ".defaultGroups", SONAR_ADMINISTRATORS); - props.put("sonar.role.user." + qualifier + ".defaultGroups", ANYONE_AND_USERS); - props.put("sonar.role.codeviewer." + qualifier + ".defaultGroups", ANYONE_AND_USERS); + props.put("sonar.role.admin." + qualifier + SUFFIX, SONAR_ADMINISTRATORS); + props.put("sonar.role.user." + qualifier + SUFFIX, ANYONE_AND_USERS); + props.put("sonar.role.codeviewer." + qualifier + SUFFIX, ANYONE_AND_USERS); } } -- 2.39.5