Pass WebDriver instead of Loggable to allow augmentation of HasLogEvents

SeleniumHQ · Oct 19, 2021 · a25ad32 · a25ad32
1 parent f2d79cf
commit a25ad32
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/java/src/org/openqa/selenium/devtools/events/CdpEventTypes.java b/java/src/org/openqa/selenium/devtools/events/CdpEventTypes.java
@@ -55,10 +55,10 @@ public void consume(ConsoleEvent event) {
       }
 
       @Override
-      public void initializeListener(HasLogEvents loggable) {
-        Require.precondition(loggable instanceof HasDevTools, "Loggable must implement HasDevTools");
+      public void initializeListener(WebDriver webDriver) {
+        Require.precondition(webDriver instanceof HasDevTools, "Loggable must implement HasDevTools");
 
-        DevTools tools = ((HasDevTools) loggable).getDevTools();
+        DevTools tools = ((HasDevTools) webDriver).getDevTools();
         tools.createSessionIfThereIsNotOne();
 
         tools.getDomains().events().addConsoleListener(handler);
@@ -87,16 +87,14 @@ public void consume(Void event) {
       }
 
       @Override
-      public void initializeListener(HasLogEvents loggable) {
-        Require.precondition(loggable instanceof WebDriver, "Loggable must be a WebDriver");
-        Require.precondition(loggable instanceof HasDevTools, "Loggable must implement HasDevTools");
+      public void initializeListener(WebDriver driver) {
+        Require.precondition(driver instanceof HasDevTools, "Loggable must implement HasDevTools");
 
-        DevTools tools = ((HasDevTools) loggable).getDevTools();
+        DevTools tools = ((HasDevTools) driver).getDevTools();
         tools.createSessionIfThereIsNotOne();
 
         tools.getDomains().javascript().pin("__webdriver_attribute", script);
 
-        WebDriver driver = (WebDriver) loggable;
         // And add the script to the current page
         ((JavascriptExecutor) driver).executeScript(script);
 

diff --git a/java/src/org/openqa/selenium/logging/EventType.java b/java/src/org/openqa/selenium/logging/EventType.java
@@ -17,11 +17,13 @@
 
 package org.openqa.selenium.logging;
 
+import org.openqa.selenium.WebDriver;
+
 @FunctionalInterface
 public interface EventType<X> {
   void consume(X event);
 
-  default void initializeListener(HasLogEvents loggable) {
+  default void initializeListener(WebDriver webDriver) {
     // no-op
   }
 }