[dotnet] Unify protected and internal Execute methods

RenderMichael · RenderMichael · commit e3aace634145 · 2025-02-05T00:53:52.000-05:00
diff --git a/dotnet/src/webdriver/Alert.cs b/dotnet/src/webdriver/Alert.cs
@@ -47,7 +47,7 @@ public string? Text
         {
             get
             {
-                Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAlertText, null);
+                Response commandResponse = this.driver.Execute(DriverCommand.GetAlertText, null);
                 return (string?)commandResponse.Value;
             }
         }
@@ -57,15 +57,15 @@ public string? Text
         /// </summary>
         public void Dismiss()
         {
-            this.driver.InternalExecute(DriverCommand.DismissAlert, null);
+            this.driver.Execute(DriverCommand.DismissAlert, null);
         }
 
         /// <summary>
         /// Accepts the alert.
         /// </summary>
         public void Accept()
         {
-            this.driver.InternalExecute(DriverCommand.AcceptAlert, null);
+            this.driver.Execute(DriverCommand.AcceptAlert, null);
         }
 
         /// <summary>
@@ -83,7 +83,7 @@ public void SendKeys(string keysToSend)
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("text", keysToSend);
 
-            this.driver.InternalExecute(DriverCommand.SetAlertValue, parameters);
+            this.driver.Execute(DriverCommand.SetAlertValue, parameters);
         }
     }
 }
diff --git a/dotnet/src/webdriver/CookieJar.cs b/dotnet/src/webdriver/CookieJar.cs
@@ -34,7 +34,7 @@ public ReadOnlyCollection<Cookie> AllCookies
         {
             get
             {
-                Response response = driver.InternalExecute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
+                Response response = driver.Execute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
 
                 List<Cookie> toReturn = new List<Cookie>();
                 if (response.Value is object?[] cookies)
@@ -67,7 +67,7 @@ public void AddCookie(Cookie cookie)
 
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("cookie", cookie);
-            driver.InternalExecute(DriverCommand.AddCookie, parameters);
+            driver.Execute(DriverCommand.AddCookie, parameters);
         }
 
         /// <summary>
@@ -84,7 +84,7 @@ public void DeleteCookieNamed(string name)
 
             Dictionary<string, object> parameters = new() { { "name", name } };
 
-            driver.InternalExecute(DriverCommand.DeleteCookie, parameters);
+            driver.Execute(DriverCommand.DeleteCookie, parameters);
         }
 
         /// <summary>
@@ -107,7 +107,7 @@ public void DeleteCookie(Cookie cookie)
         /// </summary>
         public void DeleteAllCookies()
         {
-            driver.InternalExecute(DriverCommand.DeleteAllCookies, null);
+            driver.Execute(DriverCommand.DeleteAllCookies, null);
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ public void DeleteAllCookies()
 
             try
             {
-                var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
+                var rawCookie = driver.Execute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
 
                 return Cookie.FromDictionary((Dictionary<string, object>)rawCookie!);
             }
diff --git a/dotnet/src/webdriver/HttpCommandInfo.cs b/dotnet/src/webdriver/HttpCommandInfo.cs
@@ -51,10 +51,11 @@ public class HttpCommandInfo : CommandInfo
         /// </summary>
         /// <param name="method">Method of the Command</param>
         /// <param name="resourcePath">Relative URL path to the resource used to execute the command</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="method"/> or <paramref name="resourcePath"/> are <see langword="null"/>.</exception>
         public HttpCommandInfo(string method, string resourcePath)
         {
-            this.ResourcePath = resourcePath;
-            this.Method = method;
+            this.ResourcePath = resourcePath ?? throw new ArgumentNullException(nameof(resourcePath));
+            this.Method = method ?? throw new ArgumentNullException(nameof(method));
         }
 
         /// <summary>
diff --git a/dotnet/src/webdriver/Logs.cs b/dotnet/src/webdriver/Logs.cs
@@ -52,7 +52,7 @@ public ReadOnlyCollection<string> AvailableLogTypes
                 List<string> availableLogTypes = new List<string>();
                 try
                 {
-                    Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);
+                    Response commandResponse = this.driver.Execute(DriverCommand.GetAvailableLogTypes, null);
                     if (commandResponse.Value is object[] responseValue)
                     {
                         foreach (object logKind in responseValue)
@@ -88,7 +88,7 @@ public ReadOnlyCollection<LogEntry> GetLog(string logKind)
 
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("type", logKind);
-            Response commandResponse = this.driver.InternalExecute(DriverCommand.GetLog, parameters);
+            Response commandResponse = this.driver.Execute(DriverCommand.GetLog, parameters);
 
             if (commandResponse.Value is object?[] responseValue)
             {
diff --git a/dotnet/src/webdriver/Navigator.cs b/dotnet/src/webdriver/Navigator.cs
@@ -59,7 +59,7 @@ public void Back()
         /// <returns>A task object representing the asynchronous operation.</returns>
         public async Task BackAsync()
         {
-            await this.driver.InternalExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);
+            await this.driver.ExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -79,7 +79,7 @@ public void Forward()
         /// <returns>A task object representing the asynchronous operation.</returns>
         public async Task ForwardAsync()
         {
-            await this.driver.InternalExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);
+            await this.driver.ExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -112,7 +112,7 @@ public async Task GoToUrlAsync(string url)
             {
                 { "url", url }
             };
-            await this.driver.InternalExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);
+            await this.driver.ExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -162,7 +162,7 @@ public void Refresh()
         public async Task RefreshAsync()
         {
             // driver.SwitchTo().DefaultContent();
-            await this.driver.InternalExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);
+            await this.driver.ExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);
         }
     }
 }
