[dotnet] Annotate nullability on capabilities types

RenderMichael · RenderMichael · commit acb9f5aaacdf · 2025-03-01T02:37:28.000-05:00
diff --git a/dotnet/src/webdriver/IHasCapabilities.cs b/dotnet/src/webdriver/IHasCapabilities.cs
@@ -17,6 +17,8 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
diff --git a/dotnet/src/webdriver/IWritableCapabilities.cs b/dotnet/src/webdriver/IWritableCapabilities.cs
@@ -17,6 +17,8 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
diff --git a/dotnet/src/webdriver/Remote/DesiredCapabilities.cs b/dotnet/src/webdriver/Remote/DesiredCapabilities.cs
@@ -63,7 +63,7 @@ public DesiredCapabilities()
         /// DesiredCapabilities capabilities = new DesiredCapabilities(new Dictionary<![CDATA[<string,object>]]>(){["browserName","firefox"],["version",string.Empty],["javaScript",true]});
         /// </code>
         /// </example>
-        public DesiredCapabilities(Dictionary<string, object> rawMap)
+        public DesiredCapabilities(Dictionary<string, object>? rawMap)
         {
             if (rawMap != null)
             {
diff --git a/dotnet/src/webdriver/Remote/ReadOnlyDesiredCapabilities.cs b/dotnet/src/webdriver/Remote/ReadOnlyDesiredCapabilities.cs
@@ -23,6 +23,8 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Remote
 {
     /// <summary>
@@ -56,14 +58,7 @@ public string BrowserName
         {
             get
             {
-                string name = string.Empty;
-                object capabilityValue = this.GetCapability(CapabilityType.BrowserName);
-                if (capabilityValue != null)
-                {
-                    name = capabilityValue.ToString();
-                }
-
-                return name;
+                return this.GetCapability(CapabilityType.BrowserName)?.ToString() ?? string.Empty;
             }
         }
 
@@ -85,14 +80,7 @@ public string Version
         {
             get
             {
-                string browserVersion = string.Empty;
-                object capabilityValue = this.GetCapability(CapabilityType.Version);
-                if (capabilityValue != null)
-                {
-                    browserVersion = capabilityValue.ToString();
-                }
-
-                return browserVersion;
+                return this.GetCapability(CapabilityType.Version)?.ToString() ?? string.Empty;
             }
         }
 
@@ -104,7 +92,7 @@ public bool AcceptInsecureCerts
             get
             {
                 bool acceptSSLCerts = false;
-                object capabilityValue = this.GetCapability(CapabilityType.AcceptInsecureCertificates);
+                object? capabilityValue = this.GetCapability(CapabilityType.AcceptInsecureCertificates);
                 if (capabilityValue != null)
                 {
                     acceptSSLCerts = (bool)capabilityValue;
@@ -117,18 +105,12 @@ public bool AcceptInsecureCerts
         /// <summary>
         /// Gets the underlying Dictionary for a given set of capabilities.
         /// </summary>
-        IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary
-        {
-            get { return this.CapabilitiesDictionary; }
-        }
+        IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary => this.CapabilitiesDictionary;
 
         /// <summary>
         /// Gets the underlying Dictionary for a given set of capabilities.
         /// </summary>
-        internal IDictionary<string, object> CapabilitiesDictionary
-        {
-            get { return new ReadOnlyDictionary<string, object>(this.capabilities); }
-        }
+        internal IDictionary<string, object> CapabilitiesDictionary => new ReadOnlyDictionary<string, object>(this.capabilities);
 
         /// <summary>
         /// Gets the capability value with the specified name.
@@ -142,12 +124,12 @@ public object this[string capabilityName]
         {
             get
             {
-                if (!this.capabilities.ContainsKey(capabilityName))
+                if (!this.capabilities.TryGetValue(capabilityName, out object? capabilityValue))
                 {
                     throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The capability {0} is not present in this set of capabilities", capabilityName));
                 }
 
-                return this.capabilities[capabilityName];
+                return capabilityValue;
             }
         }
 
@@ -167,20 +149,19 @@ public bool HasCapability(string capability)
         /// <param name="capability">The capability to get.</param>
         /// <returns>An object associated with the capability, or <see langword="null"/>
         /// if the capability is not set on the browser.</returns>
-        public object GetCapability(string capability)
+        public object? GetCapability(string capability)
         {
-            object capabilityValue = null;
-            if (this.capabilities.ContainsKey(capability))
+            if (this.capabilities.TryGetValue(capability, out object? capabilityValue))
             {
-                capabilityValue = this.capabilities[capability];
-                string capabilityValueString = capabilityValue as string;
-                if (capability == CapabilityType.Platform && capabilityValueString != null)
+                if (capability == CapabilityType.Platform && capabilityValue is string capabilityValueString)
                 {
-                    capabilityValue = Platform.FromString(capabilityValue.ToString());
+                    capabilityValue = Platform.FromString(capabilityValueString);
                 }
+
+                return capabilityValue;
             }
 
-            return capabilityValue;
+            return null;
         }
 
         /// <summary>
@@ -219,20 +200,19 @@ public override string ToString()
         /// </summary>
         /// <param name="obj">DesiredCapabilities you wish to compare</param>
         /// <returns>true if they are the same or false if they are not</returns>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (this == obj)
             {
                 return true;
             }
 
-            DesiredCapabilities other = obj as DesiredCapabilities;
-            if (other == null)
+            if (obj is not DesiredCapabilities other)
             {
                 return false;
             }
 
-            if (this.BrowserName != null ? this.BrowserName != other.BrowserName : other.BrowserName != null)
+            if (this.BrowserName != other.BrowserName)
             {
                 return false;
             }
@@ -242,7 +222,7 @@ public override bool Equals(object obj)
                 return false;
             }
 
-            if (this.Version != null ? this.Version != other.Version : other.Version != null)
+            if (this.Version != other.Version)
             {
                 return false;
             }
diff --git a/dotnet/src/webdriver/Remote/RemoteSessionSettings.cs b/dotnet/src/webdriver/Remote/RemoteSessionSettings.cs
@@ -22,6 +22,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -32,10 +34,10 @@ public class RemoteSessionSettings : ICapabilities
         private const string FirstMatchCapabilityName = "firstMatch";
         private const string AlwaysMatchCapabilityName = "alwaysMatch";
 
-        private readonly List<string> reservedSettingNames = new List<string>() { FirstMatchCapabilityName, AlwaysMatchCapabilityName };
-        private DriverOptions mustMatchDriverOptions;
-        private List<DriverOptions> firstMatchOptions = new List<DriverOptions>();
-        private Dictionary<string, object> remoteMetadataSettings = new Dictionary<string, object>();
+        private readonly HashSet<string> reservedSettingNames = new HashSet<string>() { FirstMatchCapabilityName, AlwaysMatchCapabilityName };
+        private DriverOptions? mustMatchDriverOptions;
+        private readonly List<DriverOptions> firstMatchOptions = new List<DriverOptions>();
+        private readonly Dictionary<string, object> remoteMetadataSettings = new Dictionary<string, object>();
 
         /// <summary>
         /// Creates a new instance of the <see cref="RemoteSessionSettings"/> class.
@@ -69,7 +71,7 @@ public RemoteSessionSettings(DriverOptions mustMatchDriverOptions, params Driver
         /// <summary>
         /// Gets a value indicating the options that must be matched by the remote end to create a session.
         /// </summary>
-        internal DriverOptions MustMatchDriverOptions => this.mustMatchDriverOptions;
+        internal DriverOptions? MustMatchDriverOptions => this.mustMatchDriverOptions;
 
         /// <summary>
         /// Gets a value indicating the number of options that may be matched by the remote end to create a session.
@@ -91,7 +93,8 @@ public object this[string capabilityName]
             {
                 if (capabilityName == AlwaysMatchCapabilityName)
                 {
-                    return this.GetAlwaysMatchOptionsAsSerializableDictionary();
+                    return this.GetAlwaysMatchOptionsAsSerializableDictionary()
+                        ?? throw new ArgumentException("The \"alwaysMatch\" value has not been set", nameof(capabilityName));
                 }
 
                 if (capabilityName == FirstMatchCapabilityName)
@@ -203,7 +206,7 @@ public bool HasCapability(string capability)
         /// <param name="capability">The capability to get.</param>
         /// <returns>An object associated with the capability, or <see langword="null"/>
         /// if the capability is not set in this set of capabilities.</returns>
-        public object GetCapability(string capability)
+        public object? GetCapability(string capability)
         {
             if (capability == AlwaysMatchCapabilityName)
             {
@@ -227,9 +230,9 @@ public object GetCapability(string capability)
         /// Return a dictionary representation of this <see cref="RemoteSessionSettings"/>.
         /// </summary>
         /// <returns>A <see cref="Dictionary{TKey, TValue}"/> representation of this <see cref="RemoteSessionSettings"/>.</returns>
-        public Dictionary<string, object> ToDictionary()
+        public Dictionary<string, object?> ToDictionary()
         {
-            Dictionary<string, object> capabilitiesDictionary = new Dictionary<string, object>();
+            Dictionary<string, object?> capabilitiesDictionary = new Dictionary<string, object?>();
 
             foreach (KeyValuePair<string, object> remoteMetadataSetting in this.remoteMetadataSettings)
             {
@@ -243,7 +246,7 @@ public Dictionary<string, object> ToDictionary()
 
             if (this.firstMatchOptions.Count > 0)
             {
-                List<object> optionsMatches = GetFirstMatchOptionsAsSerializableList();
+                List<object?> optionsMatches = GetFirstMatchOptionsAsSerializableList();
 
                 capabilitiesDictionary["firstMatch"] = optionsMatches;
             }
@@ -261,14 +264,14 @@ internal DriverOptions GetFirstMatchDriverOptions(int firstMatchIndex)
             return this.firstMatchOptions[firstMatchIndex];
         }
 
-        private IDictionary<string, object> GetAlwaysMatchOptionsAsSerializableDictionary()
+        private IDictionary<string, object>? GetAlwaysMatchOptionsAsSerializableDictionary()
         {
-            return this.mustMatchDriverOptions.ToDictionary();
+            return this.mustMatchDriverOptions?.ToDictionary();
         }
 
-        private List<object> GetFirstMatchOptionsAsSerializableList()
+        private List<object?> GetFirstMatchOptionsAsSerializableList()
         {
-            List<object> optionsMatches = new List<object>(this.firstMatchOptions.Count);
+            List<object?> optionsMatches = new List<object?>(this.firstMatchOptions.Count);
             foreach (DriverOptions options in this.firstMatchOptions)
             {
                 optionsMatches.Add(options.ToDictionary());

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`// under the License.`
`18`	`18`	`// </copyright>`
`19`	`19`
	`20`	`+#nullable enable`
	`21`	`+`
`20`	`22`	`namespace OpenQA.Selenium`
`21`	`23`	`{`
`22`	`24`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public DesiredCapabilities()`
`63`	`63`	`/// DesiredCapabilities capabilities = new DesiredCapabilities(new Dictionary<![CDATA[<string,object>]]>(){["browserName","firefox"],["version",string.Empty],["javaScript",true]});`
`64`	`64`	`/// </code>`
`65`	`65`	`/// </example>`
`66`		`- public DesiredCapabilities(Dictionary<string, object> rawMap)`
	`66`	`+ public DesiredCapabilities(Dictionary<string, object>? rawMap)`
`67`	`67`	`{`
`68`	`68`	`if (rawMap != null)`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`using System.Collections.ObjectModel;`
`24`	`24`	`using System.Globalization;`
`25`	`25`
	`26`	`+#nullable enable`
	`27`	`+`
`26`	`28`	`namespace OpenQA.Selenium.Remote`
`27`	`29`	`{`
`28`	`30`	`/// <summary>`
`@@ -56,14 +58,7 @@ public string BrowserName`
`56`	`58`	`{`
`57`	`59`	`get`
`58`	`60`	`{`
`59`		`- string name = string.Empty;`
`60`		`- object capabilityValue = this.GetCapability(CapabilityType.BrowserName);`
`61`		`- if (capabilityValue != null)`
`62`		`- {`
`63`		`- name = capabilityValue.ToString();`
`64`		`- }`
`65`		`-`
`66`		`- return name;`
	`61`	`+ return this.GetCapability(CapabilityType.BrowserName)?.ToString() ?? string.Empty;`
`67`	`62`	`}`
`68`	`63`	`}`
`69`	`64`
`@@ -85,14 +80,7 @@ public string Version`
`85`	`80`	`{`
`86`	`81`	`get`
`87`	`82`	`{`
`88`		`- string browserVersion = string.Empty;`
`89`		`- object capabilityValue = this.GetCapability(CapabilityType.Version);`
`90`		`- if (capabilityValue != null)`
`91`		`- {`
`92`		`- browserVersion = capabilityValue.ToString();`
`93`		`- }`
`94`		`-`
`95`		`- return browserVersion;`
	`83`	`+ return this.GetCapability(CapabilityType.Version)?.ToString() ?? string.Empty;`
`96`	`84`	`}`
`97`	`85`	`}`
`98`	`86`
`@@ -104,7 +92,7 @@ public bool AcceptInsecureCerts`
`104`	`92`	`get`
`105`	`93`	`{`
`106`	`94`	`bool acceptSSLCerts = false;`
`107`		`- object capabilityValue = this.GetCapability(CapabilityType.AcceptInsecureCertificates);`
	`95`	`+ object? capabilityValue = this.GetCapability(CapabilityType.AcceptInsecureCertificates);`
`108`	`96`	`if (capabilityValue != null)`
`109`	`97`	`{`
`110`	`98`	`acceptSSLCerts = (bool)capabilityValue;`
`@@ -117,18 +105,12 @@ public bool AcceptInsecureCerts`
`117`	`105`	`/// <summary>`
`118`	`106`	`/// Gets the underlying Dictionary for a given set of capabilities.`
`119`	`107`	`/// </summary>`
`120`		`- IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary`
`121`		`- {`
`122`		`- get { return this.CapabilitiesDictionary; }`
`123`		`- }`
	`108`	`+ IDictionary<string, object> IHasCapabilitiesDictionary.CapabilitiesDictionary => this.CapabilitiesDictionary;`
`124`	`109`
`125`	`110`	`/// <summary>`
`126`	`111`	`/// Gets the underlying Dictionary for a given set of capabilities.`
`127`	`112`	`/// </summary>`
`128`		`- internal IDictionary<string, object> CapabilitiesDictionary`
`129`		`- {`
`130`		`- get { return new ReadOnlyDictionary<string, object>(this.capabilities); }`
`131`		`- }`
	`113`	`+ internal IDictionary<string, object> CapabilitiesDictionary => new ReadOnlyDictionary<string, object>(this.capabilities);`
`132`	`114`
`133`	`115`	`/// <summary>`
`134`	`116`	`/// Gets the capability value with the specified name.`
`@@ -142,12 +124,12 @@ public object this[string capabilityName]`
`142`	`124`	`{`
`143`	`125`	`get`
`144`	`126`	`{`
`145`		`- if (!this.capabilities.ContainsKey(capabilityName))`
	`127`	`+ if (!this.capabilities.TryGetValue(capabilityName, out object? capabilityValue))`
`146`	`128`	`{`
`147`	`129`	`throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The capability {0} is not present in this set of capabilities", capabilityName));`
`148`	`130`	`}`
`149`	`131`
`150`		`- return this.capabilities[capabilityName];`
	`132`	`+ return capabilityValue;`
`151`	`133`	`}`
`152`	`134`	`}`
`153`	`135`
`@@ -167,20 +149,19 @@ public bool HasCapability(string capability)`
`167`	`149`	`/// <param name="capability">The capability to get.</param>`
`168`	`150`	`/// <returns>An object associated with the capability, or <see langword="null"/>`
`169`	`151`	`/// if the capability is not set on the browser.</returns>`
`170`		`- public object GetCapability(string capability)`
	`152`	`+ public object? GetCapability(string capability)`
`171`	`153`	`{`
`172`		`- object capabilityValue = null;`
`173`		`- if (this.capabilities.ContainsKey(capability))`
	`154`	`+ if (this.capabilities.TryGetValue(capability, out object? capabilityValue))`
`174`	`155`	`{`
`175`		`- capabilityValue = this.capabilities[capability];`
`176`		`- string capabilityValueString = capabilityValue as string;`
`177`		`- if (capability == CapabilityType.Platform && capabilityValueString != null)`
	`156`	`+ if (capability == CapabilityType.Platform && capabilityValue is string capabilityValueString)`
`178`	`157`	`{`
`179`		`- capabilityValue = Platform.FromString(capabilityValue.ToString());`
	`158`	`+ capabilityValue = Platform.FromString(capabilityValueString);`
`180`	`159`	`}`
	`160`	`+`
	`161`	`+ return capabilityValue;`
`181`	`162`	`}`
`182`	`163`
`183`		`- return capabilityValue;`
	`164`	`+ return null;`
`184`	`165`	`}`
`185`	`166`
`186`	`167`	`/// <summary>`
`@@ -219,20 +200,19 @@ public override string ToString()`
`219`	`200`	`/// </summary>`
`220`	`201`	`/// <param name="obj">DesiredCapabilities you wish to compare</param>`
`221`	`202`	`/// <returns>true if they are the same or false if they are not</returns>`
`222`		`- public override bool Equals(object obj)`
	`203`	`+ public override bool Equals(object? obj)`
`223`	`204`	`{`
`224`	`205`	`if (this == obj)`
`225`	`206`	`{`
`226`	`207`	`return true;`
`227`	`208`	`}`
`228`	`209`
`229`		`- DesiredCapabilities other = obj as DesiredCapabilities;`
`230`		`- if (other == null)`
	`210`	`+ if (obj is not DesiredCapabilities other)`
`231`	`211`	`{`
`232`	`212`	`return false;`
`233`	`213`	`}`
`234`	`214`
`235`		`- if (this.BrowserName != null ? this.BrowserName != other.BrowserName : other.BrowserName != null)`
	`215`	`+ if (this.BrowserName != other.BrowserName)`
`236`	`216`	`{`
`237`	`217`	`return false;`
`238`	`218`	`}`
`@@ -242,7 +222,7 @@ public override bool Equals(object obj)`
`242`	`222`	`return false;`
`243`	`223`	`}`
`244`	`224`
`245`		`- if (this.Version != null ? this.Version != other.Version : other.Version != null)`
	`225`	`+ if (this.Version != other.Version)`
`246`	`226`	`{`
`247`	`227`	`return false;`
`248`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`using System.Collections.Generic;`
`23`	`23`	`using System.Globalization;`
`24`	`24`
	`25`	`+#nullable enable`
	`26`	`+`
`25`	`27`	`namespace OpenQA.Selenium`
`26`	`28`	`{`
`27`	`29`	`/// <summary>`
`@@ -32,10 +34,10 @@ public class RemoteSessionSettings : ICapabilities`
`32`	`34`	`private const string FirstMatchCapabilityName = "firstMatch";`
`33`	`35`	`private const string AlwaysMatchCapabilityName = "alwaysMatch";`
`34`	`36`
`35`		`- private readonly List<string> reservedSettingNames = new List<string>() { FirstMatchCapabilityName, AlwaysMatchCapabilityName };`
`36`		`- private DriverOptions mustMatchDriverOptions;`
`37`		`- private List<DriverOptions> firstMatchOptions = new List<DriverOptions>();`
`38`		`- private Dictionary<string, object> remoteMetadataSettings = new Dictionary<string, object>();`
	`37`	`+ private readonly HashSet<string> reservedSettingNames = new HashSet<string>() { FirstMatchCapabilityName, AlwaysMatchCapabilityName };`
	`38`	`+ private DriverOptions? mustMatchDriverOptions;`
	`39`	`+ private readonly List<DriverOptions> firstMatchOptions = new List<DriverOptions>();`
	`40`	`+ private readonly Dictionary<string, object> remoteMetadataSettings = new Dictionary<string, object>();`
`39`	`41`
`40`	`42`	`/// <summary>`
`41`	`43`	`/// Creates a new instance of the <see cref="RemoteSessionSettings"/> class.`
`@@ -69,7 +71,7 @@ public RemoteSessionSettings(DriverOptions mustMatchDriverOptions, params Driver`
`69`	`71`	`/// <summary>`
`70`	`72`	`/// Gets a value indicating the options that must be matched by the remote end to create a session.`
`71`	`73`	`/// </summary>`
`72`		`- internal DriverOptions MustMatchDriverOptions => this.mustMatchDriverOptions;`
	`74`	`+ internal DriverOptions? MustMatchDriverOptions => this.mustMatchDriverOptions;`
`73`	`75`
`74`	`76`	`/// <summary>`
`75`	`77`	`/// Gets a value indicating the number of options that may be matched by the remote end to create a session.`
`@@ -91,7 +93,8 @@ public object this[string capabilityName]`
`91`	`93`	`{`
`92`	`94`	`if (capabilityName == AlwaysMatchCapabilityName)`
`93`	`95`	`{`
`94`		`- return this.GetAlwaysMatchOptionsAsSerializableDictionary();`
	`96`	`+ return this.GetAlwaysMatchOptionsAsSerializableDictionary()`
	`97`	`+ ?? throw new ArgumentException("The \"alwaysMatch\" value has not been set", nameof(capabilityName));`
`95`	`98`	`}`
`96`	`99`
`97`	`100`	`if (capabilityName == FirstMatchCapabilityName)`
`@@ -203,7 +206,7 @@ public bool HasCapability(string capability)`
`203`	`206`	`/// <param name="capability">The capability to get.</param>`
`204`	`207`	`/// <returns>An object associated with the capability, or <see langword="null"/>`
`205`	`208`	`/// if the capability is not set in this set of capabilities.</returns>`
`206`		`- public object GetCapability(string capability)`
	`209`	`+ public object? GetCapability(string capability)`
`207`	`210`	`{`
`208`	`211`	`if (capability == AlwaysMatchCapabilityName)`
`209`	`212`	`{`
`@@ -227,9 +230,9 @@ public object GetCapability(string capability)`
`227`	`230`	`/// Return a dictionary representation of this <see cref="RemoteSessionSettings"/>.`
`228`	`231`	`/// </summary>`
`229`	`232`	`/// <returns>A <see cref="Dictionary{TKey, TValue}"/> representation of this <see cref="RemoteSessionSettings"/>.</returns>`
`230`		`- public Dictionary<string, object> ToDictionary()`
	`233`	`+ public Dictionary<string, object?> ToDictionary()`
`231`	`234`	`{`
`232`		`- Dictionary<string, object> capabilitiesDictionary = new Dictionary<string, object>();`
	`235`	`+ Dictionary<string, object?> capabilitiesDictionary = new Dictionary<string, object?>();`
`233`	`236`
`234`	`237`	`foreach (KeyValuePair<string, object> remoteMetadataSetting in this.remoteMetadataSettings)`
`235`	`238`	`{`
`@@ -243,7 +246,7 @@ public Dictionary<string, object> ToDictionary()`
`243`	`246`
`244`	`247`	`if (this.firstMatchOptions.Count > 0)`
`245`	`248`	`{`
`246`		`- List<object> optionsMatches = GetFirstMatchOptionsAsSerializableList();`
	`249`	`+ List<object?> optionsMatches = GetFirstMatchOptionsAsSerializableList();`
`247`	`250`
`248`	`251`	`capabilitiesDictionary["firstMatch"] = optionsMatches;`
`249`	`252`	`}`
`@@ -261,14 +264,14 @@ internal DriverOptions GetFirstMatchDriverOptions(int firstMatchIndex)`
`261`	`264`	`return this.firstMatchOptions[firstMatchIndex];`
`262`	`265`	`}`
`263`	`266`
`264`		`- private IDictionary<string, object> GetAlwaysMatchOptionsAsSerializableDictionary()`
	`267`	`+ private IDictionary<string, object>? GetAlwaysMatchOptionsAsSerializableDictionary()`
`265`	`268`	`{`
`266`		`- return this.mustMatchDriverOptions.ToDictionary();`
	`269`	`+ return this.mustMatchDriverOptions?.ToDictionary();`
`267`	`270`	`}`
`268`	`271`
`269`		`- private List<object> GetFirstMatchOptionsAsSerializableList()`
	`272`	`+ private List<object?> GetFirstMatchOptionsAsSerializableList()`
`270`	`273`	`{`
`271`		`- List<object> optionsMatches = new List<object>(this.firstMatchOptions.Count);`
	`274`	`+ List<object?> optionsMatches = new List<object?>(this.firstMatchOptions.Count);`
`272`	`275`	`foreach (DriverOptions options in this.firstMatchOptions)`
`273`	`276`	`{`
`274`	`277`	`optionsMatches.Add(options.ToDictionary());`