[grid] Using getReportedUri instead of parsing moz:debuggerAddress manually

Fixes #9327

Author: diemol

java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -51,7 +51,6 @@
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.ServiceLoader;
@@ -207,17 +206,9 @@ private FirefoxDriver(FirefoxDriverCommandExecutor executor, FirefoxOptions opti
     webStorage = new RemoteWebStorage(getExecuteMethod());
 
     Capabilities capabilities = super.getCapabilities();
-    Optional<URI> cdpUri = Optional.empty();
-    if (capabilities.getCapability("moz:debuggerAddress") instanceof String) {
-      try {
-        URI providedUri = new URI(String.format("http://%s", capabilities.getCapability("moz:debuggerAddress")));
-        HttpClient.Factory clientFactory = HttpClient.Factory.createDefault();
-
-        cdpUri = CdpEndpointFinder.getCdpEndPoint(clientFactory, providedUri);
-      } catch (RuntimeException | URISyntaxException e) {
-        // Swallow the exception.
-      }
-    }
+    HttpClient.Factory clientFactory = HttpClient.Factory.createDefault();
+    Optional<URI> cdpUri = CdpEndpointFinder.getReportedUri("moz:debuggerAddress", capabilities)
+      .flatMap(reported -> CdpEndpointFinder.getCdpEndPoint(clientFactory, reported));
 
     this.cdpUri = cdpUri;
     this.capabilities = cdpUri.map(uri ->

java/server/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java

@@ -46,7 +46,6 @@
 import org.openqa.selenium.remote.tracing.Tracer;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.time.Instant;
 import java.util.HashMap;
@@ -206,17 +205,9 @@ public DevToolsInfo(URI cdpEndpoint, String version) {
       CdpEndpointFinder.getReportedUri("ms:edgeOptions", c)
         .map(uri -> new DevToolsInfo(uri, c.getBrowserVersion()));
 
-    Function<Capabilities, Optional<DevToolsInfo>> firefox = c -> {
-      Object address = c.getCapability("moz:debuggerAddress");
-      return Optional.ofNullable(address).map(adr -> {
-        try {
-          URI uri = new URI(String.format("http://%s", adr));
-          return new DevToolsInfo(uri, "86");
-        } catch (URISyntaxException e) {
-          return null;
-        }
-      });
-    };
+    Function<Capabilities, Optional<DevToolsInfo>> firefox = c ->
+      CdpEndpointFinder.getReportedUri("moz:debuggerAddress", c)
+        .map(uri -> new DevToolsInfo(uri, "86"));
 
     Optional<DevToolsInfo> maybeInfo = Stream.of(chrome, edge, firefox)
       .map(finder -> finder.apply(caps))