Merge branch 'cookie-jar' of https://github.com/RenderMichael/selenium into cookie-jar

RenderMichael · RenderMichael · commit 833eea002d01 · 2024-12-08T14:06:15.000-05:00
diff --git a/dotnet/src/webdriver/ILogs.cs b/dotnet/src/webdriver/ILogs.cs
@@ -17,8 +17,11 @@
 // under the License.
 // </copyright>
 
+using System;
 using System.Collections.ObjectModel;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -37,6 +40,7 @@ public interface ILogs
         /// <param name="logKind">The log for which to retrieve the log entries.
         /// Log types can be found in the <see cref="LogType"/> class.</param>
         /// <returns>The list of <see cref="LogEntry"/> objects for the specified log.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="logKind"/> is <see langword="null"/>.</exception>
         ReadOnlyCollection<LogEntry> GetLog(string logKind);
     }
 }
diff --git a/dotnet/src/webdriver/LogEntry.cs b/dotnet/src/webdriver/LogEntry.cs
@@ -21,16 +21,15 @@
 using System.Collections.Generic;
 using System.Globalization;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
     /// Represents an entry in a log from a driver instance.
     /// </summary>
     public class LogEntry
     {
-        private LogLevel level = LogLevel.All;
-        private DateTime timestamp = DateTime.MinValue;
-        private string message = string.Empty;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LogEntry"/> class.
@@ -42,34 +41,27 @@ private LogEntry()
         /// <summary>
         /// Gets the timestamp value of the log entry.
         /// </summary>
-        public DateTime Timestamp
-        {
-            get { return this.timestamp; }
-        }
+        public DateTime Timestamp { get; private set; } = DateTime.MinValue;
 
         /// <summary>
         /// Gets the logging level of the log entry.
         /// </summary>
-        public LogLevel Level
-        {
-            get { return this.level; }
-        }
+        public LogLevel Level { get; private set; } = LogLevel.All;
 
         /// <summary>
         /// Gets the message of the log entry.
         /// </summary>
-        public string Message
-        {
-            get { return this.message; }
-        }
+        public string Message { get; private set; } = string.Empty;
+
+        private static readonly DateTime UnixEpoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
         /// <summary>
         /// Returns a string that represents the current <see cref="LogEntry"/>.
         /// </summary>
         /// <returns>A string that represents the current <see cref="LogEntry"/>.</returns>
         public override string ToString()
         {
-            return string.Format(CultureInfo.InvariantCulture, "[{0:yyyy-MM-ddTHH:mm:ssZ}] [{1}] {2}", this.timestamp, this.level, this.message);
+            return string.Format(CultureInfo.InvariantCulture, "[{0:yyyy-MM-ddTHH:mm:ssZ}] [{1}] {2}", this.Timestamp, this.Level, this.Message);
         }
 
         /// <summary>
@@ -78,32 +70,31 @@ public override string ToString()
         /// <param name="entryDictionary">The <see cref="Dictionary{TKey, TValue}"/> from
         /// which to create the <see cref="LogEntry"/>.</param>
         /// <returns>A <see cref="LogEntry"/> with the values in the dictionary.</returns>
-        internal static LogEntry FromDictionary(Dictionary<string, object> entryDictionary)
+        internal static LogEntry FromDictionary(Dictionary<string, object?> entryDictionary)
         {
             LogEntry entry = new LogEntry();
-            if (entryDictionary.ContainsKey("message"))
+            if (entryDictionary.TryGetValue("message", out object? message))
             {
-                entry.message = entryDictionary["message"].ToString();
+                entry.Message = message?.ToString() ?? string.Empty;
             }
 
-            if (entryDictionary.ContainsKey("timestamp"))
+            if (entryDictionary.TryGetValue("timestamp", out object? timestamp))
             {
-                DateTime zeroDate = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-                double timestampValue = Convert.ToDouble(entryDictionary["timestamp"], CultureInfo.InvariantCulture);
-                entry.timestamp = zeroDate.AddMilliseconds(timestampValue);
+                double timestampValue = Convert.ToDouble(timestamp, CultureInfo.InvariantCulture);
+                entry.Timestamp = UnixEpoch.AddMilliseconds(timestampValue);
             }
 
-            if (entryDictionary.ContainsKey("level"))
+            if (entryDictionary.TryGetValue("level", out object? level))
             {
-                string levelValue = entryDictionary["level"].ToString();
-                try
+                if (Enum.TryParse(level?.ToString(), ignoreCase: true, out LogLevel result))
                 {
-                    entry.level = (LogLevel)Enum.Parse(typeof(LogLevel), levelValue, true);
+                    entry.Level = result;
                 }
-                catch (ArgumentException)
+                else
                 {
                     // If the requested log level string is not a valid log level,
                     // ignore it and use LogLevel.All.
+                    entry.Level = LogLevel.All;
                 }
             }
 
diff --git a/dotnet/src/webdriver/LogLevel.cs b/dotnet/src/webdriver/LogLevel.cs
@@ -17,6 +17,8 @@
 // under the License.
 // </copyright>
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
diff --git a/dotnet/src/webdriver/Logs.cs b/dotnet/src/webdriver/Logs.cs
@@ -21,22 +21,25 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
     /// Provides a mechanism for examining logs for the driver during the test.
     /// </summary>
     public class Logs : ILogs
     {
-        private WebDriver driver;
+        private readonly WebDriver driver;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Logs"/> class.
         /// </summary>
         /// <param name="driver">Instance of the driver currently in use</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="driver"/> is <see langword="null"/>.</exception>
         public Logs(WebDriver driver)
         {
-            this.driver = driver;
+            this.driver = driver ?? throw new ArgumentNullException(nameof(driver));
         }
 
         /// <summary>
@@ -50,12 +53,11 @@ public ReadOnlyCollection<string> AvailableLogTypes
                 try
                 {
                     Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);
-                    object[] responseValue = commandResponse.Value as object[];
-                    if (responseValue != null)
+                    if (commandResponse.Value is object[] responseValue)
                     {
                         foreach (object logKind in responseValue)
                         {
-                            availableLogTypes.Add(logKind.ToString());
+                            availableLogTypes.Add(logKind.ToString()!);
                         }
                     }
                 }
@@ -74,21 +76,25 @@ public ReadOnlyCollection<string> AvailableLogTypes
         /// <param name="logKind">The log for which to retrieve the log entries.
         /// Log types can be found in the <see cref="LogType"/> class.</param>
         /// <returns>The list of <see cref="LogEntry"/> objects for the specified log.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="logKind"/> is <see langword="null"/>.</exception>
         public ReadOnlyCollection<LogEntry> GetLog(string logKind)
         {
+            if (logKind is null)
+            {
+                throw new ArgumentNullException(nameof(logKind));
+            }
+
             List<LogEntry> entries = new List<LogEntry>();
 
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("type", logKind);
             Response commandResponse = this.driver.InternalExecute(DriverCommand.GetLog, parameters);
 
-            object[] responseValue = commandResponse.Value as object[];
-            if (responseValue != null)
+            if (commandResponse.Value is object?[] responseValue)
             {
-                foreach (object rawEntry in responseValue)
+                foreach (object? rawEntry in responseValue)
                 {
-                    Dictionary<string, object> entryDictionary = rawEntry as Dictionary<string, object>;
-                    if (entryDictionary != null)
+                    if (rawEntry is Dictionary<string, object?> entryDictionary)
                     {
                         entries.Add(LogEntry.FromDictionary(entryDictionary));
                     }
diff --git a/dotnet/src/webdriver/Response.cs b/dotnet/src/webdriver/Response.cs
@@ -31,16 +31,12 @@ namespace OpenQA.Selenium
     /// </summary>
     public class Response
     {
-        private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
+        private static readonly JsonSerializerOptions s_jsonSerializerOptions = new()
         {
             TypeInfoResolver = ResponseJsonSerializerContext.Default,
             Converters = { new ResponseValueJsonConverter() } // we still need it to make `Object` as `Dictionary`
         };
 
-        private object responseValue;
-        private string responseSessionId;
-        private WebDriverResult responseStatus;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Response"/> class
         /// </summary>
@@ -56,7 +52,7 @@ public Response(SessionId sessionId)
         {
             if (sessionId != null)
             {
-                this.responseSessionId = sessionId.ToString();
+                this.SessionId = sessionId.ToString();
             }
         }
 
@@ -66,49 +62,48 @@ private Response(Dictionary<string, object> rawResponse)
             {
                 if (rawResponse["sessionId"] != null)
                 {
-                    this.responseSessionId = rawResponse["sessionId"].ToString();
+                    this.SessionId = rawResponse["sessionId"].ToString();
                 }
             }
 
-            if (rawResponse.ContainsKey("value"))
+            if (rawResponse.TryGetValue("value", out object value))
             {
-                this.responseValue = rawResponse["value"];
+                this.Value = value;
             }
 
             // If the returned object does *not* have a "value" property
             // the response value should be the entirety of the response.
             // TODO: Remove this if statement altogether; there should
             // never be a spec-compliant response that does not contain a
             // value property.
-            if (!rawResponse.ContainsKey("value") && this.responseValue == null)
+            if (!rawResponse.ContainsKey("value") && this.Value == null)
             {
                 // Special-case for the new session command, where the "capabilities"
                 // property of the response is the actual value we're interested in.
                 if (rawResponse.ContainsKey("capabilities"))
                 {
-                    this.responseValue = rawResponse["capabilities"];
+                    this.Value = rawResponse["capabilities"];
                 }
                 else
                 {
-                    this.responseValue = rawResponse;
+                    this.Value = rawResponse;
                 }
             }
 
-            Dictionary<string, object> valueDictionary = this.responseValue as Dictionary<string, object>;
-            if (valueDictionary != null)
+            if (this.Value is Dictionary<string, object> valueDictionary)
             {
                 // Special case code for the new session command. If the response contains
                 // sessionId and capabilities properties, fix up the session ID and value members.
                 if (valueDictionary.ContainsKey("sessionId"))
                 {
-                    this.responseSessionId = valueDictionary["sessionId"].ToString();
-                    if (valueDictionary.ContainsKey("capabilities"))
+                    this.SessionId = valueDictionary["sessionId"].ToString();
+                    if (valueDictionary.TryGetValue("capabilities", out object capabilities))
                     {
-                        this.responseValue = valueDictionary["capabilities"];
+                        this.Value = capabilities;
                     }
                     else
                     {
-                        this.responseValue = valueDictionary["value"];
+                        this.Value = valueDictionary["value"];
                     }
                 }
             }
@@ -117,29 +112,17 @@ private Response(Dictionary<string, object> rawResponse)
         /// <summary>
         /// Gets or sets the value from JSON.
         /// </summary>
-        public object Value
-        {
-            get { return this.responseValue; }
-            set { this.responseValue = value; }
-        }
+        public object Value { get; set; }
 
         /// <summary>
         /// Gets or sets the session ID.
         /// </summary>
-        public string SessionId
-        {
-            get { return this.responseSessionId; }
-            set { this.responseSessionId = value; }
-        }
+        public string SessionId { get; set; }
 
         /// <summary>
         /// Gets or sets the status value of the response.
         /// </summary>
-        public WebDriverResult Status
-        {
-            get { return this.responseStatus; }
-            set { this.responseStatus = value; }
-        }
+        public WebDriverResult Status { get; set; }
 
         /// <summary>
         /// Returns a new <see cref="Response"/> from a JSON-encoded string.
@@ -148,9 +131,10 @@ public WebDriverResult Status
         /// <returns>A <see cref="Response"/> object described by the JSON string.</returns>
         public static Response FromJson(string value)
         {
-            Dictionary<string, object> deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions);
-            Response response = new Response(deserializedResponse);
-            return response;
+            Dictionary<string, object> deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions)
+                ?? throw new WebDriverException("JSON success response returned \"null\" value");
+
+            return new Response(deserializedResponse);
         }
 
         /// <summary>
@@ -160,7 +144,8 @@ public static Response FromJson(string value)
         /// <returns>A <see cref="Response"/> object described by the JSON string.</returns>
         public static Response FromErrorJson(string value)
         {
-            var deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions);
+            var deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions)
+                ?? throw new WebDriverException("JSON error response returned \"null\" value");
 
             var response = new Response();
 
@@ -181,14 +166,14 @@ public static Response FromErrorJson(string value)
                 throw new WebDriverException($"The 'value > error' property was not found in the response:{Environment.NewLine}{value}");
             }
 
-            if (errorObject is not string)
+            if (errorObject is not string errorString)
             {
                 throw new WebDriverException($"The 'value > error' property is not a string{Environment.NewLine}{value}");
             }
 
             response.Value = deserializedResponse["value"];
 
-            response.Status = WebDriverError.ResultFromError(errorObject.ToString());
+            response.Status = WebDriverError.ResultFromError(errorString);
 
             return response;
         }
@@ -213,8 +198,5 @@ public override string ToString()
     }
 
     [JsonSerializable(typeof(Dictionary<string, object>))]
