refactor(browser): simplify headless argument handling

Author: burakkaygusuz

src/main/java/io/github/burakkaygusuz/config/Browser.java

@@ -8,30 +8,28 @@
 import org.openqa.selenium.remote.AbstractDriverOptions;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 
 public enum Browser {
 
   CHROME {
     @Override
     protected ChromeOptions getOptions() {
-      Map<String, Object> prefs = Map.ofEntries(
-          Map.entry("profile.default_content_setting_values.notifications", 2),
-          Map.entry("profile.managed_default_content_settings.javascript", 1),
-          Map.entry("credentials_enable_service", false),
-          Map.entry("profile.password_manager_enabled", false));
-
       final ChromeOptions chromeOptions = new ChromeOptions();
-      chromeOptions
-          .enableBiDi()
-          .setExperimentalOption("excludeSwitches", Collections.singletonList("enable-automation"))
-          .setExperimentalOption("prefs", prefs)
-          .addArguments("--disable-gpu", "--disable-logging", "--disable-dev-shm-usage")
-          .setPageLoadStrategy(PageLoadStrategy.NORMAL)
-          .setAcceptInsecureCerts(true);
+      applyCommonOptions(chromeOptions);
+      chromeOptions.setExperimentalOption("prefs", getCommonPrefs());
       return chromeOptions;
     }
+
+    @Override
+    protected String getHeadlessArgument() {
+      return "headless=new";
+    }
+
+    @Override
+    protected void addHeadlessArgument(AbstractDriverOptions<?> options) {
+      ((ChromeOptions) options).addArguments(getHeadlessArgument());
+    }
   },
   FIREFOX {
     @Override
@@ -51,26 +49,35 @@ protected FirefoxOptions getOptions() {
           .setProfile(firefoxProfile);
       return firefoxOptions;
     }
+
+    @Override
+    protected String getHeadlessArgument() {
+      return "-headless";
+    }
+
+    @Override
+    protected void addHeadlessArgument(AbstractDriverOptions<?> options) {
+      ((FirefoxOptions) options).addArguments(getHeadlessArgument());
+    }
   },
   EDGE {
     @Override
     protected EdgeOptions getOptions() {
-      Map<String, Object> prefs = Map.ofEntries(
-          Map.entry("profile.default_content_setting_values.notifications", 2),
-          Map.entry("profile.managed_default_content_settings.javascript", 1),
-          Map.entry("credentials_enable_service", false),
-          Map.entry("profile.password_manager_enabled", false));
-
       final EdgeOptions edgeOptions = new EdgeOptions();
-      edgeOptions
-          .enableBiDi()
-          .setExperimentalOption("excludeSwitches", Collections.singletonList("enable-automation"))
-          .setExperimentalOption("prefs", prefs)
-          .addArguments("--disable-gpu", "--disable-logging", "--disable-dev-shm-usage")
-          .setPageLoadStrategy(PageLoadStrategy.NORMAL)
-          .setAcceptInsecureCerts(true);
+      applyCommonOptions(edgeOptions);
+      edgeOptions.setExperimentalOption("prefs", getCommonPrefs());
       return edgeOptions;
     }
+
+    @Override
+    protected String getHeadlessArgument() {
+      return "headless=new";
+    }
+
+    @Override
+    protected void addHeadlessArgument(AbstractDriverOptions<?> options) {
+      ((EdgeOptions) options).addArguments(getHeadlessArgument());
+    }
   };
 
   @Override
@@ -79,4 +86,34 @@ public String toString() {
   }
 
   protected abstract AbstractDriverOptions<?> getOptions();
+
+  protected abstract String getHeadlessArgument();
+
+  protected abstract void addHeadlessArgument(AbstractDriverOptions<?> options);
+
+  private static Map<String, Object> getCommonPrefs() {
+    return Map.ofEntries(
+        Map.entry("profile.default_content_setting_values.notifications", 2),
+        Map.entry("profile.managed_default_content_settings.javascript", 1),
+        Map.entry("credentials_enable_service", false),
+        Map.entry("profile.password_manager_enabled", false));
+  }
+
+  private static void applyCommonOptions(ChromeOptions options) {
+    options
+        .enableBiDi()
+        .setExperimentalOption("excludeSwitches", Collections.singletonList("enable-automation"))
+        .addArguments("--disable-gpu", "--disable-logging", "--disable-dev-shm-usage")
+        .setPageLoadStrategy(PageLoadStrategy.NORMAL)
+        .setAcceptInsecureCerts(true);
+  }
+
+  private static void applyCommonOptions(EdgeOptions options) {
+    options
+        .enableBiDi()
+        .setExperimentalOption("excludeSwitches", Collections.singletonList("enable-automation"))
+        .addArguments("--disable-gpu", "--disable-logging", "--disable-dev-shm-usage")
+        .setPageLoadStrategy(PageLoadStrategy.NORMAL)
+        .setAcceptInsecureCerts(true);
+  }
 }

src/main/java/io/github/burakkaygusuz/config/WebDriverBuilder.java

@@ -4,9 +4,7 @@
 import io.github.burakkaygusuz.listeners.CustomWebDriverListener;
 import org.apache.logging.log4j.ThreadContext;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.edge.EdgeOptions;
-import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.support.events.EventFiringDecorator;
@@ -41,23 +39,10 @@ public WebDriverBuilder enableTracing(boolean isTracingEnabled) {
   }
 
   public WebDriverBuilder enableHeadless() {
-    switch (browser) {
-      case "chrome" -> {
-        final ChromeOptions chromeOptions = new ChromeOptions();
-        chromeOptions.addArguments("headless=new");
-        options.merge(chromeOptions);
-      }
-      case "firefox" -> {
-        final FirefoxOptions firefoxOptions = new FirefoxOptions();
-        firefoxOptions.addArguments("-headless");
-        options.merge(firefoxOptions);
-      }
-      case "edge" -> {
-        final EdgeOptions edgeOptions = new EdgeOptions();
-        edgeOptions.addArguments("headless=new");
-        options.merge(edgeOptions);
-      }
-      default -> throw new UnsupportedBrowserException("Browser does not exist: %s".formatted(browser));
+    try {
+      Browser.valueOf(browser.toUpperCase()).addHeadlessArgument(options);
+    } catch (IllegalArgumentException e) {
+      throw new UnsupportedBrowserException("Browser does not exist: %s".formatted(browser));
     }
     return this;
   }
@@ -68,8 +53,8 @@ public WebDriver build() {
           : new RemoteWebDriver(options, isTracingEnabled));
       WebDriver original = DRIVER_THREAD_LOCAL.get();
       return new EventFiringDecorator<>(new CustomWebDriverListener()).decorate(original);
-    } finally {
-      DRIVER_THREAD_LOCAL.remove();
+    } catch (Exception e) {
+      throw new WebDriverException("Failed to build WebDriver", e);
     }
   }
 }