Remove Json.toJsonElement

Author: shs96c

java/client/src/org/openqa/selenium/json/Json.java

@@ -21,7 +21,6 @@
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -32,7 +31,7 @@
 import java.util.Map;
 
 public class Json {
-  final static Gson GSON = new GsonBuilder()
+  static final Gson GSON = new GsonBuilder()
       .setLenient()
       .serializeNulls()
       .disableHtmlEscaping()
@@ -49,14 +48,6 @@ public String toJson(Object toConvert) {
     return toJson.convert(toConvert);
   }
 
-  /**
-   * @deprecated No replacement. Use raw java types instead.
-   */
-  @Deprecated
-  public JsonElement toJsonElement(Object toConvert) {
-    return toJson.convertObject(toConvert);
-  }
-
   public <T> T toType(String source, Type typeOfT) {
     return toType(source, typeOfT, PropertySetting.BY_NAME);
   }

java/server/src/org/openqa/selenium/remote/server/rest/Responses.java

@@ -17,13 +17,16 @@
 
 package org.openqa.selenium.remote.server.rest;
 
+import static org.openqa.selenium.json.Json.MAP_TYPE;
+
 import com.google.gson.JsonObject;
 
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.remote.ErrorCodes;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.SessionId;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -83,9 +86,11 @@ public static Response failure(
     response.setState(ERROR_CODES.toState(response.getStatus()));
 
     if (reason != null) {
-      JsonObject json = new Json().toJsonElement(reason).getAsJsonObject();
-      screenshot.ifPresent(screen -> json.addProperty("screen", screen));
-      response.setValue(json);
+      Json json = new Json();
+      String raw = json.toJson(reason);
+      Map<String, Object> value = json.toType(raw, MAP_TYPE);
+      screenshot.ifPresent(screen -> value.put("screen", screen));
+      response.setValue(value);
     }
     return response;
   }