Fixed Java 7 support for method handle extraction.

raphw · Mar 31, 2015 · 3d3166f · 3d3166f
1 parent 55998c1
commit 3d3166f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaInstance.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaInstance.java
@@ -459,10 +459,13 @@ public String toString() {
         }
 
         /**
-         * The Java method to reveal the execution context of a {@code MethodHandle}.
+         * The Java method to reveal the execution context of a {@code MethodHandle} as {@code MethodHandleInfo}.
          */
         private static final JavaMethod REVEAL_DIRECT;
 
+        /**
+         * The Java method to construct a {@code MethodHandleInfo} instance for Java 7 where revealing is not yet supported.
+         */
         private static final JavaMethod NEW_METHOD_HANDLE_INFO;
 
         /**

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaMethod.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaMethod.java
@@ -180,7 +180,7 @@ public int hashCode() {
 
         @Override
         public String toString() {
-            return "JavaMethod.ForLoadedMethod{" +
+            return "JavaMethod.ForLoadedConstructor{" +
                     "constructor=" + constructor +
                     '}';
         }

diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/utility/JavaMethodTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/utility/JavaMethodTest.java
@@ -3,11 +3,13 @@
 import net.bytebuddy.test.utility.ObjectPropertyAssertion;
 import org.junit.Test;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Iterator;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
@@ -32,13 +34,28 @@ public void testLoadedMethod() throws Exception {
         assertThat(javaMethod.invoke(instance), is((Object) instance.toString()));
     }
 
+    @Test
+    public void testLoadedConstructor() throws Exception {
+        Constructor<?> constructor = Object.class.getDeclaredConstructor();
+        JavaMethod javaMethod = new JavaMethod.ForLoadedConstructor(constructor);
+        assertThat(javaMethod.isInvokable(), is(true));
+        assertThat(javaMethod.invokeStatic(), notNullValue(Object.class));
+    }
+
     @Test
     public void testObjectProperties() throws Exception {
-        final Iterator<Method> iterator = Arrays.asList(Object.class.getDeclaredMethods()).iterator();
+        final Iterator<Method> methodIterator = Arrays.asList(Object.class.getDeclaredMethods()).iterator();
         ObjectPropertyAssertion.of(JavaMethod.ForLoadedMethod.class).create(new ObjectPropertyAssertion.Creator<Method>() {
             @Override
             public Method create() {
-                return iterator.next();
+                return methodIterator.next();
+            }
+        }).apply();
+        final Iterator<Constructor<?>> constructorIterator = Arrays.<Constructor<?>>asList(String.class.getDeclaredConstructors()).iterator();
+        ObjectPropertyAssertion.of(JavaMethod.ForLoadedConstructor.class).create(new ObjectPropertyAssertion.Creator<Constructor<?>>() {
+            @Override
+            public Constructor<?> create() {
+                return constructorIterator.next();
             }
         }).apply();
         ObjectPropertyAssertion.of(JavaMethod.ForUnavailableMethod.class).apply();