More migration to our own JSON serialisers

Author: shs96c

java/server/src/org/openqa/selenium/remote/server/DriverServlet.java

@@ -28,10 +28,10 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HttpHeaders;
 import com.google.common.net.MediaType;
-import com.google.gson.Gson;
 
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.logging.LoggingHandler;
+import org.openqa.selenium.remote.BeanToJsonConverter;
 import org.openqa.selenium.remote.ErrorCodes;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.server.log.LoggingManager;
@@ -302,7 +302,7 @@ private void writeThrowable(HttpServletResponse resp, Throwable e) {
                     "lineNumber", element.getLineNumber()))
                 .collect(ImmutableList.toImmutableList())));
 
-    byte[] bytes = new Gson().toJson(value).getBytes(UTF_8);
+    byte[] bytes = new BeanToJsonConverter().convert(value).getBytes(UTF_8);
 
     try {
       resp.setStatus(HTTP_INTERNAL_ERROR);

java/server/src/org/openqa/selenium/remote/server/InMemorySession.java

@@ -24,9 +24,7 @@
 import com.google.common.base.StandardSystemProperty;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
+import com.google.common.io.CharStreams;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.HasCapabilities;
@@ -35,6 +33,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.remote.Dialect;
+import org.openqa.selenium.remote.JsonToBeanConverter;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
@@ -129,13 +128,11 @@ public void stop() {
 
   public static class Factory implements SessionFactory {
 
-    private static final Type MAP_TYPE = new TypeToken<Map<String, Object>>(){}.getType();
-    private final Gson gson;
+    private final JsonToBeanConverter toBean = new JsonToBeanConverter();
     private final DriverProvider provider;
 
     public Factory(DriverProvider provider) {
       this.provider = provider;
-      gson = new GsonBuilder().setLenient().create();
     }
 
     @Override
@@ -145,7 +142,7 @@ public ActiveSession apply(NewSessionPayload payload) {
           InputStream is = payload.getPayload().get();
           Reader ir = new InputStreamReader(is, UTF_8);
           Reader reader = new BufferedReader(ir)) {
-        Map<String, Object> raw = gson.fromJson(reader, MAP_TYPE);
+        Map<?, ?> raw = toBean.convert(Map.class, CharStreams.toString(reader));
         Object desired = raw.get("desiredCapabilities");
 
         if (!(desired instanceof Map)) {

java/server/src/org/openqa/selenium/remote/server/commandhandler/Status.java

@@ -54,8 +54,8 @@ public void execute(HttpRequest req, HttpResponse resp) throws IOException {
     BuildInfo buildInfo = new BuildInfo();
     value.put("build", ImmutableMap.of(
         // We need to fix the BuildInfo to properly fill out these values.
-//          "revision", buildInfo.getBuildRevision(),
-//          "time", buildInfo.getBuildTime(),
+          "revision", buildInfo.getBuildRevision(),
+          "time", buildInfo.getBuildTime(),
         "version", buildInfo.getReleaseLabel()));
 
     value.put("os", ImmutableMap.of(