SCANJLIB-226 Fix trailing slashes in REST API URL

Author: ericg138

lib/src/main/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapper.java

@@ -41,6 +41,7 @@
 
 import static org.sonarsource.scanner.lib.ScannerProperties.SCANNER_ARCH;
 import static org.sonarsource.scanner.lib.ScannerProperties.SCANNER_OS;
+import static org.sonarsource.scanner.lib.internal.http.ServerConnection.removeTrailingSlash;
 
 /**
  * Entry point to run a Sonar analysis programmatically.
@@ -151,8 +152,8 @@ private static String getServerVersion(ServerConnection serverConnection, boolea
 
   private void initBootstrapDefaultValues() {
     setBootstrapPropertyIfNotAlreadySet(ScannerProperties.HOST_URL, getSonarCloudUrl());
-    setBootstrapPropertyIfNotAlreadySet(ScannerProperties.API_BASE_URL,
-      isSonarCloud(bootstrapProperties) ? SONARCLOUD_REST_API : (bootstrapProperties.get(ScannerProperties.HOST_URL) + "/api/v2"));
+    setBootstrapPropertyIfNotAlreadySet(ScannerProperties.API_BASE_URL, isSonarCloud(bootstrapProperties) ?
+      SONARCLOUD_REST_API : (removeTrailingSlash(bootstrapProperties.get(ScannerProperties.HOST_URL)) + "/api/v2"));
     if (!bootstrapProperties.containsKey(SCANNER_OS)) {
       setBootstrapProperty(SCANNER_OS, new OsResolver(system, new Paths2()).getOs().name().toLowerCase(Locale.ENGLISH));
     }

lib/src/main/java/org/sonarsource/scanner/lib/internal/http/ServerConnection.java

@@ -67,7 +67,7 @@ public void init(Map<String, String> bootstrapProperties, Path sonarUserHome) {
     httpClient = OkHttpClientFactory.create(bootstrapProperties, sonarUserHome);
   }
 
-  private static String removeTrailingSlash(String url) {
+  public static String removeTrailingSlash(String url) {
     return url.replaceAll("(/)+$", "");
   }
 

lib/src/test/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapperTest.java

@@ -172,6 +172,19 @@ void should_use_sonarcloud_url_from_property() throws Exception {
     }
   }
 
+  @Test
+  void should_set_sonarqube_api_url_and_remove_trailing_slash() throws Exception {
+    try (var scannerEngine = underTest
+      .setBootstrapProperty(InternalProperties.SCANNER_DUMP_TO_FILE, dumpFile.toString())
+      .setBootstrapProperty(ScannerProperties.HOST_URL, "http://localhost/")
+      .bootstrap()) {
+
+      assertThat(scannerEngine.getBootstrapProperties()).contains(
+        entry(ScannerProperties.API_BASE_URL, "http://localhost/api/v2"));
+      assertThat(scannerEngine.isSonarCloud()).isFalse();
+    }
+  }
+
   @Test
   void should_set_properties() throws Exception {
     try (var scannerEngine = underTest