Skip to content

Commit 54fc9b4

Browse files
authored
[dotnet] [bidi] Avoid BiDi type in EventArgs ctor for unnecessary metadata generation (#16667)
1 parent 720e602 commit 54fc9b4

19 files changed

+75
-60
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
namespace OpenQA.Selenium.BiDi.BrowsingContext;
2323

24-
public sealed record BrowsingContextInfo(BiDi BiDi, IReadOnlyList<BrowsingContextInfo>? Children, Browser.ClientWindow ClientWindow, BrowsingContext Context, BrowsingContext? OriginalOpener, string Url, Browser.UserContext UserContext, BrowsingContext? Parent)
25-
: BrowsingContextEventArgs(BiDi, Context);
24+
public sealed record BrowsingContextInfo(IReadOnlyList<BrowsingContextInfo>? Children, Browser.ClientWindow ClientWindow, BrowsingContext Context, BrowsingContext? OriginalOpener, string Url, Browser.UserContext UserContext, BrowsingContext? Parent)
25+
: BrowsingContextEventArgs(Context);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ namespace OpenQA.Selenium.BiDi.BrowsingContext;
2828
//[JsonDerivedType(typeof(DownloadCanceledEventArgs), "canceled")]
2929
//[JsonDerivedType(typeof(DownloadCompleteEventArgs), "complete")]
3030
[JsonConverter(typeof(DownloadEndEventArgsConverter))]
31-
public abstract record DownloadEndEventArgs(BiDi BiDi, BrowsingContext Context)
32-
: BrowsingContextEventArgs(BiDi, Context);
31+
public abstract record DownloadEndEventArgs(BrowsingContext Context)
32+
: BrowsingContextEventArgs(Context);
3333

34-
public sealed record DownloadCanceledEventArgs(BiDi BiDi, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
35-
: DownloadEndEventArgs(BiDi, Context), IBaseNavigationInfo;
34+
public sealed record DownloadCanceledEventArgs(BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
35+
: DownloadEndEventArgs(Context), IBaseNavigationInfo;
3636

37-
public sealed record DownloadCompleteEventArgs(BiDi BiDi, string? Filepath, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
38-
: DownloadEndEventArgs(BiDi, Context), IBaseNavigationInfo;
37+
public sealed record DownloadCompleteEventArgs(string? Filepath, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
38+
: DownloadEndEventArgs(Context), IBaseNavigationInfo;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
namespace OpenQA.Selenium.BiDi.BrowsingContext;
2323

24-
public sealed record DownloadWillBeginEventArgs(BiDi BiDi, string SuggestedFilename, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
25-
: BrowsingContextEventArgs(BiDi, Context), IBaseNavigationInfo;
24+
public sealed record DownloadWillBeginEventArgs(string SuggestedFilename, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
25+
: BrowsingContextEventArgs(Context), IBaseNavigationInfo;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
namespace OpenQA.Selenium.BiDi.BrowsingContext;
2323

24-
public sealed record HistoryUpdatedEventArgs(BiDi BiDi, BrowsingContext Context, DateTimeOffset Timestamp, string Url)
25-
: BrowsingContextEventArgs(BiDi, Context);
24+
public sealed record HistoryUpdatedEventArgs(BrowsingContext Context, DateTimeOffset Timestamp, string Url)
25+
: BrowsingContextEventArgs(Context);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
namespace OpenQA.Selenium.BiDi.BrowsingContext;
2323

24-
public sealed record NavigationInfo(BiDi BiDi, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
25-
: BrowsingContextEventArgs(BiDi, Context), IBaseNavigationInfo;
24+
public sealed record NavigationInfo(BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
25+
: BrowsingContextEventArgs(Context), IBaseNavigationInfo;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919

2020
namespace OpenQA.Selenium.BiDi.BrowsingContext;
2121

22-
public sealed record UserPromptClosedEventArgs(BiDi BiDi, BrowsingContext Context, bool Accepted, string? UserText)
23-
: BrowsingContextEventArgs(BiDi, Context);
22+
public sealed record UserPromptClosedEventArgs(BrowsingContext Context, bool Accepted, string? UserText)
23+
: BrowsingContextEventArgs(Context);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
namespace OpenQA.Selenium.BiDi.BrowsingContext;
2424

25-
public sealed record UserPromptOpenedEventArgs(BiDi BiDi, BrowsingContext Context, Session.UserPromptHandlerType Handler, UserPromptType Type, string Message, string? DefaultValue)
26-
: BrowsingContextEventArgs(BiDi, Context);
25+
public sealed record UserPromptOpenedEventArgs(BrowsingContext Context, Session.UserPromptHandlerType Handler, UserPromptType Type, string Message, string? DefaultValue)
26+
: BrowsingContextEventArgs(Context);
2727

2828
[JsonConverter(typeof(CamelCaseEnumConverter<UserPromptType>))]
2929
public enum UserPromptType

dotnet/src/webdriver/BiDi/EventArgs.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
namespace OpenQA.Selenium.BiDi;
2323

24-
public abstract record EventArgs(BiDi BiDi)
24+
public abstract record EventArgs
2525
{
2626
[JsonIgnore]
27-
public BiDi BiDi { get; internal set; } = BiDi;
27+
public BiDi BiDi { get; internal set; }
2828
}
2929

30-
public abstract record BrowsingContextEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext Context)
31-
: EventArgs(BiDi);
30+
public abstract record BrowsingContextEventArgs(BrowsingContext.BrowsingContext Context)
31+
: EventArgs;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ namespace OpenQA.Selenium.BiDi.Log;
3131
//[JsonDerivedType(typeof(ConsoleLogEntry), "console")]
3232
//[JsonDerivedType(typeof(JavascriptLogEntry), "javascript")]
3333
[JsonConverter(typeof(LogEntryConverter))]
34-
public abstract record LogEntry(BiDi BiDi, Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp)
35-
: EventArgs(BiDi)
34+
public abstract record LogEntry(Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp)
35+
: EventArgs
3636
{
3737
public Script.StackTrace? StackTrace { get; set; }
3838
}
3939

40-
public sealed record GenericLogEntry(BiDi BiDi, string Type, Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp)
41-
: LogEntry(BiDi, Level, Source, Text, Timestamp);
40+
public sealed record GenericLogEntry(string Type, Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp)
41+
: LogEntry(Level, Source, Text, Timestamp);
4242

43-
public sealed record ConsoleLogEntry(BiDi BiDi, Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp, string Method, IReadOnlyList<Script.RemoteValue> Args)
44-
: LogEntry(BiDi, Level, Source, Text, Timestamp);
43+
public sealed record ConsoleLogEntry(Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp, string Method, IReadOnlyList<Script.RemoteValue> Args)
44+
: LogEntry(Level, Source, Text, Timestamp);
4545

46-
public sealed record JavascriptLogEntry(BiDi BiDi, Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp)
47-
: LogEntry(BiDi, Level, Source, Text, Timestamp);
46+
public sealed record JavascriptLogEntry(Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp)
47+
: LogEntry(Level, Source, Text, Timestamp);
4848

4949
[JsonConverter(typeof(CamelCaseEnumConverter<Level>))]
5050
public enum Level

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222

2323
namespace OpenQA.Selenium.BiDi.Network;
2424

25-
public record AuthRequiredEventArgs(BiDi BiDi, BrowsingContext.BrowsingContext? Context, bool IsBlocked, BrowsingContext.Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp, ResponseData Response, IReadOnlyList<Intercept>? Intercepts) :
26-
BaseParametersEventArgs(BiDi, Context, IsBlocked, Navigation, RedirectCount, Request, Timestamp, Intercepts);
25+
public record AuthRequiredEventArgs(BrowsingContext.BrowsingContext? Context, bool IsBlocked, BrowsingContext.Navigation? Navigation, long RedirectCount, RequestData Request, DateTimeOffset Timestamp, ResponseData Response, IReadOnlyList<Intercept>? Intercepts) :
26+
BaseParametersEventArgs(Context, IsBlocked, Navigation, RedirectCount, Request, Timestamp, Intercepts);

0 commit comments

Comments
 (0)