Rename the term "Compute Engine Server" to "Compute Engine"

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java b/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
index 3ea020171f0adcb455dadf9632defcabbaedd7a3..1954b218eb0dcecdc46fbff97092e1348392a11c 100644 (file)
--- a/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/app/CeServer.java
@@ -103,7 +103,7 @@ public class CeServer implements Monitored {
 
   @Override
   public void awaitStop() {
-    checkState(awaitThread.compareAndSet(null, Thread.currentThread()), "There can't be more than one thread waiting for the Compute Engine Server to stop");
+    checkState(awaitThread.compareAndSet(null, Thread.currentThread()), "There can't be more than one thread waiting for the Compute Engine to stop");
     checkState(ceMainThread != null, "awaitStop() must not be called before start()");
 
     try {
@@ -166,15 +166,15 @@ public class CeServer implements Monitored {
         startup();
         return true;
       } catch (Throwable e) {
-        LOG.error("Compute Engine Server startup failed", e);
+        LOG.error("Compute Engine startup failed", e);
         return false;
       }
     }
 
     private void startup() {
-      LOG.info("Compute Engine Server starting up...");
+      LOG.info("Compute Engine starting up...");
       computeEngine.startup();
-      LOG.info("Compute Engine Server is up");
+      LOG.info("Compute Engine is up");
     }
 
     private void waitForStopSignal() {
@@ -192,7 +192,7 @@ public class CeServer implements Monitored {
       try {
         shutdown();
       } catch (Throwable e) {
-        LOG.error("Compute Engine Server shutdown failed", e);
+        LOG.error("Compute Engine shutdown failed", e);
       } finally {
         // release thread waiting for CeServer
         stopAwait();
@@ -200,7 +200,7 @@ public class CeServer implements Monitored {
     }
 
     private void shutdown() {
-      LOG.info("Compute Engine Server shutting down...");
+      LOG.info("Compute Engine shutting down...");
       computeEngine.shutdown();
     }
 

diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java
index c863a9a8da369fc4d86e973399636c52e2bf18a6..c3f82e63524d3daf4ce25e090801d7df53f915a6 100644 (file)
--- a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java
@@ -183,7 +183,7 @@ public class CeServerTest {
     Exception exception = Objects.firstNonNull(waitingThread1.getException(), waitingThread2.getException());
     assertThat(exception)
       .isInstanceOf(IllegalStateException.class)
-      .hasMessage("There can't be more than one thread waiting for the Compute Engine Server to stop");
+      .hasMessage("There can't be more than one thread waiting for the Compute Engine to stop");
 
     assertThat(waitingThread1.getException() != null && waitingThread2.getException() != null).isFalse();
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/configuration/CeConfigurationImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/configuration/CeConfigurationImpl.java
index 1554314f9cfb10703db27a0c9f7e09ce307d34ee..76e3f1228bebb14df4642947acfbff585e0d0075 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/configuration/CeConfigurationImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/configuration/CeConfigurationImpl.java
@@ -69,7 +69,7 @@ public class CeConfigurationImpl implements CeConfiguration, Startable {
 
   private static MessageException parsingError(String workerCountAsStr) {
     return MessageException.of(format(
-      "value '%s' of property %s is invalid. It must an integer strictly greater than 0",
+      "value '%s' of property %s is invalid. It must an integer strictly greater than 0.",
       workerCountAsStr,
       CE_WORKERS_COUNT_PROPERTY)
       );

diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
index 2c89409013ef048c6f92072cbb3c8c0b5e38fd89..3fb1ce227837e830b8f7ea3a46a2628784be9206 100644 (file)
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
@@ -91,7 +91,7 @@ public class ServerTest extends PerfTestCase {
     Collections.reverse(lines);
     Date end = null;
     for (String line : lines) {
-      if (line.contains("Compute Engine Server is up")) {
+      if (line.contains("Compute Engine is up")) {
         end = ServerLogs.extractDate(line);
         break;
       }