Revert DevTools JSON handling by domains

Author: RenderMichael

dotnet/src/webdriver/DevTools/DevToolsDomains.cs

@@ -70,15 +70,6 @@ public abstract class DevToolsDomains
         /// </summary>
         public abstract Log Log { get; }
 
-        internal abstract JsonNode SerializeToNode<TCommand>(TCommand command)
-            where TCommand : ICommand;
-
-        internal abstract ICommandResponse<TCommand> DeserializeCommandResponse<TCommand>(JsonElement responseJson)
-            where TCommand : ICommand;
-
-        internal abstract TCommandResponse Deserialize<TCommandResponse>(JsonElement responseJson)
-            where TCommandResponse : ICommandResponse;
-
         /// <summary>
         /// Initializes the supplied DevTools session's domains for the specified browser version.
         /// </summary>

dotnet/src/webdriver/DevTools/DevToolsSession.cs

@@ -157,16 +157,19 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                 throw new ArgumentNullException(nameof(command));
             }
 
-            JsonNode serializedCommand = this.domains.SerializeToNode(command);
-
-            var result = await SendCommand(command.CommandName, serializedCommand, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);
+            var result = await SendCommand(command.CommandName, JsonSerializer.SerializeToNode(command), cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);
 
             if (result == null)
             {
                 return null;
             }
 
-            return this.domains.DeserializeCommandResponse<TCommand>(result.Value);
+            if (!this.domains.VersionSpecificDomains.ResponseTypeMap.TryGetCommandResponseType<TCommand>(out Type commandResponseType))
+            {
+                throw new InvalidOperationException($"Type {command.GetType()} does not correspond to a known command response type.");
+            }
+
+            return result.Value.Deserialize(commandResponseType) as ICommandResponse<TCommand>;
         }
 
         /// <summary>
@@ -187,16 +190,19 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                 throw new ArgumentNullException(nameof(command));
             }
 
-            JsonNode serializedCommand = this.domains.SerializeToNode(command);
-
-            var result = await SendCommand(command.CommandName, sessionId, serializedCommand, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);
+            var result = await SendCommand(command.CommandName, sessionId, JsonSerializer.SerializeToNode(command), cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);
 
             if (result == null)
             {
                 return null;
             }
 
-            return this.domains.DeserializeCommandResponse<TCommand>(result.Value);
+            if (!this.domains.VersionSpecificDomains.ResponseTypeMap.TryGetCommandResponseType(command, out Type commandResponseType))
+            {
+                throw new InvalidOperationException($"Type {typeof(TCommand)} does not correspond to a known command response type.");
+            }
+
+            return result.Value.Deserialize(commandResponseType) as ICommandResponse<TCommand>;
         }
 
         /// <summary>
@@ -218,16 +224,14 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                 throw new ArgumentNullException(nameof(command));
             }
 
-            JsonNode serializedCommand = this.domains.SerializeToNode(command);
-
-            var result = await SendCommand(command.CommandName, serializedCommand, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);
+            var result = await SendCommand(command.CommandName, JsonSerializer.SerializeToNode(command), cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);
 
             if (result == null)
             {
                 return default(TCommandResponse);
             }
 
-            return this.domains.Deserialize<TCommandResponse>(result.Value);
+            return result.Value.Deserialize<TCommandResponse>();
         }
 
         /// <summary>

dotnet/src/webdriver/DevTools/v130/DevToolsSerializationContext.cs

@@ -17,27 +17,13 @@
 // under the License.
 // </copyright>
 
-using System;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
 namespace OpenQA.Selenium.DevTools.V130
 {
     /// <summary>
     /// Class containing the domain implementation for version 130 of the DevTools Protocol.
     /// </summary>
     public class V130Domains : DevToolsDomains
     {
-        private static readonly JsonSerializerOptions jsonRequestSerializerOptions = new()
-        {
-            TypeInfoResolver = V130RequestSerializationContext.Default
-        };
-
-        private static readonly JsonSerializerOptions jsonResponseSerializerOptions = new()
-        {
-            TypeInfoResolver = V130ResponseSerializationContext.Default
-        };
-
         private DevToolsSessionDomains domains;
 
         /// <summary>
@@ -78,25 +64,5 @@ public V130Domains(DevToolsSession session)
         /// Gets the object used for manipulating the browser's logs.
         /// </summary>
         public override DevTools.Log Log => new V130Log(domains.Log);
-
-        internal override JsonNode SerializeToNode<TCommand>(TCommand command)
-        {
-            return JsonSerializer.SerializeToNode(command, jsonRequestSerializerOptions);
-        }
-
-        internal override ICommandResponse<TCommand> DeserializeCommandResponse<TCommand>(JsonElement responseJson)
-        {
-            if (!this.VersionSpecificDomains.ResponseTypeMap.TryGetCommandResponseType<TCommand>(out Type commandResponseType))
-            {
-                throw new InvalidOperationException($"Type {typeof(TCommand)} does not correspond to a known command response type.");
-            }
-
-            return (ICommandResponse<TCommand>)responseJson.Deserialize(commandResponseType, jsonResponseSerializerOptions);
-        }
-
-        internal override TCommandResponse Deserialize<TCommandResponse>(JsonElement responseJson)
-        {
-            return responseJson.Deserialize<TCommandResponse>(jsonResponseSerializerOptions);
-        }
     }
 }

