Merge pull request #73 from SonarSource/feature/mc/SCANNERAPI-185

SCANNERAPI-185 - Removed SonarQube-only logs and rename to SonarScanner

Author: mickael-caro-sonarsource

api/src/main/java/org/sonarsource/scanner/api/internal/IsolatedLauncherFactory.java

@@ -82,7 +82,7 @@ IsolatedLauncher createLauncher(final JarDownloader jarDownloader, final Classlo
         return objProxy;
       } catch (Exception e) {
         // Catch all other exceptions, which relates to reflection
-        throw new ScannerException("Unable to execute SonarQube", e);
+        throw new ScannerException("Unable to execute SonarScanner analysis", e);
       }
     });
   }

api/src/main/java/org/sonarsource/scanner/api/internal/ServerConnection.java

@@ -24,6 +24,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.Locale;
 import java.util.Map;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -116,7 +117,7 @@ private ResponseBody callUrl(String url) throws IOException {
       }
       return response.body();
     } catch (Exception e) {
-      logger.error(format("SonarQube server [%s] can not be reached", baseUrlWithoutTrailingSlash));
+      logger.error(format("%s server [%s] can not be reached", url.toLowerCase(Locale.ENGLISH).contains("sonarcloud") ? "SonarCloud" : "SonarQube", baseUrlWithoutTrailingSlash));
       throw e;
     }
   }

api/src/main/java/org/sonarsource/scanner/api/internal/SimulatedLauncher.java

@@ -61,7 +61,7 @@ public synchronized Enumeration<Object> keys() {
     };
     props.putAll(p);
     try (OutputStream outputStream = Files.newOutputStream(Paths.get(filePath))) {
-      props.store(outputStream, "# Generated by a SonarQube Scanner");
+      props.store(outputStream, "# Generated by a SonarScanner");
     } catch (Exception e) {
       throw new IllegalStateException("Fail to export scanner properties", e);
     }