From 39b1aac03160765422ce11def488d472477d40b4 Mon Sep 17 00:00:00 2001 From: Michael Render Date: Wed, 5 Feb 2025 15:10:34 -0500 Subject: [PATCH] [dotnet] Annotate nullability on `Log` protocol --- dotnet/src/webdriver/DevTools/Log.cs | 4 +++- dotnet/src/webdriver/DevTools/v130/V130Log.cs | 14 +++++++++----- dotnet/src/webdriver/DevTools/v131/V131Log.cs | 14 +++++++++----- dotnet/src/webdriver/DevTools/v132/V132Log.cs | 12 ++++++++---- dotnet/src/webdriver/DevTools/v85/V85Log.cs | 12 ++++++++---- 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dotnet/src/webdriver/DevTools/Log.cs b/dotnet/src/webdriver/DevTools/Log.cs index fbaccf5492976..55c35124bda34 100644 --- a/dotnet/src/webdriver/DevTools/Log.cs +++ b/dotnet/src/webdriver/DevTools/Log.cs @@ -20,6 +20,8 @@ using System; using System.Threading.Tasks; +#nullable enable + namespace OpenQA.Selenium.DevTools { /// @@ -30,7 +32,7 @@ public abstract class Log /// /// Occurs when an entry is added to the browser's log. /// - public event EventHandler EntryAdded; + public event EventHandler? EntryAdded; /// /// Asynchronously enables manipulation of the browser's log. diff --git a/dotnet/src/webdriver/DevTools/v130/V130Log.cs b/dotnet/src/webdriver/DevTools/v130/V130Log.cs index 4a2e0a47b5f9f..d4fd7d4070c85 100644 --- a/dotnet/src/webdriver/DevTools/v130/V130Log.cs +++ b/dotnet/src/webdriver/DevTools/v130/V130Log.cs @@ -18,8 +18,11 @@ // using OpenQA.Selenium.DevTools.V130.Log; +using System; using System.Threading.Tasks; +#nullable enable + namespace OpenQA.Selenium.DevTools.V130 { /// @@ -27,15 +30,16 @@ namespace OpenQA.Selenium.DevTools.V130 /// public class V130Log : DevTools.Log { - private LogAdapter adapter; + private readonly LogAdapter adapter; /// /// Initializes a new instance of the class. /// /// The adapter for the Log domain. + /// If is . public V130Log(LogAdapter adapter) { - this.adapter = adapter; + this.adapter = adapter ?? throw new ArgumentNullException(nameof(adapter)); this.adapter.EntryAdded += OnAdapterEntryAdded; } @@ -66,14 +70,14 @@ public override async Task Clear() await adapter.Clear().ConfigureAwait(false); } - private void OnAdapterEntryAdded(object sender, Log.EntryAddedEventArgs e) + private void OnAdapterEntryAdded(object? sender, Log.EntryAddedEventArgs e) { var entry = new LogEntry( kind: e.Entry.Source.ToString(), message: e.Entry.Text ); - EntryAddedEventArgs propagated = new EntryAddedEventArgs(entry); - this.OnEntryAdded(propagated); + + this.OnEntryAdded(new EntryAddedEventArgs(entry)); } } } diff --git a/dotnet/src/webdriver/DevTools/v131/V131Log.cs b/dotnet/src/webdriver/DevTools/v131/V131Log.cs index a2134dbc9240b..31466584fd53b 100644 --- a/dotnet/src/webdriver/DevTools/v131/V131Log.cs +++ b/dotnet/src/webdriver/DevTools/v131/V131Log.cs @@ -18,8 +18,11 @@ // using OpenQA.Selenium.DevTools.V131.Log; +using System; using System.Threading.Tasks; +#nullable enable + namespace OpenQA.Selenium.DevTools.V131 { /// @@ -27,15 +30,16 @@ namespace OpenQA.Selenium.DevTools.V131 /// public class V131Log : DevTools.Log { - private LogAdapter adapter; + private readonly LogAdapter adapter; /// /// Initializes a new instance of the class. /// /// The adapter for the Log domain. + /// If is . public V131Log(LogAdapter adapter) { - this.adapter = adapter; + this.adapter = adapter ?? throw new ArgumentNullException(nameof(adapter)); this.adapter.EntryAdded += OnAdapterEntryAdded; } @@ -66,14 +70,14 @@ public override async Task Clear() await adapter.Clear().ConfigureAwait(false); } - private void OnAdapterEntryAdded(object sender, Log.EntryAddedEventArgs e) + private void OnAdapterEntryAdded(object? sender, Log.EntryAddedEventArgs e) { var entry = new LogEntry( kind: e.Entry.Source.ToString(), message: e.Entry.Text ); - EntryAddedEventArgs propagated = new EntryAddedEventArgs(entry); - this.OnEntryAdded(propagated); + + this.OnEntryAdded(new EntryAddedEventArgs(entry)); } } } diff --git a/dotnet/src/webdriver/DevTools/v132/V132Log.cs b/dotnet/src/webdriver/DevTools/v132/V132Log.cs index 615290d05534e..5c6486bc0235c 100644 --- a/dotnet/src/webdriver/DevTools/v132/V132Log.cs +++ b/dotnet/src/webdriver/DevTools/v132/V132Log.cs @@ -18,8 +18,11 @@ // using OpenQA.Selenium.DevTools.V132.Log; +using System; using System.Threading.Tasks; +#nullable enable + namespace OpenQA.Selenium.DevTools.V132 { /// @@ -33,9 +36,10 @@ public class V132Log : DevTools.Log /// Initializes a new instance of the class. /// /// The adapter for the Log domain. + /// If is . public V132Log(LogAdapter adapter) { - this.adapter = adapter; + this.adapter = adapter ?? throw new ArgumentNullException(nameof(adapter)); this.adapter.EntryAdded += OnAdapterEntryAdded; } @@ -66,14 +70,14 @@ public override async Task Clear() await adapter.Clear().ConfigureAwait(false); } - private void OnAdapterEntryAdded(object sender, Log.EntryAddedEventArgs e) + private void OnAdapterEntryAdded(object? sender, Log.EntryAddedEventArgs e) { var entry = new LogEntry( kind: e.Entry.Source.ToString(), message: e.Entry.Text ); - EntryAddedEventArgs propagated = new EntryAddedEventArgs(entry); - this.OnEntryAdded(propagated); + + this.OnEntryAdded(new EntryAddedEventArgs(entry)); } } } diff --git a/dotnet/src/webdriver/DevTools/v85/V85Log.cs b/dotnet/src/webdriver/DevTools/v85/V85Log.cs index 12d9d4cbcb249..0d2332d1ba0ff 100644 --- a/dotnet/src/webdriver/DevTools/v85/V85Log.cs +++ b/dotnet/src/webdriver/DevTools/v85/V85Log.cs @@ -18,8 +18,11 @@ // using OpenQA.Selenium.DevTools.V85.Log; +using System; using System.Threading.Tasks; +#nullable enable + namespace OpenQA.Selenium.DevTools.V85 { /// @@ -27,12 +30,13 @@ namespace OpenQA.Selenium.DevTools.V85 /// public class V85Log : DevTools.Log { - private LogAdapter adapter; + private readonly LogAdapter adapter; /// /// Initializes a new instance of the class. /// /// The adapter for the Log domain. + /// If is . public V85Log(LogAdapter adapter) { this.adapter = adapter; @@ -66,14 +70,14 @@ public override async Task Clear() await adapter.Clear().ConfigureAwait(false); } - private void OnAdapterEntryAdded(object sender, Log.EntryAddedEventArgs e) + private void OnAdapterEntryAdded(object? sender, Log.EntryAddedEventArgs e) { var entry = new LogEntry( kind: e.Entry.Source.ToString(), message: e.Entry.Text ); - EntryAddedEventArgs propagated = new EntryAddedEventArgs(entry); - this.OnEntryAdded(propagated); + + this.OnEntryAdded(new EntryAddedEventArgs(entry)); } } }