-    internal partial class ResponseJsonSerializerContext : JsonSerializerContext
-    {
-
-    }
+    internal sealed partial class ResponseJsonSerializerContext : JsonSerializerContext;
 }
diff --git a/java/src/org/openqa/selenium/remote/service/DriverService.java b/java/src/org/openqa/selenium/remote/service/DriverService.java
@@ -242,8 +242,10 @@ public void start() throws IOException {
             processFinished.cancel(true);
             break;
           case PROCESS_DIED:
+            int exitValue = process.exitValue();
             process = null;
-            throw new WebDriverException("Driver server process died prematurely.");
+            throw new WebDriverException(
+                "Driver server process died prematurely, exit value: " + exitValue);
           case PROCESS_IS_ACTIVE:
             process.shutdown();
             throw new WebDriverException("Timed out waiting for driver server to bind the port.");

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,11 @@`
`17`	`17`	`// under the License.`
`18`	`18`	`// </copyright>`
`19`	`19`
	`20`	`+using System;`
`20`	`21`	`using System.Collections.ObjectModel;`
`21`	`22`
	`23`	`+#nullable enable`
	`24`	`+`
`22`	`25`	`namespace OpenQA.Selenium`
`23`	`26`	`{`
`24`	`27`	`/// <summary>`
`@@ -37,6 +40,7 @@ public interface ILogs`
`37`	`40`	`/// <param name="logKind">The log for which to retrieve the log entries.`
`38`	`41`	`/// Log types can be found in the <see cref="LogType"/> class.</param>`
`39`	`42`	`/// <returns>The list of <see cref="LogEntry"/> objects for the specified log.</returns>`
	`43`	`+ /// <exception cref="ArgumentNullException">If <paramref name="logKind"/> is <see langword="null"/>.</exception>`
`40`	`44`	`ReadOnlyCollection<LogEntry> GetLog(string logKind);`
`41`	`45`	`}`
`42`	`46`	`}`
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
`@@ -21,22 +21,25 @@`
`21`	`21`	`using System.Collections.Generic;`
`22`	`22`	`using System.Collections.ObjectModel;`
`23`	`23`
	`24`	`+#nullable enable`
	`25`	`+`
`24`	`26`	`namespace OpenQA.Selenium`
`25`	`27`	`{`
`26`	`28`	`/// <summary>`
`27`	`29`	`/// Provides a mechanism for examining logs for the driver during the test.`
`28`	`30`	`/// </summary>`
`29`	`31`	`public class Logs : ILogs`
`30`	`32`	`{`
`31`		`- private WebDriver driver;`
	`33`	`+ private readonly WebDriver driver;`
`32`	`34`
`33`	`35`	`/// <summary>`
`34`	`36`	`/// Initializes a new instance of the <see cref="Logs"/> class.`
`35`	`37`	`/// </summary>`
`36`	`38`	`/// <param name="driver">Instance of the driver currently in use</param>`
	`39`	`+ /// <exception cref="ArgumentNullException">If <paramref name="driver"/> is <see langword="null"/>.</exception>`
`37`	`40`	`public Logs(WebDriver driver)`
`38`	`41`	`{`
`39`		`- this.driver = driver;`
	`42`	`+ this.driver = driver ?? throw new ArgumentNullException(nameof(driver));`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`/// <summary>`
`@@ -50,12 +53,11 @@ public ReadOnlyCollection<string> AvailableLogTypes`
`50`	`53`	`try`
`51`	`54`	`{`
`52`	`55`	`Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);`
`53`		`- object[] responseValue = commandResponse.Value as object[];`
`54`		`- if (responseValue != null)`
	`56`	`+ if (commandResponse.Value is object[] responseValue)`
`55`	`57`	`{`
`56`	`58`	`foreach (object logKind in responseValue)`
`57`	`59`	`{`
`58`		`- availableLogTypes.Add(logKind.ToString());`
	`60`	`+ availableLogTypes.Add(logKind.ToString()!);`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`	`}`
`@@ -74,21 +76,25 @@ public ReadOnlyCollection<string> AvailableLogTypes`
`74`	`76`	`/// <param name="logKind">The log for which to retrieve the log entries.`
`75`	`77`	`/// Log types can be found in the <see cref="LogType"/> class.</param>`
`76`	`78`	`/// <returns>The list of <see cref="LogEntry"/> objects for the specified log.</returns>`
	`79`	`+ /// <exception cref="ArgumentNullException">If <paramref name="logKind"/> is <see langword="null"/>.</exception>`
