Remove aggregating interface

The underlying driver should be accessible via `WrapsDriver`
rather than us needing a custom interface.

Author: shs96c

java/client/src/org/openqa/selenium/remote/IsRemoteWebDriver.java

@@ -25,20 +25,26 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.Dimension;
+import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.ImmutableCapabilities;
+import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.NoSuchFrameException;
 import org.openqa.selenium.NoSuchWindowException;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.Pdf;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.Point;
+import org.openqa.selenium.PrintsPage;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.SessionNotCreatedException;
+import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WindowType;
+import org.openqa.selenium.interactions.HasInputDevices;
+import org.openqa.selenium.interactions.Interactive;
 import org.openqa.selenium.interactions.Keyboard;
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.Sequence;
@@ -57,6 +63,7 @@
 import org.openqa.selenium.remote.tracing.Tracer;
 import org.openqa.selenium.remote.tracing.opentelemetry.OpenTelemetryTracer;
 import org.openqa.selenium.virtualauthenticator.Credential;
+import org.openqa.selenium.virtualauthenticator.HasVirtualAuthenticator;
 import org.openqa.selenium.virtualauthenticator.VirtualAuthenticator;
 import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions;
 
@@ -87,7 +94,14 @@
 import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
 
 @Augmentable
-public class RemoteWebDriver implements IsRemoteWebDriver {
+public class RemoteWebDriver implements WebDriver,
+  JavascriptExecutor,
+  HasInputDevices,
+  HasCapabilities,
+  HasVirtualAuthenticator,
+  Interactive,
+  PrintsPage,
+  TakesScreenshot {
 
   // TODO: This static logger should be unified with the per-instance localLogs
   private static final Logger logger = Logger.getLogger(RemoteWebDriver.class.getName());
@@ -218,7 +232,6 @@ public void setFileDetector(FileDetector detector) {
     fileDetector = detector;
   }
 
-  @Override
   public SessionId getSessionId() {
     return sessionId;
   }

java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -26,7 +26,6 @@
 import org.openqa.selenium.WrapsElement;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.remote.Dialect;
-import org.openqa.selenium.remote.IsRemoteWebDriver;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.RemoteWebElement;
 import org.openqa.selenium.remote.SessionId;
@@ -45,14 +44,16 @@
 public class DecoratedRemoteWebDriverTest {
 
   @Test
-  public void canConvertDecoratedToRemoteWebDriverInterface() {
+  public void shouldImplementWrapsDriverToProvideAccessToUnderlyingDriver() {
     SessionId sessionId = new SessionId(UUID.randomUUID());
     RemoteWebDriver originalDriver = mock(RemoteWebDriver.class);
     when(originalDriver.getSessionId()).thenReturn(sessionId);
 
-    IsRemoteWebDriver decoratedDriver = (IsRemoteWebDriver) new WebDriverDecorator().decorate(originalDriver);
+    WebDriver decoratedDriver = new WebDriverDecorator().decorate(originalDriver);
+
+    RemoteWebDriver underlying = (RemoteWebDriver) ((WrapsDriver) decoratedDriver).getWrappedDriver();
 
-    assertThat(decoratedDriver.getSessionId()).isEqualTo(sessionId);
+    assertThat(underlying.getSessionId()).isEqualTo(sessionId);
   }
 
   @Test