Address comments

Author: pujagani

…ient/proxy/RemoteWebElementListener.java …java_client/proxy/WebDriverListener.javasrc/main/java/io/appium/java_client/proxy/RemoteWebElementListener.java renamed to src/main/java/io/appium/java_client/proxy/WebDriverListener.java src/main/java/io/appium/java_client/proxy/RemoteWebElementListener.java renamed to src/main/java/io/appium/java_client/proxy/WebDriverListener.java

@@ -16,14 +16,12 @@
 
 package io.appium.java_client.proxy;
 
-import com.google.common.base.Preconditions;
 import net.bytebuddy.matcher.ElementMatchers;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.RemoteWebElement;
 
 import java.lang.reflect.Method;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -33,22 +31,14 @@
 import static io.appium.java_client.proxy.Helpers.createProxy;
 import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 
-public class RemoteWebElementListener implements MethodCallListener, ProxyAwareListener {
+public class WebDriverListener implements MethodCallListener, ProxyAwareListener {
     private WebDriver parent;
-    private final Collection<MethodCallListener> listeners;
-
-    public RemoteWebElementListener(MethodCallListener listener) {
-        this.listeners = Collections.singletonList(listener);
-    }
-
-    public RemoteWebElementListener(Collection<MethodCallListener> listeners) {
-        this.listeners = listeners;
-    }
 
     @Override
     public void attachProxyInstance(Object proxy) {
-        Preconditions.checkArgument(proxy instanceof WebDriver);
-        this.parent = (WebDriver) proxy;
+        if (proxy instanceof WebDriver) {
+            this.parent = (WebDriver) proxy;
+        }
     }
 
     @Override
@@ -59,13 +49,13 @@ public Object call(Object obj, Method method, Object[] args, Callable<?> origina
             return wrapElement(
                     (RemoteWebElement) result,
                     parent,
-                    listeners);
+                    this);
         }
 
         if (result instanceof List) {
             return ((List<?>) result).stream()
                     .map(item -> item instanceof RemoteWebElement ? wrapElement(
-                                    (RemoteWebElement) item, parent, listeners) : item)
+                                    (RemoteWebElement) item, parent, this) : item)
                     .collect(Collectors.toList());
         }
 
@@ -75,13 +65,13 @@ public Object call(Object obj, Method method, Object[] args, Callable<?> origina
     private RemoteWebElement wrapElement(
             RemoteWebElement original,
             WebDriver parent,
-            Collection<MethodCallListener> listeners
+            MethodCallListener listener
     ) {
         RemoteWebElement proxy = createProxy(
                 RemoteWebElement.class,
                 new Object[]{},
                 new Class[]{},
-                listeners,
+                Collections.singletonList(listener),
                 ElementMatchers.not(
                         namedOneOf(
                                 OBJECT_METHOD_NAMES.toArray(new String[0]))

src/test/java/io/appium/java_client/proxy/ProxyHelpersTest.java

@@ -167,22 +167,21 @@ public Object onError(Object obj, Method method, Object[] args, Throwable e) thr
 
 
     @Test
-    void shouldFireEventsForRemoteWebElement() throws MalformedURLException {
+    void shouldFireEventsForAllWebDriverCommands() throws MalformedURLException {
         final StringBuilder acc = new StringBuilder();
-        MethodCallListener listener = new MethodCallListener() {
+
+        WebDriverListener remoteWebElementListener = new WebDriverListener() {
             @Override
             public void beforeCall(Object target, Method method, Object[] args) {
                 acc.append("beforeCall ").append(method.getName()).append("\n");
             }
         };
 
-        RemoteWebElementListener remoteWebElementListener = new RemoteWebElementListener(listener);
-
         FakeIOSDriver driver = createProxy(
                 FakeIOSDriver.class,
                 new Object[] {new URL("http://localhost:4723/"), new XCUITestOptions()},
                 new Class[] {URL.class, Capabilities.class},
-                List.of(remoteWebElementListener, listener)
+                remoteWebElementListener
         );
 
         WebElement element = driver.findElement(By.id("button"));