SCANJLIB-231 Preserve the original exception as suppressed

Author: henryju

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

@@ -145,7 +145,9 @@ private static String getServerVersion(ServerConnection serverConnection, boolea
       try {
         return serverConnection.callWebApi("/api/server/version");
       } catch (Exception e2) {
-        throw new IllegalStateException("Failed to get server version", e);
+        var ex = new IllegalStateException("Failed to get server version", e2);
+        ex.addSuppressed(e);
+        throw ex;
       }
     }
   }

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

@@ -37,6 +37,7 @@
 import org.sonarsource.scanner.lib.internal.http.ServerConnection;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
@@ -107,7 +108,8 @@ void should_use_old_bootstrapping_with_sonarqube_10_5() throws Exception {
 
     ScannerEngineBootstrapper bootstrapper = new ScannerEngineBootstrapper("Gradle", "3.1", system, serverConnection,
       launcherFactory, scannerEngineLauncherFactory);
-    when(serverConnection.callRestApi("/analysis/version")).thenReturn("10.5");
+    when(serverConnection.callRestApi("/analysis/version")).thenThrow(new IOException("404 Not found"));
+    when(serverConnection.callWebApi("/api/server/version")).thenReturn("10.5");
 
     try (var scannerEngineFacade = bootstrapper.setBootstrapProperty(ScannerProperties.HOST_URL, "http://localhost").bootstrap()) {
       verify(launcherFactory).createLauncher(eq(serverConnection), any(FileCache.class));
@@ -116,6 +118,26 @@ void should_use_old_bootstrapping_with_sonarqube_10_5() throws Exception {
     }
   }
 
+  @Test
+  void should_preserve_both_exceptions_when_checking_version() throws Exception {
+    IsolatedLauncherFactory launcherFactory = mock(IsolatedLauncherFactory.class);
+    when(launcherFactory.createLauncher(eq(serverConnection), any(FileCache.class)))
+      .thenReturn(mock(IsolatedLauncherFactory.IsolatedLauncherAndClassloader.class));
+
+    ScannerEngineBootstrapper bootstrapper = new ScannerEngineBootstrapper("Gradle", "3.1", system, serverConnection,
+      launcherFactory, scannerEngineLauncherFactory);
+    when(serverConnection.callRestApi("/analysis/version")).thenThrow(new IOException("404 Not found"));
+    when(serverConnection.callWebApi("/api/server/version")).thenThrow(new IOException("400 Server Error"));
+
+    assertThatThrownBy(() -> {
+      try (var ignored = bootstrapper.setBootstrapProperty(ScannerProperties.HOST_URL, "http://localhost").bootstrap()) {
+        // Should throw
+      }
+    })
+      .hasMessage("Failed to get server version")
+      .hasStackTraceContaining("400 Server Error", "404 Not found");
+  }
+
   @Test
   void should_launch_in_simulation_mode() throws Exception {
     try (var scannerEngine = underTest