closes #55, added inprocess server support

Author: Alexander Furer

ReleaseNotes.adoc

@@ -1,3 +1,8 @@
+== Version 2.1.0
+- gRPC version upgraded to 1.6.1
+- Spring boot  upgraded to 1.5.6
+- In process server support
+
 == Version 2.0.5
 - HealthStatusManager exposed as Spring bean
 - gRPC version upgraded to 1.5.0

build.gradle

@@ -1,8 +1,8 @@
 
 buildscript {
     ext {
-        springBootVersion = '1.5.2.RELEASE'
-        grpcVersion = '1.5.0'
+        springBootVersion = '1.5.6.RELEASE'
+        grpcVersion = '1.6.1'
     }
     repositories {
         mavenCentral()

grpc-spring-boot-starter-demo/build.gradle

@@ -2,9 +2,7 @@ apply plugin: 'com.google.protobuf'
 apply plugin: 'org.springframework.boot'
 
 dependencies {
-    compile "io.grpc:grpc-stub:${grpcVersion}"
-    compile "io.grpc:grpc-protobuf:${grpcVersion}"
-    compile "io.grpc:grpc-netty:${grpcVersion}"
+
     compile "org.springframework.boot:spring-boot-starter-actuator"
     compile 'org.springframework.boot:spring-boot-starter-web'
 

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

@@ -35,9 +35,9 @@
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {DemoApp.class,TestConfig.class}, webEnvironment = DEFINED_PORT)
-public class DemoAppTest {
+public class DemoAppTest extends GrpcServerTestBase{
+
 
-    private ManagedChannel channel;
 
     @Rule
     public OutputCapture outputCapture = new OutputCapture();
@@ -46,8 +46,7 @@ public class DemoAppTest {
     @Qualifier("globalInterceptor")
     private  ServerInterceptor globalInterceptor;
 
-    @Autowired
-    private ApplicationContext context;
+
 
 
     @Before
@@ -62,16 +61,12 @@ public void tearDown() {
         channel.shutdown();
     }
 
-    @Test
-    public void simpleGreeting() throws ExecutionException, InterruptedException {
 
 
-        String name ="John";
-        final GreeterGrpc.GreeterFutureStub greeterFutureStub = GreeterGrpc.newFutureStub(channel);
-        final GreeterOuterClass.HelloRequest helloRequest =GreeterOuterClass.HelloRequest.newBuilder().setName(name).build();
-        final String reply = greeterFutureStub.sayHello(helloRequest).get().getMessage();
-        assertNotNull(reply);
-        assertTrue(String.format("Replay should contain name '%s'",name),reply.contains(name));
+    @Test
+    public void disabledServerTest() throws Throwable {
+        assertNotNull(grpcServerRunner);
+        assertNull(grpcInprocessServerRunner);
 
     }
 

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

@@ -0,0 +1,69 @@
+package org.lognet.springboot.grpc;
+
+import com.google.common.base.Throwables;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.StatusRuntimeException;
+import io.grpc.examples.GreeterGrpc;
+import io.grpc.examples.GreeterOuterClass;
+import io.grpc.inprocess.InProcessChannelBuilder;
+import org.apache.tomcat.util.ExceptionUtils;
+import org.junit.After;
+import org.junit.Before;
+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.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.NestedExceptionUtils;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.net.ConnectException;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.*;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
+
+/**
+ * Created by alexf on 28-Jan-16.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {DemoApp.class },webEnvironment = NONE
+        ,properties = {"grpc.enabled=false","grpc.inProcessServerName=testServer"}
+)
+public class DisabledGrpcServerTest extends GrpcServerTestBase {
+
+
+
+
+
+
+    @Before
+     public void setup() {
+         channel = InProcessChannelBuilder.forName(gRpcServerProperties.getInProcessServerName())
+        .usePlaintext(true)
+        .build();
+        }
+
+     @After
+     public void tearDown() {
+         channel.shutdown();
+     }
+
+    @Test
+    public void disabledServerTest() throws Throwable {
+        assertNull(grpcServerRunner);
+        assertNotNull(grpcInprocessServerRunner);
+
+    }
+
+
+
+
+}

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

@@ -0,0 +1,48 @@
+package org.lognet.springboot.grpc;
+
+import io.grpc.ManagedChannel;
+import io.grpc.examples.GreeterGrpc;
+import io.grpc.examples.GreeterOuterClass;
+import org.junit.Test;
+import org.lognet.springboot.grpc.autoconfigure.GRpcServerProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.ApplicationContext;
+
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public abstract class GrpcServerTestBase {
+
+    @Autowired(required = false)
+    @Qualifier("grpcServerRunner")
+    protected GRpcServerRunner grpcServerRunner;
+
+    @Autowired(required = false)
+    @Qualifier("grpcInprocessServerRunner")
+    protected GRpcServerRunner grpcInprocessServerRunner;
+
+
+    protected ManagedChannel channel;
+
+    @Autowired
+    protected ApplicationContext context;
+
+    @Autowired
+    protected GRpcServerProperties gRpcServerProperties;
+
+    @Test
+    public void simpleGreeting() throws ExecutionException, InterruptedException {
+
+
+        String name ="John";
+        final GreeterGrpc.GreeterFutureStub greeterFutureStub = GreeterGrpc.newFutureStub(channel);
+        final GreeterOuterClass.HelloRequest helloRequest =GreeterOuterClass.HelloRequest.newBuilder().setName(name).build();
+        final String reply = greeterFutureStub.sayHello(helloRequest).get().getMessage();
+        assertNotNull(reply);
+        assertTrue(String.format("Replay should contain name '%s'",name),reply.contains(name));
+
+    }
+}

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

@@ -2,6 +2,8 @@
 
 import io.grpc.*;
 import io.grpc.health.v1.HealthCheckResponse;
+import io.grpc.inprocess.InProcessServerBuilder;
+import io.grpc.netty.NettyServerBuilder;
 import io.grpc.services.HealthStatusManager;
 import lombok.extern.slf4j.Slf4j;
 import org.lognet.springboot.grpc.autoconfigure.GRpcServerProperties;
@@ -25,7 +27,7 @@
  */
 @Slf4j
 public class GRpcServerRunner implements CommandLineRunner, DisposableBean {
-    private final Set<String> serviceList = new ConcurrentSkipListSet<>();
+
     @Autowired
     private HealthStatusManager healthStatusManager;
 
@@ -40,8 +42,11 @@ public class GRpcServerRunner implements CommandLineRunner, DisposableBean {
 
     private Server server;
 
-    public GRpcServerRunner(GRpcServerBuilderConfigurer configurer) {
+    private final ServerBuilder<?> serverBuilder;
+
+    public GRpcServerRunner(GRpcServerBuilderConfigurer configurer,ServerBuilder<?> serverBuilder) {
         this.configurer = configurer;
+        this.serverBuilder = serverBuilder;
     }
 
     @Override
@@ -52,7 +57,8 @@ public void run(String... args) throws Exception {
                 .map(name -> applicationContext.getBeanFactory().getBean(name, ServerInterceptor.class))
                 .collect(Collectors.toList());
 
-        final ServerBuilder<?> serverBuilder = ServerBuilder.forPort(gRpcServerProperties.getPort());
+
+
 
         // Adding health service
         serverBuilder.addService(healthStatusManager.getHealthService());
@@ -67,14 +73,16 @@ public void run(String... args) throws Exception {
                     serverBuilder.addService(serviceDefinition);
                     String serviceName = serviceDefinition.getServiceDescriptor().getName();
                     healthStatusManager.setStatus(serviceName, HealthCheckResponse.ServingStatus.SERVING);
-                    serviceList.add(serviceName);
+
                     log.info("'{}' service has been registered.", srv.getClass().getName());
 
                 });
 
+
         configurer.configure(serverBuilder);
         server = serverBuilder.build().start();
-        log.info("gRPC Server started, listening on port {}.", gRpcServerProperties.getPort());
+
+        log.info("gRPC Server started, listening on port {}.", server.getPort());
         startDaemonAwaitThread();
 
     }
@@ -119,7 +127,7 @@ private void startDaemonAwaitThread() {
     @Override
     public void destroy() throws Exception {
         log.info("Shutting down gRPC server ...");
-        serviceList.forEach(s -> healthStatusManager.clearStatus(s));
+        server.getServices().forEach(def->healthStatusManager.clearStatus(def.getServiceDescriptor().getName()));
         Optional.ofNullable(server).ifPresent(Server::shutdown);
         log.info("gRPC server stopped.");
     }

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

@@ -1,32 +1,61 @@
 package org.lognet.springboot.grpc.autoconfigure;
 
+import io.grpc.ServerBuilder;
+import io.grpc.inprocess.InProcessServerBuilder;
 import io.grpc.services.HealthStatusManager;
+import lombok.Getter;
 import org.lognet.springboot.grpc.GRpcServerBuilderConfigurer;
 import org.lognet.springboot.grpc.GRpcServerRunner;
 import org.lognet.springboot.grpc.GRpcService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by alexf on 25-Jan-16.
  */
-@Configuration
-@EnableConfigurationProperties(GRpcServerProperties.class)
+
 @AutoConfigureOrder
+@ConditionalOnBean(annotation = GRpcService.class)
+@EnableConfigurationProperties(GRpcServerProperties.class)
 public class GRpcAutoConfiguration {
 
+
+
+    @Autowired
+    private ApplicationContext ctx;
+
+
+    @Getter
+    @Autowired
+    private GRpcServerProperties grpcServerProperties;
+
+
+
     @Bean
-    @ConditionalOnBean(annotation = GRpcService.class)
+    @ConditionalOnProperty(value = "grpc.enabled",havingValue = "true",matchIfMissing = true)
     public GRpcServerRunner grpcServerRunner(GRpcServerBuilderConfigurer configurer){
-        return new GRpcServerRunner(configurer);
+        return new GRpcServerRunner(configurer, ServerBuilder.forPort(grpcServerProperties.getPort()));
     }
 
     @Bean
-    @ConditionalOnBean(annotation = GRpcService.class)
+    @ConditionalOnExpression("#{environment.getProperty('grpc.inProcessServerName','')!=''}")
+    public GRpcServerRunner grpcInprocessServerRunner(GRpcServerBuilderConfigurer configurer){
+        return new GRpcServerRunner(configurer, InProcessServerBuilder.forName(grpcServerProperties.getInProcessServerName()));
+    }
+
+
+
+    @Bean
     public HealthStatusManager healthStatusManager() {
         return new HealthStatusManager();
     }

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

@@ -1,22 +1,37 @@
 package org.lognet.springboot.grpc.autoconfigure;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
 
 /**
  * Created by alexf on 26-Jan-16.
  */
+
 @ConfigurationProperties("grpc")
+@Getter @Setter
 public class GRpcServerProperties {
     /**
      * gRPC server port
+     *
      */
     private int port = 6565;
 
-    public int getPort() {
-        return port;
-    }
 
-    public void setPort(int port) {
-        this.port = port;
-    }
+    /**
+     * Enables the embedded grpc server.
+     */
+    private boolean enabled = true;
+
+
+    /**
+     * In process server name.
+     * If  the value is not empty, the embedded in-process server will be created and started.
+     *
+     */
+    private String inProcessServerName;
+
+
 }