`77`	`80`	`public ReadOnlyCollection<LogEntry> GetLog(string logKind)`
`78`	`81`	`{`
	`82`	`+ if (logKind is null)`
	`83`	`+ {`
	`84`	`+ throw new ArgumentNullException(nameof(logKind));`
	`85`	`+ }`
	`86`	`+`
`79`	`87`	`List<LogEntry> entries = new List<LogEntry>();`
`80`	`88`
`81`	`89`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`82`	`90`	`parameters.Add("type", logKind);`
`83`	`91`	`Response commandResponse = this.driver.InternalExecute(DriverCommand.GetLog, parameters);`
`84`	`92`
`85`		`- object[] responseValue = commandResponse.Value as object[];`
`86`		`- if (responseValue != null)`
	`93`	`+ if (commandResponse.Value is object?[] responseValue)`
`87`	`94`	`{`
`88`		`- foreach (object rawEntry in responseValue)`
	`95`	`+ foreach (object? rawEntry in responseValue)`
`89`	`96`	`{`
`90`		`- Dictionary<string, object> entryDictionary = rawEntry as Dictionary<string, object>;`
`91`		`- if (entryDictionary != null)`
	`97`	`+ if (rawEntry is Dictionary<string, object?> entryDictionary)`
`92`	`98`	`{`
`93`	`99`	`entries.Add(LogEntry.FromDictionary(entryDictionary));`
`94`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,16 +31,12 @@ namespace OpenQA.Selenium`
`31`	`31`	`/// </summary>`
`32`	`32`	`public class Response`
`33`	`33`	`{`
`34`		`- private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()`
	`34`	`+ private static readonly JsonSerializerOptions s_jsonSerializerOptions = new()`
