Handle a Selenium 3 style "sessionId" in a Command received by a Selenium 2 server.

Note, this doesn't include the opposite conversion in the BeanToJsonConverter, since
every server out there is still a normal v2 one.

Author: shs96c

java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java

@@ -98,9 +98,15 @@ private <T> T convert(Class<T> clazz, Object text, int depth) throws JSONExcepti
     }
 
     if (SessionId.class.equals(clazz)) {
-      JSONObject object = new JSONObject((String) text);
-      String value = object.getString("value");
-      return (T) new SessionId(value);
+      // Stupid heuristic to tell if we are dealing with a selenium 2 or 3 session id.
+      String coerced = String.valueOf(text);
+      if (!coerced.isEmpty() && coerced.charAt(0) == '{') {
+        JSONObject object = new JSONObject(coerced);
+        String value = object.getString("value");
+        return (T) new SessionId(value);
+      }
+
+      return (T) new SessionId(coerced);
     }
 
     if (Capabilities.class.equals(clazz)) {

java/client/test/org/openqa/selenium/remote/JsonToBeanConverterTest.java

@@ -48,6 +48,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.google.common.collect.Maps;
+
 @RunWith(JUnit4.class)
 public class JsonToBeanConverterTest {
 
@@ -338,6 +340,23 @@ public void testShouldNotParseQuotedJsonObjectsAsActualJsonObjects() throws JSON
     assertThat(convertedInner.toString(), equalTo(inner.toString()));
   }
 
+  @Test
+  public void shouldBeAbleToConvertASelenium3CommandToASelenium2Command() throws JSONException {
+    SessionId expectedId = new SessionId("thisisakey");
+
+    JSONObject rawJson = new JSONObject();
+    // In selenium 2, the sessionId is an object. In selenium 3, it's a straight string.
+    rawJson.put("sessionId", expectedId.toString());
+    rawJson.put("name", "some command");
+    rawJson.put("parameters", Maps.newHashMap());
+
+    String stringified = rawJson.toString();
+
+    Command converted = new JsonToBeanConverter().convert(Command.class, stringified);
+
+    assertEquals(expectedId, converted.getSessionId());
+  }
+
   public static class SimpleBean {
 
     private String value;