[dotnet] Add nullability annotations to devtools domains

Author: RenderMichael

dotnet/src/webdriver/DevTools/DevToolsDomains.cs

@@ -21,6 +21,8 @@
 using System.Collections.Generic;
 using System.Reflection;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -30,7 +32,7 @@ public abstract class DevToolsDomains
     {
         // By default, we will look for a supported version within this
         // number of versions, as that will most likely still work.
-        private static readonly int DefaultVersionRange = 5;
+        private const int DefaultVersionRange = 5;
 
         // This is the list of known supported DevTools version implementation.
         // When new versions are implemented for support, new types must be
@@ -93,23 +95,18 @@ public static DevToolsDomains InitializeDomains(int protocolVersion, DevToolsSes
                 throw new ArgumentException("Version range must be positive", nameof(versionRange));
             }
 
-            DevToolsDomains domains = null;
             Type domainType = MatchDomainsVersion(protocolVersion, versionRange);
-            ConstructorInfo constructor = domainType.GetConstructor(new Type[] { typeof(DevToolsSession) });
-            if (constructor != null)
-            {
-                domains = constructor.Invoke(new object[] { session }) as DevToolsDomains;
-            }
 
-            return domains;
+            ConstructorInfo constructor = domainType.GetConstructor(new Type[] { typeof(DevToolsSession) })!;
+            return (DevToolsDomains)constructor.Invoke(new object[] { session });
         }
 
         private static Type MatchDomainsVersion(int desiredVersion, int versionRange)
         {
             // Return fast on an exact match
-            if (SupportedDevToolsVersions.ContainsKey(desiredVersion))
+            if (SupportedDevToolsVersions.TryGetValue(desiredVersion, out Type? exactMatch))
             {
-                return SupportedDevToolsVersions[desiredVersion];
+                return exactMatch;
             }
 
             // Get the list of supported versions and sort descending

dotnet/src/webdriver/DevTools/DevToolsExtensionMethods.cs

@@ -17,6 +17,8 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>

dotnet/src/webdriver/DevTools/DevToolsOptions.cs

@@ -17,6 +17,8 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>

dotnet/src/webdriver/DevTools/DevToolsSessionDomains.cs

@@ -17,15 +17,15 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
     /// Provides an abstract base class for version-specific domain implementations.
     /// </summary>
     public abstract class DevToolsSessionDomains
     {
-        private CommandResponseTypeMap responseTypeMap = new CommandResponseTypeMap();
-
         /// <summary>
         /// Initializes a new instance of the <see cref="DevToolsSessionDomains"/> class.
         /// </summary>
@@ -37,7 +37,7 @@ protected DevToolsSessionDomains()
         /// <summary>
         /// Gets the <see cref="CommandResponseTypeMap"/> containing information about the types returned by DevTools Protocol commands.,
         /// </summary>
-        internal CommandResponseTypeMap ResponseTypeMap => this.responseTypeMap;
+        internal CommandResponseTypeMap ResponseTypeMap { get; } = new CommandResponseTypeMap();
 
         /// <summary>
         /// Populates the command response type map.

dotnet/src/webdriver/DevTools/DevToolsSessionEventReceivedEventArgs.cs

@@ -21,6 +21,8 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
@@ -44,16 +46,16 @@ public DevToolsEventReceivedEventArgs(string domainName, string eventName, JsonE
         /// <summary>
         /// Gets the domain on which the event is to be raised.
         /// </summary>
-        public string DomainName { get; private set; }
+        public string DomainName { get; }
 
         /// <summary>
         /// Gets the name of the event to be raised.
         /// </summary>
-        public string EventName { get; private set; }
+        public string EventName { get; }
 
         /// <summary>
         /// Gets the data with which the event is to be raised.
         /// </summary>
-        public JsonElement EventData { get; private set; }
+        public JsonElement EventData { get; }
     }
 }

dotnet/src/webdriver/DevTools/DevToolsSessionLogMessageEventArgs.cs

@@ -19,6 +19,8 @@
 
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>

dotnet/src/webdriver/DevTools/ExceptionThrownEventArgs.cs

@@ -19,21 +19,34 @@
 
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>
     /// Provides data for events relating to JavaScript exception handling.
     /// </summary>
     public class ExceptionThrownEventArgs : EventArgs
     {
+        /// <summary>
+        /// Initializes new instance of the <see cref="ExceptionThrownEventArgs"/> type.
+        /// </summary>
+        /// <param name="timestamp">The time stamp of the exception.</param>
+        /// <param name="message">The text of the exception.</param>
+        public ExceptionThrownEventArgs(DateTime timestamp, string message)
+        {
+            Timestamp = timestamp;
+            Message = message;
+        }
+
         /// <summary>
         /// Gets the time stamp of the exception.
         /// </summary>
-        public DateTime Timestamp { get; internal set; }
+        public DateTime Timestamp { get; }
 
         /// <summary>
         /// Gets the text of the exception.
         /// </summary>
-        public string Message { get; internal set; }
+        public string Message { get; }
     }
 }

dotnet/src/webdriver/DevTools/Json/JsonEnumMemberConverter.cs

@@ -24,21 +24,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.Json
 {
-    internal class JsonEnumMemberConverter<TEnum> : JsonConverter<TEnum> where TEnum : Enum
+    internal sealed class JsonEnumMemberConverter<TEnum>
+        : JsonConverter<TEnum> where TEnum : struct, Enum
     {
         private readonly Dictionary<TEnum, string> _enumToString = new Dictionary<TEnum, string>();
         private readonly Dictionary<string, TEnum> _stringToEnum = new Dictionary<string, TEnum>();
 
         public JsonEnumMemberConverter()
         {
             var type = typeof(TEnum);
-            var values = Enum.GetValues(type);
+#if NET8_0_OR_GREATER
+            TEnum[] values = Enum.GetValues<TEnum>();
+#else
+            Array values = Enum.GetValues(type);
+#endif
 
             foreach (var value in values)
             {
-                var enumMember = type.GetMember(value.ToString())[0];
+                var enumMember = type.GetField(value.ToString())!;
                 var attr = enumMember.GetCustomAttributes(typeof(EnumMemberAttribute), false)
                   .Cast<EnumMemberAttribute>()
                   .FirstOrDefault();
@@ -59,7 +66,7 @@ public JsonEnumMemberConverter()
 
         public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            var stringValue = reader.GetString();
+            var stringValue = reader.GetString() ?? throw new JsonException("Cannot read an enum string from \"null\"");
 
             if (_stringToEnum.TryGetValue(stringValue, out var enumValue))
             {

dotnet/src/webdriver/DevTools/ResponsePausedEventArgs.cs

@@ -19,6 +19,8 @@
 
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools
 {
     /// <summary>

dotnet/src/webdriver/DevTools/v130/V130JavaScript.cs

@@ -153,11 +153,11 @@ private void OnRuntimeBindingCalled(object sender, Runtime.BindingCalledEventArg
         private void OnRuntimeExceptionThrown(object sender, Runtime.ExceptionThrownEventArgs e)
         {
             // TODO: Collect stack trace elements
-            var wrapped = new ExceptionThrownEventArgs()
-            {
-                Timestamp = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(e.Timestamp),
-                Message = e.ExceptionDetails.Text
-            };
+            var wrapped = new ExceptionThrownEventArgs
+            (
+                timestamp: new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(e.Timestamp),
+                message: e.ExceptionDetails.Text
+            );
 
             this.OnExceptionThrown(wrapped);
         }