[java] Improving FirefoxDriver BiDi

diemol · diemol · commit d1b8e6cdf1c6 · 2023-05-29T15:25:37.000+02:00
Credits to @pujagani
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -88,7 +88,7 @@ public class FirefoxDriver extends RemoteWebDriver
   private final Optional<URI> biDiUri;
   private Connection connection;
   private DevTools devTools;
-  private BiDi biDi;
+  private Optional<BiDi> biDi;
 
   /**
    * Creates a new FirefoxDriver using the {@link GeckoDriverService#createDefaultService)} server
@@ -175,6 +175,8 @@ private FirefoxDriver(
               return null;
             });
 
+    this.biDi = createBiDi(biDiUri);
+
     this.cdpUri = cdpUri;
     this.capabilities =
         cdpUri
@@ -321,12 +323,7 @@ public DevTools getDevTools() {
         .orElseThrow(() -> new DevToolsException("Unable to initialize CDP connection"));
   }
 
-  @Override
-  public Optional<BiDi> maybeGetBiDi() {
-    if (biDi != null) {
-      return Optional.of(biDi);
-    }
-
+  private Optional<BiDi> createBiDi(Optional<URI> biDiUri) {
     if (!biDiUri.isPresent()) {
       return Optional.empty();
     }
@@ -340,12 +337,15 @@ public Optional<BiDi> maybeGetBiDi() {
     ClientConfig wsConfig = ClientConfig.defaultConfig().baseUri(wsUri);
     HttpClient wsClient = clientFactory.createClient(wsConfig);
 
-    org.openqa.selenium.bidi.Connection connection =
+    org.openqa.selenium.bidi.Connection biDiConnection =
         new org.openqa.selenium.bidi.Connection(wsClient, wsUri.toString());
 
-    biDi = new BiDi(connection);
+    return Optional.of(new BiDi(biDiConnection));
+  }
 
-    return Optional.of(biDi);
+  @Override
+  public Optional<BiDi> maybeGetBiDi() {
+    return biDi;
   }
 
   @Override
