grpc.port property is properly populated by config server client, should fix 99 and 103

Author: Alexander Furer

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         springBoot_1_X_Version = '1.5.13.RELEASE'
-        springBoot_2_X_Version = '2.0.3.RELEASE'
+        springBoot_2_X_Version = '2.1.3.RELEASE'
         grpcVersion = '1.19.0'
     }
     repositories {

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

@@ -16,7 +16,7 @@ public class GRpcServerProperties {
      * gRPC server port
      *
      */
-    private int port = DEFAULT_GRPC_PORT;
+    private int port = 0;
 
     /**
      * Enables the embedded grpc server.

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

@@ -22,13 +22,11 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
         MutablePropertySources sources = environment.getPropertySources();
         Properties properties = new Properties();
         Integer configuredPort = environment.getProperty("grpc.port", Integer.class);
-        properties.put("grpc.port", 0);
-        if (null == configuredPort) {
+          if (null == configuredPort) {
             properties.put(LocalRunningGrpcPort.propertyName, DEFAULT_GRPC_PORT);
         } else if (0 == configuredPort) {
             properties.put(LocalRunningGrpcPort.propertyName, SocketUtils.findAvailableTcpPort());
         } else {
-            properties.put("grpc.port", configuredPort);
             properties.put(LocalRunningGrpcPort.propertyName, configuredPort);
         }
 

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

@@ -8,7 +8,7 @@
         ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Value("${" + LocalRunningGrpcPort.propertyName + "}")
+@Value("#{environment.containsProperty('grpc.port') && '0' != environment.getProperty('grpc.port') ? environment.getProperty('grpc.port'): ${" + LocalRunningGrpcPort.propertyName + "}}")
 public @interface LocalRunningGrpcPort {
     String propertyName = "local.grpc.port";
 }

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

@@ -31,6 +31,8 @@ dependencies {
     testRuntime('org.springframework.boot:spring-boot-starter-actuator')
     testRuntime('org.springframework.boot:spring-boot-starter-web')
 
+	testCompile "org.springframework.cloud:spring-cloud-config-server:2.1.1.RELEASE"
+	testCompile "org.springframework.cloud:spring-cloud-config-client:2.1.1.RELEASE"
 
 }
 bootJar.enabled  =false

grpc-spring-boot2-starter-demo/src/main/resources/bootstrap.yml

@@ -0,0 +1,6 @@
+spring:
+  application:
+    name: grpc-demo
+  cloud:
+    config:
+      uri: http://localhost:${config.port:8888}

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

@@ -0,0 +1,63 @@
+package org.lognet.springboot.grpc;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.lognet.springboot.grpc.demo.DemoApp;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.SocketUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+import java.util.Optional;
+
+import static org.junit.Assert.assertEquals;
+
+@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"})
+public class ConfigServerEnvironmentTest extends GrpcServerTestBase{
+
+    private static int configPort = SocketUtils.findAvailableTcpPort();
+    private static ConfigurableApplicationContext server;
+
+    @BeforeClass
+    public static void startConfigServer() throws IOException, URISyntaxException {
+        File configDir = Paths.get(ConfigServerEnvironmentTest.class.getResource("/config-repo/grpc-demo.properties").toURI())
+                .toFile()
+                .getParentFile();
+
+
+
+
+        server = SpringApplication.run(org.springframework.cloud.config.server.ConfigServerApplication.class,
+                "--server.port=" + configPort,
+                "--spring.autoconfigure.exclude=org.lognet.springboot.grpc.autoconfigure.GRpcAutoConfiguration",
+                "--spring.cloud.config.server.health.enabled=false",
+                "--spring.cloud.config.server.bootstrap=false",
+                "--spring.profiles.active=native",
+                "--spring.cloud.config.server.native.search-locations[0]=file:"+configDir.getAbsolutePath()
+        );
+        System.setProperty("config.port", "" + configPort);
+
+    }
+
+    @Test
+    public void assertConfigServerConfiguredPort(){
+        assertEquals(6666,getPort());
+    }
+    @AfterClass
+    public static void close() {
+        System.clearProperty("config.port");
+        Optional.ofNullable(server).ifPresent(ConfigurableApplicationContext::close);
+    }
+
+}

grpc-spring-boot2-starter-demo/src/test/resources/application.properties

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

grpc-spring-boot2-starter-demo/src/test/resources/config-repo/grpc-demo.properties

@@ -0,0 +1 @@
+grpc.port = 6666