Skip to content

Commit 303f43a

Browse files
authored
[dotnet] Nullable value in dictionary for json preparation (#17087)
1 parent dd67b77 commit 303f43a

16 files changed

Lines changed: 50 additions & 58 deletions

dotnet/src/webdriver/Alert.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void SendKeys(string keysToSend)
7878
throw new ArgumentNullException(nameof(keysToSend), "Keys to send must not be null.");
7979
}
8080

81-
Dictionary<string, object> parameters = new Dictionary<string, object>();
81+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
8282
parameters.Add("text", keysToSend);
8383

8484
this.driver.Execute(DriverCommand.SetAlertValue, parameters);

dotnet/src/webdriver/Chromium/ChromiumDriver.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public ChromiumNetworkConditions NetworkConditions
221221
throw new ArgumentNullException(nameof(value), "value must not be null");
222222
}
223223

224-
Dictionary<string, object> parameters = new Dictionary<string, object>();
224+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
225225
parameters["network_conditions"] = value;
226226

227227
this.Execute(SetNetworkConditionsCommand, parameters);
@@ -240,7 +240,7 @@ public void LaunchApp(string id)
240240
throw new ArgumentNullException(nameof(id), "id must not be null");
241241
}
242242

243-
Dictionary<string, object> parameters = new Dictionary<string, object>();
243+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
244244
parameters["id"] = id;
245245

246246
this.Execute(LaunchAppCommand, parameters);
@@ -264,9 +264,9 @@ public void SetPermission(string permissionName, string permissionValue)
264264
throw new ArgumentNullException(nameof(permissionValue), "value must not be null");
265265
}
266266

267-
Dictionary<string, object> nameParameter = new Dictionary<string, object>();
267+
Dictionary<string, object?> nameParameter = new Dictionary<string, object?>();
268268
nameParameter["name"] = permissionName;
269-
Dictionary<string, object> parameters = new Dictionary<string, object>();
269+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
270270
parameters["descriptor"] = nameParameter;
271271
parameters["state"] = permissionValue;
272272
this.Execute(SetPermissionCommand, parameters);
@@ -279,14 +279,14 @@ public void SetPermission(string permissionName, string permissionValue)
279279
/// <param name="commandParameters">Parameters of the command to execute.</param>
280280
/// <returns>An object representing the result of the command, if applicable.</returns>
281281
/// <exception cref="ArgumentNullException">If <paramref name="commandName"/> is <see langword="null"/>.</exception>
282-
public object? ExecuteCdpCommand(string commandName, Dictionary<string, object> commandParameters)
282+
public object? ExecuteCdpCommand(string commandName, Dictionary<string, object?> commandParameters)
283283
{
284284
if (commandName == null)
285285
{
286286
throw new ArgumentNullException(nameof(commandName), "commandName must not be null");
287287
}
288288

289-
Dictionary<string, object> parameters = new Dictionary<string, object>();
289+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
290290
parameters["cmd"] = commandName;
291291
parameters["params"] = commandParameters;
292292
Response response = this.Execute(ExecuteCdp, parameters);
@@ -404,7 +404,7 @@ public void SelectCastSink(string deviceName)
404404
throw new ArgumentNullException(nameof(deviceName), "deviceName must not be null");
405405
}
406406

407-
Dictionary<string, object> parameters = new Dictionary<string, object>();
407+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
408408
parameters["sinkName"] = deviceName;
409409
this.Execute(SelectCastSinkCommand, parameters);
410410
}
@@ -420,7 +420,7 @@ public void StartTabMirroring(string deviceName)
420420
throw new ArgumentNullException(nameof(deviceName), "deviceName must not be null");
421421
}
422422

423-
Dictionary<string, object> parameters = new Dictionary<string, object>();
423+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
424424
parameters["sinkName"] = deviceName;
425425
this.Execute(StartCastTabMirroringCommand, parameters);
426426
}
@@ -436,7 +436,7 @@ public void StartDesktopMirroring(string deviceName)
436436
throw new ArgumentNullException(nameof(deviceName), "deviceName must not be null");
437437
}
438438

439-
Dictionary<string, object> parameters = new Dictionary<string, object>();
439+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
440440
parameters["sinkName"] = deviceName;
441441
this.Execute(StartCastDesktopMirroringCommand, parameters);
442442
}
@@ -462,7 +462,7 @@ public void StopCasting(string deviceName)
462462
throw new ArgumentNullException(nameof(deviceName), "deviceName must not be null");
463463
}
464464

465-
Dictionary<string, object> parameters = new Dictionary<string, object>();
465+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
466466
parameters["sinkName"] = deviceName;
467467
this.Execute(StopCastingCommand, parameters);
468468
}

dotnet/src/webdriver/CookieJar.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ReadOnlyCollection<Cookie> AllCookies
3232
{
3333
get
3434
{
35-
Response response = driver.Execute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
35+
Response response = driver.Execute(DriverCommand.GetAllCookies, new Dictionary<string, object?>());
3636

3737
List<Cookie> toReturn = new List<Cookie>();
3838
if (response.Value is object?[] cookies)
@@ -63,7 +63,7 @@ public void AddCookie(Cookie cookie)
6363
throw new ArgumentNullException(nameof(cookie));
6464
}
6565

66-
Dictionary<string, object> parameters = new Dictionary<string, object>();
66+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
6767
parameters.Add("cookie", cookie);
6868
driver.Execute(DriverCommand.AddCookie, parameters);
6969
}
@@ -80,7 +80,7 @@ public void DeleteCookieNamed(string name)
8080
throw new ArgumentException("Cookie name cannot be null or empty", nameof(name));
8181
}
8282

