Merge branch 'trunk' into cookie-jar

Author: RenderMichael

java/private/export.bzl

@@ -1,3 +1,4 @@
+load("@contrib_rules_jvm//java:defs.bzl", "java_library")
 load(
     "@rules_jvm_external//:defs.bzl",
     "javadoc",
@@ -24,7 +25,7 @@ def java_export(
     lib_name = "%s-lib" % name
 
     # Construct the java_library we'll export from here.
-    native.java_library(
+    java_library(
         name = lib_name,
         tags = tags,
         exports = exports,

java/spotbugs-excludes.xml

@@ -242,7 +242,7 @@
 
   <Match>
     <Class name="org.openqa.selenium.manager.SeleniumManager"/>
-    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
+    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE,IS2_INCONSISTENT_SYNC"/>
   </Match>
 
 </FindBugsFilter>

py/selenium/webdriver/chromium/webdriver.py

@@ -138,7 +138,7 @@ def execute_cdp_cmd(self, cmd: str, cmd_args: dict):
             For example to getResponseBody:
             {'base64Encoded': False, 'body': 'response body string'}
         """
-        return self.execute("executeCdpCommand", {"cmd": cmd, "params": cmd_args})["value"]
+        return super().execute_cdp_cmd(cmd, cmd_args)
 
     def get_sinks(self) -> list:
         """:Returns: A list of sinks available for Cast."""

py/selenium/webdriver/remote/webdriver.py

@@ -361,6 +361,26 @@ def _unwrap_value(self, value):
             return list(self._unwrap_value(item) for item in value)
         return value
 
+    def execute_cdp_cmd(self, cmd: str, cmd_args: dict):
+        """Execute Chrome Devtools Protocol command and get returned result The
+        command and command args should follow chrome devtools protocol
+        domains/commands, refer to link
+        https://chromedevtools.github.io/devtools-protocol/
+
+        :Args:
+         - cmd: A str, command name
+         - cmd_args: A dict, command args. empty dict {} if there is no command args
+        :Usage:
+            ::
+
+                driver.execute_cdp_cmd('Network.getResponseBody', {'requestId': requestId})
+        :Returns:
+            A dict, empty dict {} if there is no result to return.
+            For example to getResponseBody:
+            {'base64Encoded': False, 'body': 'response body string'}
+        """
+        return self.execute("executeCdpCommand", {"cmd": cmd, "params": cmd_args})["value"]
+
     def execute(self, driver_command: str, params: dict = None) -> dict:
         """Sends a command to be executed by a command.CommandExecutor.