diff --git a/dotnet/src/webdriver/ShadowRoot.cs b/dotnet/src/webdriver/ShadowRoot.cs
@@ -98,7 +98,7 @@ public IWebElement FindElement(By by)
             parameters.Add("using", by.Mechanism);
             parameters.Add("value", by.Criteria);
 
-            Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElement, parameters);
+            Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElement, parameters);
             return this.driver.GetElementFromResponse(commandResponse);
         }
 
@@ -122,7 +122,7 @@ public ReadOnlyCollection<IWebElement> FindElements(By by)
             parameters.Add("using", by.Mechanism);
             parameters.Add("value", by.Criteria);
 
-            Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElements, parameters);
+            Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElements, parameters);
             return this.driver.GetElementsFromResponse(commandResponse);
         }
 
diff --git a/dotnet/src/webdriver/TargetLocator.cs b/dotnet/src/webdriver/TargetLocator.cs
@@ -53,7 +53,7 @@ public IWebDriver Frame(int frameIndex)
         {
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("id", frameIndex);
-            this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);
+            this.driver.Execute(DriverCommand.SwitchToFrame, parameters);
             return this.driver;
         }
 
@@ -116,7 +116,7 @@ public IWebDriver Frame(IWebElement frameElement)
 
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("id", elementDictionary);
-            this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);
+            this.driver.Execute(DriverCommand.SwitchToFrame, parameters);
             return this.driver;
         }
 
@@ -127,7 +127,7 @@ public IWebDriver Frame(IWebElement frameElement)
         public IWebDriver ParentFrame()
         {
             Dictionary<string, object> parameters = new Dictionary<string, object>();
-            this.driver.InternalExecute(DriverCommand.SwitchToParentFrame, parameters);
+            this.driver.Execute(DriverCommand.SwitchToParentFrame, parameters);
             return this.driver;
         }
 
@@ -148,7 +148,7 @@ public IWebDriver Window(string windowHandleOrName)
             parameters.Add("handle", windowHandleOrName);
             try
             {
-                this.driver.InternalExecute(DriverCommand.SwitchToWindow, parameters);
+                this.driver.Execute(DriverCommand.SwitchToWindow, parameters);
                 return this.driver;
             }
             catch (NoSuchWindowException)
@@ -195,7 +195,7 @@ public IWebDriver NewWindow(WindowType typeHint)
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("type", typeHint.ToString().ToLowerInvariant());
 
-            Response response = this.driver.InternalExecute(DriverCommand.NewWindow, parameters);
+            Response response = this.driver.Execute(DriverCommand.NewWindow, parameters);
 
             Dictionary<string, object> result = (Dictionary<string, object>)response.Value!;
             string newWindowHandle = result["handle"].ToString()!;
