closes #251

Author: Alexander Furer

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

@@ -0,0 +1,25 @@
+package org.lognet.springboot.grpc.consul;
+
+import com.ecwid.consul.v1.health.model.HealthService;
+import org.hamcrest.Matchers;
+import org.junit.runner.RunWith;
+import org.lognet.springboot.grpc.demo.DemoApp;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.event.RecordApplicationEvents;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+@SpringBootTest(classes = DemoApp.class,properties = "grpc.consul.registration-mode=NOOP")
+@RunWith(SpringRunner.class)
+@RecordApplicationEvents
+public class ConsulNoopHealthCheckTest extends ConsulRegistrationBaseTest{
+
+    @Override
+    void doTest( List<HealthService> healthServices) {
+        assertThat(healthServices,Matchers.hasSize(0));
+    }
+}

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

@@ -80,35 +80,54 @@ public void setUp() throws Exception {
 
 
         List<ServiceInstance> instances = discoveryClient.getInstances(serviceId);
-        assertThat(instances, Matchers.not(Matchers.empty()));
 
-        ServiceInstance serviceInstance = instances.get(0);
+        final ServiceRegistrationMode registrationMode = applicationContext.getBean(GRpcServerProperties.class)
+                .getConsul().getRegistrationMode();
 
-        channel = ManagedChannelBuilder.forAddress(serviceInstance.getHost(), serviceInstance.getPort())
-                .usePlaintext()
-                .build();
+        if(!ServiceRegistrationMode.NOOP.equals(registrationMode)) {
 
-        final GreeterGrpc.GreeterFutureStub greeterFutureStub = GreeterGrpc.newFutureStub(channel);
-        final GreeterOuterClass.HelloRequest helloRequest = GreeterOuterClass.HelloRequest.newBuilder().setName("Bob").build();
-        final String reply = greeterFutureStub.sayHello(helloRequest).get().getMessage();
-        assertThat("Reply should not be null", reply, Matchers.notNullValue(String.class));
+
+            assertThat(instances, Matchers.not(Matchers.empty()));
+
+            ServiceInstance serviceInstance = instances.get(0);
+
+            channel = ManagedChannelBuilder.forAddress(serviceInstance.getHost(), serviceInstance.getPort())
+                    .usePlaintext()
+                    .build();
+
+            final GreeterGrpc.GreeterFutureStub greeterFutureStub = GreeterGrpc.newFutureStub(channel);
+            final GreeterOuterClass.HelloRequest helloRequest = GreeterOuterClass.HelloRequest.newBuilder().setName("Bob").build();
+            final String reply = greeterFutureStub.sayHello(helloRequest).get().getMessage();
+            assertThat("Reply should not be null", reply, Matchers.notNullValue(String.class));
+        }
     }
 
     @After
     public void tearDown() throws Exception {
-        channel.shutdownNow();
-        channel.awaitTermination(1, TimeUnit.SECONDS);
+        if(null!=channel) {
+            channel.shutdownNow();
+            channel.awaitTermination(1, TimeUnit.SECONDS);
+        }
         applicationContext.stop();
     }
 
     @Test
     public void contextLoads() {
 
-
-        int expectedRegistrations = applicationContext.getBean(GRpcServerProperties.class)
+        int minExpectedRegistrations;
+        switch (applicationContext.getBean(GRpcServerProperties.class)
                 .getConsul()
-                .getRegistrationMode().equals(ServiceRegistrationMode.STANDALONE_SERVICES) ?
-                getServicesDefinitions().size() : 1;
+                .getRegistrationMode()) {
+            case STANDALONE_SERVICES:
+                minExpectedRegistrations = getServicesDefinitions().size();
+                break;
+            case NOOP:
+                minExpectedRegistrations = 0;
+                break;
+            default:
+                minExpectedRegistrations = 1;
+        }
+
 
         final List<HealthService> healthServices = Awaitility.await()
                 .atMost(Duration.ofSeconds(20))
@@ -119,7 +138,7 @@ public void contextLoads() {
                                         .build())
                                 .getValue()
 
-                        , Matchers.hasSize(Matchers.greaterThanOrEqualTo(expectedRegistrations)));
+                        , Matchers.hasSize(Matchers.greaterThanOrEqualTo(minExpectedRegistrations)));
 
         doTest(healthServices);
 

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

@@ -18,6 +18,12 @@
 import java.util.stream.Collectors;
 
 public enum ServiceRegistrationMode implements ServiceRegistrationStrategy {
+    NOOP{
+        @Override
+        public Collection<NewService> createServices(Server grpcServer, ApplicationContext applicationContext) {
+            return Collections.emptyList();
+        }
+    },
     SINGLE_SERVER_WITH_GLOBAL_CHECK {
         @Override
         public Collection<NewService> createServices(Server grpcServer, ApplicationContext applicationContext) {