Do not throw an exception when exit code != 0

Author: henryju

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

@@ -35,8 +35,9 @@ class InProcessScannerEngineFacade extends ScannerEngineFacade {
   }
 
   @Override
-  void doAnalyze(Map<String, String> allProps) {
+  boolean doAnalyze(Map<String, String> allProps) {
     launcherAndCl.getLauncher().execute(allProps, new Slf4jLogOutputAdapter());
+    return true;
   }
 
   @Override

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

@@ -33,8 +33,8 @@ class NewScannerEngineFacade extends ScannerEngineFacade {
   }
 
   @Override
-  void doAnalyze(Map<String, String> allProps) {
-    launcher.execute(allProps);
+  boolean doAnalyze(Map<String, String> allProps) {
+    return launcher.execute(allProps);
   }
 
   @Override

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

@@ -52,13 +52,13 @@ public boolean isSonarCloud() {
     return isSonarCloud;
   }
 
-  public void analyze(Map<String, String> analysisProps) {
+  public boolean analyze(Map<String, String> analysisProps) {
     Map<String, String> allProps = new HashMap<>();
     allProps.putAll(bootstrapProperties);
     allProps.putAll(analysisProps);
     initAnalysisProperties(allProps);
     addStatsProperties(allProps);
-    doAnalyze(allProps);
+    return doAnalyze(allProps);
   }
 
   private void addStatsProperties(Map<String, String> allProps) {
@@ -68,7 +68,7 @@ private void addStatsProperties(Map<String, String> allProps) {
     allProps.put("sonar.scanner.wasEngineCacheHit", String.valueOf(wasEngineCacheHit));
   }
 
-  abstract void doAnalyze(Map<String, String> allProps);
+  abstract boolean doAnalyze(Map<String, String> allProps);
 
   private static void initAnalysisProperties(Map<String, String> p) {
     new Dirs().init(p);

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

@@ -43,10 +43,11 @@ class SimulationScannerEngineFacade extends ScannerEngineFacade {
   }
 
   @Override
-  void doAnalyze(Map<String, String> allProps) {
+  boolean doAnalyze(Map<String, String> allProps) {
     String filePath = allProps.get(InternalProperties.SCANNER_DUMP_TO_FILE);
     writeProperties(filePath, allProps);
     LOG.info("Simulation mode. Configuration written to {}", new File(filePath).getAbsolutePath());
+    return true;
   }
 
   private static void writeProperties(String filePath, Map<String, String> p) {

lib/src/main/java/org/sonarsource/scanner/lib/internal/JavaRunner.java

@@ -50,7 +50,7 @@ public JreCacheHit getJreCacheHit() {
     return jreCacheHit;
   }
 
-  public void execute(List<String> args, @Nullable String input) {
+  public boolean execute(List<String> args, @Nullable String input) {
     try {
       List<String> command = new ArrayList<>(args);
       command.add(0, javaExecutable.toString());
@@ -69,8 +69,10 @@ public void execute(List<String> args, @Nullable String input) {
       stdoutConsummer.join();
       stdErrConsummer.join();
       if (exitCode != 0) {
-        throw new IllegalStateException("Error returned by the Java command execution: " + process.exitValue());
+        LOG.debug("Java command exited with code {}", process.exitValue());
+        return false;
       }
+      return true;
     } catch (IOException | InterruptedException e) {
       Thread.currentThread().interrupt();
       throw new IllegalStateException("Failed to run the Java command", e);

lib/src/main/java/org/sonarsource/scanner/lib/internal/ScannerEngineLauncher.java

@@ -45,9 +45,8 @@ public ScannerEngineLauncher(JavaRunner javaRunner, CachedFile scannerEngineJar)
     this.scannerEngineJar = scannerEngineJar;
   }
 
-  public void execute(Map<String, String> properties) {
-    LOG.info("Starting scanner-engine");
-    javaRunner.execute(buildArgs(properties), buildJsonProperties(properties));
+  public boolean execute(Map<String, String> properties) {
+    return javaRunner.execute(buildArgs(properties), buildJsonProperties(properties));
   }
 
   private List<String> buildArgs(Map<String, String> properties) {

lib/src/test/java/org/sonarsource/scanner/lib/internal/JavaRunnerTest.java

@@ -41,7 +41,8 @@ void execute_shouldLogProcessOutput() {
     runner.execute(List.of("--version"), "test");
     assertThat(logTester.logs(Level.INFO)).isNotEmpty().allMatch(s -> s.startsWith("[stdout] "));
 
-    runner.execute(List.of("-version"), null);
+    assertThat(runner.execute(List.of("-version"), null)).isTrue();
+
     assertThat(logTester.logs(Level.ERROR)).isNotEmpty().allMatch(s -> s.startsWith("[stderr] "));
   }
 
@@ -55,12 +56,10 @@ void execute_whenInvalidRunner_shouldFail() {
   }
 
   @Test
-  void execute_shouldFailWhenBadRunner() {
+  void execute_shouldReturnFalseWhenNonZeroExitCode() {
     JavaRunner runner = new JavaRunner(Paths.get("java"), JreCacheHit.DISABLED);
     List<String> command = List.of("unknown-command");
-    assertThatThrownBy(() -> runner.execute(command, "test"))
-      .isInstanceOf(IllegalStateException.class)
-      .hasMessageContaining("Error returned by the Java command execution");
+    assertThat(runner.execute(command, "test")).isFalse();
   }
 
   @Test