[dotnet] Unify protected and internal Execute methods (#15233)

RenderMichael · web-flow · commit ee17b37ebcac · 2025-03-31T11:20:44.000-04:00
* [dotnet] Unify protected and internal Execute methods

* Fix merge issue
diff --git a/dotnet/src/webdriver/Alert.cs b/dotnet/src/webdriver/Alert.cs
@@ -45,7 +45,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;
             }
         }
@@ -55,15 +55,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>
@@ -81,7 +81,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
@@ -32,7 +32,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)
@@ -65,7 +65,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>
@@ -82,7 +82,7 @@ public void DeleteCookieNamed(string name)
 
             Dictionary<string, object> parameters = new() { { "name", name } };
 
-            driver.InternalExecute(DriverCommand.DeleteCookie, parameters);
+            driver.Execute(DriverCommand.DeleteCookie, parameters);
         }
 
         /// <summary>
@@ -105,7 +105,7 @@ public void DeleteCookie(Cookie cookie)
         /// </summary>
         public void DeleteAllCookies()
         {
-            driver.InternalExecute(DriverCommand.DeleteAllCookies, null);
+            driver.Execute(DriverCommand.DeleteAllCookies, null);
         }
 
         /// <summary>
@@ -123,7 +123,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
@@ -49,10 +49,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
@@ -50,7 +50,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)
@@ -86,7 +86,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
@@ -57,7 +57,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>
@@ -77,7 +77,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>
@@ -110,7 +110,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>
@@ -160,7 +160,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
@@ -96,7 +96,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)!;
         }
 
@@ -120,7 +120,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
@@ -51,7 +51,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;
         }
 
@@ -114,7 +114,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;
         }
 
@@ -125,7 +125,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;
         }
 
@@ -146,7 +146,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)
@@ -193,7 +193,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()!;
@@ -210,7 +210,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;
         }
 
@@ -220,7 +220,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)!;
         }
 
@@ -232,7 +232,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
@@ -109,7 +109,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))
@@ -142,7 +142,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
@@ -551,46 +551,14 @@ 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>
-        /// <exception cref="ArgumentNullException">If <paramref name="driverCommandToExecute"/> is <see langword="null"/>.</exception>
-        internal Response InternalExecute(string driverCommandToExecute, Dictionary<string,
-#nullable disable
-            object
-#nullable enable
-            >? 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>
-        /// <exception cref="ArgumentNullException">If <paramref name="driverCommandToExecute"/> is <see langword="null"/>.</exception>
-        internal Task<Response> InternalExecuteAsync(string driverCommandToExecute, Dictionary<string,
-#nullable disable
-                object
-#nullable enable
-                >? 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>
         /// <exception cref="ArgumentNullException">If <paramref name="driverCommandToExecute"/> is <see langword="null"/>.</exception>
-        protected virtual Response Execute(string driverCommandToExecute, Dictionary<string,
+        protected internal virtual Response Execute(string driverCommandToExecute, Dictionary<string,
 #nullable disable
             object
 #nullable enable
@@ -606,7 +574,7 @@ protected virtual Response Execute(string driverCommandToExecute, Dictionary<str
         /// <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>
         /// <exception cref="ArgumentNullException">If <paramref name="driverCommandToExecute"/> is <see langword="null"/>.</exception>
-        protected virtual async Task<Response> ExecuteAsync(string driverCommandToExecute, Dictionary<string,
+        protected internal virtual async Task<Response> ExecuteAsync(string driverCommandToExecute, Dictionary<string,
 #nullable disable
             object
 #nullable enable
diff --git a/dotnet/src/webdriver/WebElement.cs b/dotnet/src/webdriver/WebElement.cs
@@ -703,7 +703,7 @@ protected virtual Response Execute(string commandToExecute, Dictionary<string,
 #nullable enable
                 >? 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
@@ -48,7 +48,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);
@@ -62,7 +62,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);
             }
         }
 
@@ -74,7 +74,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);
@@ -88,7 +88,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);
             }
         }
 
