SONAR-12043 rename current shutdown code from stop to hardStop

5 files changed, 10 insertions, 10 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java b/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
index 36301d0ca49..44bdc4377e3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
@@ -28,7 +28,7 @@ public interface ProcessCommandWrapper {
   /**
    * Requests to the main process that the WebServer is stopped.
    */
-  void requestStop();
+  void requestHardStop();
 
   /**
    * Notifies any listening process that the WebServer is operational.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java b/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
index ae4d0ac5fe5..12b3f68543c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
@@ -38,8 +38,8 @@ public class ProcessCommandWrapperImpl implements ProcessCommandWrapper {
     processCommands.askForRestart();
     return null;
   };
-  private static final ProcessMethod<Void> ASK_FOR_STOP = processCommands -> {
-    processCommands.askForStop();
+  private static final ProcessMethod<Void> ASK_FOR_HARD_STOP = processCommands -> {
+    processCommands.askForHardStop();
     return null;
   };
   private static final ProcessMethod<Boolean> IS_OPERATIONAL = ProcessCommands::isOperational;
@@ -56,8 +56,8 @@ public class ProcessCommandWrapperImpl implements ProcessCommandWrapper {
   }
 
   @Override
-  public void requestStop() {
-    call(ASK_FOR_STOP, selfProcessNumber());
+  public void requestHardStop() {
+    call(ASK_FOR_HARD_STOP, selfProcessNumber());
   }
 
   @Override
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/WebServer.java b/server/sonar-server/src/main/java/org/sonar/server/app/WebServer.java
index fc0635d6e79..b893e6cd7c8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/WebServer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/WebServer.java
@@ -71,7 +71,7 @@ public class WebServer implements Monitored {
   }
 
   @Override
-  public void stop() {
+  public void hardStop() {
     tomcat.terminate();
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index 3a8d4780b29..8b342923e2e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -390,7 +390,7 @@ public class Platform {
     @Override
     public void failure(Throwable t) {
       LOGGER.error("Background initialization failed. Stopping SonarQube", t);
-      processCommandWrapper.requestStop();
+      processCommandWrapper.requestHardStop();
       this.running = false;
     }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
index 0c639459d74..de5f24347fc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
@@ -86,7 +86,7 @@ public class ProcessCommandWrapperImplTest {
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Property process.sharedDir is not set");
 
-    processCommandWrapper.requestStop();
+    processCommandWrapper.requestHardStop();
   }
 
   @Test
@@ -96,10 +96,10 @@ public class ProcessCommandWrapperImplTest {
     settings.setProperty(PROPERTY_PROCESS_INDEX, PROCESS_NUMBER);
 
     ProcessCommandWrapperImpl underTest = new ProcessCommandWrapperImpl(settings.asConfig());
-    underTest.requestStop();
+    underTest.requestHardStop();
 
     try (DefaultProcessCommands processCommands = DefaultProcessCommands.secondary(tmpDir, PROCESS_NUMBER)) {
-      assertThat(processCommands.askedForStop()).isTrue();
+      assertThat(processCommands.askedForHardStop()).isTrue();
     }
   }