[java] Removing DriverServiceInfo

Author: diemol

java/src/org/openqa/selenium/chrome/ChromeDriverService.java

@@ -23,7 +23,6 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.chromium.ChromiumDriverLogLevel;
 import org.openqa.selenium.remote.service.DriverService;
-import org.openqa.selenium.remote.service.DriverServiceInfo;
 
 import java.io.File;
 import java.io.IOException;
@@ -154,7 +153,7 @@ public Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link ChromeDriverService} using the default configuration. In
    * this configuration, the service will use the ChromeDriver executable identified by
-   * {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverServiceInfo, Capabilities)}.
+   * {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}.
    * Each service created by this method will be configured to use a free port on the current system.
    *
    * @return A new ChromeDriverService using the default configuration.
@@ -166,7 +165,7 @@ public static ChromeDriverService createDefaultService() {
   /**
    * Configures and returns a new {@link ChromeDriverService} using the supplied configuration. In
    * this configuration, the service will use the ChromeDriver executable identified by
-   * {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverServiceInfo, Capabilities)}.
+   * {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}.
    * Each service created by this method will be configured to use a free port on the current system.
    *
    * @return A new ChromeDriverService using the supplied configuration from {@link ChromeOptions}.

java/src/org/openqa/selenium/edge/EdgeDriverService.java

@@ -23,7 +23,6 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.chromium.ChromiumDriverLogLevel;
 import org.openqa.selenium.remote.service.DriverService;
-import org.openqa.selenium.remote.service.DriverServiceInfo;
 
 import java.io.File;
 import java.io.IOException;
@@ -129,7 +128,7 @@ public Capabilities getDefaultDriverOptions() {
   /**
    * Configures and returns a new {@link EdgeDriverService} using the default configuration. In
    * this configuration, the service will use the MSEdgeDriver executable identified by the
-   * {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverServiceInfo, Capabilities)}.
+   * {@link org.openqa.selenium.remote.service.DriverFinder#getPath(DriverService, Capabilities)}.
    * Each service created by this method will be configured to use a free port on the current system.
    *
    * @return A new ChromiumEdgeDriverService using the default configuration.
@@ -153,14 +152,14 @@ static boolean isPresent() {
    * Builder used to configure new {@link EdgeDriverService} instances.
    */
   @AutoService(DriverService.Builder.class)
-  public static class Builder extends DriverService.Builder<
-    EdgeDriverService, Builder> {
+  public static class Builder extends DriverService.Builder<EdgeDriverService, Builder> {
 
     private boolean disableBuildCheck = Boolean.getBoolean(EDGE_DRIVER_DISABLE_BUILD_CHECK);
     private boolean readableTimestamp = Boolean.getBoolean(EDGE_DRIVER_READABLE_TIMESTAMP);
     private boolean appendLog = Boolean.getBoolean(EDGE_DRIVER_APPEND_LOG_PROPERTY);
     private boolean verbose = Boolean.getBoolean(EDGE_DRIVER_VERBOSE_LOG_PROPERTY);
-    private ChromiumDriverLogLevel logLevel = ChromiumDriverLogLevel.fromString(System.getProperty(EDGE_DRIVER_LOG_LEVEL_PROPERTY));
+    private ChromiumDriverLogLevel logLevel = ChromiumDriverLogLevel
+      .fromString(System.getProperty(EDGE_DRIVER_LOG_LEVEL_PROPERTY));
     private boolean silent = Boolean.getBoolean(EDGE_DRIVER_SILENT_OUTPUT_PROPERTY);
     private String allowedListIps = System.getProperty(EDGE_DRIVER_ALLOWED_IPS_PROPERTY);
 

java/src/org/openqa/selenium/firefox/FirefoxDriverService.java

@@ -18,7 +18,6 @@
 package org.openqa.selenium.firefox;
 
 import org.openqa.selenium.remote.service.DriverService;
-import org.openqa.selenium.remote.service.DriverServiceInfo;
 
 import java.io.File;
 import java.io.IOException;

java/src/org/openqa/selenium/remote/service/DriverFinder.java

@@ -12,28 +12,28 @@ public class DriverFinder {
 
   private static final Logger LOG = Logger.getLogger(DriverFinder.class.getName());
 
-  public static String getPath(DriverServiceInfo serviceInfo, Capabilities options) {
+  public static String getPath(DriverService service, Capabilities options) {
     Require.nonNull("Browser options", options);
-    String defaultPath = new ExecutableFinder().find(serviceInfo.getDriverName());
-    String exePath = System.getProperty(serviceInfo.getDriverProperty(), defaultPath);
+    String defaultPath = new ExecutableFinder().find(service.getDriverName());
+    String exePath = System.getProperty(service.getDriverProperty(), defaultPath);
 
-    if (exePath == null && serviceInfo.getDriverExecutable() != null) {
-      exePath = serviceInfo.getDriverExecutable().getAbsolutePath();
+    if (exePath == null && service.getDriverExecutable() != null) {
+      exePath = service.getDriverExecutable().getAbsolutePath();
     }
 
     if (exePath == null) {
       try {
         exePath = SeleniumManager.getInstance().getDriverPath(options);
       } catch (Exception e) {
         LOG.warning(String.format("Unable to obtain %s using Selenium Manager: %s",
-                                  serviceInfo.getDriverName(), e.getMessage()));
+                                  service.getDriverName(), e.getMessage()));
       }
     }
 
     String validPath = Require.state("The path to the driver executable", exePath).nonNull(
         "Unable to locate the %s executable; for more information on how to install drivers, " +
         "see https://www.selenium.dev/documentation/webdriver/getting_started/install_drivers/",
-        serviceInfo.getDriverName());
+        service.getDriverName());
 
       File exe = new File(validPath);
       Require.state("The driver executable", exe).isFile();

java/src/org/openqa/selenium/remote/service/DriverService.java

@@ -59,7 +59,7 @@
  * In addition to this, it is supposed that the driver server implements /shutdown hook that is
  * used to stop the server.
  */
-public class DriverService implements Closeable, DriverServiceInfo {
+public class DriverService implements Closeable {
 
   private static final String NAME = "Driver Service Executor";
   protected static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(20);
@@ -140,11 +140,23 @@ protected Map<String, String> getEnvironment() {
 
   protected URL getUrl(int port) throws IOException {
     return new URL(String.format("http://localhost:%d", port));
- }
+  }
 
- protected Capabilities getDefaultDriverOptions() {
-   return new ImmutableCapabilities();
- }
+  protected Capabilities getDefaultDriverOptions() {
+    return new ImmutableCapabilities();
+  }
+
+  protected String getDriverName() {
+    return null;
+  }
+
+  protected String getDriverProperty() {
+    return null;
+  }
+
+  protected File getDriverExecutable() {
+    return null;
+  }
 
   /**
    * @return The base URL for the managed driver server.

java/src/org/openqa/selenium/remote/service/DriverServiceInfo.java

@@ -53,7 +53,7 @@ public boolean isSupporting(Capabilities capabilities) {
     }
 
     return capabilities.asMap().keySet().parallelStream()
-      .map(key -> key.startsWith("safari.") || key.startsWith("safari:"))
+      .map(key -> key.startsWith("safari:"))
       .reduce(Boolean::logicalOr)
       .orElse(false);
   }