@@ -97,23 +97,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
`@@ -45,7 +45,7 @@ public string? Text`
`45`	`45`	`{`
`46`	`46`	`get`
`47`	`47`	`{`
`48`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAlertText, null);`
	`48`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetAlertText, null);`
`49`	`49`	`return (string?)commandResponse.Value;`
`50`	`50`	`}`
`51`	`51`	`}`
`@@ -55,15 +55,15 @@ public string? Text`
`55`	`55`	`/// </summary>`
`56`	`56`	`public void Dismiss()`
`57`	`57`	`{`
`58`		`- this.driver.InternalExecute(DriverCommand.DismissAlert, null);`
	`58`	`+ this.driver.Execute(DriverCommand.DismissAlert, null);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/// <summary>`
`62`	`62`	`/// Accepts the alert.`
`63`	`63`	`/// </summary>`
`64`	`64`	`public void Accept()`
`65`	`65`	`{`
`66`		`- this.driver.InternalExecute(DriverCommand.AcceptAlert, null);`
	`66`	`+ this.driver.Execute(DriverCommand.AcceptAlert, null);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/// <summary>`
`@@ -81,7 +81,7 @@ public void SendKeys(string keysToSend)`
`81`	`81`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`82`	`82`	`parameters.Add("text", keysToSend);`
`83`	`83`
`84`		`- this.driver.InternalExecute(DriverCommand.SetAlertValue, parameters);`
	`84`	`+ this.driver.Execute(DriverCommand.SetAlertValue, parameters);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ReadOnlyCollection<Cookie> AllCookies`
`32`	`32`	`{`
`33`	`33`	`get`
`34`	`34`	`{`
`35`		`- Response response = driver.InternalExecute(DriverCommand.GetAllCookies, new Dictionary<string, object>());`
	`35`	`+ Response response = driver.Execute(DriverCommand.GetAllCookies, new Dictionary<string, object>());`
`36`	`36`
`37`	`37`	`List<Cookie> toReturn = new List<Cookie>();`
`38`	`38`	`if (response.Value is object?[] cookies)`
`@@ -65,7 +65,7 @@ public void AddCookie(Cookie cookie)`
`65`	`65`
`66`	`66`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`67`	`67`	`parameters.Add("cookie", cookie);`
`68`		`- driver.InternalExecute(DriverCommand.AddCookie, parameters);`
	`68`	`+ driver.Execute(DriverCommand.AddCookie, parameters);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/// <summary>`
`@@ -82,7 +82,7 @@ public void DeleteCookieNamed(string name)`
`82`	`82`
`83`	`83`	`Dictionary<string, object> parameters = new() { { "name", name } };`
`84`	`84`
`85`		`- driver.InternalExecute(DriverCommand.DeleteCookie, parameters);`
	`85`	`+ driver.Execute(DriverCommand.DeleteCookie, parameters);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/// <summary>`
`@@ -105,7 +105,7 @@ public void DeleteCookie(Cookie cookie)`
`105`	`105`	`/// </summary>`
`106`	`106`	`public void DeleteAllCookies()`
`107`	`107`	`{`
`108`		`- driver.InternalExecute(DriverCommand.DeleteAllCookies, null);`
	`108`	`+ driver.Execute(DriverCommand.DeleteAllCookies, null);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`/// <summary>`
`@@ -123,7 +123,7 @@ public void DeleteAllCookies()`
`123`	`123`
`124`	`124`	`try`
`125`	`125`	`{`
`126`		`- var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;`
	`126`	`+ var rawCookie = driver.Execute(DriverCommand.GetCookie, new() { { "name", name } }).Value;`
`127`	`127`
`128`	`128`	`return Cookie.FromDictionary((Dictionary<string, object?>)rawCookie!);`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,11 @@ public class HttpCommandInfo : CommandInfo`
`49`	`49`	`/// </summary>`
`50`	`50`	`/// <param name="method">Method of the Command</param>`
`51`	`51`	`/// <param name="resourcePath">Relative URL path to the resource used to execute the command</param>`
	`52`	`+ /// <exception cref="ArgumentNullException">If <paramref name="method"/> or <paramref name="resourcePath"/> are <see langword="null"/>.</exception>`