@@ -212,7 +212,7 @@ public IWebDriver DefaultContent()
         {
             Dictionary<string, object?> parameters = new Dictionary<string, object?>();
             parameters.Add("id", null);
-            this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);
+            this.driver.Execute(DriverCommand.SwitchToFrame, parameters);
             return this.driver;
         }
 
@@ -222,7 +222,7 @@ public IWebDriver DefaultContent()
         /// <returns>Element that is active</returns>
         public IWebElement ActiveElement()
         {
-            Response response = this.driver.InternalExecute(DriverCommand.GetActiveElement, null);
+            Response response = this.driver.Execute(DriverCommand.GetActiveElement, null);
             return this.driver.GetElementFromResponse(response);
         }
 
@@ -234,7 +234,7 @@ public IAlert Alert()
         {
             // N.B. We only execute the GetAlertText command to be able to throw
             // a NoAlertPresentException if there is no alert found.
-            this.driver.InternalExecute(DriverCommand.GetAlertText, null);
+            this.driver.Execute(DriverCommand.GetAlertText, null);
             return new Alert(this.driver);
         }
     }
diff --git a/dotnet/src/webdriver/Timeouts.cs b/dotnet/src/webdriver/Timeouts.cs
@@ -111,7 +111,7 @@ public TimeSpan PageLoad
 
         private TimeSpan ExecuteGetTimeout(string timeoutType)
         {
-            Response commandResponse = this.driver.InternalExecute(DriverCommand.GetTimeouts, null);
+            Response commandResponse = this.driver.Execute(DriverCommand.GetTimeouts, null);
 
             Dictionary<string, object?> responseValue = (Dictionary<string, object?>)commandResponse.Value!;
             if (!responseValue.TryGetValue(timeoutType, out object? timeout))
@@ -144,7 +144,7 @@ private void ExecuteSetTimeout(string timeoutType, TimeSpan timeToWait)
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add(timeoutType, Convert.ToInt64(milliseconds));
 
-            this.driver.InternalExecute(DriverCommand.SetTimeouts, parameters);
+            this.driver.Execute(DriverCommand.SetTimeouts, parameters);
         }
     }
 }
diff --git a/dotnet/src/webdriver/WebDriver.cs b/dotnet/src/webdriver/WebDriver.cs
@@ -576,36 +576,13 @@ internal ReadOnlyCollection<IWebElement> GetElementsFromResponse(Response respon
             return toReturn.AsReadOnly();
         }
 
-        /// <summary>
-        /// Executes commands with the driver
-        /// </summary>
-        /// <param name="driverCommandToExecute">Command that needs executing</param>
-        /// <param name="parameters">Parameters needed for the command</param>
-        /// <returns>WebDriver Response</returns>
-        internal Response InternalExecute(string driverCommandToExecute, Dictionary<string, object> parameters)
-        {
-            return Task.Run(() => this.InternalExecuteAsync(driverCommandToExecute, parameters)).GetAwaiter().GetResult();
-        }
-
-        /// <summary>
-        /// Executes commands with the driver asynchronously
-        /// </summary>
-        /// <param name="driverCommandToExecute">Command that needs executing</param>
-        /// <param name="parameters">Parameters needed for the command</param>
-        /// <returns>A task object representing the asynchronous operation</returns>
-        internal Task<Response> InternalExecuteAsync(string driverCommandToExecute,
-            Dictionary<string, object> parameters)
-        {
-            return this.ExecuteAsync(driverCommandToExecute, parameters);
-        }
-
         /// <summary>
         /// Executes a command with this driver.
         /// </summary>
         /// <param name="driverCommandToExecute">A <see cref="DriverCommand"/> value representing the command to execute.</param>
         /// <param name="parameters">A <see cref="Dictionary{K, V}"/> containing the names and values of the parameters of the command.</param>
         /// <returns>A <see cref="Response"/> containing information about the success or failure of the command and any data returned by the command.</returns>
