From 35d36f7d41cc86c6e0fc0c863d902fdf75d937aa Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Fri, 11 Sep 2020 18:07:37 +0200
Subject: [PATCH] Fix call.

---
 .../cloud/kubernetes/examples/GreetingController.java      | 7 +++----
 .../cloud/kubernetes/examples/NameService.java             | 7 +++----
 .../cloud/kubernetes/examples/NameController.java          | 4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingController.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingController.java
index 066ac12c..4ec2844f 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingController.java
+++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingController.java
@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.kubernetes.examples;
 
-
 import reactor.core.publisher.Mono;
 
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,9 +51,9 @@ public class GreetingController {
 	 */
 	@GetMapping("/greeting")
 	public Mono<String> getGreeting(
-		@RequestParam(value = "delay", defaultValue = "0") int delay) {
-		return Mono
-			.just(String.format("Hello from %s!", nameService.getName(delay)));
+			@RequestParam(value = "delay", defaultValue = "0") int delay) {
+		return nameService.getName(delay)
+				.map(name -> String.format("Hello from %s!", name));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java
index d8e423f4..7d479e32 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java
+++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java
@@ -19,7 +19,6 @@ package org.springframework.cloud.kubernetes.examples;
 import reactor.core.publisher.Mono;
 
 import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
 
 /**
@@ -37,10 +36,10 @@ public class NameService {
 		webClient = webClientBuilder.build();
 	}
 
-	public Mono<ClientResponse> getName(int delay) {
+	public Mono<String> getName(int delay) {
 		return webClient.get()
-			.uri("http://name-service/name?delay=%d", delay)
-			.exchange();
+				.uri(String.format("http://name-service/name?delay=%d", delay)).retrieve()
+				.bodyToMono(String.class);
 	}
 
 }
diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameController.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameController.java
index 9fa3dd63..cad79b6a 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameController.java
+++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameController.java
@@ -51,9 +51,9 @@ public class NameController {
 	 */
 	@GetMapping("/name")
 	public Mono<String> getName(
-		@RequestParam(value = "delay", defaultValue = "0") int delayValue) {
+			@RequestParam(value = "delay", defaultValue = "0") int delayValue) {
 		LOG.info(String.format("Returning a name '%s' with a delay '%d'", hostName,
-			delayValue));
+				delayValue));
 		delay(delayValue);
 		return Mono.just(hostName);
 	}