`52`	`53`	`public HttpCommandInfo(string method, string resourcePath)`
`53`	`54`	`{`
`54`		`- this.ResourcePath = resourcePath;`
`55`		`- this.Method = method;`
	`55`	`+ this.ResourcePath = resourcePath ?? throw new ArgumentNullException(nameof(resourcePath));`
	`56`	`+ this.Method = method ?? throw new ArgumentNullException(nameof(method));`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public ReadOnlyCollection<string> AvailableLogTypes`
`50`	`50`	`List<string> availableLogTypes = new List<string>();`
`51`	`51`	`try`
`52`	`52`	`{`
`53`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);`
	`53`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetAvailableLogTypes, null);`
`54`	`54`	`if (commandResponse.Value is object[] responseValue)`
`55`	`55`	`{`
`56`	`56`	`foreach (object logKind in responseValue)`
`@@ -86,7 +86,7 @@ public ReadOnlyCollection<LogEntry> GetLog(string logKind)`
`86`	`86`
`87`	`87`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`88`	`88`	`parameters.Add("type", logKind);`
`89`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetLog, parameters);`
	`89`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetLog, parameters);`
`90`	`90`
`91`	`91`	`if (commandResponse.Value is object?[] responseValue)`
`92`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void Back()`
`57`	`57`	`/// <returns>A task object representing the asynchronous operation.</returns>`
`58`	`58`	`public async Task BackAsync()`
`59`	`59`	`{`
`60`		`- await this.driver.InternalExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);`
	`60`	`+ await this.driver.ExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/// <summary>`
`@@ -77,7 +77,7 @@ public void Forward()`
`77`	`77`	`/// <returns>A task object representing the asynchronous operation.</returns>`
`78`	`78`	`public async Task ForwardAsync()`
`79`	`79`	`{`
`80`		`- await this.driver.InternalExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);`
	`80`	`+ await this.driver.ExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/// <summary>`
`@@ -110,7 +110,7 @@ public async Task GoToUrlAsync(string url)`
`110`	`110`	`{`
`111`	`111`	`{ "url", url }`
`112`	`112`	`};`
`113`		`- await this.driver.InternalExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);`
	`113`	`+ await this.driver.ExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/// <summary>`
`@@ -160,7 +160,7 @@ public void Refresh()`
`160`	`160`	`public async Task RefreshAsync()`
`161`	`161`	`{`
`162`	`162`	`// driver.SwitchTo().DefaultContent();`
`163`		`- await this.driver.InternalExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);`
	`163`	`+ await this.driver.ExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public IWebElement FindElement(By by)`
`96`	`96`	`parameters.Add("using", by.Mechanism);`
`97`	`97`	`parameters.Add("value", by.Criteria);`
`98`	`98`
`99`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElement, parameters);`
	`99`	`+ Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElement, parameters);`
`100`	`100`	`return this.driver.GetElementFromResponse(commandResponse)!;`
`101`	`101`	`}`
`102`	`102`
`@@ -120,7 +120,7 @@ public ReadOnlyCollection<IWebElement> FindElements(By by)`
`120`	`120`	`parameters.Add("using", by.Mechanism);`
`121`	`121`	`parameters.Add("value", by.Criteria);`
`122`	`122`
`123`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElements, parameters);`
	`123`	`+ Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElements, parameters);`
