Replace cglib with bytebuddy

Apparently this is the best thing to use these days.

java/client/.classpath

@@ -16,7 +16,6 @@
 	<classpathentry kind="lib" path="/third-party/java/commons/commons-exec-1.3.jar" sourcepath="/third-party/java/commons/commons-exec-1.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-util-9.4.5.v20170502.jar" sourcepath="/third-party/java/jetty/jetty-util-9.4.5.v20170502-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-3.2.4.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet/javax.servlet-api-3.1.0.jar" sourcepath="/third-party/java/servlet/javax.servlet-api-3.1.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.4.0.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.4.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.3.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.3-sources.jar"/>
@@ -45,5 +44,6 @@
 	<classpathentry kind="lib" path="/third-party/java/gson/gson-2.8.0.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.9.9.jar" sourcepath="/third-party/java/testng/testng-6.9.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/github/org.eclipse.egit.github.core-2.1.5.jar" sourcepath="/third-party/java/github/org.eclipse.egit.github.core-2.1.5.jar-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/bytebuddy/byte-buddy-1.7.5.jar" sourcepath="/third-party/java/bytebuddy/byte-buddy-1.7.5-sources.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>

java/client/client.iml

@@ -16,6 +16,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="byte-buddy" level="project" />
     <orderEntry type="library" name="cglib" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-codec" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-collections" level="project" />

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

@@ -18,16 +18,20 @@
 package org.openqa.selenium.remote;
 
 
+import static net.bytebuddy.matcher.ElementMatchers.any;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Sets;
 
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.description.annotation.AnnotationDescription;
+import net.bytebuddy.implementation.FixedValue;
+import net.bytebuddy.implementation.InvocationHandlerAdapter;
 
 import org.openqa.selenium.WebDriver;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -37,6 +41,7 @@
 import java.util.Set;
 import java.util.logging.Logger;
 
