[dotnet] [bidi] Simplify namespace for communications

dotnet/src/webdriver/BiDi/BiDi.cs

@@ -17,14 +17,13 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
 namespace OpenQA.Selenium.BiDi;
 

dotnet/src/webdriver/BiDi/Communication/Broker.cs → dotnet/src/webdriver/BiDi/Broker.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Transport;
 using OpenQA.Selenium.Internal.Logging;
 using System;
 using System.Collections.Concurrent;
@@ -28,7 +27,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OpenQA.Selenium.BiDi.Communication;
+namespace OpenQA.Selenium.BiDi;
 
 public sealed class Broker : IAsyncDisposable
 {
@@ -214,13 +213,13 @@ public async Task<Subscription> SubscribeAsync<TEventArgs>(string eventName, Fun
         }
     }
 
-    public async Task UnsubscribeAsync(Session.Subscription subscription, EventHandler eventHandler)
+    public async Task UnsubscribeAsync(Subscription subscription)
     {
-        var eventHandlers = _eventHandlers[eventHandler.EventName];
+        var eventHandlers = _eventHandlers[subscription.EventHandler.EventName];
 
-        eventHandlers.Remove(eventHandler);
+        eventHandlers.Remove(subscription.EventHandler);
 
-        await _bidi.SessionModule.UnsubscribeAsync([subscription]).ConfigureAwait(false);
+        await _bidi.SessionModule.UnsubscribeAsync([subscription.SubscriptionId]).ConfigureAwait(false);
     }
 
     public async ValueTask DisposeAsync()

dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.Browser;

dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs

@@ -17,7 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Browser;

dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs

@@ -17,7 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Browser;

dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.Browser;
 
 internal sealed class CloseCommand()

dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.Browser;
 
 internal sealed class CreateUserContextCommand(CreateUserContextParameters @params)

dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Collections.Generic;
 
 namespace OpenQA.Selenium.BiDi.Browser;

dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Collections.Generic;
 
 namespace OpenQA.Selenium.BiDi.Browser;

dotnet/src/webdriver/BiDi/Browser/RemoveUserContextCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.Browser;
 
 internal sealed class RemoveUserContextCommand(RemoveUserContextParameters @params)

dotnet/src/webdriver/BiDi/Browser/SetDownloadBehaviorCommand.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 

dotnet/src/webdriver/BiDi/Browser/UserContextInfo.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.Browser;
 
 public record UserContextInfo(UserContext UserContext) : EmptyResult;

dotnet/src/webdriver/BiDi/BrowsingContext/ActivateCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class ActivateCommand(ActivateParameters @params)

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs

@@ -17,9 +17,8 @@
 // under the License.
 // </copyright>
 
-using System.Threading.Tasks;
 using System;
-using OpenQA.Selenium.BiDi.Communication;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs

@@ -19,7 +19,6 @@
 
 using System;
 using System.Threading.Tasks;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 

dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs

@@ -17,8 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
 using System.Text.Json.Serialization;
 

dotnet/src/webdriver/BiDi/BrowsingContext/CloseCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class CloseCommand(CloseParameters @params)

dotnet/src/webdriver/BiDi/BrowsingContext/CreateCommand.cs

@@ -17,8 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/BrowsingContext/DownloadEndEventArgs.cs

@@ -17,7 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
+using OpenQA.Selenium.BiDi.Json.Converters.Polymorphic;
 using System;
 using System.Text.Json.Serialization;
 

dotnet/src/webdriver/BiDi/BrowsingContext/GetTreeCommand.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Collections.Generic;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/BrowsingContext/HandleUserPromptCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class HandleUserPromptCommand(HandleUserPromptParameters @params)

dotnet/src/webdriver/BiDi/BrowsingContext/LocateNodesCommand.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Collections.Generic;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/BrowsingContext/Locator.cs

@@ -17,7 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/BrowsingContext/NavigateCommand.cs

@@ -17,8 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/BrowsingContext/Navigation.cs

@@ -17,7 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs

@@ -17,8 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;

dotnet/src/webdriver/BiDi/BrowsingContext/ReloadCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class ReloadCommand(ReloadParameters @params)

dotnet/src/webdriver/BiDi/BrowsingContext/SetViewportCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class SetViewportCommand(SetViewportParameters @params)

dotnet/src/webdriver/BiDi/BrowsingContext/TraverseHistoryCommand.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 internal sealed class TraverseHistoryCommand(TraverseHistoryParameters @params)

dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptOpenedEventArgs.cs

@@ -17,7 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;

dotnet/src/webdriver/BiDi/Communication/Command.cs → dotnet/src/webdriver/BiDi/Command.cs

@@ -17,10 +17,9 @@
 // under the License.
 // </copyright>
 
-using System;
 using System.Text.Json.Serialization;
 
-namespace OpenQA.Selenium.BiDi.Communication;
+namespace OpenQA.Selenium.BiDi;
 
 public abstract class Command
 {

dotnet/src/webdriver/BiDi/Communication/CommandOptions.cs → dotnet/src/webdriver/BiDi/CommandOptions.cs

@@ -19,7 +19,7 @@
 
 using System;
 
-namespace OpenQA.Selenium.BiDi.Communication;
+namespace OpenQA.Selenium.BiDi;
 
 public abstract class CommandOptions
 {

dotnet/src/webdriver/BiDi/Emulation/EmulationModule.cs

@@ -18,7 +18,6 @@
 // </copyright>
 
 using System.Threading.Tasks;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.Emulation;
 

dotnet/src/webdriver/BiDi/Emulation/SetForcedColorsModeThemeOverrideCommand.cs

@@ -17,8 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 

dotnet/src/webdriver/BiDi/Emulation/SetGeolocationOverrideCommand.cs

@@ -19,7 +19,6 @@
 
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.Emulation;
 

dotnet/src/webdriver/BiDi/Emulation/SetLocaleOverrideCommand.cs

@@ -19,7 +19,6 @@
 
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.Emulation;
 

dotnet/src/webdriver/BiDi/Emulation/SetScreenOrientationOverrideCommand.cs

@@ -17,8 +17,7 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 

dotnet/src/webdriver/BiDi/Emulation/SetScriptingEnabledCommand.cs

@@ -19,7 +19,6 @@
 
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.Emulation;
 

dotnet/src/webdriver/BiDi/Emulation/SetTimezoneOverrideCommand.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 

dotnet/src/webdriver/BiDi/Emulation/SetUserAgentOverrideCommand.cs

@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;