`124`	`124`	`return this.driver.GetElementsFromResponse(commandResponse);`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public IWebDriver Frame(int frameIndex)`
`51`	`51`	`{`
`52`	`52`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`53`	`53`	`parameters.Add("id", frameIndex);`
`54`		`- this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);`
	`54`	`+ this.driver.Execute(DriverCommand.SwitchToFrame, parameters);`
`55`	`55`	`return this.driver;`
`56`	`56`	`}`
`57`	`57`
`@@ -114,7 +114,7 @@ public IWebDriver Frame(IWebElement frameElement)`
`114`	`114`
`115`	`115`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`116`	`116`	`parameters.Add("id", elementDictionary);`
`117`		`- this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);`
	`117`	`+ this.driver.Execute(DriverCommand.SwitchToFrame, parameters);`
`118`	`118`	`return this.driver;`
`119`	`119`	`}`
`120`	`120`
`@@ -125,7 +125,7 @@ public IWebDriver Frame(IWebElement frameElement)`
`125`	`125`	`public IWebDriver ParentFrame()`
`126`	`126`	`{`
`127`	`127`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`128`		`- this.driver.InternalExecute(DriverCommand.SwitchToParentFrame, parameters);`
	`128`	`+ this.driver.Execute(DriverCommand.SwitchToParentFrame, parameters);`
`129`	`129`	`return this.driver;`
`130`	`130`	`}`
`131`	`131`
`@@ -146,7 +146,7 @@ public IWebDriver Window(string windowHandleOrName)`
`146`	`146`	`parameters.Add("handle", windowHandleOrName);`
`147`	`147`	`try`
`148`	`148`	`{`
`149`		`- this.driver.InternalExecute(DriverCommand.SwitchToWindow, parameters);`
	`149`	`+ this.driver.Execute(DriverCommand.SwitchToWindow, parameters);`
`150`	`150`	`return this.driver;`
`151`	`151`	`}`
`152`	`152`	`catch (NoSuchWindowException)`
`@@ -193,7 +193,7 @@ public IWebDriver NewWindow(WindowType typeHint)`
`193`	`193`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`194`	`194`	`parameters.Add("type", typeHint.ToString().ToLowerInvariant());`
`195`	`195`
`196`		`- Response response = this.driver.InternalExecute(DriverCommand.NewWindow, parameters);`
	`196`	`+ Response response = this.driver.Execute(DriverCommand.NewWindow, parameters);`
`197`	`197`
`198`	`198`	`Dictionary<string, object> result = (Dictionary<string, object>)response.Value!;`
`199`	`199`	`string newWindowHandle = result["handle"].ToString()!;`
`@@ -210,7 +210,7 @@ public IWebDriver DefaultContent()`
`210`	`210`	`{`
`211`	`211`	`Dictionary<string, object?> parameters = new Dictionary<string, object?>();`
`212`	`212`	`parameters.Add("id", null);`
`213`		`- this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);`
	`213`	`+ this.driver.Execute(DriverCommand.SwitchToFrame, parameters);`
`214`	`214`	`return this.driver;`
`215`	`215`	`}`
`216`	`216`
`@@ -220,7 +220,7 @@ public IWebDriver DefaultContent()`
`220`	`220`	`/// <returns>Element that is active</returns>`
`221`	`221`	`public IWebElement ActiveElement()`
`222`	`222`	`{`
`223`		`- Response response = this.driver.InternalExecute(DriverCommand.GetActiveElement, null);`
	`223`	`+ Response response = this.driver.Execute(DriverCommand.GetActiveElement, null);`
`224`	`224`	`return this.driver.GetElementFromResponse(response)!;`
`225`	`225`	`}`
`226`	`226`
`@@ -232,7 +232,7 @@ public IAlert Alert()`
`232`	`232`	`{`
`233`	`233`	`// N.B. We only execute the GetAlertText command to be able to throw`
`234`	`234`	`// a NoAlertPresentException if there is no alert found.`
`235`		`- this.driver.InternalExecute(DriverCommand.GetAlertText, null);`
	`235`	`+ this.driver.Execute(DriverCommand.GetAlertText, null);`
