Fix parsing of Java opts

Author: henryju

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

@@ -22,8 +22,10 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonarsource.scanner.lib.ScannerProperties;
@@ -51,13 +53,20 @@ private List<String> buildArgs(Map<String, String> properties) {
     List<String> args = new ArrayList<>();
     String javaOpts = properties.get(ScannerProperties.SCANNER_JAVA_OPTS);
     if (javaOpts != null) {
-      args.add(javaOpts);
+      args.addAll(split(javaOpts));
     }
     args.add("-jar");
     args.add(scannerEngineJar.getPathInCache().toAbsolutePath().toString());
     return args;
   }
 
+  private static List<String> split(String value) {
+    return Arrays.stream(value.split("\\s+"))
+      .map(String::trim)
+      .filter(s -> !s.isEmpty())
+      .collect(Collectors.toList());
+  }
+
   private static String buildJsonProperties(Map<String, String> properties) {
     JsonObject jsonObject = new JsonObject();
     jsonObject.add(JSON_FIELD_SCANNER_PROPERTIES, new Gson().toJsonTree(properties));

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

@@ -43,12 +43,12 @@ void execute() {
     var scannerEngine = temp.resolve("scanner-engine.jar");
     ScannerEngineLauncher launcher = new ScannerEngineLauncher(javaRunner, new CachedFile(scannerEngine, true));
 
-    Map<String, String> properties = Map.of(ScannerProperties.SCANNER_JAVA_OPTS, "-Xmx4g",
+    Map<String, String> properties = Map.of(ScannerProperties.SCANNER_JAVA_OPTS, "-Xmx4g -Xms1g",
       ScannerProperties.HOST_URL, "http://localhost:9000");
     launcher.execute(properties);
 
     verify(javaRunner).execute(
-      List.of("-Xmx4g", "-jar", scannerEngine.toAbsolutePath().toString()),
+      List.of("-Xmx4g", "-Xms1g", "-jar", scannerEngine.toAbsolutePath().toString()),
       "{\"scannerProperties\":" + new Gson().toJson(properties) + "}");
   }
 }