From 7858fac1ab007eaf2f21990941d230e7c1828606 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 26 Jul 2016 14:41:33 +0200
Subject: [PATCH] Rename org.sonar.server.platform.WebServerSettings to
 ServerSettingsImpl

---
 .../{WebServerSettings.java => ServerSettingsImpl.java}   | 8 +++-----
 .../server/platform/platformlevel/PlatformLevel1.java     | 4 ++--
 .../ws/template/SetDefaultTemplateActionTest.java         | 4 ++--
 .../org/sonar/server/platform/PersistentSettingsTest.java | 2 +-
 .../org/sonar/server/platform/ServerSettingsTest.java     | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename server/sonar-server/src/main/java/org/sonar/server/platform/{WebServerSettings.java => ServerSettingsImpl.java} (89%)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/WebServerSettings.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerSettingsImpl.java
similarity index 89%
rename from server/sonar-server/src/main/java/org/sonar/server/platform/WebServerSettings.java
rename to server/sonar-server/src/main/java/org/sonar/server/platform/ServerSettingsImpl.java
index 7a74f92318c..b19d2939f25 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/WebServerSettings.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerSettingsImpl.java
@@ -35,17 +35,15 @@ import java.util.Properties;
  * <li>environment variables</li>
  * <li>system properties</li>
  * </ol>
- *
- * @since 2.12
  */
-public class WebServerSettings extends Settings implements ServerSettings {
+public class ServerSettingsImpl extends Settings implements ServerSettings {
 
   private final Properties properties;
 
-  public WebServerSettings(PropertyDefinitions definitions, Properties properties) {
+  public ServerSettingsImpl(PropertyDefinitions definitions, Properties properties) {
     super(definitions);
     this.properties = properties;
-    load(Collections.<String, String>emptyMap());
+    load(Collections.emptyMap());
     // Secret key is loaded from conf/sonar.properties
     getEncryption().setPathToSecretKey(getString(CoreProperties.ENCRYPTION_SECRET_KEY_PATH));
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java
index 2d23b102dee..58053ce3498 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java
@@ -46,8 +46,8 @@ import org.sonar.server.platform.DatabaseServerCompatibility;
 import org.sonar.server.platform.DefaultServerFileSystem;
 import org.sonar.server.platform.Platform;
 import org.sonar.server.platform.ServerImpl;
+import org.sonar.server.platform.ServerSettingsImpl;
 import org.sonar.server.platform.TempFolderProvider;
-import org.sonar.server.platform.WebServerSettings;
 import org.sonar.server.qualityprofile.index.ActiveRuleIndex;
 import org.sonar.server.ruby.PlatformRackBridge;
 import org.sonar.server.rule.index.RuleIndex;
@@ -77,7 +77,7 @@ public class PlatformLevel1 extends PlatformLevel {
       SonarRuntimeImpl.forSonarQube(apiVersion, SonarQubeSide.SERVER),
       ProcessCommandWrapperImpl.class,
       RestartFlagHolderImpl.class,
-      WebServerSettings.class,
+      ServerSettingsImpl.class,
       ServerImpl.class,
       UuidFactoryImpl.INSTANCE,
       EmbeddedDatabaseFactory.class,
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java
index a9c3918e28b..b4146f29238 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java
@@ -44,7 +44,7 @@ import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.i18n.I18nRule;
 import org.sonar.server.permission.ws.PermissionDependenciesFinder;
 import org.sonar.server.platform.PersistentSettings;
-import org.sonar.server.platform.WebServerSettings;
+import org.sonar.server.platform.ServerSettingsImpl;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.usergroups.ws.UserGroupFinder;
 import org.sonar.server.ws.TestRequest;
@@ -82,7 +82,7 @@ public class SetDefaultTemplateActionTest {
   @Before
   public void setUp() {
     DbClient dbClient = db.getDbClient();
-    persistentSettings = new PersistentSettings(dbClient, new WebServerSettings(new PropertyDefinitions(), new Properties()));
+    persistentSettings = new PersistentSettings(dbClient, new ServerSettingsImpl(new PropertyDefinitions(), new Properties()));
     persistentSettings.saveProperty(DEFAULT_TEMPLATE_PROPERTY, "any-template-uuid");
     persistentSettings.saveProperty(defaultRootQualifierTemplateProperty(PROJECT), "any-template-uuid");
     persistentSettings.saveProperty(defaultRootQualifierTemplateProperty(VIEW), "any-view-template-uuid");
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
index 5a9bfaa1544..e80eaae4251 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
@@ -42,7 +42,7 @@ public class PersistentSettingsTest {
   DbSession dbSession = db.getSession();
 
   private PropertiesDao dao = dbClient.propertiesDao();
-  private ServerSettings settings = new WebServerSettings(
+  private ServerSettings settings = new ServerSettingsImpl(
     new PropertyDefinitions(),
     new Properties());
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java
index 7e2aef09679..f06f5ede8e0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java
@@ -33,7 +33,7 @@ public class ServerSettingsTest {
 
   Properties properties;
 
-  WebServerSettings settings;
+  ServerSettingsImpl settings;
 
   @Before
   public void before() {
@@ -41,7 +41,7 @@ public class ServerSettingsTest {
     properties.put("hello", "world");
     properties.put("in_file", "true");
     properties.put("ServerSettingsTestEnv", "in_file");
-    settings = new WebServerSettings(new PropertyDefinitions(), properties);
+    settings = new ServerSettingsImpl(new PropertyDefinitions(), properties);
   }
 
   @Test
-- 
2.39.5