From 1179e7ef7f549aecdc1f240418dba3a1caac3d51 Mon Sep 17 00:00:00 2001
From: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Date: Tue, 13 Aug 2019 13:54:45 +0200
Subject: separate Action from indirect dependencies in system WS

---
 .../platform/platformlevel/PlatformLevel4.java     | 30 ++++++----------------
 .../platformlevel/PlatformLevelSafeMode.java       | 14 +++-------
 2 files changed, 12 insertions(+), 32 deletions(-)

(limited to 'server/sonar-webserver')

diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index b72635af2a9..c367e84d711 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -120,19 +120,12 @@ import org.sonar.server.platform.web.DeprecatedPropertiesWsFilter;
 import org.sonar.server.platform.web.WebServiceFilter;
 import org.sonar.server.platform.web.WebServiceReroutingFilter;
 import org.sonar.server.platform.web.requestid.HttpRequestIdModule;
-import org.sonar.server.platform.ws.ChangeLogLevelActionModule;
-import org.sonar.server.platform.ws.DbMigrationStatusAction;
-import org.sonar.server.platform.ws.HealthActionModule;
+import org.sonar.server.platform.ws.ChangeLogLevelServiceModule;
+import org.sonar.server.platform.ws.HealthCheckerModule;
 import org.sonar.server.platform.ws.L10nWs;
-import org.sonar.server.platform.ws.LogsAction;
-import org.sonar.server.platform.ws.MigrateDbAction;
-import org.sonar.server.platform.ws.PingAction;
-import org.sonar.server.platform.ws.RestartAction;
 import org.sonar.server.platform.ws.ServerWs;
-import org.sonar.server.platform.ws.StatusAction;
-import org.sonar.server.platform.ws.SystemWs;
-import org.sonar.server.platform.ws.UpgradesAction;
-import org.sonar.server.platform.ws.WebSystemInfoModule;
+import org.sonar.server.platform.ws.SystemWsModule;
+import org.sonar.server.platform.ws.SystemInfoWriterModule;
 import org.sonar.server.plugins.PluginDownloader;
 import org.sonar.server.plugins.PluginUninstaller;
 import org.sonar.server.plugins.ServerExtensionInstaller;
@@ -469,16 +462,9 @@ public class PlatformLevel4 extends PlatformLevel {
 
       // System
       ServerLogging.class,
-      RestartAction.class,
-      PingAction.class,
-      UpgradesAction.class,
-      StatusAction.class,
-      MigrateDbAction.class,
-      LogsAction.class,
-      ChangeLogLevelActionModule.class,
-      DbMigrationStatusAction.class,
-      HealthActionModule.class,
-      SystemWs.class,
+      ChangeLogLevelServiceModule.class,
+      HealthCheckerModule.class,
+      SystemWsModule.class,
 
       // Plugins WS
       PluginUpdateAggregator.class,
@@ -537,7 +523,7 @@ public class PlatformLevel4 extends PlatformLevel {
     );
 
     // system info
-    add(WebSystemInfoModule.class);
+    add(SystemInfoWriterModule.class);
 
     addAll(level4AddedComponents);
   }
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
index 81c6adf532e..6eacf03ff4d 100644
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelSafeMode.java
@@ -27,13 +27,10 @@ import org.sonar.server.platform.db.migration.DatabaseMigrationImpl;
 import org.sonar.server.platform.db.migration.MigrationEngineModule;
 import org.sonar.server.platform.db.migration.NoopDatabaseMigrationImpl;
 import org.sonar.server.platform.web.WebServiceFilter;
-import org.sonar.server.platform.ws.DbMigrationStatusAction;
 import org.sonar.server.platform.ws.IndexAction;
 import org.sonar.server.platform.ws.L10nWs;
-import org.sonar.server.platform.ws.MigrateDbAction;
-import org.sonar.server.platform.ws.SafeModeHealthActionModule;
-import org.sonar.server.platform.ws.StatusAction;
-import org.sonar.server.platform.ws.SystemWs;
+import org.sonar.server.platform.ws.SafeModeHealthCheckerModule;
+import org.sonar.server.platform.ws.SafemodeSystemWsModule;
 import org.sonar.server.ws.WebServiceEngine;
 import org.sonar.server.ws.ws.WebServicesWsModule;
 
@@ -52,11 +49,8 @@ public class PlatformLevelSafeMode extends PlatformLevel {
       IndexAction.class,
 
       // Server WS
-      StatusAction.class,
-      MigrateDbAction.class,
-      DbMigrationStatusAction.class,
-      SafeModeHealthActionModule.class,
-      SystemWs.class,
+      SafeModeHealthCheckerModule.class,
+      SafemodeSystemWsModule.class,
 
       // Listing WS
       WebServicesWsModule.class,
-- 
cgit v1.2.3