`35`	`35`	`{`
`36`	`36`	`TypeInfoResolver = ResponseJsonSerializerContext.Default,`
`37`	`37`	Converters = { new ResponseValueJsonConverter() } // we still need it to make `Object` as `Dictionary`
`38`	`38`	`};`
`39`	`39`
`40`		`- private object responseValue;`
`41`		`- private string responseSessionId;`
`42`		`- private WebDriverResult responseStatus;`
`43`		`-`
`44`	`40`	`/// <summary>`
`45`	`41`	`/// Initializes a new instance of the <see cref="Response"/> class`
`46`	`42`	`/// </summary>`
`@@ -56,7 +52,7 @@ public Response(SessionId sessionId)`
`56`	`52`	`{`
`57`	`53`	`if (sessionId != null)`
`58`	`54`	`{`
`59`		`- this.responseSessionId = sessionId.ToString();`
	`55`	`+ this.SessionId = sessionId.ToString();`
`60`	`56`	`}`
`61`	`57`	`}`
`62`	`58`
`@@ -66,49 +62,48 @@ private Response(Dictionary<string, object> rawResponse)`
`66`	`62`	`{`
`67`	`63`	`if (rawResponse["sessionId"] != null)`
`68`	`64`	`{`
`69`		`- this.responseSessionId = rawResponse["sessionId"].ToString();`
	`65`	`+ this.SessionId = rawResponse["sessionId"].ToString();`
