Switch to our own classes for outputting JSON

SeleniumHQ · May 18, 2018 · 5344028 · 5344028
1 parent ddf1071
commit 5344028
Show file tree

Hide file tree

Showing 8 changed files with 382 additions and 317 deletions.
diff --git a/java/client/src/org/openqa/selenium/json/BeanToJsonConverter.java b/java/client/src/org/openqa/selenium/json/BeanToJsonConverter.java
diff --git a/java/client/src/org/openqa/selenium/json/Json.java b/java/client/src/org/openqa/selenium/json/Json.java
@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.json;
 
-import com.google.common.io.CharStreams;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -44,7 +43,6 @@ public class Json {
   public static final Type OBJECT_TYPE = new TypeToken<Object>() {}.getType();
 
   private final JsonTypeCoercer fromJson = new JsonTypeCoercer();
-  private final BeanToJsonConverter toJson = new BeanToJsonConverter();
 
   public String toJson(Object toConvert) {
     try (Writer writer = new StringWriter();
@@ -76,10 +74,6 @@ public JsonInput newInput(Reader from) throws UncheckedIOException {
   }
 
   public JsonOutput newOutput(Appendable to) throws UncheckedIOException {
-    try {
-      return new JsonOutput(toJson, GSON.newJsonWriter(CharStreams.asWriter(to)));
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
+    return new JsonOutput(to);
   }
 }