Fix the JSON input/output

Author: henryju

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

@@ -88,11 +88,11 @@ void tryParse(String stdout) {
       if (log.message != null) {
         sb.append(log.message);
       }
-      if (log.message != null && log.throwable != null) {
+      if (log.message != null && log.stacktrace != null) {
         sb.append("\n");
       }
-      if (log.throwable != null) {
-        sb.append(log.throwable);
+      if (log.stacktrace != null) {
+        sb.append(log.stacktrace);
       }
       log(log.level, sb.toString());
     } catch (Exception e) {
@@ -123,10 +123,10 @@ private static void log(String level, String msg) {
   private static class Log {
     @SerializedName("level")
     private String level;
-    @SerializedName("formattedMessage")
+    @SerializedName("message")
     private String message;
-    @SerializedName("throwable")
-    private String throwable;
+    @SerializedName("stacktrace")
+    private String stacktrace;
   }
 
   private static class StreamGobbler extends Thread {

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

@@ -20,6 +20,7 @@
 package org.sonarsource.scanner.lib.internal;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,8 +69,15 @@ private static List<String> split(String value) {
   }
 
   private static String buildJsonProperties(Map<String, String> properties) {
+    JsonArray propertiesArray = new JsonArray();
+    properties.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEach(prop -> {
+      JsonObject property = new JsonObject();
+      property.addProperty("key", prop.getKey());
+      property.addProperty("value", prop.getValue());
+      propertiesArray.add(property);
+    });
     JsonObject jsonObject = new JsonObject();
-    jsonObject.add(JSON_FIELD_SCANNER_PROPERTIES, new Gson().toJsonTree(properties));
+    jsonObject.add(JSON_FIELD_SCANNER_PROPERTIES, propertiesArray);
     return new Gson().toJson(jsonObject);
   }
 

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

@@ -69,14 +69,14 @@ void tryParse_shouldParseLogMessages() {
 
     runner.tryParse("{\n" +
       "    \"level\": \"ERROR\",\n" +
-      "    \"formattedMessage\": \"Some error message\",\n" +
-      "    \"throwable\": \"exception\"\n" +
+      "    \"message\": \"Some error message\",\n" +
+      "    \"stacktrace\": \"exception\"\n" +
       "}");
-    runner.tryParse("{\"level\": \"WARN\", \"formattedMessage\": \"Some warn message\"}");
-    runner.tryParse("{\"level\": \"DEBUG\", \"formattedMessage\": \"Some debug message\"}");
-    runner.tryParse("{\"level\": \"TRACE\", \"formattedMessage\": \"Some trace message\"}");
-    runner.tryParse("{\"level\": \"INFO\", \"formattedMessage\": \"Some info message\"}");
-    runner.tryParse("{\"level\": \"UNKNOWN-LEVEL\", \"formattedMessage\": \"Some unknown level message\"}");
+    runner.tryParse("{\"level\": \"WARN\", \"message\": \"Some warn message\"}");
+    runner.tryParse("{\"level\": \"DEBUG\", \"message\": \"Some debug message\"}");
+    runner.tryParse("{\"level\": \"TRACE\", \"message\": \"Some trace message\"}");
+    runner.tryParse("{\"level\": \"INFO\", \"message\": \"Some info message\"}");
+    runner.tryParse("{\"level\": \"UNKNOWN-LEVEL\", \"message\": \"Some unknown level message\"}");
 
     assertThat(logTester.logs(Level.ERROR)).containsOnly("Some error message\nexception");
     assertThat(logTester.logs(Level.WARN)).containsOnly("Some warn message");

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

@@ -19,7 +19,6 @@
  */
 package org.sonarsource.scanner.lib.internal;
 
-import com.google.gson.Gson;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -43,12 +42,13 @@ 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 -Xms1g",
+    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", "-Xms1g", "-jar", scannerEngine.toAbsolutePath().toString()),
-      "{\"scannerProperties\":" + new Gson().toJson(properties) + "}");
+      "{\"scannerProperties\":[{\"key\":\"sonar.host.url\",\"value\":\"http://localhost:9000\"},{\"key\":\"sonar.scanner.javaOpts\",\"value\":\"-Xmx4g -Xms1g\"}]}");
   }
 }