auto consule registration

Author: Alexander Furer

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

@@ -2,47 +2,26 @@
 
 import org.lognet.springboot.grpc.GRpcServerRunner;
 import org.lognet.springboot.grpc.autoconfigure.GRpcAutoConfiguration;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
-import org.springframework.cloud.consul.serviceregistry.ConsulRegistration;
 import org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistry;
 import org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @AutoConfigureAfter({ ConsulServiceRegistryAutoConfiguration.class, GRpcAutoConfiguration.class})
-@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
-@ConditionalOnBean({ConsulServiceRegistry.class, GRpcServerRunner.class})
-
 public class ConsulGrpcAutoConfiguration{
 
 
+    @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
+    @ConditionalOnBean({ConsulServiceRegistry.class, GRpcServerRunner.class})
     @Bean
-    public GrpcConsulRegistrar consulRegistrar(ServiceRegistry<ConsulRegistration> consulServiceRegistry){
+    public GrpcConsulRegistrar consulRegistrar(ConsulServiceRegistry consulServiceRegistry){
         return new GrpcConsulRegistrar(consulServiceRegistry);
     }
 
-   // @Bean
-    public BeanPostProcessor consuleServiceRegistryPostProcessor() {
-        return new BeanPostProcessor() {
-            @Override
-            public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-                return bean;
-            }
 
-            @Override
-            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-                if(ConsulServiceRegistry.class.isAssignableFrom(bean.getClass())){
-                    return  new SmartCountingConsulServiceRegistry(ConsulServiceRegistry.class.cast(bean));
-                }
-                return  bean;
-            }
-        };
-    }
 }
 

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

@@ -4,19 +4,19 @@
 import org.lognet.springboot.grpc.context.GRpcServerInitializedEvent;
 import org.lognet.springboot.grpc.context.GRpcServerStoppedEvent;
 import org.lognet.springboot.grpc.context.GrpcServerEvent;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
 import org.springframework.cloud.consul.serviceregistry.ConsulAutoRegistration;
 import org.springframework.cloud.consul.serviceregistry.ConsulRegistration;
+import org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistry;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.EventListener;
 
 public class GrpcConsulRegistrar {
 
     private ConsulRegistration registration;
-    private ServiceRegistry<ConsulRegistration> consulServiceRegistry;
+    private ConsulServiceRegistry consulServiceRegistry;
 
-    public GrpcConsulRegistrar(ServiceRegistry<ConsulRegistration>  consulServiceRegistry) {
+    public GrpcConsulRegistrar(ConsulServiceRegistry consulServiceRegistry) {
         this.consulServiceRegistry = consulServiceRegistry;
     }
 

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

@@ -4,6 +4,7 @@
 import org.junit.ClassRule;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
+import org.lognet.springboot.grpc.autoconfigure.GRpcAutoConfiguration;
 import org.lognet.springboot.grpc.demo.DemoApp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
@@ -20,16 +21,22 @@
 import java.net.URISyntaxException;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DemoApp.class,
         // Normally spring.cloud.config.enabled:true is the default but since we have the
         // config server on the classpath we need to set it explicitly
-        properties = { "spring.cloud.config.enabled:true"})
+        properties = { "spring.cloud.config.enabled=true",
+                "spring.cloud.consul.discovery.enabled=false",
+                "spring.cloud.service-registry.enabled=false",
+                "spring.cloud.service-registry.auto-registration.enabled=false",
+})
 public abstract class ConfigServerEnvironmentBaseTest extends GrpcServerTestBase{
 
-    private static int configPort = SocketUtils.findAvailableTcpPort();
+
     private static ConfigurableApplicationContext server;
 
     @ClassRule
@@ -41,7 +48,7 @@ public abstract class ConfigServerEnvironmentBaseTest extends GrpcServerTestBase
 
 
     public static void startConfigServer(Properties properties) throws IOException, URISyntaxException {
-
+        int configPort = SocketUtils.findAvailableTcpPort();
         File cfgFile = temporaryFolder.newFile("grpc-demo.properties");
         try(OutputStream os = new FileOutputStream(cfgFile)) {
             properties.store(os,null);
@@ -50,7 +57,11 @@ public static void startConfigServer(Properties properties) throws IOException,
 
         server = SpringApplication.run(org.springframework.cloud.config.server.ConfigServerApplication.class,
                 "--server.port=" + configPort,
-                "--spring.autoconfigure.exclude=org.lognet.springboot.grpc.autoconfigure.GRpcAutoConfiguration",
+                "--spring.autoconfigure.exclude="+Stream.of(GRpcAutoConfiguration.class)
+                        .map(Class::getName).collect(Collectors.joining(",")),
+                "--spring.cloud.consul.discovery.enabled=false",
+                "--spring.cloud.service-registry.enabled=false",
+                "--spring.cloud.service-registry.auto-registration.enabled=false",
                 "--spring.cloud.config.server.health.enabled=false",
                 "--spring.cloud.config.server.bootstrap=false",
                 "--spring.profiles.active=native",

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConfigServerEnvironmentBaseTest.java

@@ -1,14 +1,16 @@
 package org.lognet.springboot.grpc;
 
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
-
+@DirtiesContext
 public class ConfigServerEnvironmentTest1 extends ConfigServerEnvironmentBaseTest{
 
 
@@ -19,6 +21,10 @@ public static void startConfigServer() throws IOException, URISyntaxException {
         startConfigServer(properties);
 
     }
+    @AfterClass
+    public static void close() {
+        System.clearProperty("grpc.port");
+    }
 
 
 

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConfigServerEnvironmentTest1.java

@@ -3,6 +3,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.lognet.springboot.grpc.autoconfigure.GRpcServerProperties;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -11,7 +12,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
-
+@DirtiesContext
 public class ConfigServerEnvironmentTest2 extends ConfigServerEnvironmentBaseTest{
 
 

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConfigServerEnvironmentTest2.java

@@ -4,6 +4,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.lognet.springboot.grpc.autoconfigure.GRpcServerProperties;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -12,7 +13,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
-
+@DirtiesContext
 public class ConfigServerEnvironmentTest3 extends ConfigServerEnvironmentBaseTest{
 
     @BeforeClass

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConfigServerEnvironmentTest3.java

@@ -27,7 +27,7 @@
 public class ConsulRegistrationTest {
 
     @ClassRule
-    public static final ConsulResource consul = new ConsulResource();
+    public static final ConsulResource consul = new ConsulResource(8500);
 
     @Autowired
     private DiscoveryClient discoveryClient;

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConsulRegistrationTest.java

@@ -1,3 +1,4 @@
 management.endpoints.web.base-path=/
 management.endpoints.web.exposure.include=*
 spring.main.allow-bean-definition-overriding=true
+spring.jmx.enabled=false