Clean up the Augmenter

The Augmenter provides a mechanism to enhance classes dynamically at
runtime, but the existing implementation had a number of problems:

 1. It wasn't clear which version people should use.
 2. Neither version properly handled "reflexive" calls, which made
    implementing new locating mechanisms harder.

This diff cleans that up. It does so by removing the JRE Proxy-based
implementation (sadly --- I'd much rather we didn't have the bytebuddy
dependency as it's very heavy) and cleaning out the implementation.

The key interfaces and methods were marked as `Beta` or otherwise had
notices that they were liable to change without notice, so although
this isn't strictly in the spirit of the rest of the Se4 release,
it'll get us over the hump.

java/client/src/org/openqa/selenium/devtools/DevToolsProvider.java

@@ -19,42 +19,31 @@
 
 import com.google.auto.service.AutoService;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.AugmenterProvider;
-import org.openqa.selenium.remote.InterfaceImplementation;
+import org.openqa.selenium.remote.ExecuteMethod;
 
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
 
 @AutoService(AugmenterProvider.class)
-public class DevToolsProvider implements AugmenterProvider {
+public class DevToolsProvider implements AugmenterProvider<HasDevTools> {
 
   @Override
   public Predicate<Capabilities> isApplicable() {
     return caps -> getCdpUrl(caps) != null;
   }
 
   @Override
-  public Class<?> getDescribedInterface() {
+  public Class<HasDevTools> getDescribedInterface() {
     return HasDevTools.class;
   }
 
   @Override
-  public InterfaceImplementation getImplementation(Object value) {
-    Require.argument("Implementation", value).instanceOf(Capabilities.class);
+  public HasDevTools getImplementation(Capabilities caps, ExecuteMethod executeMethod) {
+    Optional<DevTools> devTools = SeleniumCdpConnection.create(caps).map(DevTools::new);
 
-    Capabilities caps = (Capabilities) value;
-    Optional<DevTools> devTools = SeleniumCdpConnection.create(caps)
-      .map(DevTools::new);
-
-    return (executeMethod, self, method, args) -> {
-      if (!"getDevTools".equals(method.getName())) {
-        throw new IllegalStateException("Unexpected call to " + method);
-      }
-
-      return devTools.orElseThrow(() -> new IllegalStateException("Unable to create connection to " + caps));
-    };
+    return () -> devTools.orElseThrow(() -> new IllegalStateException("Unable to create connection to " + caps));
   }
 
   private String getCdpUrl(Capabilities caps) {

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

@@ -17,45 +17,56 @@
 
 package org.openqa.selenium.remote;
 
-import com.google.common.collect.ImmutableMap;
-
-import org.openqa.selenium.DeviceRotation;
+import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Rotatable;
-import org.openqa.selenium.ScreenOrientation;
 
-public class AddRotatable implements AugmenterProvider {
+import java.util.function.Predicate;
+
+import static org.openqa.selenium.remote.CapabilityType.ROTATABLE;
+
+public class AddRotatable implements AugmenterProvider<Rotatable> {
 
   @Override
-  public Class<?> getDescribedInterface() {
+  public Predicate<Capabilities> isApplicable() {
+    return caps -> caps.is(ROTATABLE);
+  }
+
+  @Override
+  public Class<Rotatable> getDescribedInterface() {
     return Rotatable.class;
   }
 
   @Override
-  public InterfaceImplementation getImplementation(Object value) {
-    return (executeMethod, self, method, args) -> {
-      String m = method.getName();
-      Object response;
-      switch(m) {
-        case "rotate":
-          if (args[0] instanceof ScreenOrientation) {
-            response = executeMethod.execute(DriverCommand.SET_SCREEN_ORIENTATION, ImmutableMap.of("orientation", args[0]));
-          } else if (args[0] instanceof DeviceRotation) {
-            response = executeMethod.execute(DriverCommand.SET_SCREEN_ORIENTATION, ((DeviceRotation)args[0]).parameters());
-          } else {
-            throw new IllegalArgumentException("rotate parameter must be either of type 'ScreenOrientation' or 'DeviceRotation'");
-          }
-          break;
-        case "getOrientation":
-          response = ScreenOrientation.valueOf((String) executeMethod.execute(DriverCommand.GET_SCREEN_ORIENTATION, null));
-          break;
-        case "rotation":
-          response = executeMethod.execute(DriverCommand.GET_SCREEN_ROTATION, null);
-          break;
-        default:
-          throw new IllegalArgumentException(method.getName() + ", Not defined in rotatable interface");
-      }
-      return response;
-    };
+  public Rotatable getImplementation(Capabilities capabilities, ExecuteMethod executeMethod) {
+    return new RemoteRotatable(executeMethod);
   }
 
+//  @Override
+//  public InterfaceImplementation getImplementation(Object value) {
+//    return (executeMethod, self, method, args) -> {
+//      String m = method.getName();
+//      Object response;
+//      switch(m) {
+//        case "rotate":
+//          if (args[0] instanceof ScreenOrientation) {
+//            response = executeMethod.execute(DriverCommand.SET_SCREEN_ORIENTATION, ImmutableMap.of("orientation", args[0]));
+//          } else if (args[0] instanceof DeviceRotation) {
+//            response = executeMethod.execute(DriverCommand.SET_SCREEN_ORIENTATION, ((DeviceRotation)args[0]).parameters());
+//          } else {
+//            throw new IllegalArgumentException("rotate parameter must be either of type 'ScreenOrientation' or 'DeviceRotation'");
+//          }
+//          break;
+//        case "getOrientation":
+//          response = ScreenOrientation.valueOf((String) executeMethod.execute(DriverCommand.GET_SCREEN_ORIENTATION, null));
+//          break;
+//        case "rotation":
+//          response = executeMethod.execute(DriverCommand.GET_SCREEN_ROTATION, null);
+//          break;
+//        default:
+//          throw new IllegalArgumentException(method.getName() + ", Not defined in rotatable interface");
+//      }
+//      return response;
+//    };
+//  }
+
 }