[java] Use internal JSON parser instead of GSON

bonigarcia · bonigarcia · commit 1ee41339cd09 · 2023-03-14T18:19:38.000+01:00
diff --git a/java/src/org/openqa/selenium/manager/BUILD.bazel b/java/src/org/openqa/selenium/manager/BUILD.bazel
@@ -18,8 +18,8 @@ java_export(
     ],
     deps = [
         "//java/src/org/openqa/selenium:core",
+        "//java/src/org/openqa/selenium/json",
         artifact("com.google.guava:guava"),
-        artifact("com.google.code.gson:gson"),
     ],
 )
 
diff --git a/java/src/org/openqa/selenium/manager/SeleniumManager.java b/java/src/org/openqa/selenium/manager/SeleniumManager.java
@@ -18,11 +18,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.CharStreams;
-import com.google.gson.GsonBuilder;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.json.Json;
 
 import java.io.File;
 import java.io.IOException;
@@ -113,7 +113,7 @@ private static String runCommand(String... command) {
             throw new WebDriverException("Unsuccessful command executed: " + Arrays.toString(command) +
                     "\n" + output);
         }
-        SeleniumManagerJsonOutput jsonOutput = new GsonBuilder().create().fromJson(output,
+        SeleniumManagerJsonOutput jsonOutput = new Json().toType(output,
                 SeleniumManagerJsonOutput.class);
         jsonOutput.logs.stream().filter(log -> log.level.equalsIgnoreCase(WARN))
                 .forEach(log -> LOG.warning(log.message));
diff --git a/java/src/org/openqa/selenium/manager/SeleniumManagerJsonOutput.java b/java/src/org/openqa/selenium/manager/SeleniumManagerJsonOutput.java
@@ -20,18 +20,74 @@
 
 public class SeleniumManagerJsonOutput {
 
-    List<Log> logs;
-    Result result;
+    public List<Log> logs;
+    public Result result;
 
-    class Log {
-        String level;
+    public List<Log> getLogs() {
+        return logs;
+    }
+
+    public void setLogs(List<Log> logs) {
+        this.logs = logs;
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public void setResult(Result result) {
+        this.result = result;
+    }
+
+    public static class Log {
+        public String level;
         long timestamp;
-        String message;
+        public String message;
+
+        public String getLevel() {
+            return level;
+        }
+
+        public void setLevel(String level) {
+            this.level = level;
+        }
+
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        public void setTimestamp(long timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
     }
 
-    class Result {
-        int code;
-        String message;
+    public static class Result {
+        public int code;
+        public String message;
+
+        public int getCode() {
+            return code;
+        }
+
+        public void setCode(int code) {
+            this.code = code;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ java_export(`
`18`	`18`	`],`
`19`	`19`	`deps = [`
`20`	`20`	`"//java/src/org/openqa/selenium:core",`
	`21`	`+ "//java/src/org/openqa/selenium/json",`
`21`	`22`	`artifact("com.google.guava:guava"),`
`22`		`- artifact("com.google.code.gson:gson"),`
`23`	`23`	`],`
`24`	`24`	`)`
`25`	`25`