-        protected virtual Response Execute(string driverCommandToExecute,
+        protected internal virtual Response Execute(string driverCommandToExecute,
             Dictionary<string, object> parameters)
         {
             return Task.Run(() => this.ExecuteAsync(driverCommandToExecute, parameters)).GetAwaiter().GetResult();
@@ -617,7 +594,7 @@ protected virtual Response Execute(string driverCommandToExecute,
         /// <param name="driverCommandToExecute">A <see cref="DriverCommand"/> value representing the command to execute.</param>
         /// <param name="parameters">A <see cref="Dictionary{K, V}"/> containing the names and values of the parameters of the command.</param>
         /// <returns>A <see cref="Response"/> containing information about the success or failure of the command and any data returned by the command.</returns>
-        protected virtual async Task<Response> ExecuteAsync(string driverCommandToExecute, Dictionary<string, object> parameters)
+        protected internal virtual async Task<Response> ExecuteAsync(string driverCommandToExecute, Dictionary<string, object> parameters)
         {
             Command commandToExecute = new Command(SessionId, driverCommandToExecute, parameters);
 
diff --git a/dotnet/src/webdriver/WebElement.cs b/dotnet/src/webdriver/WebElement.cs
@@ -684,7 +684,7 @@ Dictionary<string, object> IWebDriverObjectReference.ToDictionary()
         /// <returns>The <see cref="Response"/> object containing the result of the command execution.</returns>
         protected virtual Response Execute(string commandToExecute, Dictionary<string, object> parameters)
         {
-            return this.driver.InternalExecute(commandToExecute, parameters);
+            return this.driver.Execute(commandToExecute, parameters);
         }
 
         private static string GetAtom(string atomResourceName)
diff --git a/dotnet/src/webdriver/Window.cs b/dotnet/src/webdriver/Window.cs
@@ -50,7 +50,7 @@ public Point Position
         {
             get
             {
-                Response commandResponse = this.driver.InternalExecute(DriverCommand.GetWindowRect, null);
+                Response commandResponse = this.driver.Execute(DriverCommand.GetWindowRect, null);
 
                 Dictionary<string, object?> rawPosition = (Dictionary<string, object?>)commandResponse.Value!;
                 int x = Convert.ToInt32(rawPosition["x"], CultureInfo.InvariantCulture);
@@ -64,7 +64,7 @@ public Point Position
                 Dictionary<string, object> parameters = new Dictionary<string, object>();
                 parameters.Add("x", value.X);
                 parameters.Add("y", value.Y);
-                this.driver.InternalExecute(DriverCommand.SetWindowRect, parameters);
+                this.driver.Execute(DriverCommand.SetWindowRect, parameters);
             }
         }
 
@@ -76,7 +76,7 @@ public Size Size
         {
             get
             {
-                Response commandResponse = this.driver.InternalExecute(DriverCommand.GetWindowRect, null);
+                Response commandResponse = this.driver.Execute(DriverCommand.GetWindowRect, null);
 
                 Dictionary<string, object?> rawPosition = (Dictionary<string, object?>)commandResponse.Value!;
                 int height = Convert.ToInt32(rawPosition["height"], CultureInfo.InvariantCulture);
@@ -90,7 +90,7 @@ public Size Size
                 Dictionary<string, object> parameters = new Dictionary<string, object>();
                 parameters.Add("width", value.Width);
                 parameters.Add("height", value.Height);
-                this.driver.InternalExecute(DriverCommand.SetWindowRect, parameters);
+                this.driver.Execute(DriverCommand.SetWindowRect, parameters);
             }
         }
 
@@ -99,23 +99,23 @@ public Size Size
         /// </summary>
         public void Maximize()
         {
-            this.driver.InternalExecute(DriverCommand.MaximizeWindow, null);
+            this.driver.Execute(DriverCommand.MaximizeWindow, null);
         }
 
         /// <summary>
         /// Minimizes the current window if it is not already minimized.
         /// </summary>
         public void Minimize()
         {
-            this.driver.InternalExecute(DriverCommand.MinimizeWindow, null);
+            this.driver.Execute(DriverCommand.MinimizeWindow, null);
         }
 
         /// <summary>
         /// Sets the current window to full screen if it is not already in that state.
         /// </summary>
         public void FullScreen()
         {
-            this.driver.InternalExecute(DriverCommand.FullScreenWindow, null);
+            this.driver.Execute(DriverCommand.FullScreenWindow, null);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public string? Text`
`47`	`47`	`{`
`48`	`48`	`get`
`49`	`49`	`{`
`50`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAlertText, null);`
	`50`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetAlertText, null);`
`51`	`51`	`return (string?)commandResponse.Value;`
`52`	`52`	`}`
`53`	`53`	`}`
`@@ -57,15 +57,15 @@ public string? Text`
`57`	`57`	`/// </summary>`
`58`	`58`	`public void Dismiss()`
`59`	`59`	`{`
`60`		`- this.driver.InternalExecute(DriverCommand.DismissAlert, null);`
	`60`	`+ this.driver.Execute(DriverCommand.DismissAlert, null);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/// <summary>`
`64`	`64`	`/// Accepts the alert.`
`65`	`65`	`/// </summary>`
`66`	`66`	`public void Accept()`
`67`	`67`	`{`
`68`		`- this.driver.InternalExecute(DriverCommand.AcceptAlert, null);`
	`68`	`+ this.driver.Execute(DriverCommand.AcceptAlert, null);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/// <summary>`
`@@ -83,7 +83,7 @@ public void SendKeys(string keysToSend)`
`83`	`83`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`84`	`84`	`parameters.Add("text", keysToSend);`
`85`	`85`
`86`		`- this.driver.InternalExecute(DriverCommand.SetAlertValue, parameters);`
	`86`	`+ this.driver.Execute(DriverCommand.SetAlertValue, parameters);`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public ReadOnlyCollection<Cookie> AllCookies`
`34`	`34`	`{`
`35`	`35`	`get`
`36`	`36`	`{`
`37`		`- Response response = driver.InternalExecute(DriverCommand.GetAllCookies, new Dictionary<string, object>());`
	`37`	`+ Response response = driver.Execute(DriverCommand.GetAllCookies, new Dictionary<string, object>());`
`38`	`38`
`39`	`39`	`List<Cookie> toReturn = new List<Cookie>();`
`40`	`40`	`if (response.Value is object?[] cookies)`
`@@ -67,7 +67,7 @@ public void AddCookie(Cookie cookie)`
`67`	`67`
`68`	`68`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`69`	`69`	`parameters.Add("cookie", cookie);`
`70`		`- driver.InternalExecute(DriverCommand.AddCookie, parameters);`
	`70`	`+ driver.Execute(DriverCommand.AddCookie, parameters);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/// <summary>`
`@@ -84,7 +84,7 @@ public void DeleteCookieNamed(string name)`
`84`	`84`
`85`	`85`	`Dictionary<string, object> parameters = new() { { "name", name } };`
`86`	`86`
`87`		`- driver.InternalExecute(DriverCommand.DeleteCookie, parameters);`
	`87`	`+ driver.Execute(DriverCommand.DeleteCookie, parameters);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/// <summary>`
`@@ -107,7 +107,7 @@ public void DeleteCookie(Cookie cookie)`
`107`	`107`	`/// </summary>`
`108`	`108`	`public void DeleteAllCookies()`
`109`	`109`	`{`
`110`		`- driver.InternalExecute(DriverCommand.DeleteAllCookies, null);`
	`110`	`+ driver.Execute(DriverCommand.DeleteAllCookies, null);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`/// <summary>`
`@@ -125,7 +125,7 @@ public void DeleteAllCookies()`
`125`	`125`
`126`	`126`	`try`
`127`	`127`	`{`
`128`		`- var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;`
	`128`	`+ var rawCookie = driver.Execute(DriverCommand.GetCookie, new() { { "name", name } }).Value;`
`129`	`129`
`130`	`130`	`return Cookie.FromDictionary((Dictionary<string, object>)rawCookie!);`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,11 @@ public class HttpCommandInfo : CommandInfo`
`51`	`51`	`/// </summary>`
`52`	`52`	`/// <param name="method">Method of the Command</param>`
`53`	`53`	`/// <param name="resourcePath">Relative URL path to the resource used to execute the command</param>`
	`54`	`+ /// <exception cref="ArgumentNullException">If <paramref name="method"/> or <paramref name="resourcePath"/> are <see langword="null"/>.</exception>`
`54`	`55`	`public HttpCommandInfo(string method, string resourcePath)`
`55`	`56`	`{`
`56`		`- this.ResourcePath = resourcePath;`
`57`		`- this.Method = method;`
	`57`	`+ this.ResourcePath = resourcePath ?? throw new ArgumentNullException(nameof(resourcePath));`
	`58`	`+ this.Method = method ?? throw new ArgumentNullException(nameof(method));`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public ReadOnlyCollection<string> AvailableLogTypes`
`52`	`52`	`List<string> availableLogTypes = new List<string>();`
`53`	`53`	`try`
`54`	`54`	`{`
`55`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);`
	`55`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetAvailableLogTypes, null);`
`56`	`56`	`if (commandResponse.Value is object[] responseValue)`
`57`	`57`	`{`
`58`	`58`	`foreach (object logKind in responseValue)`
`@@ -88,7 +88,7 @@ public ReadOnlyCollection<LogEntry> GetLog(string logKind)`
`88`	`88`
`89`	`89`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`90`	`90`	`parameters.Add("type", logKind);`
`91`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetLog, parameters);`
	`91`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetLog, parameters);`
`92`	`92`
`93`	`93`	`if (commandResponse.Value is object?[] responseValue)`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void Back()`
`59`	`59`	`/// <returns>A task object representing the asynchronous operation.</returns>`
`60`	`60`	`public async Task BackAsync()`
`61`	`61`	`{`
`62`		`- await this.driver.InternalExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);`
	`62`	`+ await this.driver.ExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/// <summary>`
`@@ -79,7 +79,7 @@ public void Forward()`
`79`	`79`	`/// <returns>A task object representing the asynchronous operation.</returns>`
`80`	`80`	`public async Task ForwardAsync()`
`81`	`81`	`{`
`82`		`- await this.driver.InternalExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);`
	`82`	`+ await this.driver.ExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/// <summary>`
`@@ -112,7 +112,7 @@ public async Task GoToUrlAsync(string url)`
`112`	`112`	`{`
`113`	`113`	`{ "url", url }`
`114`	`114`	`};`
`115`		`- await this.driver.InternalExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);`
	`115`	`+ await this.driver.ExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/// <summary>`
`@@ -162,7 +162,7 @@ public void Refresh()`
`162`	`162`	`public async Task RefreshAsync()`
`163`	`163`	`{`
`164`	`164`	`// driver.SwitchTo().DefaultContent();`
`165`		`- await this.driver.InternalExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);`
	`165`	`+ await this.driver.ExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public IWebElement FindElement(By by)`
`98`	`98`	`parameters.Add("using", by.Mechanism);`
`99`	`99`	`parameters.Add("value", by.Criteria);`
`100`	`100`
`101`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElement, parameters);`
	`101`	`+ Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElement, parameters);`
`102`	`102`	`return this.driver.GetElementFromResponse(commandResponse);`
`103`	`103`	`}`
`104`	`104`
`@@ -122,7 +122,7 @@ public ReadOnlyCollection<IWebElement> FindElements(By by)`
`122`	`122`	`parameters.Add("using", by.Mechanism);`
`123`	`123`	`parameters.Add("value", by.Criteria);`
`124`	`124`
`125`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElements, parameters);`
	`125`	`+ Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElements, parameters);`
`126`	`126`	`return this.driver.GetElementsFromResponse(commandResponse);`
`127`	`127`	`}`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public IWebDriver Frame(int frameIndex)`
`53`	`53`	`{`
`54`	`54`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`55`	`55`	`parameters.Add("id", frameIndex);`
`56`		`- this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);`
	`56`	`+ this.driver.Execute(DriverCommand.SwitchToFrame, parameters);`
`57`	`57`	`return this.driver;`
`58`	`58`	`}`
`59`	`59`
`@@ -116,7 +116,7 @@ public IWebDriver Frame(IWebElement frameElement)`
`116`	`116`
`117`	`117`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`118`	`118`	`parameters.Add("id", elementDictionary);`
`119`		`- this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);`
	`119`	`+ this.driver.Execute(DriverCommand.SwitchToFrame, parameters);`
`120`	`120`	`return this.driver;`
`121`	`121`	`}`
`122`	`122`
`@@ -127,7 +127,7 @@ public IWebDriver Frame(IWebElement frameElement)`
`127`	`127`	`public IWebDriver ParentFrame()`
`128`	`128`	`{`
`129`	`129`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`130`		`- this.driver.InternalExecute(DriverCommand.SwitchToParentFrame, parameters);`
	`130`	`+ this.driver.Execute(DriverCommand.SwitchToParentFrame, parameters);`
`131`	`131`	`return this.driver;`
`132`	`132`	`}`
`133`	`133`
`@@ -148,7 +148,7 @@ public IWebDriver Window(string windowHandleOrName)`
`148`	`148`	`parameters.Add("handle", windowHandleOrName);`
`149`	`149`	`try`
`150`	`150`	`{`
`151`		`- this.driver.InternalExecute(DriverCommand.SwitchToWindow, parameters);`
	`151`	`+ this.driver.Execute(DriverCommand.SwitchToWindow, parameters);`
`152`	`152`	`return this.driver;`
`153`	`153`	`}`
`154`	`154`	`catch (NoSuchWindowException)`
`@@ -195,7 +195,7 @@ public IWebDriver NewWindow(WindowType typeHint)`
`195`	`195`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`196`	`196`	`parameters.Add("type", typeHint.ToString().ToLowerInvariant());`
`197`	`197`
`198`		`- Response response = this.driver.InternalExecute(DriverCommand.NewWindow, parameters);`
	`198`	`+ Response response = this.driver.Execute(DriverCommand.NewWindow, parameters);`
`199`	`199`
`200`	`200`	`Dictionary<string, object> result = (Dictionary<string, object>)response.Value!;`
`201`	`201`	`string newWindowHandle = result["handle"].ToString()!;`
`@@ -212,7 +212,7 @@ public IWebDriver DefaultContent()`
`212`	`212`	`{`
`213`	`213`	`Dictionary<string, object?> parameters = new Dictionary<string, object?>();`
`214`	`214`	`parameters.Add("id", null);`
`215`		`- this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);`
	`215`	`+ this.driver.Execute(DriverCommand.SwitchToFrame, parameters);`
`216`	`216`	`return this.driver;`
`217`	`217`	`}`
`218`	`218`
`@@ -222,7 +222,7 @@ public IWebDriver DefaultContent()`
`222`	`222`	`/// <returns>Element that is active</returns>`
`223`	`223`	`public IWebElement ActiveElement()`
`224`	`224`	`{`
`225`		`- Response response = this.driver.InternalExecute(DriverCommand.GetActiveElement, null);`
	`225`	`+ Response response = this.driver.Execute(DriverCommand.GetActiveElement, null);`
