[java][bidi] Close BiDi connection on webdriver quit command

Author: pujagani

java/src/org/openqa/selenium/bidi/BUILD.bazel

@@ -1,24 +1,45 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//java:defs.bzl", "java_library")
 
+AUGMENTER_SRCS = [
+    "BiDiProvider.java",
+]
+
+java_library(
+    name = "augmenter",
+    srcs = AUGMENTER_SRCS,
+    visibility = [
+        "//java/src/org/openqa/selenium/remote:__pkg__",
+    ],
+    deps = [
+        ":bidi",
+        "//java:auto-service",
+        "//java/src/org/openqa/selenium:core",
+        "//java/src/org/openqa/selenium/remote:api",
+        "//java/src/org/openqa/selenium/remote/http",
+    ],
+)
+
 java_library(
     name = "bidi",
     srcs = glob([
         "*.java",
         "log/*.java",
         "browsingcontext/*.java"
-    ]),
+    ],
+    exclude = AUGMENTER_SRCS,
+    ),
     visibility = [
         "//java/src/org/openqa/selenium/bidi:__subpackages__",
         "//java/src/org/openqa/selenium/firefox:__subpackages__",
+        "//java/src/org/openqa/selenium/remote:__pkg__",
         "//java/test/org/openqa/selenium/bidi:__subpackages__",
         "//java/test/org/openqa/selenium/grid:__subpackages__",
     ],
     deps = [
-        "//java:auto-service",
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/json",
-        "//java/src/org/openqa/selenium/remote",
+        "//java/src/org/openqa/selenium/remote/http",
         artifact("com.google.guava:guava"),
     ],
 )

java/src/org/openqa/selenium/bidi/BiDiProvider.java

@@ -20,13 +20,6 @@
 import com.google.auto.service.AutoService;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.devtools.CdpEndpointFinder;
-import org.openqa.selenium.devtools.CdpInfo;
-import org.openqa.selenium.devtools.CdpVersionFinder;
-import org.openqa.selenium.devtools.DevTools;
-import org.openqa.selenium.devtools.HasDevTools;
-import org.openqa.selenium.devtools.SeleniumCdpConnection;
-import org.openqa.selenium.devtools.noop.NoOpCdpInfo;
 import org.openqa.selenium.remote.AugmenterProvider;
 import org.openqa.selenium.remote.ExecuteMethod;
 import org.openqa.selenium.remote.http.ClientConfig;
@@ -36,7 +29,6 @@
 import java.net.URISyntaxException;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.logging.Logger;
 
 @AutoService(AugmenterProvider.class)
 public class BiDiProvider implements AugmenterProvider<HasBiDi> {

java/src/org/openqa/selenium/remote/BUILD.bazel

@@ -24,6 +24,8 @@ java_export(
     exports = [
         ":api",
         "//java/src/org/openqa/selenium:core",
+        "//java/src/org/openqa/selenium/bidi",
+        "//java/src/org/openqa/selenium/bidi:augmenter",
         "//java/src/org/openqa/selenium/devtools",
         "//java/src/org/openqa/selenium/devtools:augmenter",
         "//java/src/org/openqa/selenium/io",
@@ -44,11 +46,13 @@ java_library(
     ],
     visibility = [
         "//java/src/org/openqa/selenium/devtools:__pkg__",
+        "//java/src/org/openqa/selenium/bidi:__pkg__",
     ],
     exports = [
     ],
     deps = [
         "//java/src/org/openqa/selenium:core",
+        "//java/src/org/openqa/selenium/bidi",
         "//java/src/org/openqa/selenium/concurrent",
         "//java/src/org/openqa/selenium/devtools",
         "//java/src/org/openqa/selenium/io",

java/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -45,6 +45,8 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WindowType;
+import org.openqa.selenium.bidi.BiDi;
+import org.openqa.selenium.bidi.HasBiDi;
 import org.openqa.selenium.devtools.DevTools;
 import org.openqa.selenium.devtools.HasDevTools;
 import org.openqa.selenium.interactions.Interactive;
@@ -444,6 +446,10 @@ public void quit() {
         ((HasDevTools) this).maybeGetDevTools().ifPresent(DevTools::close);
       }
 
+      if (this instanceof HasBiDi) {
+        ((HasBiDi) this).maybeGetBiDi().ifPresent(BiDi::close);
+      }
+
       execute(DriverCommand.QUIT);
     } finally {
       sessionId = null;