Move context away from DevToolsJsonOptions

Author: RenderMichael

dotnet/src/webdriver/DevTools/DevToolsSession.cs

@@ -284,7 +284,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
 
                 LogTrace("Sending {0} {1}: {2}", message.CommandId, message.CommandName, commandParameters.ToString());
 
-                string contents = JsonSerializer.Serialize(message, DevToolsJsonOptions.DevToolsSerializerContext.Default.DevToolsCommandData);
+                string contents = JsonSerializer.Serialize(message, DevToolsSerializerContext.Default.DevToolsCommandData);
                 this.pendingCommands.TryAdd(message.CommandId, message);
                 await this.connection.SendData(contents).ConfigureAwait(false);
 
@@ -411,7 +411,7 @@ private async Task<int> InitializeProtocol(int requestedProtocolVersion)
                     rawVersionInfo = await client.GetStringAsync("/json/version").ConfigureAwait(false);
                 }
 
-                var versionInfo = JsonSerializer.Deserialize(rawVersionInfo, DevToolsJsonOptions.DevToolsSerializerContext.Default.DevToolsVersionInfo);
+                var versionInfo = JsonSerializer.Deserialize(rawVersionInfo, DevToolsSerializerContext.Default.DevToolsVersionInfo);
                 this.websocketAddress = versionInfo.WebSocketDebuggerUrl;
 
                 if (requestedProtocolVersion == AutoDetectDevToolsProtocolVersion)

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

@@ -18,13 +18,12 @@
 // </copyright>
 
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 #nullable enable
 
 namespace OpenQA.Selenium.DevTools.Json;
 
-internal static partial class DevToolsJsonOptions
+internal static class DevToolsJsonOptions
 {
     public static JsonSerializerOptions Default { get; } = new JsonSerializerOptions()
     {
@@ -33,9 +32,4 @@ internal static partial class DevToolsJsonOptions
             new StringConverter(),
         }
     };
-
-    [JsonSerializable(typeof(DevToolsCommandData))]
-    [JsonSerializable(typeof(DevToolsVersionInfo))]
-    [JsonSerializable(typeof(DomMutationData))]
-    internal sealed partial class DevToolsSerializerContext : JsonSerializerContext;
 }

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

@@ -0,0 +1,29 @@
+// <copyright file="DevToolsSerializerContext.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System.Text.Json.Serialization;
+
+#nullable enable
+
+namespace OpenQA.Selenium.DevTools.Json;
+
+[JsonSerializable(typeof(DevToolsCommandData))]
+[JsonSerializable(typeof(DevToolsVersionInfo))]
+[JsonSerializable(typeof(DomMutationData))]
+internal sealed partial class DevToolsSerializerContext : JsonSerializerContext;

dotnet/src/webdriver/JavaScriptEngine.cs

@@ -399,7 +399,7 @@ private void OnScriptBindingCalled(object sender, BindingCalledEventArgs e)
         {
             if (e.Name == MonitorBindingName)
             {
-                DomMutationData valueChangeData = JsonSerializer.Deserialize(e.Payload, DevToolsJsonOptions.DevToolsSerializerContext.Default.DomMutationData);
+                DomMutationData valueChangeData = JsonSerializer.Deserialize(e.Payload, DevToolsSerializerContext.Default.DomMutationData);
                 var locator = By.CssSelector($"*[data-__webdriver_id='{valueChangeData.TargetId}']");
                 valueChangeData.Element = driver.FindElements(locator).FirstOrDefault();
 

dotnet/src/webdriver/Response.cs

@@ -33,6 +33,12 @@ namespace OpenQA.Selenium
     /// </summary>
     public class Response
     {
+        private static readonly JsonSerializerOptions s_jsonSerializerOptions = new()
+        {
+            TypeInfoResolver = ResponseJsonSerializerContext.Default,
+            Converters = { new ResponseValueJsonConverter() } // we still need it to make `Object` as `Dictionary`
+        };
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Response"/> class
         /// </summary>
@@ -73,7 +79,7 @@ public Response(string? sessionId, object? value, WebDriverResult status)
         /// <exception cref="JsonException">If <paramref name="value"/> is not a valid JSON object.</exception>
         public static Response FromJson(string value)
         {
-            Dictionary<string, object?> rawResponse = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, ResponseJsonSerializerContext.Default.DictionaryStringObject)
+            Dictionary<string, object?> rawResponse = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, s_jsonSerializerOptions)
                 ?? throw new WebDriverException("JSON success response returned \"null\" value");
 
             object? contents;
@@ -172,7 +178,7 @@ public WebDriverResult Status
         /// <exception cref="WebDriverException">If the JSON dictionary is not in the expected state, per spec.</exception>
         public static Response FromErrorJson(string value)
         {
-            Dictionary<string, object?> deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, ResponseJsonSerializerContext.Default.DictionaryStringObject)
+            Dictionary<string, object?> deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, s_jsonSerializerOptions)
                 ?? throw new WebDriverException("JSON error response returned \"null\" value");
 
             if (!deserializedResponse.TryGetValue("value", out object? valueObject))
@@ -220,6 +226,5 @@ public override string ToString()
     }
 
     [JsonSerializable(typeof(Dictionary<string, object>))]
-    [JsonSourceGenerationOptions(Converters = [typeof(ResponseValueJsonConverter)])] // we still need it to make `Object` as `Dictionary`
     internal sealed partial class ResponseJsonSerializerContext : JsonSerializerContext;
 }