refactor(driverbuilder): pull up autoDriverDownload()

acdcjunior · acdcjunior · commit 8b4ac82e17aa · 2017-12-03T17:00:43.000-02:00
diff --git a/src/main/java/io/github/seleniumquery/browser/driver/DriverBuilder.java b/src/main/java/io/github/seleniumquery/browser/driver/DriverBuilder.java
@@ -15,9 +15,16 @@
  */
 package io.github.seleniumquery.browser.driver;
 
+import java.util.function.Consumer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import io.github.bonigarcia.wdm.BrowserManager;
+import io.github.bonigarcia.wdm.WebDriverManager;
+
 /**
  * Builds {@link WebDriver} instances for SeleniumQueryDriver.
  *
@@ -26,10 +33,14 @@
  */
 public abstract class DriverBuilder<T extends DriverBuilder<T>> {
 
+    private static final Log LOGGER = LogFactory.getLog(DriverBuilder.class);
+
     private DesiredCapabilities desiredCapabilities;
 
     private boolean capabilitiesManuallySet = false;
 
+    private Consumer<BrowserManager> autoDriverDownloadConfigurer;
+
     @SuppressWarnings("unchecked")
     public T withCapabilities(DesiredCapabilities desiredCapabilities) {
         markCapabilitiesWereSet();
@@ -70,4 +81,38 @@ protected boolean isCapabilitiesManuallySet() {
      */
     protected abstract WebDriver build();
 
+    protected void autoDownloadDriverIfAskedFor(Class<? extends WebDriver> driverClass) {
+        if (this.autoDriverDownloadConfigurer != null) {
+            BrowserManager browserManager = WebDriverManager.getInstance(driverClass);
+            this.autoDriverDownloadConfigurer.accept(browserManager);
+            browserManager.setup();
+        }
+    }
+
+    /**
+     * Automatically downloads and configures the chromedriver.exe executable using
+     * <a href="https://github.com/bonigarcia/webdrivermanager">webdrivermanager</a>.
+     * @return A self reference, allowing further configuration of the driver builder.
+     * @since 0.18.0
+     */
+    public T autoDriverDownload() {
+        return this.autoDriverDownload(x -> {});
+    }
+
+    /**
+     * Automatically downloads and configures the chromedriver.exe executable using
+     * <a href="https://github.com/bonigarcia/webdrivermanager">webdrivermanager</a>.
+     * @param configurer A function that allows <a href="https://github.com/bonigarcia/webdrivermanager#webdrivermanager-api">additional configuration</a> of the {@link BrowserManager}.
+     * @return A self reference, allowing further configuration of the driver builder.
+     * @since 0.18.0
+     */
+    @SuppressWarnings("unchecked")
+    public T autoDriverDownload(Consumer<BrowserManager> configurer) {
+        if (this.autoDriverDownloadConfigurer != null) {
+            LOGGER.warn(".autoDriverDownload() has already been called. Ignoring all calls but the last.");
+        }
+        this.autoDriverDownloadConfigurer = configurer;
+        return (T) this;
+    }
+
 }
diff --git a/src/main/java/io/github/seleniumquery/browser/driver/builders/ChromeDriverBuilder.java b/src/main/java/io/github/seleniumquery/browser/driver/builders/ChromeDriverBuilder.java
@@ -151,14 +151,6 @@ protected WebDriver build() {
         }
     }
 
-    private void autoDownloadDriverIfAskedFor(Class<? extends WebDriver> driverClass) {
-        if (this.autoDriverDownloadConfigurer != null) {
-            BrowserManager browserManager = WebDriverManager.getInstance(driverClass);
-            this.autoDriverDownloadConfigurer.accept(browserManager);
-            browserManager.setup();
-        }
-    }
-
     private WebDriver buildUsingCapabilities() {
         DesiredCapabilities capabilities = capabilities(DesiredCapabilities.chrome());
         overwriteCapabilityIfValueNotNull(capabilities, ChromeOptions.CAPABILITY, this.chromeOptions);
@@ -214,31 +206,4 @@ private void throwCustomExceptionIfExecutableWasNotFound(IllegalStateException e
         }
     }
 
-    private Consumer<BrowserManager> autoDriverDownloadConfigurer;
-
-    /**
-     * Automatically downloads and configures the chromedriver.exe executable using
-     * <a href="https://github.com/bonigarcia/webdrivermanager">webdrivermanager</a>.
-     * @return A self reference, allowing further configuration of the driver builder.
-     * @since 0.18.0
-     */
-    public ChromeDriverBuilder autoDriverDownload() {
-        return this.autoDriverDownload(x -> {});
-    }
-
-    /**
-     * Automatically downloads and configures the chromedriver.exe executable using
-     * <a href="https://github.com/bonigarcia/webdrivermanager">webdrivermanager</a>.
-     * @param configurer A function that allows <a href="https://github.com/bonigarcia/webdrivermanager#webdrivermanager-api">additional configuration</a> of the {@link BrowserManager}.
-     * @return A self reference, allowing further configuration of the driver builder.
-     * @since 0.18.0
-     */
-    public ChromeDriverBuilder autoDriverDownload(Consumer<BrowserManager> configurer) {
-        if (this.autoDriverDownloadConfigurer != null) {
-            LOGGER.warn(".autoDriverDownload() has already been called. Ignoring all calls but the last.");
-        }
-        this.autoDriverDownloadConfigurer = configurer;
-        return this;
-    }
-
 }