`236`	`236`	`return new Alert(this.driver);`
`237`	`237`	`}`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public TimeSpan PageLoad`
`109`	`109`
`110`	`110`	`private TimeSpan ExecuteGetTimeout(string timeoutType)`
`111`	`111`	`{`
`112`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetTimeouts, null);`
	`112`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetTimeouts, null);`
`113`	`113`
`114`	`114`	`Dictionary<string, object?> responseValue = (Dictionary<string, object?>)commandResponse.Value!;`
`115`	`115`	`if (!responseValue.TryGetValue(timeoutType, out object? timeout))`
`@@ -142,7 +142,7 @@ private void ExecuteSetTimeout(string timeoutType, TimeSpan timeToWait)`
`142`	`142`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`143`	`143`	`parameters.Add(timeoutType, Convert.ToInt64(milliseconds));`
`144`	`144`
`145`		`- this.driver.InternalExecute(DriverCommand.SetTimeouts, parameters);`
	`145`	`+ this.driver.Execute(DriverCommand.SetTimeouts, parameters);`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ protected virtual Response Execute(string commandToExecute, Dictionary<string,`
`703`	`703`	`#nullable enable`
`704`	`704`	`>? parameters)`
`705`	`705`	`{`
`706`		`- return this.driver.InternalExecute(commandToExecute, parameters);`
	`706`	`+ return this.driver.Execute(commandToExecute, parameters);`
`707`	`707`	`}`
`708`	`708`
`709`	`709`	`private static string GetAtom(string atomResourceName)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public Point Position`
`48`	`48`	`{`
`49`	`49`	`get`
`50`	`50`	`{`
`51`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetWindowRect, null);`
	`51`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetWindowRect, null);`
`52`	`52`
`53`	`53`	`Dictionary<string, object?> rawPosition = (Dictionary<string, object?>)commandResponse.Value!;`
`54`	`54`	`int x = Convert.ToInt32(rawPosition["x"], CultureInfo.InvariantCulture);`
`@@ -62,7 +62,7 @@ public Point Position`
`62`	`62`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`63`	`63`	`parameters.Add("x", value.X);`
`64`	`64`	`parameters.Add("y", value.Y);`
`65`		`- this.driver.InternalExecute(DriverCommand.SetWindowRect, parameters);`
	`65`	`+ this.driver.Execute(DriverCommand.SetWindowRect, parameters);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`@@ -74,7 +74,7 @@ public Size Size`
`74`	`74`	`{`
`75`	`75`	`get`
`76`	`76`	`{`
`77`		`- Response commandResponse = this.driver.InternalExecute(DriverCommand.GetWindowRect, null);`
	`77`	`+ Response commandResponse = this.driver.Execute(DriverCommand.GetWindowRect, null);`
`78`	`78`
`79`	`79`	`Dictionary<string, object?> rawPosition = (Dictionary<string, object?>)commandResponse.Value!;`
`80`	`80`	`int height = Convert.ToInt32(rawPosition["height"], CultureInfo.InvariantCulture);`
`@@ -88,7 +88,7 @@ public Size Size`
`88`	`88`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`89`	`89`	`parameters.Add("width", value.Width);`
`90`	`90`	`parameters.Add("height", value.Height);`
`91`		`- this.driver.InternalExecute(DriverCommand.SetWindowRect, parameters);`
	`91`	`+ this.driver.Execute(DriverCommand.SetWindowRect, parameters);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`@@ -97,23 +97,23 @@ public Size Size`
`97`	`97`	`/// </summary>`
`98`	`98`	`public void Maximize()`
`99`	`99`	`{`
`100`		`- this.driver.InternalExecute(DriverCommand.MaximizeWindow, null);`
	`100`	`+ this.driver.Execute(DriverCommand.MaximizeWindow, null);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/// <summary>`
`104`	`104`	`/// Minimizes the current window if it is not already minimized.`
`105`	`105`	`/// </summary>`
`106`	`106`	`public void Minimize()`
`107`	`107`	`{`
`108`		`- this.driver.InternalExecute(DriverCommand.MinimizeWindow, null);`
	`108`	`+ this.driver.Execute(DriverCommand.MinimizeWindow, null);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`/// <summary>`
`112`	`112`	`/// Sets the current window to full screen if it is not already in that state.`
`113`	`113`	`/// </summary>`
`114`	`114`	`public void FullScreen()`
`115`	`115`	`{`
`116`		`- this.driver.InternalExecute(DriverCommand.FullScreenWindow, null);`
	`116`	`+ this.driver.Execute(DriverCommand.FullScreenWindow, null);`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`