[dotnet] Annotate DriverServiceCommandExecutor for nullability (#14942)

Author: RenderMichael

dotnet/src/webdriver/Remote/DriverServiceCommandExecutor.cs

@@ -20,22 +20,24 @@
 using System;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.Remote
 {
     /// <summary>
     /// Provides a mechanism to execute commands on the browser
     /// </summary>
     public class DriverServiceCommandExecutor : ICommandExecutor
     {
-        private DriverService service;
-        private HttpCommandExecutor internalExecutor;
+        private readonly DriverService service;
         private bool isDisposed;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DriverServiceCommandExecutor"/> class.
         /// </summary>
         /// <param name="driverService">The <see cref="DriverService"/> that drives the browser.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="driverService"/> is <see langword="null"/>.</exception>
         public DriverServiceCommandExecutor(DriverService driverService, TimeSpan commandTimeout)
             : this(driverService, commandTimeout, true)
         {
@@ -48,10 +50,11 @@ public DriverServiceCommandExecutor(DriverService driverService, TimeSpan comman
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         /// <param name="enableKeepAlive"><see langword="true"/> if the KeepAlive header should be sent
         /// with HTTP requests; otherwise, <see langword="false"/>.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="driverService"/> is <see langword="null"/>.</exception>
         public DriverServiceCommandExecutor(DriverService driverService, TimeSpan commandTimeout, bool enableKeepAlive)
         {
-            this.service = driverService;
-            this.internalExecutor = new HttpCommandExecutor(driverService.ServiceUrl, commandTimeout, enableKeepAlive);
+            this.service = driverService ?? throw new ArgumentNullException(nameof(driverService));
+            this.HttpExecutor = new HttpCommandExecutor(driverService.ServiceUrl, commandTimeout, enableKeepAlive);
         }
 
         /// <summary>
@@ -60,33 +63,31 @@ public DriverServiceCommandExecutor(DriverService driverService, TimeSpan comman
         /// <param name="service">The <see cref="DriverService"/> that drives the browser.</param>
         /// <param name="commandExecutor">The <see cref="HttpCommandExecutor"/> object used to execute commands,
         /// communicating with the service via HTTP.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="service"/> or <paramref name="commandExecutor"/> are <see langword="null"/>.</exception>
         public DriverServiceCommandExecutor(DriverService service, HttpCommandExecutor commandExecutor)
         {
-            this.service = service;
-            this.internalExecutor = commandExecutor;
+            this.service = service ?? throw new ArgumentNullException(nameof(service));
+            this.HttpExecutor = commandExecutor ?? throw new ArgumentNullException(nameof(commandExecutor));
         }
 
         /// <summary>
         /// Gets the <see cref="CommandInfoRepository"/> object associated with this executor.
         /// </summary>
         //public CommandInfoRepository CommandInfoRepository
         //{
-        //    get { return this.internalExecutor.CommandInfoRepository; }
+        //    get { return this.HttpExecutor.CommandInfoRepository; }
         //}
 
         public bool TryAddCommand(string commandName, CommandInfo info)
         {
-            return this.internalExecutor.TryAddCommand(commandName, info);
+            return this.HttpExecutor.TryAddCommand(commandName, info);
         }
 
         /// <summary>
         /// Gets the <see cref="HttpCommandExecutor"/> that sends commands to the remote
         /// end WebDriver implementation.
         /// </summary>
-        public HttpCommandExecutor HttpExecutor
-        {
-            get { return this.internalExecutor; }
-        }
+        public HttpCommandExecutor HttpExecutor { get; }
 
         /// <summary>
         /// Executes a command
@@ -110,7 +111,7 @@ public async Task<Response> ExecuteAsync(Command commandToExecute)
                 throw new ArgumentNullException(nameof(commandToExecute), "Command to execute cannot be null");
             }
 
-            Response toReturn = null;
+            Response toReturn;
             if (commandToExecute.Name == DriverCommand.NewSession)
             {
                 this.service.Start();
@@ -120,7 +121,7 @@ public async Task<Response> ExecuteAsync(Command commandToExecute)
             // command, so that we can get the finally block.
             try
             {
-                toReturn = await this.internalExecutor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
+                toReturn = await this.HttpExecutor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
             }
             finally
             {
@@ -139,6 +140,7 @@ public async Task<Response> ExecuteAsync(Command commandToExecute)
         public void Dispose()
         {
             this.Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>
@@ -153,7 +155,7 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    this.internalExecutor.Dispose();
+                    this.HttpExecutor.Dispose();
                     this.service.Dispose();
                 }
 

dotnet/src/webdriver/Remote/ICommandServer.cs

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