Ensure that we forward metadata in the new session payload

shs96c · TikhomirovSergey · commit ed5fba8fb852 · 2018-02-09T22:53:26.000+03:00
diff --git a/src/main/java/org/openqa/selenium/remote/NewSessionPayload.java b/src/main/java/org/openqa/selenium/remote/NewSessionPayload.java
@@ -219,8 +219,7 @@ public void writeTo(Appendable appendable) throws IOException {
 
             Map<String, Object> first = getOss();
             if (first == null) {
-                //noinspection unchecked
-                first = (Map<String, Object>) stream().findFirst()
+                first = stream().findFirst()
                         .orElse(new ImmutableCapabilities())
                         .asMap();
             }
@@ -246,10 +245,36 @@ public void writeTo(Appendable appendable) throws IOException {
             json.endArray();
 
             json.endObject();  // Close "capabilities" object
+
+            writeMetaData(json);
+
             json.endObject();
         }
     }
 
+    private void writeMetaData(JsonOutput out) throws IOException {
+        CharSource charSource = backingStore.asByteSource().asCharSource(UTF_8);
+        try (Reader reader = charSource.openBufferedStream();
+             JsonInput input = json.newInput(reader)) {
+            input.beginObject();
+            while (input.hasNext()) {
+                String name = input.nextName();
+                switch (name) {
+                    case "capabilities":
+                    case "desiredCapabilities":
+                    case "requiredCapabilities":
+                        input.skipValue();
+                        break;
+
+                    default:
+                        out.name(name);
+                        out.write(input.<Object>read(Object.class), Object.class);
+                        break;
+                }
+            }
+        }
+    }
+
     private void streamW3CProtocolParameters(JsonOutput out, Map<String, Object> des) {
         // Technically we should be building up a combination of "alwaysMatch" and "firstMatch" options.
         // We're going to do a little processing to figure out what we might be able to do, and assume
