[dotnet] Annotate nullability on elements and WebDriver (#15352)

RenderMichael · web-flow · commit 375dceaaaa0a · 2025-03-01T02:50:37.000-05:00
* [dotnet] Annotate nullability on elements and `WebDriver`

* Fix null warnings
diff --git a/dotnet/src/support/Events/EventFiringWebDriver.cs b/dotnet/src/support/Events/EventFiringWebDriver.cs
@@ -442,14 +442,14 @@ public void Dispose()
         /// variable, as if the function were called via "Function.apply"
         /// </para>
         /// </remarks>
-        public object ExecuteScript(string script, params object?[] args)
+        public object? ExecuteScript(string script, params object?[] args)
         {
             if (this.WrappedDriver is not IJavaScriptExecutor javascriptDriver)
             {
                 throw new NotSupportedException("Underlying driver instance does not support executing JavaScript");
             }
 
-            object scriptResult;
+            object? scriptResult;
             try
             {
                 object?[] unwrappedArgs = UnwrapElementArguments(args);
@@ -505,7 +505,7 @@ public object ExecuteScript(string script, params object?[] args)
         /// variable, as if the function were called via "Function.apply"
         /// </para>
         /// </remarks>
-        public object ExecuteScript(PinnedScript script, params object?[] args)
+        public object? ExecuteScript(PinnedScript script, params object?[] args)
         {
             if (script == null)
             {
@@ -517,7 +517,7 @@ public object ExecuteScript(PinnedScript script, params object?[] args)
                 throw new NotSupportedException("Underlying driver instance does not support executing JavaScript");
             }
 
-            object scriptResult;
+            object? scriptResult;
             try
             {
                 object?[] unwrappedArgs = UnwrapElementArguments(args);
@@ -542,14 +542,14 @@ public object ExecuteScript(PinnedScript script, params object?[] args)
         /// <param name="script">The JavaScript code to execute.</param>
         /// <param name="args">The arguments to the script.</param>
         /// <returns>The value returned by the script.</returns>
-        public object ExecuteAsyncScript(string script, params object?[] args)
+        public object? ExecuteAsyncScript(string script, params object?[] args)
         {
             if (this.WrappedDriver is not IJavaScriptExecutor javascriptDriver)
             {
                 throw new NotSupportedException("Underlying driver instance does not support executing JavaScript");
             }
 
-            object scriptResult;
+            object? scriptResult;
             try
             {
                 object?[] unwrappedArgs = UnwrapElementArguments(args);
@@ -1589,20 +1589,17 @@ public void Click()
             /// </summary>
             /// <param name="attributeName">Attribute you wish to get details of</param>
             /// <returns>The attribute's current value or null if the value is not set.</returns>
-            public string GetAttribute(string attributeName)
+            public string? GetAttribute(string attributeName)
             {
-                string attribute;
                 try
                 {
-                    attribute = this.WrappedElement.GetAttribute(attributeName);
+                    return this.WrappedElement.GetAttribute(attributeName);
                 }
                 catch (Exception ex)
                 {
                     this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));
                     throw;
                 }
-
-                return attribute;
             }
 
             /// <summary>
@@ -1617,20 +1614,17 @@ public string GetAttribute(string attributeName)
             /// of an IDL property of the element, either use the <see cref="GetAttribute(string)"/>
             /// method or the <see cref="GetDomProperty(string)"/> method.
             /// </remarks>
-            public string GetDomAttribute(string attributeName)
+            public string? GetDomAttribute(string attributeName)
             {
-                string attribute;
                 try
                 {
-                    attribute = this.WrappedElement.GetDomAttribute(attributeName);
+                    return this.WrappedElement.GetDomAttribute(attributeName);
                 }
                 catch (Exception ex)
                 {
                     this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));
                     throw;
                 }
-
-                return attribute;
             }
 
             /// <summary>
@@ -1639,20 +1633,17 @@ public string GetDomAttribute(string attributeName)
             /// <param name="propertyName">The name of the JavaScript property to get the value of.</param>
             /// <returns>The JavaScript property's current value. Returns a <see langword="null"/> if the
             /// value is not set or the property does not exist.</returns>
-            public string GetDomProperty(string propertyName)
+            public string? GetDomProperty(string propertyName)
             {
-                string elementProperty;
                 try
                 {
-                    elementProperty = this.WrappedElement.GetDomProperty(propertyName);
+                    return this.WrappedElement.GetDomProperty(propertyName);
                 }
                 catch (Exception ex)
                 {
                     this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));
                     throw;
                 }
-
-                return elementProperty;
             }
 
             /// <summary>
@@ -1683,22 +1674,19 @@ public string GetCssValue(string propertyName)
             /// <returns>A shadow root representation.</returns>
             public ISearchContext GetShadowRoot()
             {
-                ISearchContext shadowRoot;
                 try
                 {
                     GetShadowRootEventArgs e = new GetShadowRootEventArgs(this.parentDriver.WrappedDriver, this.WrappedElement);
                     this.parentDriver.OnGettingShadowRoot(e);
-                    shadowRoot = this.WrappedElement.GetShadowRoot();
+                    ISearchContext shadowRoot = this.WrappedElement.GetShadowRoot();
                     this.parentDriver.OnGetShadowRootCompleted(e);
-                    shadowRoot = new EventFiringShadowRoot(this.parentDriver, shadowRoot);
+                    return new EventFiringShadowRoot(this.parentDriver, shadowRoot);
                 }
                 catch (Exception ex)
                 {
                     this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));
                     throw;
                 }
