tests fixes

Author: Alexander Furer

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

@@ -13,6 +13,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -26,6 +27,7 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {DemoApp.class, CustomManagedHealthStatusServiceTest.Cfg.class}, webEnvironment = NONE)
 @ActiveProfiles("disable-security")
+
 public class CustomManagedHealthStatusServiceTest extends GrpcServerTestBase {
     @TestConfiguration
     static class Cfg{
@@ -38,11 +40,13 @@ static class MyCustomHealthStatusService extends DefaultHealthStatusService {}
     private ManagedHealthStatusService healthStatusManager;
 
     @Test
+    @DirtiesContext
     public void contextLoads() {
         assertThat(healthStatusManager,isA(Cfg.MyCustomHealthStatusService.class));
     }
 
     @Test
+    @DirtiesContext
     public void testHealthCheck() throws ExecutionException, InterruptedException {
         final HealthCheckRequest healthCheckRequest = HealthCheckRequest.newBuilder().setService(GreeterGrpc.getServiceDescriptor().getName()).build();
         final HealthGrpc.HealthFutureStub healthFutureStub = HealthGrpc.newFutureStub(channel);

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

@@ -98,7 +98,11 @@ public void start() {
                                         HealthGrpc.HealthImplBase.class.getName()
                                         ));
                             }
-                            healthStatusManager = Optional.of((ManagedHealthStatusService)srv);
+                            if(healthStatusManager.isPresent()){
+                                throw new FatalBeanException(String.format("Only 1 single %s service instance is allowed",ManagedHealthStatusService.class.getName()));
+                            }else {
+                                healthStatusManager = Optional.of((ManagedHealthStatusService) srv);
+                            }
                         } else {
                             serviceNames.add(serviceDefinition.getServiceDescriptor().getName());
                         }

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

@@ -6,7 +6,6 @@
 import org.lognet.springboot.grpc.GRpcServerRunner;
 import org.lognet.springboot.grpc.GRpcService;
 import org.lognet.springboot.grpc.health.DefaultHealthStatusService;
-import org.lognet.springboot.grpc.health.ManagedHealthStatusService;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,7 +36,8 @@
 @ConditionalOnBean(annotation = GRpcService.class)
 @EnableConfigurationProperties({GRpcServerProperties.class})
 @Import({GRpcValidationConfiguration.class,
-        NettyServerBuilderSelector.class
+        NettyServerBuilderSelector.class,
+        DefaultHealthStatusService.class
 })
 public class GRpcAutoConfiguration {
 
@@ -58,11 +58,7 @@ public GRpcServerRunner grpcInprocessServerRunner(@Qualifier("grpcInternalConfig
         return new GRpcServerRunner(configurator, InProcessServerBuilder.forName(grpcServerProperties.getInProcessServerName()));
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public ManagedHealthStatusService healthStatusManager() {
-        return new DefaultHealthStatusService();
-    }
+
 
     @Bean
     @ConditionalOnMissingBean(GRpcServerBuilderConfigurer.class)

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

@@ -5,7 +5,13 @@
 import io.grpc.health.v1.HealthGrpc;
 import io.grpc.protobuf.services.HealthStatusManager;
 import io.grpc.stub.StreamObserver;
+import org.lognet.springboot.grpc.GRpcService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Configuration;
 
+@GRpcService
+@Configuration
+@ConditionalOnMissingBean(ManagedHealthStatusService.class)
 public class DefaultHealthStatusService extends ManagedHealthStatusService {
     private final HealthStatusManager healthStatusManager = new HealthStatusManager();
     private final HealthGrpc.HealthImplBase service = (HealthGrpc.HealthImplBase) healthStatusManager.getHealthService();