Pass WebDriver instead of Loggable to allow augmentation of HasLogEvents

pujagani · pujagani · commit a25ad324ea3d · 2021-10-19T16:22:48.000+05:30
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
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,13 @@`
`17`	`17`
`18`	`18`	`package org.openqa.selenium.logging;`
`19`	`19`
	`20`	`+import org.openqa.selenium.WebDriver;`
	`21`	`+`
`20`	`22`	`@FunctionalInterface`
`21`	`23`	`public interface EventType<X> {`
`22`	`24`	`void consume(X event);`
`23`	`25`
`24`		`- default void initializeListener(HasLogEvents loggable) {`
	`26`	`+ default void initializeListener(WebDriver webDriver) {`
`25`	`27`	`// no-op`
`26`	`28`	`}`
`27`	`29`	`}`