Decorator should honour implementation checks

java/src/org/openqa/selenium/support/decorators/WebDriverDecorator.java

@@ -304,13 +304,25 @@ protected final <Z> Z createProxy(final Decorated<Z> decorated, Class<Z> clazz)
             || decoratedInterfaces.contains(method.getDeclaringClass())) {
           return method.invoke(decorated, args);
         }
-        if (originalInterfaces.contains(method.getDeclaringClass())) {
+        // Check if the class in which the method resides, implements any one of the
+        // interfaces that we extracted from the decorated class.
+        boolean isCompatible = originalInterfaces.stream()
+          .anyMatch(eachInterface -> eachInterface.isAssignableFrom(method.getDeclaringClass()));
+
+        if (isCompatible) {
           decorated.beforeCall(method, args);
           Object result = decorated.call(method, args);
           decorated.afterCall(method, result, args);
           return result;
         }
-        if (derivedInterfaces.containsKey(method.getDeclaringClass())) {
+
+        // Check if the class in which the current method resides, implements any of the
+        // additional interfaces that we extracted from the decorated class.
+        // E.g., of additional interfaces include WrapsDriver,WrapsElement,JsonSerializer
+        isCompatible = derivedInterfaces.keySet().stream()
+          .anyMatch(eachInterface -> eachInterface.isAssignableFrom(method.getDeclaringClass()));
+
+        if (isCompatible) {
           return derivedInterfaces.get(method.getDeclaringClass()).invoke(proxy, method, args);
         }
 

java/test/org/openqa/selenium/support/events/EventFiringDecoratorTest.java

@@ -21,10 +21,12 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
+import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Tag;
 import org.openqa.selenium.Alert;
@@ -436,4 +438,21 @@ public void onError(Object target, Method method, Object[] args, InvocationTarge
     assertThatExceptionOfType(WebDriverException.class)
       .isThrownBy(decorated::getWindowHandle);
   }
+
+  @Test
+  public void ensureListenersAreInvokedWhenUsingDecoratedSubClasses() {
+    RemoteWebDriver originalDriver = mock(RemoteWebDriver.class);
+    doNothing().when(originalDriver).get(any());
+    AtomicInteger invocationCount = new AtomicInteger(0);
+    WebDriverListener listener = new WebDriverListener() {
+      @Override
+      public void beforeAnyCall(Object target, Method method, Object[] args) {
+        invocationCount.incrementAndGet();
+      }
+    };
+    RemoteWebDriver rem = new EventFiringDecorator<>(RemoteWebDriver.class, listener)
+      .decorate(originalDriver);
+    rem.get("http://localhost:4444");
+    assertThat(invocationCount.get()).isEqualTo(1);
+  }
 }