Move Input

Author: nvborisenko

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -22,22 +22,12 @@
 
 namespace OpenQA.Selenium.BiDi.Communication.Json;
 
-#region https://github.com/dotnet/runtime/issues/72604
-[JsonSerializable(typeof(Log.GenericLogEntry))]
-[JsonSerializable(typeof(Log.ConsoleLogEntry))]
-[JsonSerializable(typeof(Log.JavascriptLogEntry))]
-#endregion
+
 
 [JsonSerializable(typeof(Command))]
 [JsonSerializable(typeof(EmptyResult))]
 
-[JsonSerializable(typeof(Input.PerformActionsCommand))]
-[JsonSerializable(typeof(Input.ReleaseActionsCommand))]
-[JsonSerializable(typeof(Input.SetFilesCommand))]
-[JsonSerializable(typeof(IEnumerable<Input.IPointerSourceAction>))]
-[JsonSerializable(typeof(IEnumerable<Input.IKeySourceAction>))]
-[JsonSerializable(typeof(IEnumerable<Input.INoneSourceAction>))]
-[JsonSerializable(typeof(IEnumerable<Input.IWheelSourceAction>))]
+
 
 
 internal partial class BiDiJsonSerializerContext : JsonSerializerContext;

dotnet/src/webdriver/BiDi/Input/InputModule.cs

@@ -18,7 +18,6 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -28,7 +27,7 @@ namespace OpenQA.Selenium.BiDi.Input;
 
 public sealed class InputModule : Module
 {
-    private JsonSerializerContext _jsonContext = null!;
+    private InputModuleJsonSerializerContext _jsonContext = null!;
 
     public async Task<EmptyResult> PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
     {
@@ -53,6 +52,19 @@ public async Task<EmptyResult> SetFilesAsync(BrowsingContext.BrowsingContext con
 
     protected internal override void Initialize(JsonSerializerOptions options)
     {
-        _jsonContext = new BiDiJsonSerializerContext(options);
+        _jsonContext = new(options);
     }
 }
+
+[JsonSerializable(typeof(Command))]
+[JsonSerializable(typeof(EmptyResult))]
+
+[JsonSerializable(typeof(PerformActionsCommand))]
+[JsonSerializable(typeof(ReleaseActionsCommand))]
+[JsonSerializable(typeof(SetFilesCommand))]
+[JsonSerializable(typeof(IEnumerable<IPointerSourceAction>))]
+[JsonSerializable(typeof(IEnumerable<IKeySourceAction>))]
+[JsonSerializable(typeof(IEnumerable<INoneSourceAction>))]
+[JsonSerializable(typeof(IEnumerable<IWheelSourceAction>))]
+
+internal partial class InputModuleJsonSerializerContext : JsonSerializerContext;

dotnet/src/webdriver/BiDi/Log/LogModule.cs

@@ -45,6 +45,12 @@ protected internal override void Initialize(JsonSerializerOptions options)
     }
 }
 
+#region https://github.com/dotnet/runtime/issues/72604
+[JsonSerializable(typeof(GenericLogEntry))]
+[JsonSerializable(typeof(ConsoleLogEntry))]
+[JsonSerializable(typeof(JavascriptLogEntry))]
+#endregion
+
 [JsonSerializable(typeof(Command))]
 [JsonSerializable(typeof(EmptyResult))]