closes #30

Author: Alexander Furer

build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'idea'
 buildscript {
     ext {
-        springBootVersion = '1.4.0.RELEASE'
-        grpcVersion = '1.0.0'
+        springBootVersion = '1.4.2.RELEASE'
+        grpcVersion = '1.0.2'
     }
     repositories {
         mavenCentral()

grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/CalculatorGrpc.java

@@ -1,24 +1,14 @@
 package io.grpc.examples;
 
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
-import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
-import static io.grpc.stub.ClientCalls.futureUnaryCall;
 import static io.grpc.MethodDescriptor.generateFullMethodName;
+import static io.grpc.stub.ClientCalls.*;
 import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
 import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.0.0)",
+    value = "by gRPC proto compiler (version 1.0.2)",
     comments = "Source: calculator.proto")
 public class CalculatorGrpc {
 

grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/GreeterGrpc.java

@@ -11,7 +11,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.0.0)",
+    value = "by gRPC proto compiler (version 1.0.2)",
     comments = "Source: greeter.proto")
 public class GreeterGrpc {
 

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

@@ -1,18 +1,14 @@
 package org.lognet.springboot.grpc;
 
-import static org.junit.Assert.*;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
-
-import java.util.concurrent.ExecutionException;
-
-import io.grpc.*;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.ServerInterceptor;
 import io.grpc.examples.CalculatorGrpc;
 import io.grpc.examples.CalculatorOuterClass;
+import io.grpc.examples.GreeterGrpc;
+import io.grpc.examples.GreeterOuterClass;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.runner.RunWith;
 import org.lognet.springboot.grpc.demo.DemoApp;
 import org.mockito.Mockito;
@@ -21,12 +17,15 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.rule.OutputCapture;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import io.grpc.examples.GreeterGrpc;
-import io.grpc.examples.GreeterOuterClass;
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.*;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
 
 /**
  * Created by alexf on 28-Jan-16.
@@ -44,6 +43,8 @@ public class DemoAppTest {
     @Qualifier("globalInterceptor")
     private  ServerInterceptor globalInterceptor;
 
+    @Autowired
+    private ApplicationContext context;
 
 
     @Before
@@ -101,4 +102,12 @@ public void actuatorTest() throws ExecutionException, InterruptedException {
     }
 
 
+    @Test
+    public void testDefaultConfigurer(){
+        Assert.assertEquals("Default configurer should be picked up",
+                context.getBean(GRpcServerBuilderConfigurer.class).getClass(),
+                GRpcServerBuilderConfigurer.class);
+    }
+
+
 }

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

@@ -0,0 +1,70 @@
+package org.lognet.springboot.grpc;
+
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.examples.CalculatorGrpc;
+import io.grpc.examples.CalculatorOuterClass;
+import org.hamcrest.CoreMatchers;
+import org.junit.*;
+import org.junit.runner.RunWith;
+import org.lognet.springboot.grpc.demo.DemoApp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.concurrent.ExecutionException;
+
+import static org.lognet.springboot.grpc.TestConfig.CUSTOM_EXECUTOR_MESSAGE;
+
+
+/**
+ * Created by 310242212 on 21-Dec-16.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {DemoApp.class,TestConfig.class},
+        webEnvironment = SpringBootTest.WebEnvironment.NONE
+        ,properties = "grpc.port=7777")
+@ActiveProfiles(profiles = {"customServerBuilder"})
+public class GRpcServerBuilderConfigurerTest {
+
+    private ManagedChannel channel;
+
+    @Autowired
+    private GRpcServerBuilderConfigurer configurer;
+
+    @Rule
+    public OutputCapture outputCapture = new OutputCapture();
+
+    @Before
+    public void setup() {
+        channel = ManagedChannelBuilder.forAddress("localhost", 7777)
+                .usePlaintext(true)
+                .build();
+    }
+
+    @After
+    public void tearDown() {
+        channel.shutdown();
+    }
+
+    @Test
+    public void customServerBuilderTest() throws ExecutionException, InterruptedException {
+
+
+        Assert.assertNotEquals("Custom configurer should be picked up", configurer.getClass(),GRpcServerBuilderConfigurer.class);
+
+        double result = CalculatorGrpc.newFutureStub(channel)
+                .calculate(CalculatorOuterClass.CalculatorRequest.newBuilder()
+                        .setNumber1(1.0)
+                        .setNumber2(1.0)
+                        .setOperation(CalculatorOuterClass.CalculatorRequest.OperationType.ADD)
+                        .build())
+                .get().getResult();
+        Assert.assertEquals(2.0,result,0.0);
+
+        // log interceptor should be invoked only on GreeterService and not CalculatorService
+        outputCapture.expect(CoreMatchers.containsString(CUSTOM_EXECUTOR_MESSAGE));
+    }
+}

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

@@ -1,16 +1,13 @@
 package org.lognet.springboot.grpc;
 
-import io.grpc.Metadata;
-import io.grpc.ServerCall;
-import io.grpc.ServerCallHandler;
-import io.grpc.ServerInterceptor;
-import static   org.mockito.Mockito.*;
-
+import io.grpc.*;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
+import static org.mockito.Mockito.*;
 
 
 /**
@@ -20,6 +17,7 @@
 public class TestConfig {
 
 
+    public  static final String CUSTOM_EXECUTOR_MESSAGE="Hello from custom executor.";
 
     @Bean(name = "globalInterceptor")
     @GRpcGlobalInterceptor
@@ -37,6 +35,22 @@ public ServerCall.Listener answer(InvocationOnMock invocation) throws Throwable
         return mock;
     }
 
+    @Bean
+    @Profile("customServerBuilder")
+    public GRpcServerBuilderConfigurer grpcServerWithPredefinedPortConfigurer(){
+        return  new GRpcServerBuilderConfigurer(){
+            @Override
+            public ServerBuilder<?> configure(ServerBuilder<?> serverBuilder){
+                return serverBuilder.executor(command -> {
+                            System.out.println(CUSTOM_EXECUTOR_MESSAGE);
+                            command.run();
+                        }
+                );
+
+            }
+        };
+    }
+
 
 
 

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

@@ -0,0 +1,12 @@
+package org.lognet.springboot.grpc;
+
+import io.grpc.ServerBuilder;
+
+/**
+ * Created by 310242212 on 21-Dec-16.
+ */
+public class GRpcServerBuilderConfigurer {
+    public ServerBuilder<?> configure(ServerBuilder<?> serverBuilder){
+        return serverBuilder;
+    }
+}

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

@@ -32,8 +32,15 @@ public class GRpcServerRunner implements CommandLineRunner,DisposableBean  {
     @Autowired
     private GRpcServerProperties gRpcServerProperties;
 
+
+    private GRpcServerBuilderConfigurer configurer;
+
     private Server server;
 
+    public GRpcServerRunner(GRpcServerBuilderConfigurer configurer) {
+        this.configurer = configurer;
+    }
+
     @Override
     public void run(String... args) throws Exception {
         log.info("Starting gRPC Server ...");
@@ -57,7 +64,7 @@ public void run(String... args) throws Exception {
                 });
 
 
-        server = serverBuilder.build().start();
+        server = configurer.configure(serverBuilder).build().start();
         log.info("gRPC Server started, listening on port {}.", gRpcServerProperties.getPort());
         startDaemonAwaitThread();
 

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

@@ -1,8 +1,11 @@
 package org.lognet.springboot.grpc.autoconfigure;
 
+import org.lognet.springboot.grpc.GRpcServerBuilderConfigurer;
 import org.lognet.springboot.grpc.GRpcServerRunner;
 import org.lognet.springboot.grpc.GRpcService;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,10 +15,18 @@
  */
 @Configuration
 @EnableConfigurationProperties(GRpcServerProperties.class)
+@AutoConfigureOrder
 public class GRpcAutoConfiguration {
+
     @Bean
     @ConditionalOnBean(annotation = GRpcService.class)
-    public GRpcServerRunner grpcServerRunner(){
-        return new GRpcServerRunner();
+    public GRpcServerRunner grpcServerRunner(GRpcServerBuilderConfigurer configurer){
+        return new GRpcServerRunner(configurer);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(  GRpcServerBuilderConfigurer.class)
+    public GRpcServerBuilderConfigurer serverBuilderConfigurer(){
+        return new GRpcServerBuilderConfigurer();
     }
 }