`70`	`66`	`}`
`71`	`67`	`}`
`72`	`68`
`73`		`- if (rawResponse.ContainsKey("value"))`
	`69`	`+ if (rawResponse.TryGetValue("value", out object value))`
`74`	`70`	`{`
`75`		`- this.responseValue = rawResponse["value"];`
	`71`	`+ this.Value = value;`
`76`	`72`	`}`
`77`	`73`
`78`	`74`	`// If the returned object does not have a "value" property`
`79`	`75`	`// the response value should be the entirety of the response.`
`80`	`76`	`// TODO: Remove this if statement altogether; there should`
`81`	`77`	`// never be a spec-compliant response that does not contain a`
`82`	`78`	`// value property.`
`83`		`- if (!rawResponse.ContainsKey("value") && this.responseValue == null)`
	`79`	`+ if (!rawResponse.ContainsKey("value") && this.Value == null)`
`84`	`80`	`{`
`85`	`81`	`// Special-case for the new session command, where the "capabilities"`
`86`	`82`	`// property of the response is the actual value we're interested in.`
`87`	`83`	`if (rawResponse.ContainsKey("capabilities"))`
`88`	`84`	`{`
`89`		`- this.responseValue = rawResponse["capabilities"];`
	`85`	`+ this.Value = rawResponse["capabilities"];`
