[bugfix] Prevent null pointer exceptions in the commandRunner

fsantiag · May 3, 2019 · 586fd02 · 586fd02
1 parent 71f4d2c
commit 586fd02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/main/java/org/sonar/plugins/clojure/sensors/CommandRunner.java b/src/main/java/org/sonar/plugins/clojure/sensors/CommandRunner.java
@@ -7,6 +7,7 @@
 import org.sonar.api.utils.log.Loggers;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 @ScannerSide
 public class CommandRunner {
@@ -30,7 +31,7 @@ public CommandRunner() {
     CommandStreamConsumer run(String command, CommandStreamConsumer stdout,
                                      CommandStreamConsumer stderr, String... arguments) {
         Command cmd = Command.create(command);
-        Arrays.stream(arguments).forEach(cmd::addArgument);
+        Arrays.stream(arguments).filter(Objects::nonNull).forEach(cmd::addArgument);
 
         commandExecutor.execute(cmd, stdout, stderr, TIMEOUT);
 

diff --git a/src/test/java/org/sonar/plugins/clojure/sensors/CommandRunnerTest.java b/src/test/java/org/sonar/plugins/clojure/sensors/CommandRunnerTest.java
@@ -14,7 +14,6 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -37,13 +36,7 @@ public void setUp() {
 
     @Test
     public void shouldTakeMultipleArgumentsForCommand() {
-        doReturn(0).when(commandExecutor).execute(
-                any(),
-                any(),
-                any(),
-                anyLong());
-
-        commandRunner.run("echo", "argument1", "argument2");
+        commandRunner.run("echo", "argument1", null, "argument2");
 
         ArgumentCaptor<Command> commandCaptor = ArgumentCaptor.forClass(Command.class);
         verify(commandExecutor, times(1))