Add test that fails due to ignored inherited method checks

Author: ST-DDT

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/advice/GrpcAdviceDiscoverer.java

@@ -49,10 +49,13 @@ public class GrpcAdviceDiscoverer implements InitializingBean, ApplicationContex
     private Set<Class<?>> annotatedClasses;
     private Set<Method> annotatedMethods;
 
-
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void setApplicationContext(final ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
 
+    @Override
+    public void afterPropertiesSet() {
         annotatedBeans = applicationContext.getBeansWithAnnotation(GrpcAdvice.class);
         annotatedBeans.forEach(
                 (key, value) -> log.debug("Found gRPC advice: " + key + ", class: " + value.getClass().getName()));
@@ -76,13 +79,7 @@ private Set<Method> findAnnotatedMethods() {
                 .collect(Collectors.toSet());
     }
 
-    @Override
-    public void setApplicationContext(final ApplicationContext applicationContext) {
-        this.applicationContext = applicationContext;
-    }
-
     boolean isAnnotationPresent() {
-
         return !annotatedClasses.isEmpty() && !annotatedMethods.isEmpty();
     }
 
@@ -96,5 +93,4 @@ public Set<Method> getAnnotatedMethods() {
         return annotatedMethods;
     }
 
-
 }

grpc-server-spring-boot-autoconfigure/src/test/java/net/devh/boot/grpc/server/advice/GrpcAdviceDiscovererTest.java

@@ -0,0 +1,100 @@
+
+package net.devh.boot.grpc.server.advice;
+
+import static java.util.Collections.singletonMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.ApplicationContext;
+
+import io.grpc.Status;
+
+/**
+ * Tests for {@link GrpcAdviceDiscoverer}.
+ */
+class GrpcAdviceDiscovererTest {
+
+    private final ApplicationContext context = mock(ApplicationContext.class);
+
+    @BeforeEach
+    void beforeEach() {
+        reset(this.context);
+    }
+
+    /**
+     * Tests that the {@link GrpcAdviceDiscoverer} discovers inherited methods.
+     */
+    @Test
+    void testDiscoversInheritedMethods() {
+        when(this.context.getBeansWithAnnotation(GrpcAdvice.class))
+                .thenReturn(singletonMap("bean", new Extended()));
+
+        final GrpcAdviceDiscoverer disco = new GrpcAdviceDiscoverer();
+        disco.setApplicationContext(this.context);
+        disco.afterPropertiesSet();
+
+        assertThat(disco.getAnnotatedMethods())
+                .containsExactlyInAnyOrder(
+                        findMethod(Base.class, "handleRuntimeException", RuntimeException.class),
+                        findMethod(Extended.class, "handleIllegalArgument", IllegalArgumentException.class));
+    }
+
+    @Test
+    void testOverriddenMethods() {
+        when(this.context.getBeansWithAnnotation(GrpcAdvice.class))
+                .thenReturn(singletonMap("bean", new Overriden()));
+
+        final GrpcAdviceDiscoverer disco = new GrpcAdviceDiscoverer();
+        disco.setApplicationContext(this.context);
+        disco.afterPropertiesSet();
+
+        assertThat(disco.getAnnotatedMethods())
+                .containsExactly(findMethod(Overriden.class, "handleRuntimeException", RuntimeException.class));
+    }
+
+    private static Method findMethod(final Class<?> clazz, final String method, final Class<?>... parameters) {
+        try {
+            return clazz.getDeclaredMethod(method, parameters);
+        } catch (NoSuchMethodException | SecurityException e) {
+            throw new IllegalStateException("Failed to find method", e);
+        }
+    }
+
+    @GrpcAdvice
+    private class Base {
+
+        @GrpcExceptionHandler
+        Status handleRuntimeException(final RuntimeException e) {
+            return Status.INTERNAL;
+        }
+
+    }
+
+    @GrpcAdvice
+    private class Extended extends Base {
+
+        @GrpcExceptionHandler
+        Status handleIllegalArgument(final IllegalArgumentException e) {
+            return Status.INVALID_ARGUMENT;
+        }
+
+    }
+
+    @GrpcAdvice
+    private class Overriden extends Base {
+
+        @Override
+        @GrpcExceptionHandler
+        Status handleRuntimeException(final RuntimeException e) {
+            return Status.INVALID_ARGUMENT;
+        }
+
+    }
+
+}