`90`	`86`	`}`
`91`	`87`	`else`
`92`	`88`	`{`
`93`		`- this.responseValue = rawResponse;`
	`89`	`+ this.Value = rawResponse;`
`94`	`90`	`}`
`95`	`91`	`}`
`96`	`92`
`97`		`- Dictionary<string, object> valueDictionary = this.responseValue as Dictionary<string, object>;`
`98`		`- if (valueDictionary != null)`
	`93`	`+ if (this.Value is Dictionary<string, object> valueDictionary)`
`99`	`94`	`{`
`100`	`95`	`// Special case code for the new session command. If the response contains`
`101`	`96`	`// sessionId and capabilities properties, fix up the session ID and value members.`
`102`	`97`	`if (valueDictionary.ContainsKey("sessionId"))`
`103`	`98`	`{`
`104`		`- this.responseSessionId = valueDictionary["sessionId"].ToString();`
`105`		`- if (valueDictionary.ContainsKey("capabilities"))`
	`99`	`+ this.SessionId = valueDictionary["sessionId"].ToString();`
	`100`	`+ if (valueDictionary.TryGetValue("capabilities", out object capabilities))`
`106`	`101`	`{`
`107`		`- this.responseValue = valueDictionary["capabilities"];`
	`102`	`+ this.Value = capabilities;`
`108`	`103`	`}`
`109`	`104`	`else`
`110`	`105`	`{`
`111`		`- this.responseValue = valueDictionary["value"];`
	`106`	`+ this.Value = valueDictionary["value"];`
`112`	`107`	`}`
`113`	`108`	`}`
`114`	`109`	`}`
`@@ -117,29 +112,17 @@ private Response(Dictionary<string, object> rawResponse)`
`117`	`112`	`/// <summary>`
`118`	`113`	`/// Gets or sets the value from JSON.`
`119`	`114`	`/// </summary>`
`120`		`- public object Value`
`121`		`- {`
`122`		`- get { return this.responseValue; }`
`123`		`- set { this.responseValue = value; }`
`124`		`- }`
	`115`	`+ public object Value { get; set; }`