`226`	`226`	`return this.driver.GetElementFromResponse(response);`
`227`	`227`	`}`
`228`	`228`
`@@ -234,7 +234,7 @@ public IAlert Alert()`
`234`	`234`	`{`
`235`	`235`	`// N.B. We only execute the GetAlertText command to be able to throw`
`236`	`236`	`// a NoAlertPresentException if there is no alert found.`
`237`		`- this.driver.InternalExecute(DriverCommand.GetAlertText, null);`
	`237`	`+ this.driver.Execute(DriverCommand.GetAlertText, null);`
`238`	`238`	`return new Alert(this.driver);`
`239`	`239`	`}`
`240`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public TimeSpan PageLoad`
`111`	`111`
`112`	`112`	`private TimeSpan ExecuteGetTimeout(string timeoutType)`
`113`	`113`	`{`
`114`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetTimeouts, null);`
	`114`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetTimeouts, null);`
`115`	`115`
`116`	`116`	`Dictionary<string, object?> responseValue = (Dictionary<string, object?>)commandResponse.Value!;`
`117`	`117`	`if (!responseValue.TryGetValue(timeoutType, out object? timeout))`
`@@ -144,7 +144,7 @@ private void ExecuteSetTimeout(string timeoutType, TimeSpan timeToWait)`
`144`	`144`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`145`	`145`	`parameters.Add(timeoutType, Convert.ToInt64(milliseconds));`
`146`	`146`
`147`		`- this.driver.InternalExecute(DriverCommand.SetTimeouts, parameters);`
	`147`	`+ this.driver.Execute(DriverCommand.SetTimeouts, parameters);`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ Dictionary<string, object> IWebDriverObjectReference.ToDictionary()`
`684`	`684`	`/// <returns>The <see cref="Response"/> object containing the result of the command execution.</returns>`
`685`	`685`	`protected virtual Response Execute(string commandToExecute, Dictionary<string, object> parameters)`
`686`	`686`	`{`
`687`		`- return this.driver.InternalExecute(commandToExecute, parameters);`
	`687`	`+ return this.driver.Execute(commandToExecute, parameters);`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`private static string GetAtom(string atomResourceName)`