Spring/spring-loaded
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ClassCastException in

Browse Source 
org.springsource.loaded.ri.ReflectiveInterceptor.jlrMethodInvoke(Method,
Object, Object...)
This commit is contained in:
Stefan Eggerstorfer
2013-09-02 22:23:47 +02:00
parent 9c5f2851bc
commit 85e7164633
6 changed files with 148 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAccessibleObject.java Normal file
View File

@@ -0,0 +1,28 @@
package iri;
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Method;
import reflection.AnnoT;
public class JLRMGetAnnotationViaAccessibleObject extends FormattingHelper {
@AnnoT
public void string() {
}
public String run() throws Exception {
Method m = AccessibleObject.class.getMethod("getAnnotation", Class.class);
Method mm = JLRMGetAnnotationViaAccessibleObject.class.getDeclaredMethod("string");
Annotation a = (Annotation) m.invoke(mm, AnnoT.class);
Annotation b = (Annotation) m.invoke(mm, Deprecated.class);
return a + " " + b;
}
public static void main(String[] argv) throws Exception {
System.out.println(new JLRMGetAnnotationViaAccessibleObject().run());
}
}

33
org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAccessibleObject2.java Normal file
View File

@@ -0,0 +1,33 @@
package iri;
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Method;
import reflection.AnnoT;
public class JLRMGetAnnotationViaAccessibleObject2 extends FormattingHelper {
@AnnoT
public void string() {
}
@Deprecated
public void newmethod() {
}
public String run() throws Exception {
Method m = AccessibleObject.class.getMethod("getAnnotation", Class.class);
Method mm = JLRMGetAnnotationViaAccessibleObject2.class.getDeclaredMethod("newmethod");
Annotation a = (Annotation) m.invoke(mm, AnnoT.class);
Annotation b = (Annotation) m.invoke(mm, Deprecated.class);
return a + " " + b;
}
public static void main(String[] argv) throws Exception {
System.out.println(new JLRMGetAnnotationViaAccessibleObject2().run());
}
}

28
org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAnnotatedElement.java Normal file
View File

@@ -0,0 +1,28 @@
package iri;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
import reflection.AnnoT;
public class JLRMGetAnnotationViaAnnotatedElement extends FormattingHelper {
@AnnoT
public void string() {
}
public String run() throws Exception {
Method m = AnnotatedElement.class.getMethod("getAnnotation", Class.class);
Method mm = JLRMGetAnnotationViaAnnotatedElement.class.getDeclaredMethod("string");
Annotation a = (Annotation) m.invoke(mm, AnnoT.class);
Annotation b = (Annotation) m.invoke(mm, Deprecated.class);
return a + " " + b;
}
public static void main(String[] argv) throws Exception {
System.out.println(new JLRMGetAnnotationViaAnnotatedElement().run());
}
}

33
org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAnnotatedElement2.java Normal file
View File

@@ -0,0 +1,33 @@
package iri;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
import reflection.AnnoT;
public class JLRMGetAnnotationViaAnnotatedElement2 extends FormattingHelper {
@AnnoT
public void string() {
}
@Deprecated
public void newmethod() {
}
public String run() throws Exception {
Method m = AnnotatedElement.class.getMethod("getAnnotation", Class.class);
Method mm = JLRMGetAnnotationViaAnnotatedElement2.class.getDeclaredMethod("newmethod");
Annotation a = (Annotation) m.invoke(mm, AnnoT.class);
Annotation b = (Annotation) m.invoke(mm, Deprecated.class);
return a + " " + b;
}
public static void main(String[] argv) throws Exception {
System.out.println(new JLRMGetAnnotationViaAnnotatedElement2().run());
}
}

5
org.springsource.loaded/src/main/java/org/springsource/loaded/ri/ReflectiveInterceptor.java
View File

@@ -32,7 +32,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -1205,7 +1204,7 @@ public class ReflectiveInterceptor {
if (target instanceof Constructor) {
return jlrConstructorGetAnnotation((Constructor) target, (Class) params[0]);
} else if (target instanceof Method) {
return jlClassGetAnnotation((Class) target, (Class) params[0]);
return jlrMethodGetAnnotation((Method) target, (Class) params[0]);
} else if (target instanceof Field) {
return jlrFieldGetAnnotation((Field) target, (Class) params[0]);
}
@@ -1241,7 +1240,7 @@ public class ReflectiveInterceptor {
if (target instanceof Constructor) {
return jlrConstructorGetAnnotation((Constructor) target, (Class) params[0]);
} else if (target instanceof Method) {
return jlClassGetAnnotation((Class) target, (Class) params[0]);
return jlrMethodGetAnnotation((Method) target, (Class) params[0]);
} else if (target instanceof Field) {
return jlrFieldGetAnnotation((Field) target, (Class) params[0]);
}

24
org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReflectiveReflectionTests.java
View File

@@ -551,6 +551,30 @@ public class ReflectiveReflectionTests extends SpringLoadedTests {
result = runUnguarded(rtype.getClazz(), "run");
assertEquals("null @java.lang.Deprecated()", result.returnValue);
}
@Test
public void testJRMethodGetAnnotationViaAccessibleObject() throws Exception {
String t = "iri.JLRMGetAnnotationViaAccessibleObject";
TypeRegistry r = getTypeRegistry(t);
ReloadableType rtype = r.addType(t, loadBytesForClass(t));
result = runUnguarded(rtype.getClazz(), "run");
assertEquals("@reflection.AnnoT() null", result.returnValue);
rtype.loadNewVersion(retrieveRenameRetarget(t));
result = runUnguarded(rtype.getClazz(), "run");
assertEquals("null @java.lang.Deprecated()", result.returnValue);
}
@Test
public void testGetAnnotationViaAnnotatedElement() throws Exception {
String t = "iri.JLRMGetAnnotationViaAnnotatedElement";
TypeRegistry r = getTypeRegistry(t);
ReloadableType rtype = r.addType(t, loadBytesForClass(t));
result = runUnguarded(rtype.getClazz(), "run");
assertEquals("@reflection.AnnoT() null", result.returnValue);
rtype.loadNewVersion(retrieveRenameRetarget(t));
result = runUnguarded(rtype.getClazz(), "run");
assertEquals("null @java.lang.Deprecated()", result.returnValue);
}
// general