Json.toType now requires a String

Ulitmately, it would be nice if this took a Reader, but
now we don't have to try and deal with the weird edge
case of both a String and a JsonElement being passed in.

Author: shs96c

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

@@ -68,7 +68,7 @@ public JsonElement toJsonElement(Object toConvert) {
     return toJson.convertObject(toConvert);
   }
 
-  public <T> T toType(Object source, Type typeOfT) {
+  public <T> T toType(String source, Type typeOfT) {
     Class<?> type;
     if (typeOfT instanceof ParameterizedType) {
       type = (Class<?>) ((ParameterizedType) typeOfT).getRawType();

java/server/src/org/openqa/grid/internal/utils/configuration/GridNodeConfiguration.java

@@ -120,7 +120,7 @@ static List<MutableCapabilities> getCapabilities() {
       JsonObject defaults = loadJSONFromResourceOrFile(DEFAULT_NODE_CONFIG_FILE);
       List<MutableCapabilities> caps = new ArrayList<>();
       for (JsonElement el : defaults.getAsJsonArray("capabilities")) {
-        caps.add(new Json().toType(el, DesiredCapabilities.class));
+        caps.add(new Json().toType(el.toString(), DesiredCapabilities.class));
       }
       return caps;
     }
@@ -451,7 +451,7 @@ public List<MutableCapabilities> deserialize(JsonElement jsonElement, Type type,
         List<MutableCapabilities> desiredCapabilities = new ArrayList<>();
         Json json = new Json();
         for (JsonElement arrayElement : jsonElement.getAsJsonArray()) {
-          desiredCapabilities.add(json.toType(arrayElement, DesiredCapabilities.class));
+          desiredCapabilities.add(json.toType(arrayElement.toString(), DesiredCapabilities.class));
         }
         return desiredCapabilities;
       }

java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java

@@ -39,7 +39,6 @@
 import java.io.InputStreamReader;
 import java.util.logging.Logger;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -174,7 +173,7 @@ private void considerV2Json(GridNodeConfiguration configuration, JsonObject json
       JsonArray capabilities = json.get("capabilities").getAsJsonArray();
       Json converter = new Json();
       for (int i = 0; i < capabilities.size(); i++) {
-        MutableCapabilities cap = converter.toType(capabilities.get(i), DesiredCapabilities.class);
+        MutableCapabilities cap = converter.toType(capabilities.get(i).toString(), DesiredCapabilities.class);
         configuration.capabilities.add(cap);
       }
       configuration.fixUpCapabilities();