fix default method for java 8+ (fixes #104, via #112)

qameta · May 31, 2023 · b38decf · b38decf
1 parent 639708f
commit b38decf
Showing 1 changed file with 27 additions and 5 deletions.
diff --git a/atlas-core/src/main/java/io/qameta/atlas/core/internal/DefaultMethodExtension.java b/atlas-core/src/main/java/io/qameta/atlas/core/internal/DefaultMethodExtension.java
@@ -2,11 +2,16 @@
 
 import io.qameta.atlas.core.api.MethodExtension;
 import io.qameta.atlas.core.util.MethodInfo;
+import org.apache.commons.lang3.JavaVersion;
 
+import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
+import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
+
 /**
  * Default method extension.
  */
@@ -20,11 +25,28 @@ public boolean test(final Method method) {
     @Override
     public Object invoke(final Object proxy, final MethodInfo methodInfo, final Configuration config) throws Throwable {
         final Class<?> declaringClass = methodInfo.getMethod().getDeclaringClass();
-        final Constructor<MethodHandles.Lookup> constructor = MethodHandles.Lookup.class
-                .getDeclaredConstructor(Class.class, int.class);
-        constructor.setAccessible(true);
-        return constructor.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE)
-                .unreflectSpecial(methodInfo.getMethod(), declaringClass)
+
+        if (isJavaVersionAtMost(JavaVersion.JAVA_1_8)) {
+            final Constructor<MethodHandles.Lookup> constructor = MethodHandles.Lookup.class
+                    .getDeclaredConstructor(Class.class, int.class);
+            constructor.setAccessible(true);
+            return constructor.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE)
+                    .unreflectSpecial(methodInfo.getMethod(), declaringClass)
+                    .bindTo(proxy)
+                    .invokeWithArguments(methodInfo.getArgs());
+        }
+
+        final MethodHandle methodHandle = MethodHandles.lookup().findSpecial(
+                declaringClass,
+                methodInfo.getMethod().getName(),
+                MethodType.methodType(
+                        methodInfo.getMethod().getReturnType(),
+                        methodInfo.getMethod().getParameterTypes()
+                ),
+                declaringClass
+        );
+
+        return methodHandle
                 .bindTo(proxy)
                 .invokeWithArguments(methodInfo.getArgs());
     }