Skip to content

Commit 8a26ef5

Browse files
authored
[dotnet] [bidi] Simplify modules namespace (breaking change) (#15820)
1 parent 8fdc63a commit 8a26ef5

File tree

169 files changed

+361
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+361
-376
lines changed

dotnet/src/webdriver/BiDi/BiDi.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@ public class BiDi : IAsyncDisposable
2727
{
2828
private readonly Broker _broker;
2929

30-
private readonly Lazy<Modules.Session.SessionModule> _sessionModule;
31-
private readonly Lazy<Modules.BrowsingContext.BrowsingContextModule> _browsingContextModule;
32-
private readonly Lazy<Modules.Browser.BrowserModule> _browserModule;
33-
private readonly Lazy<Modules.Network.NetworkModule> _networkModule;
34-
private readonly Lazy<Modules.Input.InputModule> _inputModule;
35-
private readonly Lazy<Modules.Script.ScriptModule> _scriptModule;
36-
private readonly Lazy<Modules.Log.LogModule> _logModule;
37-
private readonly Lazy<Modules.Storage.StorageModule> _storageModule;
30+
private readonly Lazy<Session.SessionModule> _sessionModule;
31+
private readonly Lazy<BrowsingContext.BrowsingContextModule> _browsingContextModule;
32+
private readonly Lazy<Browser.BrowserModule> _browserModule;
33+
private readonly Lazy<Network.NetworkModule> _networkModule;
34+
private readonly Lazy<Input.InputModule> _inputModule;
35+
private readonly Lazy<Script.ScriptModule> _scriptModule;
36+
private readonly Lazy<Log.LogModule> _logModule;
37+
private readonly Lazy<Storage.StorageModule> _storageModule;
3838

3939
internal BiDi(string url)
4040
{
4141
var uri = new Uri(url);
4242

4343
_broker = new Broker(this, uri);
4444

45-
_sessionModule = new Lazy<Modules.Session.SessionModule>(() => new Modules.Session.SessionModule(_broker));
46-
_browsingContextModule = new Lazy<Modules.BrowsingContext.BrowsingContextModule>(() => new Modules.BrowsingContext.BrowsingContextModule(_broker));
47-
_browserModule = new Lazy<Modules.Browser.BrowserModule>(() => new Modules.Browser.BrowserModule(_broker));
48-
_networkModule = new Lazy<Modules.Network.NetworkModule>(() => new Modules.Network.NetworkModule(_broker));
49-
_inputModule = new Lazy<Modules.Input.InputModule>(() => new Modules.Input.InputModule(_broker));
50-
_scriptModule = new Lazy<Modules.Script.ScriptModule>(() => new Modules.Script.ScriptModule(_broker));
51-
_logModule = new Lazy<Modules.Log.LogModule>(() => new Modules.Log.LogModule(_broker));
52-
_storageModule = new Lazy<Modules.Storage.StorageModule>(() => new Modules.Storage.StorageModule(_broker));
45+
_sessionModule = new Lazy<Session.SessionModule>(() => new Session.SessionModule(_broker));
46+
_browsingContextModule = new Lazy<BrowsingContext.BrowsingContextModule>(() => new BrowsingContext.BrowsingContextModule(_broker));
47+
_browserModule = new Lazy<Browser.BrowserModule>(() => new Browser.BrowserModule(_broker));
48+
_networkModule = new Lazy<Network.NetworkModule>(() => new Network.NetworkModule(_broker));
49+
_inputModule = new Lazy<Input.InputModule>(() => new Input.InputModule(_broker));
50+
_scriptModule = new Lazy<Script.ScriptModule>(() => new Script.ScriptModule(_broker));
51+
_logModule = new Lazy<Log.LogModule>(() => new Log.LogModule(_broker));
52+
_storageModule = new Lazy<Storage.StorageModule>(() => new Storage.StorageModule(_broker));
5353
}
5454

55-
internal Modules.Session.SessionModule SessionModule => _sessionModule.Value;
56-
public Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;
57-
public Modules.Browser.BrowserModule Browser => _browserModule.Value;
58-
public Modules.Network.NetworkModule Network => _networkModule.Value;
59-
internal Modules.Input.InputModule InputModule => _inputModule.Value;
60-
public Modules.Script.ScriptModule Script => _scriptModule.Value;
61-
public Modules.Log.LogModule Log => _logModule.Value;
62-
public Modules.Storage.StorageModule Storage => _storageModule.Value;
55+
internal Session.SessionModule SessionModule => _sessionModule.Value;
56+
public BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;
57+
public Browser.BrowserModule Browser => _browserModule.Value;
58+
public Network.NetworkModule Network => _networkModule.Value;
59+
internal Input.InputModule InputModule => _inputModule.Value;
60+
public Script.ScriptModule Script => _scriptModule.Value;
61+
public Log.LogModule Log => _logModule.Value;
62+
public Storage.StorageModule Storage => _storageModule.Value;
6363

64-
public Task<Modules.Session.StatusResult> StatusAsync()
64+
public Task<Session.StatusResult> StatusAsync()
6565
{
6666
return SessionModule.StatusAsync();
6767
}
@@ -75,7 +75,7 @@ public static async Task<BiDi> ConnectAsync(string url)
7575
return bidi;
7676
}
7777

78-
public Task EndAsync(Modules.Session.EndOptions? options = null)
78+
public Task EndAsync(Session.EndOptions? options = null)
7979
{
8080
return SessionModule.EndAsync(options);
8181
}

dotnet/src/webdriver/BiDi/Modules/Browser/BrowserModule.cs renamed to dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System.Threading.Tasks;
2121
using OpenQA.Selenium.BiDi.Communication;
2222

23-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
23+
namespace OpenQA.Selenium.BiDi.Browser;
2424

2525
public sealed class BrowserModule(Broker broker) : Module(broker)
2626
{

dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindow.cs renamed to dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// under the License.
1818
// </copyright>
1919

20-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
20+
namespace OpenQA.Selenium.BiDi.Browser;
2121

2222
public record ClientWindow
2323
{

dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs renamed to dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// under the License.
1818
// </copyright>
1919

20-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
20+
namespace OpenQA.Selenium.BiDi.Browser;
2121

2222
public record ClientWindowInfo(bool Active, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y);
2323

dotnet/src/webdriver/BiDi/Modules/Browser/CloseCommand.cs renamed to dotnet/src/webdriver/BiDi/Browser/CloseCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
using OpenQA.Selenium.BiDi.Communication;
2121

22-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
22+
namespace OpenQA.Selenium.BiDi.Browser;
2323

2424
internal class CloseCommand()
2525
: Command<CommandParameters, EmptyResult>(CommandParameters.Empty, "browser.close");

dotnet/src/webdriver/BiDi/Modules/Browser/CreateUserContextCommand.cs renamed to dotnet/src/webdriver/BiDi/Browser/CreateUserContextCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
using OpenQA.Selenium.BiDi.Communication;
2121

22-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
22+
namespace OpenQA.Selenium.BiDi.Browser;
2323

2424
internal class CreateUserContextCommand(CreateUserContextCommandParameters @params)
2525
: Command<CreateUserContextCommandParameters, UserContextInfo>(@params, "browser.createUserContext");

dotnet/src/webdriver/BiDi/Modules/Browser/GetClientWindowsCommand.cs renamed to dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using System.Collections;
2222
using System.Collections.Generic;
2323

24-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
24+
namespace OpenQA.Selenium.BiDi.Browser;
2525

2626
internal class GetClientWindowsCommand()
2727
: Command<CommandParameters, GetClientWindowsResult>(CommandParameters.Empty, "browser.getClientWindows");

dotnet/src/webdriver/BiDi/Modules/Browser/GetUserContextsCommand.cs renamed to dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using System.Collections;
2222
using System.Collections.Generic;
2323

24-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
24+
namespace OpenQA.Selenium.BiDi.Browser;
2525

2626
internal class GetUserContextsCommand()
2727
: Command<CommandParameters, GetUserContextsResult>(CommandParameters.Empty, "browser.getUserContexts");

dotnet/src/webdriver/BiDi/Modules/Browser/RemoveUserContextCommand.cs renamed to dotnet/src/webdriver/BiDi/Browser/RemoveUserContextCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
using OpenQA.Selenium.BiDi.Communication;
2121

22-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
22+
namespace OpenQA.Selenium.BiDi.Browser;
2323

2424
internal class RemoveUserContextCommand(RemoveUserContextCommandParameters @params)
2525
: Command<RemoveUserContextCommandParameters, EmptyResult>(@params, "browser.removeUserContext");

dotnet/src/webdriver/BiDi/Modules/Browser/UserContext.cs renamed to dotnet/src/webdriver/BiDi/Browser/UserContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System;
2121
using System.Threading.Tasks;
2222

23-
namespace OpenQA.Selenium.BiDi.Modules.Browser;
23+
namespace OpenQA.Selenium.BiDi.Browser;
2424

2525
public class UserContext : IAsyncDisposable
2626
{

0 commit comments

Comments
 (0)