Move Network

Author: nvborisenko

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

@@ -72,27 +72,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 
 
 
-[JsonSerializable(typeof(Network.AddDataCollectorCommand))]
-[JsonSerializable(typeof(Network.AddDataCollectorResult))]
-[JsonSerializable(typeof(Network.AddInterceptCommand))]
-[JsonSerializable(typeof(Network.AddInterceptResult))]
-[JsonSerializable(typeof(Network.ContinueRequestCommand))]
-[JsonSerializable(typeof(Network.ContinueResponseCommand))]
-[JsonSerializable(typeof(Network.ContinueWithAuthCommand))]
-[JsonSerializable(typeof(Network.FailRequestCommand))]
-[JsonSerializable(typeof(Network.GetDataCommand))]
-[JsonSerializable(typeof(Network.GetDataResult))]
-[JsonSerializable(typeof(Network.ProvideResponseCommand))]
-[JsonSerializable(typeof(Network.RemoveDataCollectorCommand))]
-[JsonSerializable(typeof(Network.RemoveInterceptCommand))]
-[JsonSerializable(typeof(Network.SetCacheBehaviorCommand))]
-[JsonSerializable(typeof(Network.SetExtraHeadersCommand))]
 
-[JsonSerializable(typeof(Network.BeforeRequestSentEventArgs))]
-[JsonSerializable(typeof(Network.ResponseStartedEventArgs))]
-[JsonSerializable(typeof(Network.ResponseCompletedEventArgs))]
-[JsonSerializable(typeof(Network.FetchErrorEventArgs))]
-[JsonSerializable(typeof(Network.AuthRequiredEventArgs))]
 
 [JsonSerializable(typeof(Log.LogEntry))]
 

dotnet/src/webdriver/BiDi/Network/NetworkModule.cs

@@ -23,13 +23,12 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json;
 
 namespace OpenQA.Selenium.BiDi.Network;
 
 public sealed partial class NetworkModule : Module
 {
-    private JsonSerializerContext _jsonContext = null!;
+    private NetworkModuleJsonSerializerContext _jsonContext = null!;
 
     public async Task<Collector> AddDataCollectorAsync(IEnumerable<DataType> DataTypes, int MaxEncodedDataSize, AddDataCollectorOptions? options = null)
     {
@@ -181,6 +180,32 @@ public async Task<Subscription> OnAuthRequiredAsync(Action<AuthRequiredEventArgs
 
     protected internal override void Initialize(JsonSerializerOptions options)
     {
-        _jsonContext = new BiDiJsonSerializerContext(options);
+        _jsonContext = new(options);
     }
 }
+
+[JsonSerializable(typeof(Command))]
+[JsonSerializable(typeof(EmptyResult))]
+
+[JsonSerializable(typeof(AddDataCollectorCommand))]
+[JsonSerializable(typeof(AddDataCollectorResult))]
+[JsonSerializable(typeof(AddInterceptCommand))]
+[JsonSerializable(typeof(AddInterceptResult))]
+[JsonSerializable(typeof(ContinueRequestCommand))]
+[JsonSerializable(typeof(ContinueResponseCommand))]
+[JsonSerializable(typeof(ContinueWithAuthCommand))]
+[JsonSerializable(typeof(FailRequestCommand))]
+[JsonSerializable(typeof(GetDataCommand))]
+[JsonSerializable(typeof(GetDataResult))]
+[JsonSerializable(typeof(ProvideResponseCommand))]
+[JsonSerializable(typeof(RemoveDataCollectorCommand))]
+[JsonSerializable(typeof(RemoveInterceptCommand))]
+[JsonSerializable(typeof(SetCacheBehaviorCommand))]
+[JsonSerializable(typeof(SetExtraHeadersCommand))]
+
+[JsonSerializable(typeof(BeforeRequestSentEventArgs))]
+[JsonSerializable(typeof(ResponseStartedEventArgs))]
+[JsonSerializable(typeof(ResponseCompletedEventArgs))]
+[JsonSerializable(typeof(FetchErrorEventArgs))]
+[JsonSerializable(typeof(AuthRequiredEventArgs))]
+internal partial class NetworkModuleJsonSerializerContext : JsonSerializerContext;