bugfix(aop/guice): add support for retrieving annotations from superclasses in DefaultAnnotationResolver

Author: lprimak

core/src/main/java/org/apache/shiro/aop/DefaultAnnotationResolver.java

@@ -63,8 +63,20 @@ public Annotation getAnnotation(MethodInvocation mi, Class<? extends Annotation>
         if (annotation == null) {
             Object miThis = mi.getThis();
             //SHIRO-473 - miThis could be null for static methods, just return null
-            annotation = miThis != null ? miThis.getClass().getAnnotation(clazz) : null;
+            annotation = miThis != null ? getAnnotationFromClassHierarchy(miThis.getClass(), clazz) : null;
         }
         return annotation;
     }
+
+    private Annotation getAnnotationFromClassHierarchy(Class<?> targetClass, Class<? extends Annotation> clazz) {
+        Class<?> current = targetClass;
+        while (current != null) {
+            Annotation annotation = current.getDeclaredAnnotation(clazz);
+            if (annotation != null) {
+                return annotation;
+            }
+            current = current.getSuperclass();
+        }
+        return null;
+    }
 }

core/src/test/java/org/apache/shiro/aop/AnnotationResolverTest.java

@@ -42,6 +42,16 @@ public void operateThat() {
         }
     }
 
+    @SuppressWarnings("unused")
+    @RequiresRoles("admin")
+    private static class ParentFixture {
+        public void operateParent() {
+        }
+    }
+
+    private static final class ChildFixture extends ParentFixture {
+    }
+
     DefaultAnnotationResolver annotationResolver = new DefaultAnnotationResolver();
 
     @Test
@@ -64,6 +74,17 @@ void testAnnotationFoundFromMethod() throws SecurityException, NoSuchMethodExcep
         assertThat(annotationResolver.getAnnotation(methodInvocation, RequiresUser.class)).isNotNull();
     }
 
+    @Test
+    void testAnnotationFoundFromSuperclass() throws SecurityException, NoSuchMethodException {
+        ChildFixture childFixture = new ChildFixture();
+        MethodInvocation methodInvocation = createMock(MethodInvocation.class);
+        Method method = ParentFixture.class.getDeclaredMethod("operateParent");
+        expect(methodInvocation.getMethod()).andReturn(method);
+        expect(methodInvocation.getThis()).andReturn(childFixture);
+        replay(methodInvocation);
+        assertThat(annotationResolver.getAnnotation(methodInvocation, RequiresRoles.class)).isNotNull();
+    }
+
     @Test
     void testNullMethodInvocation() throws SecurityException, NoSuchMethodException {
         MethodInvocation methodInvocation = createMock(MethodInvocation.class);