Fix @GRpcService annotation detection (#38)

* updating to latest spring-boot version

* Security overrides for spring-activator endpoint

* extracting GreeterService to expose bug in finding beans with annotation

* fixing server runner to correctly identify beans with annotation

Author: willtaylor

build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'idea'
 buildscript {
     ext {
-        springBootVersion = '1.4.5.RELEASE'
+        springBootVersion = '1.5.2.RELEASE'
         grpcVersion = '1.2.0'
     }
     repositories {

grpc-spring-boot-starter-demo/src/main/java/org/lognet/springboot/grpc/demo/DemoApp.java

@@ -6,6 +6,7 @@
 import org.lognet.springboot.grpc.GRpcService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 
 import io.grpc.examples.GreeterGrpc;
 import io.grpc.examples.GreeterOuterClass;
@@ -19,15 +20,10 @@
 @SpringBootApplication
 public class DemoApp {
 
-    @GRpcService(interceptors = { LogInterceptor.class })
-    public static class GreeterService extends GreeterGrpc.GreeterImplBase {
-        @Override
-        public void sayHello(GreeterOuterClass.HelloRequest request, StreamObserver<GreeterOuterClass.HelloReply> responseObserver) {
-            final GreeterOuterClass.HelloReply.Builder replyBuilder = GreeterOuterClass.HelloReply.newBuilder().setMessage("Hello " + request.getName());
-            responseObserver.onNext(replyBuilder.build());
-            responseObserver.onCompleted();
-        }
-    }
+    @Bean
+    public GreeterService greeterService() {
+		return new GreeterService();
+	}
 
     @GRpcService
     public static class CalculatorService extends CalculatorGrpc.CalculatorImplBase{

grpc-spring-boot-starter-demo/src/main/java/org/lognet/springboot/grpc/demo/GreeterService.java

@@ -0,0 +1,21 @@
+package org.lognet.springboot.grpc.demo;
+
+import io.grpc.examples.CalculatorGrpc;
+import io.grpc.examples.CalculatorOuterClass;
+import org.lognet.springboot.grpc.GRpcService;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import io.grpc.examples.GreeterGrpc;
+import io.grpc.examples.GreeterOuterClass;
+import io.grpc.stub.StreamObserver;
+
+@GRpcService(interceptors = { LogInterceptor.class })
+public class GreeterService extends GreeterGrpc.GreeterImplBase {
+    @Override
+    public void sayHello(GreeterOuterClass.HelloRequest request, StreamObserver<GreeterOuterClass.HelloReply> responseObserver) {
+        final GreeterOuterClass.HelloReply.Builder replyBuilder = GreeterOuterClass.HelloReply.newBuilder().setMessage("Hello " + request.getName());
+        responseObserver.onNext(replyBuilder.build());
+        responseObserver.onCompleted();
+    }
+}

grpc-spring-boot-starter-demo/src/main/resources/application.properties

@@ -0,0 +1,2 @@
+security.basic.enabled=false
+management.security.enabled=false

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/DemoAppTestAop.java

@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.lognet.springboot.grpc.demo.DemoApp;
+import org.lognet.springboot.grpc.demo.GreeterService;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -26,7 +27,7 @@ public class DemoAppTestAop {
 
 
     @Autowired
-    private DemoApp.GreeterService greeterService;
+    private GreeterService greeterService;
 
     @Autowired
     private DemoApp.CalculatorService calculatorService;

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/GRpcServerRunner.java

@@ -14,6 +14,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -118,15 +119,19 @@ public void destroy() throws Exception {
 
     private <T> Stream<String> getBeanNamesByTypeWithAnnotation(Class<? extends Annotation> annotationType, Class<T> beanType) throws Exception{
 
-
        return Stream.of(applicationContext.getBeanNamesForType(beanType))
                 .filter(name->{
-                    BeanDefinition beanDefinition = applicationContext.getBeanFactory().getBeanDefinition(name);
-                    if( beanDefinition.getSource() instanceof StandardMethodMetadata) {
+                    final BeanDefinition beanDefinition = applicationContext.getBeanFactory().getBeanDefinition(name);
+                    final Map<String, Object> beansWithAnnotation = applicationContext.getBeansWithAnnotation(annotationType);
+
+                    if ( !beansWithAnnotation.isEmpty() ) {
+                        return beansWithAnnotation.containsKey(name);
+                    } else if( beanDefinition.getSource() instanceof StandardMethodMetadata) {
                         StandardMethodMetadata metadata = (StandardMethodMetadata) beanDefinition.getSource();
                         return metadata.isAnnotated(annotationType.getName());
                     }
-                    return null!= applicationContext.getBeanFactory().findAnnotationOnBean(name,annotationType);
+
+                    return false;
                 });
     }