Separate serialization contexts

Author: RenderMichael

dotnet/src/webdriver/DevTools/DevToolsSession.cs

@@ -25,6 +25,7 @@
 using System.Net.Http;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -284,7 +285,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
 
                 LogTrace("Sending {0} {1}: {2}", message.CommandId, message.CommandName, commandParameters.ToString());
 
-                string contents = JsonSerializer.Serialize(message, DevToolsSerializerContext.Default.DevToolsCommandData);
+                string contents = JsonSerializer.Serialize(message, DevToolsSessionSerializerContext.Default.DevToolsCommandData);
                 this.pendingCommands.TryAdd(message.CommandId, message);
                 await this.connection.SendData(contents).ConfigureAwait(false);
 
@@ -411,7 +412,7 @@ private async Task<int> InitializeProtocol(int requestedProtocolVersion)
                     rawVersionInfo = await client.GetStringAsync("/json/version").ConfigureAwait(false);
                 }
 
-                var versionInfo = JsonSerializer.Deserialize(rawVersionInfo, DevToolsSerializerContext.Default.DevToolsVersionInfo);
+                var versionInfo = JsonSerializer.Deserialize(rawVersionInfo, DevToolsSessionSerializerContext.Default.DevToolsVersionInfo);
                 this.websocketAddress = versionInfo.WebSocketDebuggerUrl;
 
                 if (requestedProtocolVersion == AutoDetectDevToolsProtocolVersion)
@@ -664,4 +665,8 @@ private void LogError(string message, params object[] args)
             }
         }
     }
+
+    [JsonSerializable(typeof(DevToolsCommandData))]
+    [JsonSerializable(typeof(DevToolsVersionInfo))]
+    internal sealed partial class DevToolsSessionSerializerContext : JsonSerializerContext;
 }

dotnet/src/webdriver/DevTools/Json/DevToolsSerializerContext.cs

@@ -26,6 +26,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium
@@ -399,7 +400,7 @@ private void OnScriptBindingCalled(object sender, BindingCalledEventArgs e)
         {
             if (e.Name == MonitorBindingName)
             {
-                DomMutationData valueChangeData = JsonSerializer.Deserialize(e.Payload, DevToolsSerializerContext.Default.DomMutationData);
+                DomMutationData valueChangeData = JsonSerializer.Deserialize(e.Payload, JsonEngineSerializerContext.Default.DomMutationData);
                 var locator = By.CssSelector($"*[data-__webdriver_id='{valueChangeData.TargetId}']");
                 valueChangeData.Element = driver.FindElements(locator).FirstOrDefault();
 
@@ -450,4 +451,7 @@ private void OnConsoleApiCalled(object sender, ConsoleApiCalledEventArgs e)
             }
         }
     }
+
+    [JsonSerializable(typeof(DomMutationData))]
+    internal sealed partial class JsonEngineSerializerContext : JsonSerializerContext;
 }