[java] Removing deprecated ChromeDriverLogLevel

diemol · diemol · commit b4b76e21f15c · 2023-07-26T11:08:42.000+02:00
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverLogLevel.java b/java/src/org/openqa/selenium/chrome/ChromeDriverLogLevel.java
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverService.java b/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
@@ -206,21 +206,6 @@ public Builder withBuildCheckDisabled(boolean noBuildCheck) {
       return this;
     }
 
-    /**
-     * Configures the driver server verbosity.
-     *
-     * @param logLevel {@link ChromeDriverLogLevel} for desired log level output.
-     * @return A self reference.
-     * @deprecated use {@link #withLogLevel(ChromiumDriverLogLevel)} instead.
-     */
-    @Deprecated
-    public Builder withLogLevel(ChromeDriverLogLevel logLevel) {
-      this.logLevel = ChromiumDriverLogLevel.fromString(logLevel.toString());
-      this.silent = false;
-      this.verbose = false;
-      return this;
-    }
-
     /**
      * Configures the driver server log level.
      *
diff --git a/java/src/org/openqa/selenium/chrome/ChromeOptions.java b/java/src/org/openqa/selenium/chrome/ChromeOptions.java
@@ -51,23 +51,13 @@ public class ChromeOptions extends ChromiumOptions<ChromeOptions> {
   /** Key used to store a set of ChromeOptions in a {@link Capabilities} object. */
   public static final String CAPABILITY = "goog:chromeOptions";
 
+  @SuppressWarnings("unused")
   public static final String LOGGING_PREFS = "goog:loggingPrefs";
-  private ChromeDriverLogLevel logLevel;
 
   public ChromeOptions() {
     super(CapabilityType.BROWSER_NAME, CHROME.browserName(), CAPABILITY);
   }
 
-  /**
-   * @deprecated Use {@link ChromeDriverService.Builder#withLogLevel(ChromiumDriverLogLevel)} to set
-   *     log level.
-   */
-  @Deprecated
-  public ChromeOptions setLogLevel(ChromeDriverLogLevel logLevel) {
-    this.logLevel = Require.nonNull("Log level", logLevel);
-    return this;
-  }
-
   @Override
   public ChromeOptions merge(Capabilities extraCapabilities) {
     Require.nonNull("Capabilities to merge", extraCapabilities);
@@ -79,12 +69,4 @@ public ChromeOptions merge(Capabilities extraCapabilities) {
 
     return newInstance;
   }
-
-  /**
-   * @deprecated Log Level only applies to {@link ChromeDriverService}.
-   */
-  @Deprecated
-  public ChromeDriverLogLevel getLogLevel() {
-    return logLevel;
-  }
 }
diff --git a/java/test/org/openqa/selenium/chrome/ChromeOptionsTest.java b/java/test/org/openqa/selenium/chrome/ChromeOptionsTest.java
@@ -23,8 +23,8 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
 import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
 import static org.assertj.core.api.InstanceOfAssertFactories.STRING;
-import static org.openqa.selenium.chrome.ChromeDriverLogLevel.OFF;
-import static org.openqa.selenium.chrome.ChromeDriverLogLevel.SEVERE;
+import static org.openqa.selenium.chromium.ChromiumDriverLogLevel.OFF;
+import static org.openqa.selenium.chromium.ChromiumDriverLogLevel.SEVERE;
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
 import static org.openqa.selenium.remote.CapabilityType.TIMEOUTS;
 
@@ -43,6 +43,7 @@
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.PageLoadStrategy;
 import org.openqa.selenium.UnexpectedAlertBehaviour;
+import org.openqa.selenium.chromium.ChromiumDriverLogLevel;
 import org.openqa.selenium.testing.TestUtilities;
 
 @Tag("UnitTests")
@@ -69,8 +70,8 @@ void optionsAsMapShouldBeImmutable() {
 
   @Test
   void canBuildLogLevelFromStringRepresentation() {
-    assertThat(ChromeDriverLogLevel.fromString("off")).isEqualTo(OFF);
-    assertThat(ChromeDriverLogLevel.fromString("SEVERE")).isEqualTo(SEVERE);
+    assertThat(ChromiumDriverLogLevel.fromString("off")).isEqualTo(OFF);
+    assertThat(ChromiumDriverLogLevel.fromString("SEVERE")).isEqualTo(SEVERE);
   }
 
   @Test
@@ -363,7 +364,6 @@ void isW3CSafe() {
         new ChromeOptions()
             .setBinary("some/path")
             .addArguments("--headless")
-            .setLogLevel(ChromeDriverLogLevel.INFO)
             .asMap();
 
     Predicate<String> badKeys = new AcceptedW3CCapabilityKeys().negate();