`125`	`116`
`126`	`117`	`/// <summary>`
`127`	`118`	`/// Gets or sets the session ID.`
`128`	`119`	`/// </summary>`
`129`		`- public string SessionId`
`130`		`- {`
`131`		`- get { return this.responseSessionId; }`
`132`		`- set { this.responseSessionId = value; }`
`133`		`- }`
	`120`	`+ public string SessionId { get; set; }`
`134`	`121`
`135`	`122`	`/// <summary>`
`136`	`123`	`/// Gets or sets the status value of the response.`
`137`	`124`	`/// </summary>`
`138`		`- public WebDriverResult Status`
`139`		`- {`
`140`		`- get { return this.responseStatus; }`
`141`		`- set { this.responseStatus = value; }`
`142`		`- }`
	`125`	`+ public WebDriverResult Status { get; set; }`
`143`	`126`
`144`	`127`	`/// <summary>`
`145`	`128`	`/// Returns a new <see cref="Response"/> from a JSON-encoded string.`
`@@ -148,9 +131,10 @@ public WebDriverResult Status`
`148`	`131`	`/// <returns>A <see cref="Response"/> object described by the JSON string.</returns>`
`149`	`132`	`public static Response FromJson(string value)`
`150`	`133`	`{`
`151`		`- Dictionary<string, object> deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions);`
`152`		`- Response response = new Response(deserializedResponse);`
`153`		`- return response;`
	`134`	`+ Dictionary<string, object> deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions)`
	`135`	`+ ?? throw new WebDriverException("JSON success response returned \"null\" value");`
	`136`	`+`
	`137`	`+ return new Response(deserializedResponse);`
`154`	`138`	`}`
`155`	`139`
`156`	`140`	`/// <summary>`
`@@ -160,7 +144,8 @@ public static Response FromJson(string value)`
`160`	`144`	`/// <returns>A <see cref="Response"/> object described by the JSON string.</returns>`
`161`	`145`	`public static Response FromErrorJson(string value)`
`162`	`146`	`{`
`163`		`- var deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions);`
	`147`	`+ var deserializedResponse = JsonSerializer.Deserialize<Dictionary<string, object>>(value, s_jsonSerializerOptions)`
	`148`	`+ ?? throw new WebDriverException("JSON error response returned \"null\" value");`
`164`	`149`
`165`	`150`	`var response = new Response();`
`166`	`151`
`@@ -181,14 +166,14 @@ public static Response FromErrorJson(string value)`
`181`	`166`	`throw new WebDriverException($"The 'value > error' property was not found in the response:{Environment.NewLine}{value}");`
`182`	`167`	`}`
`183`	`168`
`184`		`- if (errorObject is not string)`
	`169`	`+ if (errorObject is not string errorString)`
`185`	`170`	`{`
`186`	`171`	`throw new WebDriverException($"The 'value > error' property is not a string{Environment.NewLine}{value}");`
`187`	`172`	`}`
`188`	`173`
`189`	`174`	`response.Value = deserializedResponse["value"];`
`190`	`175`
`191`		`- response.Status = WebDriverError.ResultFromError(errorObject.ToString());`
	`176`	`+ response.Status = WebDriverError.ResultFromError(errorString);`
`192`	`177`
`193`	`178`	`return response;`
`194`	`179`	`}`
`@@ -213,8 +198,5 @@ public override string ToString()`
`213`	`198`	`}`
`214`	`199`
`215`	`200`	`[JsonSerializable(typeof(Dictionary<string, object>))]`
`216`		`- internal partial class ResponseJsonSerializerContext : JsonSerializerContext`
`217`		`- {`
`218`		`-`
`219`		`- }`
	`201`	`+ internal sealed partial class ResponseJsonSerializerContext : JsonSerializerContext;`
`220`	`202`	`}`