Merge branch 'trunk' into java-for-loop-enhance

Author: pujagani

.bazelrc

@@ -30,10 +30,12 @@ build --tool_java_runtime_version=remotejdk_17
 build --javacopt="--release 11"
 
 # Require java dependencies to be used and first-order
-
 build --experimental_strict_java_deps=strict
 build --explicit_java_test_deps
 
+# Avoid ErrorProne getting annoyed about "impossible null checks"
+build --javacopt="-Xep:ImpossibleNullComparison:OFF"
+
 # Allow spaces in runfile paths
 build --nobuild_runfile_links
 
@@ -55,6 +57,11 @@ query --@aspect_rules_ts//ts:default_to_tsc_transpiler
 
 build --incompatible_strict_action_env
 
+# Required to get `protobuf` compiling, which is required for `rules_closure`
+build --incompatible_enable_cc_toolchain_resolution
+build --cxxopt=-std=c++14
+build --host_cxxopt=-std=c++14
+
 # For build stamping
 
 build --enable_platform_specific_config

MODULE.bazel

@@ -12,7 +12,7 @@ bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
 bazel_dep(name = "platforms", version = "0.0.10")
 
 # Required for the closure rules
-bazel_dep(name = "protobuf", version = "21.7", dev_dependency = True, repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "29.1", dev_dependency = True, repo_name = "com_google_protobuf")
 
 # Required for rules_rust to import the crates properly
 bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)

WORKSPACE

@@ -6,17 +6,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_closure",
-    patch_args = [
-        "-p1",
-    ],
-    patches = [
-        "//javascript:rules_closure_shell.patch",
-    ],
-    sha256 = "d66deed38a0bb20581c15664f0ab62270af5940786855c7adc3087b27168b529",
-    strip_prefix = "rules_closure-0.11.0",
-    urls = [
-        "https://github.com/bazelbuild/rules_closure/archive/0.11.0.tar.gz",
-    ],
+    strip_prefix = "rules_closure-0.12.0",
+    url = "https://github.com/bazelbuild/rules_closure/archive/refs/tags/0.12.0.tar.gz",
 )
 
 load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_dependencies", "rules_closure_toolchains")

dotnet/src/webdriver/Alert.cs

@@ -20,14 +20,16 @@
 using System;
 using System.Collections.Generic;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
     /// Defines the interface through which the user can manipulate JavaScript alerts.
     /// </summary>
     internal class Alert : IAlert
     {
-        private WebDriver driver;
+        private readonly WebDriver driver;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Alert"/> class.
@@ -41,12 +43,12 @@ public Alert(WebDriver driver)
         /// <summary>
         /// Gets the text of the alert.
         /// </summary>
-        public string Text
+        public string? Text
         {
             get
             {
                 Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAlertText, null);
-                return commandResponse.Value.ToString();
+                return (string?)commandResponse.Value;
             }
         }
 
@@ -70,9 +72,10 @@ public void Accept()
         /// Sends keys to the alert.
         /// </summary>
         /// <param name="keysToSend">The keystrokes to send.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="keysToSend" /> is <see langword="null"/>.</exception>
         public void SendKeys(string keysToSend)
         {
-            if (keysToSend == null)
+            if (keysToSend is null)
             {
                 throw new ArgumentNullException(nameof(keysToSend), "Keys to send must not be null.");
             }

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs

@@ -62,7 +62,7 @@ public abstract record ClipRectangle
 {
     public record Box(double X, double Y, double Width, double Height) : ClipRectangle;
 
-    public record Element([property: JsonPropertyName("element")] Script.SharedReference SharedReference) : ClipRectangle;
+    public record Element([property: JsonPropertyName("element")] Script.ISharedReference SharedReference) : ClipRectangle;
 }
 
 public record CaptureScreenshotResult(string Data)

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/LocateNodesCommand.cs

@@ -33,7 +33,7 @@ internal record LocateNodesCommandParameters(BrowsingContext Context, Locator Lo
 
     public Script.SerializationOptions? SerializationOptions { get; set; }
 
-    public IEnumerable<Script.SharedReference>? StartNodes { get; set; }
+    public IEnumerable<Script.ISharedReference>? StartNodes { get; set; }
 }
 
 public record LocateNodesOptions : CommandOptions
@@ -42,7 +42,7 @@ public record LocateNodesOptions : CommandOptions
 
     public Script.SerializationOptions? SerializationOptions { get; set; }
 
-    public IEnumerable<Script.SharedReference>? StartNodes { get; set; }
+    public IEnumerable<Script.ISharedReference>? StartNodes { get; set; }
 }
 
 public record LocateNodesResult : IReadOnlyList<Script.RemoteValue.Node>

dotnet/src/webdriver/BiDi/Modules/Input/Origin.cs

@@ -29,7 +29,7 @@ public record Viewport() : Origin;
 
     public record Pointer() : Origin;
 
-    public record Element([property: JsonPropertyName("element")] Script.SharedReference SharedReference) : Origin
+    public record Element([property: JsonPropertyName("element")] Script.ISharedReference SharedReference) : Origin
     {
         public string Type { get; } = "element";
     }

dotnet/src/webdriver/BiDi/Modules/Script/RemoteReference.cs renamed to dotnet/src/webdriver/BiDi/Modules/Script/IRemoteReference.cs

@@ -1,4 +1,4 @@
-// <copyright file="RemoteReference.cs" company="Selenium Committers">
+// <copyright file="IRemoteReference.cs" company="Selenium Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -21,14 +21,18 @@
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
-public abstract record RemoteReference : LocalValue;
+public interface IRemoteReference;
 
-public record SharedReference(string SharedId) : RemoteReference
+public interface ISharedReference : IRemoteReference
 {
+    public string SharedId { get; }
+
     public Handle? Handle { get; set; }
 }
 
-public record RemoteObjectReference(Handle Handle) : RemoteReference
+public interface IRemoteObjectReference : IRemoteReference
 {
+    public Handle Handle { get; }
+
     public string? SharedId { get; set; }
 }

dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs

@@ -246,7 +246,7 @@ public record HtmlCollection : RemoteValue
         public IReadOnlyList<RemoteValue>? Value { get; set; }
     }
 
-    public record Node : RemoteValue
+    public record Node : RemoteValue, ISharedReference
     {
         [JsonInclude]
         public string? SharedId { get; internal set; }

dotnet/src/webdriver/BiDi/Modules/Session/ProxyConfiguration.cs

@@ -24,14 +24,14 @@
 namespace OpenQA.Selenium.BiDi.Modules.Session;
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "proxyType")]
-[JsonDerivedType(typeof(Autodetect), "autodetect")]
+[JsonDerivedType(typeof(AutoDetect), "autodetect")]
 [JsonDerivedType(typeof(Direct), "direct")]
 [JsonDerivedType(typeof(Manual), "manual")]
 [JsonDerivedType(typeof(Pac), "pac")]
 [JsonDerivedType(typeof(System), "system")]
 public abstract record ProxyConfiguration
 {
-    public record Autodetect : ProxyConfiguration;
+    public record AutoDetect : ProxyConfiguration;
 
     public record Direct : ProxyConfiguration;
 
@@ -48,7 +48,7 @@ public record Manual : ProxyConfiguration
         public long? SocksVersion { get; set; }
     }
 
-    public record Pac(string ProxyAutoconfigUrl) : ProxyConfiguration;
+    public record Pac(string ProxyAutoConfigUrl) : ProxyConfiguration;
 
     public record System : ProxyConfiguration;
 }