Simplify cloud examples

Author: ST-DDT

examples/cloud-grpc-client-consul/build.gradle

@@ -2,16 +2,28 @@ plugins {
     id 'org.springframework.boot'
 }
 
+def discoveryProvider = project.findProperty('discovery') ?: 'consul';
+
 dependencies {
-    implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
+	switch (discoveryProvider) {
+		case "nacos": {
+			implementation 'com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery'
+			break;
+		}
+		case "consul": {
+			implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
+			break;
+		}
+	}
+
+    implementation project(':grpc-client-spring-boot-starter') // Replace with actual dependency "net.devh:grpc-client-spring-boot-starter:${springBootGrpcVersion}"
+    implementation project(':examples:grpc-lib') // Replace with your grpc interface spec
+
+	// For demonstration only
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+}
 
-    implementation project(':examples:grpc-lib')
-    implementation project(':grpc-client-spring-boot-starter') // replace to implementation "net.devh:grpc-server-spring-boot-starter:${springBootGrpcVersion}"
-
-    testImplementation('org.springframework.boot:spring-boot-starter-test'){
-        exclude module: 'junit-vintage-engine'
-        exclude module: 'junit'
-    }
+bootRun {
+    args = ["--spring.profiles.active=" + discoveryProvider]
 }

examples/cloud-grpc-client-consul/src/main/java/net/devh/boot/grpc/examples/cloud/client/ConsulClientApplication.java renamed to examples/cloud-grpc-client-consul/src/main/java/net/devh/boot/grpc/examples/cloud/client/CloudClientApplication.java

@@ -21,16 +21,12 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
-/**
- * @author zhaochunlin ([email protected])
- * @since 2021/1/9
- */
 @EnableDiscoveryClient
 @SpringBootApplication
-public class ConsulClientApplication {
+public class CloudClientApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(ConsulClientApplication.class, args);
+    public static void main(final String... args) {
+        SpringApplication.run(CloudClientApplication.class, args);
     }
 
 }

examples/cloud-grpc-client-consul/src/main/java/net/devh/boot/grpc/examples/cloud/client/GrpcClientController.java

@@ -23,8 +23,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * @author zhaochunlin ([email protected])
- * @since 2021/1/9
+ * Optional demo controller making the grpc service accessible via browser.
  */
 @RestController
 public class GrpcClientController {
@@ -33,8 +32,8 @@ public class GrpcClientController {
     private GrpcClientService grpcClientService;
 
     @RequestMapping("/")
-    public String printMessage(@RequestParam(defaultValue = "Michael") String name) {
-        return grpcClientService.sendMessage(name);
+    public String printMessage(@RequestParam(defaultValue = "Michael") final String name) {
+        return this.grpcClientService.sendMessage(name);
     }
 
 }

examples/cloud-grpc-client-consul/src/main/java/net/devh/boot/grpc/examples/cloud/client/GrpcClientService.java

@@ -26,23 +26,19 @@
 import net.devh.boot.grpc.examples.lib.HelloRequest;
 import net.devh.boot.grpc.examples.lib.SimpleGrpc.SimpleBlockingStub;
 
-/**
- * @author zhaochunlin ([email protected])
- * @since 2021/1/9
- */
 @Service
 @Slf4j
 public class GrpcClientService {
 
-    @GrpcClient("cloud-grpc-server-consul")
+    @GrpcClient("cloud-grpc-server")
     private SimpleBlockingStub simpleStub;
 
     public String sendMessage(final String name) {
         try {
             final HelloReply response = this.simpleStub.sayHello(HelloRequest.newBuilder().setName(name).build());
             return response.getMessage();
         } catch (final StatusRuntimeException e) {
-            log.error(e.getMessage());
+            log.error("Request failed", e);
             return "FAILED with " + e.getStatus().getCode();
         }
     }

examples/cloud-grpc-client-consul/src/main/resources/application-consul.yml

@@ -0,0 +1,7 @@
+spring:
+  cloud:
+    consul:
+      discovery:
+        register: false
+#        hostname: localhost
+#        port: 8500

examples/cloud-grpc-client-consul/src/main/resources/application-nacos.yml

@@ -0,0 +1,6 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        register-enabled: false
+#        server-addr: localhost:8848

examples/cloud-grpc-client-consul/src/main/resources/application.yml

@@ -1,17 +1,12 @@
 server:
-  port: 8082
+  port: 8080
 spring:
   application:
-    name: cloud-grpc-client-consul
-  cloud:
-    consul:
-      discovery:
-        registry: false
-        port: 8500
-        hostname: 127.0.0.1
+    name: cloud-grpc-client
 grpc:
   client:
-    cloud-grpc-server-consul:
+    cloud-grpc-server:
+      address: 'discovery:///cloud-grpc-server'
       enableKeepAlive: true
       keepAliveWithoutCalls: true
       negotiationType: plaintext