+
 /**
  * Enhance the interfaces implemented by an instance of the
  * {@link org.openqa.selenium.remote.RemoteWebDriver} based on the returned
@@ -49,8 +54,10 @@ public class Augmenter extends BaseAugmenter {
   private static final Logger logger = Logger.getLogger(Augmenter.class.getName());
 
   @Override
-  protected <X> X create(RemoteWebDriver driver,
-      Map<String, AugmenterProvider> augmentors, X objectToAugment) {
+  protected <X> X create(
+      RemoteWebDriver driver,
+      Map<String, AugmenterProvider> augmentors,
+      X objectToAugment) {
     CompoundHandler handler = determineAugmentation(driver, augmentors, objectToAugment);
 
     X augmented = performAugmentation(handler, objectToAugment);
@@ -62,12 +69,10 @@ protected <X> X create(RemoteWebDriver driver,
 
   @Override
   protected RemoteWebDriver extractRemoteWebDriver(WebDriver driver) {
-    if (driver.getClass().isAnnotationPresent(Augmentable.class) ||
-        driver.getClass().getName().startsWith(
-            "org.openqa.selenium.remote.RemoteWebDriver$$EnhancerByCGLIB")) {
+    if (driver.getClass().isAnnotationPresent(Augmentable.class)) {
       return (RemoteWebDriver) driver;
-
     }
+
     logger.warning("Augmenter should be applied to the instances of @Augmentable classes " +
         "or previously augmented instances only (instance class was: " + driver.getClass() + ")");
     return null;
@@ -91,10 +96,6 @@ private void copyField(Object source, Object target, Field field) {
       return;
     }
 
-    if (field.getName().startsWith("CGLIB$")) {
-      return;
-    }
-
     try {
       field.setAccessible(true);
       Object value = field.get(source);
@@ -104,8 +105,10 @@ private void copyField(Object source, Object target, Field field) {
     }
   }
 
-  private CompoundHandler determineAugmentation(RemoteWebDriver driver,
-      Map<String, AugmenterProvider> augmentors, Object objectToAugment) {
+  private CompoundHandler determineAugmentation(
+      RemoteWebDriver driver,
+      Map<String, AugmenterProvider> augmentors,
+      Object objectToAugment) {
     Map<String, ?> capabilities = driver.getCapabilities().asMap();
 
     CompoundHandler handler = new CompoundHandler(driver, objectToAugment);
@@ -131,39 +134,41 @@ private CompoundHandler determineAugmentation(RemoteWebDriver driver,
   protected <X> X performAugmentation(CompoundHandler handler, X from) {
     if (handler.isNeedingApplication()) {
       Class<?> superClass = from.getClass();
-      while (Enhancer.isEnhanced(superClass)) {
-        superClass = superClass.getSuperclass();
-      }
-
-      Enhancer enhancer = new Enhancer();
-      enhancer.setCallback(handler);
-      enhancer.setSuperclass(superClass);
 
-      Set<Class<?>> interfaces = Sets.newHashSet();
-      interfaces.addAll(ImmutableList.copyOf(from.getClass().getInterfaces()));
-      interfaces.addAll(handler.getInterfaces());
-      enhancer.setInterfaces(interfaces.toArray(new Class<?>[interfaces.size()]));
-
-      return (X) enhancer.create();
+      Class<?> loaded = new ByteBuddy()
+          .subclass(superClass)
+          .implement(ImmutableList.copyOf(handler.getInterfaces()))
+          .annotateType(AnnotationDescription.Builder.ofType(Augmentable.class).build())
+          .method(any()).intercept(InvocationHandlerAdapter.of(handler))
+          .method(named("isAugmented")).intercept(FixedValue.value(true))
+          .make()
+          .load(superClass.getClassLoader())
+          .getLoaded()
+          .asSubclass(from.getClass());
+
+      try {
+        return (X) loaded.newInstance();
+      } catch (ReflectiveOperationException e) {
+        throw new RuntimeException("Unable to create subclass", e);
+      }
     }
 
     return from;
   }
 
-  private class CompoundHandler implements MethodInterceptor {
-
-    private Map<Method, InterfaceImplementation> handlers = new HashMap<>();
-    private Set<Class<?>> interfaces = new HashSet<>();
+  private class CompoundHandler implements InvocationHandler {
 
-    private final RemoteWebDriver driver;
+    private final ExecuteMethod execute;
     private final Object originalInstance;
+    private final Map<Method, InterfaceImplementation> handlers = new HashMap<>();
+    private final Set<Class<?>> interfaces = new HashSet<>();
 
     private CompoundHandler(RemoteWebDriver driver, Object originalInstance) {
-      this.driver = driver;
+      this.execute = new RemoteExecuteMethod(driver);
       this.originalInstance = originalInstance;
     }
 
-    public void addCapabilityHander(Class<?> fromInterface, InterfaceImplementation handledBy) {
+    void addCapabilityHander(Class<?> fromInterface, InterfaceImplementation handledBy) {
       if (fromInterface.isInterface()) {
         interfaces.add(fromInterface);
       }
@@ -172,16 +177,16 @@ public void addCapabilityHander(Class<?> fromInterface, InterfaceImplementation
       }
     }
 
-    public Set<Class<?>> getInterfaces() {
+    Set<Class<?>> getInterfaces() {
       return interfaces;
     }
 
-    public boolean isNeedingApplication() {
+    boolean isNeedingApplication() {
       return !handlers.isEmpty();
     }
 
-    public Object intercept(Object self, Method method, Object[] args, MethodProxy methodProxy)
-        throws Throwable {
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
       InterfaceImplementation handler = handlers.get(method);
 
       if (handler == null) {
@@ -192,7 +197,7 @@ public Object intercept(Object self, Method method, Object[] args, MethodProxy m
         }
       }
 
-      return handler.invoke(new RemoteExecuteMethod(driver), self, method, args);
+      return handler.invoke(execute, proxy, method, args);
     }
   }
 }

java/client/src/org/openqa/selenium/remote/BUCK

@@ -54,7 +54,7 @@ java_library(name = 'remote',
     '//java/client/src/org/openqa/selenium:selenium',
   ],
   deps = [
-    '//third_party/java/cglib:cglib',
+    '//third_party/java/bytebuddy:bytebuddy',
     '//third_party/java/guava:guava',
   ],
   visibility = ['PUBLIC'],

java/client/test/org/openqa/selenium/remote/BaseAugmenterTest.java

@@ -165,12 +165,7 @@ public Class<?> getDescribedInterface() {
       }
 
       public InterfaceImplementation getImplementation(Object value) {
-        return new InterfaceImplementation() {
-          public Object invoke(ExecuteMethod executeMethod, Object self, Method method,
-              Object... args) {
-            return "Hello World";
-          }
-        };
+        return (executeMethod, self, method, args) -> "Hello World";
       }
     });