Fix some quality flaws

3 files changed, 32 insertions, 37 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java
index 60d2d053263..ba2d3dfdf33 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java
@@ -22,7 +22,6 @@ package org.sonar.server.platform;
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.configuration.Configuration;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.ServerComponent;
 import org.sonar.api.config.GlobalPropertyChangeHandler;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
@@ -46,7 +45,7 @@ import java.util.Properties;
  *
  * @since 2.12
  */
-public class ServerSettings extends Settings implements ServerComponent {
+public class ServerSettings extends Settings {
 
   public static final String DEPLOY_DIR = "sonar.web.deployDir";
 
diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java
index 82943acaa0d..ea1cd7f29df 100644
--- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java
+++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java
@@ -21,17 +21,11 @@ package org.sonar.server.startup;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.TimeProfiler;
 import org.sonar.api.web.Dashboard;
 import org.sonar.api.web.DashboardTemplate;
-import org.sonar.core.dashboard.ActiveDashboardDao;
-import org.sonar.core.dashboard.ActiveDashboardDto;
-import org.sonar.core.dashboard.DashboardDao;
-import org.sonar.core.dashboard.DashboardDto;
-import org.sonar.core.dashboard.WidgetDto;
-import org.sonar.core.dashboard.WidgetPropertyDto;
+import org.sonar.core.dashboard.*;
 import org.sonar.core.template.LoadedTemplateDao;
 import org.sonar.core.template.LoadedTemplateDto;
 
@@ -44,7 +38,6 @@ import java.util.Map.Entry;
  * @since 2.13
  */
 public final class RegisterNewDashboards {
-  private static final Logger LOG = LoggerFactory.getLogger(RegisterNewDashboards.class);
   static final String DEFAULT_DASHBOARD_NAME = "Dashboard";
 
   private final List<DashboardTemplate> dashboardTemplates;
@@ -53,7 +46,7 @@ public final class RegisterNewDashboards {
   private final LoadedTemplateDao loadedTemplateDao;
 
   public RegisterNewDashboards(DashboardTemplate[] dashboardTemplatesArray, DashboardDao dashboardDao,
-      ActiveDashboardDao activeDashboardDao, LoadedTemplateDao loadedTemplateDao) {
+                               ActiveDashboardDao activeDashboardDao, LoadedTemplateDao loadedTemplateDao) {
     this.dashboardTemplates = Lists.newArrayList(dashboardTemplatesArray);
     this.dashboardDao = dashboardDao;
     this.activeDashboardDao = activeDashboardDao;
@@ -89,8 +82,8 @@ public final class RegisterNewDashboards {
 
   private void activate(DashboardDto dashboardDto, int index) {
     ActiveDashboardDto activeDashboardDto = new ActiveDashboardDto()
-        .setDashboardId(dashboardDto.getId())
-        .setOrderIndex(index);
+      .setDashboardId(dashboardDto.getId())
+      .setOrderIndex(index);
     activeDashboardDao.insert(activeDashboardDto);
 
     LoggerFactory.getLogger(getClass()).info("New dashboard '" + dashboardDto.getName() + "' registered");
@@ -111,31 +104,31 @@ public final class RegisterNewDashboards {
     Date now = new Date();
 
     DashboardDto dashboardDto = new DashboardDto()
-        .setName(name)
-        .setDescription(dashboard.getDescription())
-        .setColumnLayout(dashboard.getLayout().getCode())
-        .setShared(true)
-        .setGlobal(dashboard.isGlobal())
-        .setCreatedAt(now)
-        .setUpdatedAt(now);
+      .setName(name)
+      .setDescription(dashboard.getDescription())
+      .setColumnLayout(dashboard.getLayout().getCode())
+      .setShared(true)
+      .setGlobal(dashboard.isGlobal())
+      .setCreatedAt(now)
+      .setUpdatedAt(now);
 
     for (int columnIndex = 1; columnIndex <= dashboard.getLayout().getColumns(); columnIndex++) {
       List<Dashboard.Widget> widgets = dashboard.getWidgetsOfColumn(columnIndex);
       for (int rowIndex = 1; rowIndex <= widgets.size(); rowIndex++) {
         Dashboard.Widget widget = widgets.get(rowIndex - 1);
         WidgetDto widgetDto = new WidgetDto()
-            .setKey(widget.getId())
-            .setColumnIndex(columnIndex)
-            .setRowIndex(rowIndex)
-            .setConfigured(true)
-            .setCreatedAt(now)
-            .setUpdatedAt(now);
+          .setKey(widget.getId())
+          .setColumnIndex(columnIndex)
+          .setRowIndex(rowIndex)
+          .setConfigured(true)
+          .setCreatedAt(now)
+          .setUpdatedAt(now);
         dashboardDto.addWidget(widgetDto);
 
         for (Entry<String, String> property : widget.getProperties().entrySet()) {
           WidgetPropertyDto propDto = new WidgetPropertyDto()
-              .setKey(property.getKey())
-              .setValue(property.getValue());
+            .setKey(property.getKey())
+            .setValue(property.getValue());
           widgetDto.addWidgetProperty(propDto);
         }
       }
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 318a8ff6089..9aa5702ea21 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
@@ -29,6 +29,9 @@ import java.util.Map;
  * @since 3.2
  */
 public class SetDefaultProjectPermissions {
+  private static final String SONAR_ADMINISTRATORS = "sonar-administrators";
+  private static final String ANYONE_AND_USERS = "Anyone,sonar-users";
+
   private final PersistentSettings persistentSettings;
 
   public SetDefaultProjectPermissions(PersistentSettings persistentSettings) {
@@ -39,17 +42,17 @@ public class SetDefaultProjectPermissions {
     if (persistentSettings.getSettings().getKeysStartingWith("sonar.role.").isEmpty()) {
       LoggerFactory.getLogger(SetDefaultProjectPermissions.class).info("Setting default project permissions");
       Map<String, String> props = Maps.newHashMap();
-      props.put("sonar.role.admin.TRK.defaultGroups", "sonar-administrators");
-      props.put("sonar.role.user.TRK.defaultGroups", "Anyone,sonar-users");
-      props.put("sonar.role.codeviewer.TRK.defaultGroups", "Anyone,sonar-users");
+      props.put("sonar.role.admin.TRK.defaultGroups", SONAR_ADMINISTRATORS);
+      props.put("sonar.role.user.TRK.defaultGroups", ANYONE_AND_USERS);
+      props.put("sonar.role.codeviewer.TRK.defaultGroups", ANYONE_AND_USERS);
 
       // Support old versions of Views plugin
-      props.put("sonar.role.admin.VW.defaultGroups", "sonar-administrators");
-      props.put("sonar.role.user.VW.defaultGroups", "Anyone,sonar-users");
-      props.put("sonar.role.codeviewer.VW.defaultGroups", "Anyone,sonar-users");
-      props.put("sonar.role.admin.SVW.defaultGroups", "sonar-administrators");
-      props.put("sonar.role.user.SVW.defaultGroups", "Anyone,sonar-users");
-      props.put("sonar.role.codeviewer.SVW.defaultGroups", "Anyone,sonar-users");
+      props.put("sonar.role.admin.VW.defaultGroups", SONAR_ADMINISTRATORS);
+      props.put("sonar.role.user.VW.defaultGroups", ANYONE_AND_USERS);
+      props.put("sonar.role.codeviewer.VW.defaultGroups", ANYONE_AND_USERS);
+      props.put("sonar.role.admin.SVW.defaultGroups", SONAR_ADMINISTRATORS);
+      props.put("sonar.role.user.SVW.defaultGroups", ANYONE_AND_USERS);
+      props.put("sonar.role.codeviewer.SVW.defaultGroups", ANYONE_AND_USERS);
 
       persistentSettings.saveProperties(props);
     }