[java] implement Edge Driver Service using log level with enum and deprecate using String

titusfortner · titusfortner · commit a9ab17a1b6b1 · 2023-01-14T17:38:28.000-06:00
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -21,6 +21,7 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.chromium.ChromiumDriverLogLevel;
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.File;
@@ -132,7 +133,7 @@ public static class Builder extends DriverService.Builder<
     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 String logLevel = 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);
 
@@ -186,16 +187,28 @@ public Builder withBuildCheckDisabled(boolean noBuildCheck) {
      */
     public Builder withVerbose(boolean verbose) {
       if (verbose) {
-        this.logLevel = "ALL";
+        this.logLevel = ChromiumDriverLogLevel.ALL;
       }
       this.verbose = false;
       return this;
     }
 
     /**
      * Configures the driver server log level.
+     * @deprecated Use {@link #withLoglevel(ChromiumDriverLogLevel)} instead.
      */
+    @Deprecated
     public Builder withLoglevel(String logLevel) {
+      this.verbose = false;
+      this.silent = false;
+      this.logLevel = ChromiumDriverLogLevel.fromString(logLevel);
+      return this;
+    }
+
+    /**
+     * Configures the driver server log level.
+     */
+    public Builder withLoglevel(ChromiumDriverLogLevel logLevel) {
       this.verbose = false;
       this.silent = false;
       this.logLevel = logLevel;
@@ -210,7 +223,7 @@ public Builder withLoglevel(String logLevel) {
      */
     public Builder withSilent(boolean silent) {
       if (silent) {
-        this.logLevel = "OFF";
+        this.logLevel = ChromiumDriverLogLevel.OFF;
       }
       this.silent = false;
       return this;
@@ -278,7 +291,7 @@ protected List<String> createArgs() {
         args.add("--append-log");
       }
       if (logLevel != null) {
-        args.add(String.format("--log-level=%s", logLevel));
+        args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase()));
       }
       if (allowedListIps != null) {
         args.add(String.format("--allowed-ips=%s", allowedListIps));