-
-                return shadowRoot;
             }
 
             /// <summary>
diff --git a/dotnet/src/webdriver/By.cs b/dotnet/src/webdriver/By.cs
@@ -99,7 +99,7 @@ protected By(Func<ISearchContext, IWebElement> findElementMethod, Func<ISearchCo
         protected string Description { get; set; } = "OpenQA.Selenium.By";
 
         /// <summary>
-        /// Gets or sets the method used to find a single element matching specified criteria.
+        /// Gets or sets the method used to find a single element matching specified criteria, or throws <see cref="NoSuchElementException"/> if no element is found.
         /// </summary>
         protected Func<ISearchContext, IWebElement>? FindElementMethod { get; set; }
 
@@ -324,6 +324,7 @@ public static By CssSelector(string cssSelectorToFind)
         /// </summary>
         /// <param name="context">An <see cref="ISearchContext"/> object to use to search for the elements.</param>
         /// <returns>The first matching <see cref="IWebElement"/> on the current context.</returns>
+        /// <exception cref="NoSuchElementException">If no element matches the criteria.</exception>
         public virtual IWebElement FindElement(ISearchContext context)
         {
             if (this.FindElementMethod is not { } findElementMethod)
diff --git a/dotnet/src/webdriver/Chromium/ChromiumDriver.cs b/dotnet/src/webdriver/Chromium/ChromiumDriver.cs
@@ -168,7 +168,7 @@ private static ICommandExecutor GenerateDriverServiceCommandExecutor(DriverServi
                 string fullServicePath = finder.GetDriverPath();
                 service.DriverServicePath = Path.GetDirectoryName(fullServicePath);
                 service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);
-                if (finder.TryGetBrowserPath(out string browserPath))
+                if (finder.TryGetBrowserPath(out string? browserPath))
                 {
                     options.BinaryLocation = browserPath;
                     options.BrowserVersion = null;
diff --git a/dotnet/src/webdriver/Command.cs b/dotnet/src/webdriver/Command.cs
@@ -56,10 +56,10 @@ public Command(string name, string jsonParameters)
         /// <param name="name">Name of the command</param>
         /// <param name="parameters">Parameters for that command</param>
         /// <exception cref="ArgumentNullException">If <paramref name="name"/> is <see langword="null"/>.</exception>
-        public Command(SessionId? sessionId, string name, Dictionary<string, object>? parameters)
+        public Command(SessionId? sessionId, string name, Dictionary<string, object?>? parameters)
         {
             this.SessionId = sessionId;
-            this.Parameters = parameters ?? new Dictionary<string, object>();
+            this.Parameters = parameters ?? new Dictionary<string, object?>();
             this.Name = name ?? throw new ArgumentNullException(nameof(name));
         }
 
@@ -79,7 +79,7 @@ public Command(SessionId? sessionId, string name, Dictionary<string, object>? pa
         /// Gets the parameters of the command
         /// </summary>
         [JsonPropertyName("parameters")]
-        public Dictionary<string, object> Parameters { get; }
+        public Dictionary<string, object?> Parameters { get; }
 
         /// <summary>
         /// Gets the parameters of the command as a JSON-encoded string.
@@ -118,9 +118,9 @@ public override string ToString()
         /// <returns>A <see cref="Dictionary{K, V}"/> with a string keys, and an object value. </returns>
         /// <exception cref="JsonException">If <paramref name="value"/> is not a JSON object.</exception>
         /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <see langword="null"/>.</exception>
-        private static Dictionary<string, object>? ConvertParametersFromJson(string value)
+        private static Dictionary<string, object?>? ConvertParametersFromJson(string value)
         {
-            Dictionary<string, object>? parameters = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions);
+            Dictionary<string, object?>? parameters = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, s_jsonSerializerOptions);
             return parameters;
         }
     }
diff --git a/dotnet/src/webdriver/CookieJar.cs b/dotnet/src/webdriver/CookieJar.cs
@@ -127,7 +127,7 @@ public void DeleteAllCookies()
             {
                 var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
 
-                return Cookie.FromDictionary((Dictionary<string, object>)rawCookie!);
+                return Cookie.FromDictionary((Dictionary<string, object?>)rawCookie!);
             }
             catch (NoSuchCookieException)
             {
diff --git a/dotnet/src/webdriver/Firefox/FirefoxDriver.cs b/dotnet/src/webdriver/Firefox/FirefoxDriver.cs
@@ -221,7 +221,7 @@ private static ICommandExecutor GenerateDriverServiceCommandExecutor(DriverServi
                 string fullServicePath = finder.GetDriverPath();
                 service.DriverServicePath = Path.GetDirectoryName(fullServicePath);
                 service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);
-                if (finder.TryGetBrowserPath(out string browserPath))
+                if (finder.TryGetBrowserPath(out string? browserPath))
                 {
                     options.BinaryLocation = browserPath;
                     options.BrowserVersion = null;
diff --git a/dotnet/src/webdriver/Firefox/FirefoxProfile.cs b/dotnet/src/webdriver/Firefox/FirefoxProfile.cs
@@ -160,7 +160,7 @@ public void WriteToDisk()
             this.ProfileDirectory = GenerateProfileDirectoryName();
             if (!string.IsNullOrEmpty(this.sourceProfileDir))
             {
-                FileUtilities.CopyDirectory(this.sourceProfileDir, this.ProfileDirectory);
+                FileUtilities.CopyDirectory(this.sourceProfileDir!, this.ProfileDirectory);
             }
             else
             {
diff --git a/dotnet/src/webdriver/IJavascriptExecutor.cs b/dotnet/src/webdriver/IJavascriptExecutor.cs
@@ -20,6 +20,8 @@
 using System;
 using System.Collections.Generic;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -62,7 +64,7 @@ public interface IJavaScriptExecutor
         /// variable, as if the function were called via "Function.apply"
         /// </para>
         /// </remarks>
-        object ExecuteScript(string script, params object[] args);
+        object? ExecuteScript(string script, params object?[] args);
 
         /// <summary>
         /// Executes JavaScript in the context of the currently selected frame or window.
@@ -100,14 +102,14 @@ public interface IJavaScriptExecutor
         /// </para>
         /// </remarks>
         /// <exception cref="ArgumentNullException">If <paramref name="script" /> is <see langword="null"/>.</exception>
-        object ExecuteScript(PinnedScript script, params object[] args);
+        object? ExecuteScript(PinnedScript script, params object?[] args);
 
         /// <summary>
         /// Executes JavaScript asynchronously in the context of the currently selected frame or window.
         /// </summary>
         /// <param name="script">The JavaScript code to execute.</param>
         /// <param name="args">The arguments to the script.</param>
         /// <returns>The value returned by the script.</returns>
-        object ExecuteAsyncScript(string script, params object[] args);
+        object? ExecuteAsyncScript(string script, params object?[] args);
     }
 }
diff --git a/dotnet/src/webdriver/IWebDriver.cs b/dotnet/src/webdriver/IWebDriver.cs
@@ -20,6 +20,8 @@
 using System;
 using System.Collections.ObjectModel;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
diff --git a/dotnet/src/webdriver/IWebElement.cs b/dotnet/src/webdriver/IWebElement.cs
@@ -20,6 +20,8 @@
 using System;
 using System.Drawing;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -170,7 +172,7 @@ public interface IWebElement : ISearchContext
         /// </list>
         /// </remarks>
         /// <exception cref="StaleElementReferenceException">Thrown when the target element is no longer valid in the document DOM.</exception>
-        string GetAttribute(string attributeName);
+        string? GetAttribute(string attributeName);
 
         /// <summary>
         /// Gets the value of a declared HTML attribute of this element.
@@ -185,7 +187,7 @@ public interface IWebElement : ISearchContext
         /// of an IDL property of the element, either use the <see cref="GetAttribute(string)"/>
         /// method or the <see cref="GetDomProperty(string)"/> method.
         /// </remarks>
-        string GetDomAttribute(string attributeName);
+        string? GetDomAttribute(string attributeName);
 
         /// <summary>
         /// Gets the value of a JavaScript property of this element.
@@ -194,7 +196,7 @@ public interface IWebElement : ISearchContext
         /// <returns>The JavaScript property's current value. Returns a <see langword="null"/> if the
         /// value is not set or the property does not exist.</returns>
         /// <exception cref="StaleElementReferenceException">Thrown when the target element is no longer valid in the document DOM.</exception>
-        string GetDomProperty(string propertyName);
+        string? GetDomProperty(string propertyName);
 
         /// <summary>
         /// Gets the value of a CSS property of this element.
diff --git a/dotnet/src/webdriver/RelativeBy.cs b/dotnet/src/webdriver/RelativeBy.cs
@@ -108,7 +108,7 @@ public override ReadOnlyCollection<IWebElement> FindElements(ISearchContext cont
             filterParameters["root"] = GetSerializableObject(this.root);
             filterParameters["filters"] = this.filters;
             parameters["relative"] = filterParameters;
-            object rawElements = js.ExecuteScript(wrappedAtom, parameters);
+            object? rawElements = js.ExecuteScript(wrappedAtom, parameters);
 
             if (rawElements is ReadOnlyCollection<IWebElement> elements)
             {
diff --git a/dotnet/src/webdriver/ShadowRoot.cs b/dotnet/src/webdriver/ShadowRoot.cs
@@ -99,7 +99,7 @@ public IWebElement FindElement(By by)
             parameters.Add("value", by.Criteria);
 
             Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElement, parameters);
-            return this.driver.GetElementFromResponse(commandResponse);
+            return this.driver.GetElementFromResponse(commandResponse)!;
         }
 
         /// <summary>
diff --git a/dotnet/src/webdriver/TargetLocator.cs b/dotnet/src/webdriver/TargetLocator.cs
@@ -166,7 +166,7 @@ public IWebDriver Window(string windowHandleOrName)
                 foreach (string handle in this.driver.WindowHandles)
                 {
                     this.Window(handle);
-                    if (windowHandleOrName == this.driver.ExecuteScript("return window.name").ToString())
+                    if (windowHandleOrName == this.driver.ExecuteScript("return window.name")!.ToString())
                     {
                         return this.driver; // found by name
                     }
@@ -223,7 +223,7 @@ public IWebDriver DefaultContent()
         public IWebElement ActiveElement()
         {
             Response response = this.driver.InternalExecute(DriverCommand.GetActiveElement, null);
-            return this.driver.GetElementFromResponse(response);
+            return this.driver.GetElementFromResponse(response)!;
         }
 
         /// <summary>
diff --git a/dotnet/src/webdriver/WebDriver.cs b/dotnet/src/webdriver/WebDriver.cs
diff --git a/dotnet/src/webdriver/WebElement.cs b/dotnet/src/webdriver/WebElement.cs
diff --git a/dotnet/src/webdriver/WebElementFactory.cs b/dotnet/src/webdriver/WebElementFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -442,14 +442,14 @@ public void Dispose()`
`442`	`442`	`/// variable, as if the function were called via "Function.apply"`
`443`	`443`	`/// </para>`
`444`	`444`	`/// </remarks>`
`445`		`- public object ExecuteScript(string script, params object?[] args)`
	`445`	`+ public object? ExecuteScript(string script, params object?[] args)`
`446`	`446`	`{`
`447`	`447`	`if (this.WrappedDriver is not IJavaScriptExecutor javascriptDriver)`
`448`	`448`	`{`
`449`	`449`	`throw new NotSupportedException("Underlying driver instance does not support executing JavaScript");`
`450`	`450`	`}`
`451`	`451`
`452`		`- object scriptResult;`
	`452`	`+ object? scriptResult;`
`453`	`453`	`try`
`454`	`454`	`{`
`455`	`455`	`object?[] unwrappedArgs = UnwrapElementArguments(args);`
`@@ -505,7 +505,7 @@ public object ExecuteScript(string script, params object?[] args)`
`505`	`505`	`/// variable, as if the function were called via "Function.apply"`
`506`	`506`	`/// </para>`
`507`	`507`	`/// </remarks>`
`508`		`- public object ExecuteScript(PinnedScript script, params object?[] args)`
	`508`	`+ public object? ExecuteScript(PinnedScript script, params object?[] args)`
`509`	`509`	`{`
`510`	`510`	`if (script == null)`
`511`	`511`	`{`
`@@ -517,7 +517,7 @@ public object ExecuteScript(PinnedScript script, params object?[] args)`
`517`	`517`	`throw new NotSupportedException("Underlying driver instance does not support executing JavaScript");`
`518`	`518`	`}`
`519`	`519`
`520`		`- object scriptResult;`
	`520`	`+ object? scriptResult;`
`521`	`521`	`try`
`522`	`522`	`{`
`523`	`523`	`object?[] unwrappedArgs = UnwrapElementArguments(args);`
`@@ -542,14 +542,14 @@ public object ExecuteScript(PinnedScript script, params object?[] args)`
`542`	`542`	`/// <param name="script">The JavaScript code to execute.</param>`
`543`	`543`	`/// <param name="args">The arguments to the script.</param>`
`544`	`544`	`/// <returns>The value returned by the script.</returns>`
`545`		`- public object ExecuteAsyncScript(string script, params object?[] args)`
	`545`	`+ public object? ExecuteAsyncScript(string script, params object?[] args)`
`546`	`546`	`{`
`547`	`547`	`if (this.WrappedDriver is not IJavaScriptExecutor javascriptDriver)`
`548`	`548`	`{`
`549`	`549`	`throw new NotSupportedException("Underlying driver instance does not support executing JavaScript");`
`550`	`550`	`}`
`551`	`551`
`552`		`- object scriptResult;`
	`552`	`+ object? scriptResult;`
`553`	`553`	`try`
`554`	`554`	`{`
`555`	`555`	`object?[] unwrappedArgs = UnwrapElementArguments(args);`
`@@ -1589,20 +1589,17 @@ public void Click()`
`1589`	`1589`	`/// </summary>`
`1590`	`1590`	`/// <param name="attributeName">Attribute you wish to get details of</param>`
`1591`	`1591`	`/// <returns>The attribute's current value or null if the value is not set.</returns>`
`1592`		`- public string GetAttribute(string attributeName)`
	`1592`	`+ public string? GetAttribute(string attributeName)`
`1593`	`1593`	`{`
`1594`		`- string attribute;`
`1595`	`1594`	`try`
`1596`	`1595`	`{`
`1597`		`- attribute = this.WrappedElement.GetAttribute(attributeName);`
	`1596`	`+ return this.WrappedElement.GetAttribute(attributeName);`
`1598`	`1597`	`}`
`1599`	`1598`	`catch (Exception ex)`
`1600`	`1599`	`{`
`1601`	`1600`	`this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));`
`1602`	`1601`	`throw;`
`1603`	`1602`	`}`
`1604`		`-`
`1605`		`- return attribute;`
`1606`	`1603`	`}`
`1607`	`1604`
`1608`	`1605`	`/// <summary>`
`@@ -1617,20 +1614,17 @@ public string GetAttribute(string attributeName)`
`1617`	`1614`	`/// of an IDL property of the element, either use the <see cref="GetAttribute(string)"/>`
`1618`	`1615`	`/// method or the <see cref="GetDomProperty(string)"/> method.`
`1619`	`1616`	`/// </remarks>`
`1620`		`- public string GetDomAttribute(string attributeName)`
	`1617`	`+ public string? GetDomAttribute(string attributeName)`
`1621`	`1618`	`{`
`1622`		`- string attribute;`
`1623`	`1619`	`try`
`1624`	`1620`	`{`
`1625`		`- attribute = this.WrappedElement.GetDomAttribute(attributeName);`
	`1621`	`+ return this.WrappedElement.GetDomAttribute(attributeName);`
`1626`	`1622`	`}`
`1627`	`1623`	`catch (Exception ex)`
`1628`	`1624`	`{`
`1629`	`1625`	`this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));`
`1630`	`1626`	`throw;`
`1631`	`1627`	`}`
`1632`		`-`
`1633`		`- return attribute;`
`1634`	`1628`	`}`
`1635`	`1629`
`1636`	`1630`	`/// <summary>`
`@@ -1639,20 +1633,17 @@ public string GetDomAttribute(string attributeName)`
`1639`	`1633`	`/// <param name="propertyName">The name of the JavaScript property to get the value of.</param>`
`1640`	`1634`	`/// <returns>The JavaScript property's current value. Returns a <see langword="null"/> if the`
`1641`	`1635`	`/// value is not set or the property does not exist.</returns>`
`1642`		`- public string GetDomProperty(string propertyName)`
	`1636`	`+ public string? GetDomProperty(string propertyName)`
`1643`	`1637`	`{`
`1644`		`- string elementProperty;`
`1645`	`1638`	`try`
`1646`	`1639`	`{`
`1647`		`- elementProperty = this.WrappedElement.GetDomProperty(propertyName);`
	`1640`	`+ return this.WrappedElement.GetDomProperty(propertyName);`
`1648`	`1641`	`}`
`1649`	`1642`	`catch (Exception ex)`
`1650`	`1643`	`{`
`1651`	`1644`	`this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));`
`1652`	`1645`	`throw;`
`1653`	`1646`	`}`
`1654`		`-`
`1655`		`- return elementProperty;`
`1656`	`1647`	`}`
`1657`	`1648`
`1658`	`1649`	`/// <summary>`
`@@ -1683,22 +1674,19 @@ public string GetCssValue(string propertyName)`
`1683`	`1674`	`/// <returns>A shadow root representation.</returns>`
`1684`	`1675`	`public ISearchContext GetShadowRoot()`
`1685`	`1676`	`{`
`1686`		`- ISearchContext shadowRoot;`
`1687`	`1677`	`try`
`1688`	`1678`	`{`
`1689`	`1679`	`GetShadowRootEventArgs e = new GetShadowRootEventArgs(this.parentDriver.WrappedDriver, this.WrappedElement);`
`1690`	`1680`	`this.parentDriver.OnGettingShadowRoot(e);`
`1691`		`- shadowRoot = this.WrappedElement.GetShadowRoot();`
	`1681`	`+ ISearchContext shadowRoot = this.WrappedElement.GetShadowRoot();`
`1692`	`1682`	`this.parentDriver.OnGetShadowRootCompleted(e);`
`1693`		`- shadowRoot = new EventFiringShadowRoot(this.parentDriver, shadowRoot);`
	`1683`	`+ return new EventFiringShadowRoot(this.parentDriver, shadowRoot);`
`1694`	`1684`	`}`
`1695`	`1685`	`catch (Exception ex)`
`1696`	`1686`	`{`
`1697`	`1687`	`this.parentDriver.OnException(new WebDriverExceptionEventArgs(this.parentDriver, ex));`
`1698`	`1688`	`throw;`
`1699`	`1689`	`}`
`1700`		`-`
`1701`		`- return shadowRoot;`
`1702`	`1690`	`}`
`1703`	`1691`
`1704`	`1692`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ private static ICommandExecutor GenerateDriverServiceCommandExecutor(DriverServi`
`168`	`168`	`string fullServicePath = finder.GetDriverPath();`
`169`	`169`	`service.DriverServicePath = Path.GetDirectoryName(fullServicePath);`
`170`	`170`	`service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);`
`171`		`- if (finder.TryGetBrowserPath(out string browserPath))`
	`171`	`+ if (finder.TryGetBrowserPath(out string? browserPath))`
`172`	`172`	`{`
`173`	`173`	`options.BinaryLocation = browserPath;`
`174`	`174`	`options.BrowserVersion = null;`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public void DeleteAllCookies()`
`127`	`127`	`{`
`128`	`128`	`var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;`
`129`	`129`
`130`		`- return Cookie.FromDictionary((Dictionary<string, object>)rawCookie!);`
	`130`	`+ return Cookie.FromDictionary((Dictionary<string, object?>)rawCookie!);`
`131`	`131`	`}`
`132`	`132`	`catch (NoSuchCookieException)`
`133`	`133`	`{`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ private static ICommandExecutor GenerateDriverServiceCommandExecutor(DriverServi`
`221`	`221`	`string fullServicePath = finder.GetDriverPath();`
`222`	`222`	`service.DriverServicePath = Path.GetDirectoryName(fullServicePath);`
`223`	`223`	`service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);`
`224`		`- if (finder.TryGetBrowserPath(out string browserPath))`
	`224`	`+ if (finder.TryGetBrowserPath(out string? browserPath))`
`225`	`225`	`{`
`226`	`226`	`options.BinaryLocation = browserPath;`
`227`	`227`	`options.BrowserVersion = null;`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public void WriteToDisk()`
`160`	`160`	`this.ProfileDirectory = GenerateProfileDirectoryName();`
`161`	`161`	`if (!string.IsNullOrEmpty(this.sourceProfileDir))`
`162`	`162`	`{`
`163`		`- FileUtilities.CopyDirectory(this.sourceProfileDir, this.ProfileDirectory);`
	`163`	`+ FileUtilities.CopyDirectory(this.sourceProfileDir!, this.ProfileDirectory);`
`164`	`164`	`}`
`165`	`165`	`else`
`166`	`166`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`using System;`
`21`	`21`	`using System.Collections.ObjectModel;`
`22`	`22`
	`23`	`+#nullable enable`
	`24`	`+`
`23`	`25`	`namespace OpenQA.Selenium`
`24`	`26`	`{`
`25`	`27`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public override ReadOnlyCollection<IWebElement> FindElements(ISearchContext cont`
`108`	`108`	`filterParameters["root"] = GetSerializableObject(this.root);`
`109`	`109`	`filterParameters["filters"] = this.filters;`
`110`	`110`	`parameters["relative"] = filterParameters;`
`111`		`- object rawElements = js.ExecuteScript(wrappedAtom, parameters);`
	`111`	`+ object? rawElements = js.ExecuteScript(wrappedAtom, parameters);`
`112`	`112`
`113`	`113`	`if (rawElements is ReadOnlyCollection<IWebElement> elements)`
`114`	`114`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public IWebElement FindElement(By by)`
`99`	`99`	`parameters.Add("value", by.Criteria);`
`100`	`100`
`101`	`101`	`Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElement, parameters);`
`102`		`- return this.driver.GetElementFromResponse(commandResponse);`
	`102`	`+ return this.driver.GetElementFromResponse(commandResponse)!;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public IWebDriver Window(string windowHandleOrName)`
`166`	`166`	`foreach (string handle in this.driver.WindowHandles)`
`167`	`167`	`{`
`168`	`168`	`this.Window(handle);`
`169`		`- if (windowHandleOrName == this.driver.ExecuteScript("return window.name").ToString())`
	`169`	`+ if (windowHandleOrName == this.driver.ExecuteScript("return window.name")!.ToString())`
`170`	`170`	`{`
`171`	`171`	`return this.driver; // found by name`
`172`	`172`	`}`
`@@ -223,7 +223,7 @@ public IWebDriver DefaultContent()`
`223`	`223`	`public IWebElement ActiveElement()`
`224`	`224`	`{`
`225`	`225`	`Response response = this.driver.InternalExecute(DriverCommand.GetActiveElement, null);`
`226`		`- return this.driver.GetElementFromResponse(response);`
	`226`	`+ return this.driver.GetElementFromResponse(response)!;`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`/// <summary>`