83-
Dictionary<string, object> parameters = new() { { "name", name } };
83+
Dictionary<string, object?> parameters = new() { { "name", name } };
8484

8585
driver.Execute(DriverCommand.DeleteCookie, parameters);
8686
}

dotnet/src/webdriver/Firefox/FirefoxDriver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public FirefoxCommandContext GetContext()
276276
public void SetContext(FirefoxCommandContext context)
277277
{
278278
string contextValue = context.ToString().ToLowerInvariant();
279-
Dictionary<string, object> parameters = new Dictionary<string, object>();
279+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
280280
parameters["context"] = contextValue;
281281
this.Execute(SetContextCommand, parameters);
282282
}
@@ -354,7 +354,7 @@ public string InstallAddOn(string base64EncodedAddOn, bool temporary = false)
354354
throw new ArgumentNullException(nameof(base64EncodedAddOn), "Base64 encoded add-on must not be null or the empty string");
355355
}
356356

357-
Dictionary<string, object> parameters = new Dictionary<string, object>
357+
Dictionary<string, object?> parameters = new Dictionary<string, object?>()
358358
{
359359
["addon"] = base64EncodedAddOn,
360360
["temporary"] = temporary
@@ -376,7 +376,7 @@ public void UninstallAddOn(string addOnId)
376376
throw new ArgumentNullException(nameof(addOnId), "Base64 encoded add-on must not be null or the empty string");
377377
}
378378

379-
Dictionary<string, object> parameters = new Dictionary<string, object>();
379+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
380380
parameters["id"] = addOnId;
381381
this.Execute(UninstallAddOnCommand, parameters);
382382
}

dotnet/src/webdriver/ICustomDriverCommandExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface ICustomDriverCommandExecutor
3434
/// <param name="parameters">A <see cref="Dictionary{K, V}"/> containing the names and values of the parameters of the command.</param>
3535
/// <returns>An object that contains the value returned by the command, if any.</returns>
3636
/// <exception cref="WebDriverException">The command returned an exceptional value.</exception>
37-
object? ExecuteCustomDriverCommand(string driverCommandToExecute, Dictionary<string, object> parameters);
37+
object? ExecuteCustomDriverCommand(string driverCommandToExecute, Dictionary<string, object?> parameters);
3838

3939
/// <summary>
4040
/// Registers a set of commands to be executed with this driver instance.

dotnet/src/webdriver/Logs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public ReadOnlyCollection<LogEntry> GetLog(string logKind)
8484

8585
List<LogEntry> entries = new List<LogEntry>();
8686

87-
Dictionary<string, object> parameters = new Dictionary<string, object>();
87+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
8888
parameters.Add("type", logKind);
8989
Response commandResponse = this.driver.Execute(DriverCommand.GetLog, parameters);
9090

dotnet/src/webdriver/Navigator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public async Task GoToUrlAsync(string url)
106106
throw new ArgumentNullException(nameof(url), "URL cannot be null.");
107107
}
108108

109-
Dictionary<string, object> parameters = new Dictionary<string, object>
109+
Dictionary<string, object?> parameters = new Dictionary<string, object?>
110110
{
111111
{ "url", url }
112112
};

dotnet/src/webdriver/Remote/RemoteWebDriver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ public void DownloadFile(string fileName, string targetDirectory)
533533
throw new WebDriverException("You must enable downloads in order to work with downloadable files.");
534534
}
535535

536-
Dictionary<string, object> parameters = new Dictionary<string, object>
536+
Dictionary<string, object?> parameters = new Dictionary<string, object?>
537537
{
538538
{ "name", fileName }
539539
};

dotnet/src/webdriver/Safari/SafariDriver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public void SetPermission(string permissionName, bool permissionValue)
214214

215215
Dictionary<string, object> permissions = new Dictionary<string, object>();
216216
permissions[permissionName] = permissionValue;
217-
Dictionary<string, object> parameters = new Dictionary<string, object>();
217+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
218218
parameters["permissions"] = permissions;
219219
this.Execute(SetPermissionsCommand, parameters);
220220
}

dotnet/src/webdriver/ShadowRoot.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public IWebElement FindElement(By by)
9191
throw new ArgumentNullException(nameof(by), "by cannot be null");
9292
}
9393

94-
Dictionary<string, object> parameters = new Dictionary<string, object>();
94+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
9595
parameters.Add("id", this.shadowRootId);
9696
parameters.Add("using", by.Mechanism);
9797
parameters.Add("value", by.Criteria);
@@ -115,7 +115,7 @@ public ReadOnlyCollection<IWebElement> FindElements(By by)
115115
throw new ArgumentNullException(nameof(by), "by cannot be null");
116116
}
117117

118-
Dictionary<string, object> parameters = new Dictionary<string, object>();
118+
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
119119
parameters.Add("id", this.shadowRootId);
120120
parameters.Add("using", by.Mechanism);
121121
parameters.Add("value", by.Criteria);

0 commit comments

Comments
 (0)