dotnet/src/webdriver/DevTools/v130/V130Domains.cs

@@ -17,27 +17,13 @@
 // under the License.
 // </copyright>
 
-using System;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
 namespace OpenQA.Selenium.DevTools.V131
 {
     /// <summary>
     /// Class containing the domain implementation for version 131 of the DevTools Protocol.
     /// </summary>
     public class V131Domains : DevToolsDomains
     {
-        private static readonly JsonSerializerOptions jsonRequestSerializerOptions = new()
-        {
-            TypeInfoResolver = V131RequestSerializationContext.Default
-        };
-
-        private static readonly JsonSerializerOptions jsonResponseSerializerOptions = new()
-        {
-            TypeInfoResolver = V131ResponseSerializationContext.Default
-        };
-
         private DevToolsSessionDomains domains;
 
         /// <summary>
@@ -78,25 +64,5 @@ public V131Domains(DevToolsSession session)
         /// Gets the object used for manipulating the browser's logs.
         /// </summary>
         public override DevTools.Log Log => new V131Log(domains.Log);
-
-        internal override JsonNode SerializeToNode<TCommand>(TCommand command)
-        {
-            return JsonSerializer.SerializeToNode(command, jsonRequestSerializerOptions);
-        }
-
-        internal override ICommandResponse<TCommand> DeserializeCommandResponse<TCommand>(JsonElement responseJson)
-        {
-            if (!this.VersionSpecificDomains.ResponseTypeMap.TryGetCommandResponseType<TCommand>(out Type commandResponseType))
-            {
-                throw new InvalidOperationException($"Type {typeof(TCommand)} does not correspond to a known command response type.");
-            }
-
-            return (ICommandResponse<TCommand>)responseJson.Deserialize(commandResponseType, jsonResponseSerializerOptions);
-        }
-
-        internal override TCommandResponse Deserialize<TCommandResponse>(JsonElement responseJson)
-        {
-            return responseJson.Deserialize<TCommandResponse>(jsonResponseSerializerOptions);
-        }
     }
 }

dotnet/src/webdriver/DevTools/v131/DevToolsSerializationContext.cs

@@ -17,27 +17,13 @@
 // under the License.
 // </copyright>
 
-using System;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
 namespace OpenQA.Selenium.DevTools.V132
 {
     /// <summary>
     /// Class containing the domain implementation for version 132 of the DevTools Protocol.
     /// </summary>
     public class V132Domains : DevToolsDomains
     {
-        private static readonly JsonSerializerOptions jsonRequestSerializerOptions = new()
-        {
-            TypeInfoResolver = V132RequestSerializationContext.Default
-        };
-
-        private static readonly JsonSerializerOptions jsonResponseSerializerOptions = new()
-        {
-            TypeInfoResolver = V132ResponseSerializationContext.Default
-        };
-
         private DevToolsSessionDomains domains;
 
         /// <summary>
@@ -78,25 +64,5 @@ public V132Domains(DevToolsSession session)
         /// Gets the object used for manipulating the browser's logs.
         /// </summary>
         public override DevTools.Log Log => new V132Log(domains.Log);
-
-        internal override JsonNode SerializeToNode<TCommand>(TCommand command)
-        {
-            return JsonSerializer.SerializeToNode(command, jsonRequestSerializerOptions);
-        }
-
-        internal override ICommandResponse<TCommand> DeserializeCommandResponse<TCommand>(JsonElement responseJson)
-        {
-            if (!this.VersionSpecificDomains.ResponseTypeMap.TryGetCommandResponseType<TCommand>(out Type commandResponseType))
-            {
-                throw new InvalidOperationException($"Type {typeof(TCommand)} does not correspond to a known command response type.");
-            }
-
-            return (ICommandResponse<TCommand>)responseJson.Deserialize(commandResponseType, jsonResponseSerializerOptions);
-        }
-
-        internal override TCommandResponse Deserialize<TCommandResponse>(JsonElement responseJson)
-        {
-            return responseJson.Deserialize<TCommandResponse>(jsonResponseSerializerOptions);
-        }
     }
 }