SafariDriver is dead. Long live SafariDriver!

Java only using safaridriver provided by Apple now.

Author: lukeis

java/client/src/org/openqa/selenium/safari/SafariDriver.java

@@ -37,18 +37,6 @@
  */
 public class SafariDriver extends RemoteWebDriver {
 
-  /**
-   * Capability to force usage of the deprecated SafariDriver extension while running
-   * on macOS Sierra.
-   *
-   * <pre>
-   *   DesiredCapabilities safariCap = DesiredCapabilities.Safari();
-   *   safariCap.setCapability(SafariDriver.USE_LEGACY_DRIVER_CAPABILITY, true);
-   *   WebDriver driver = new SafariDriver(safariCap);
-   * </pre>
-   */
-  public static final String USE_LEGACY_DRIVER_CAPABILITY = "useLegacyDriver";
-
   private SafariDriverService service;
 
   /**
@@ -82,23 +70,15 @@ public SafariDriver(SafariOptions safariOptions) {
    * Ensure the new safaridriver receives non null required capabilities.
    */
   private static Capabilities requiredCapabilities(SafariOptions options) {
-    if (isLegacy(options)) {
-      return null;
-    }
     return new DesiredCapabilities();
   }
 
   private static CommandExecutor getExecutor(SafariOptions options) {
     SafariDriverService service = SafariDriverService.createDefaultService(options);
-    if (isLegacy(options) && service != null) {
-      return new DriverCommandExecutor(service);
+    if (service == null) {
+      throw new WebDriverException("SafariDriver requires Safari 10 running on OSX El Capitan or greater.");
     }
-    return new SafariDriverCommandExecutor(options);
-  }
-
-  private static boolean isLegacy(SafariOptions options) {
-    Object useLegacy = options.toCapabilities().getCapability(USE_LEGACY_DRIVER_CAPABILITY);
-    return useLegacy != null && (Boolean)useLegacy;
+    return new DriverCommandExecutor(service);
   }
 
   @Override
@@ -107,36 +87,4 @@ public void setFileDetector(FileDetector detector) {
         "Setting the file detector only works on remote webdriver instances obtained " +
         "via RemoteWebDriver");
   }
-
-  @Override
-  protected void startClient() {
-    CommandExecutor commandExecutor = this.getCommandExecutor();
-    if (commandExecutor instanceof SafariDriverCommandExecutor) {
-      try {
-        ((SafariDriverCommandExecutor)commandExecutor).start();
-      } catch (IOException e) {
-        throw new WebDriverException(e);
-      }
-    } else {
-      super.startClient();
-    }
-  }
-
-  @Override
-  protected void stopClient() {
-    CommandExecutor commandExecutor = this.getCommandExecutor();
-    if (commandExecutor instanceof SafariDriverCommandExecutor) {
-      ((SafariDriverCommandExecutor)commandExecutor).stop();
-    } else {
-      super.stopClient();
-    }
-  }
-
-  @Override
-  public <X> X getScreenshotAs(OutputType<X> target) throws WebDriverException {
-    // Get the screenshot as base64.
-    String base64 = (String) execute(DriverCommand.SCREENSHOT).getValue();
-    // ... and convert it.
-    return target.convertFromBase64Png(base64);
-  }
 }