From d2c5ee0439a1861d961e998cbbf0ad586e013bdd Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 9 Oct 2017 16:00:55 -0400
Subject: [PATCH] Polish

---
 .../filter/LoadBalancerClientFilter.java      |  4 +++-
 .../gateway/test/BaseWebClientTests.java      |  3 +++
 .../gateway/test/GatewayIntegrationTests.java | 19 +++++++------------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilter.java
index f971e015..a56ce11a 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilter.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilter.java
@@ -67,9 +67,11 @@ public class LoadBalancerClientFilter implements GlobalFilter, Ordered {
 		final ServiceInstance instance = loadBalancer.choose(url.getHost());
 
 		if (instance == null) {
-			throw new NotFoundException("");
+			throw new NotFoundException("Unable to find instance for " + url.getHost());
 		}
 
+		/*URI uri = exchange.getRequest().getURI();
+		URI requestUrl = loadBalancer.reconstructURI(instance, uri);*/
 		URI requestUrl = UriComponentsBuilder.fromUri(url)
 				.scheme(instance.isSecure()? "https" : "http") //TODO: support websockets
 				.host(instance.getHost())
diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java
index 58b819b9..03a11594 100644
--- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java
@@ -39,6 +39,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.codec.multipart.Part;
+import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -67,6 +68,7 @@ public class BaseWebClientTests {
 	@LocalServerPort
 	protected int port = 0;
 
+	protected WebTestClient testClient;
 	protected WebClient webClient;
 	protected String baseUri;
 
@@ -75,6 +77,7 @@ public class BaseWebClientTests {
 		//TODO: how to set new ReactorClientHttpConnector()
 		baseUri = "http://localhost:" + port;
 		this.webClient = WebClient.create(baseUri);
+		this.testClient = WebTestClient.bindToServer().baseUrl(baseUri).build();
 	}
 
 	@RestController
diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java
index a5e10fc0..a88f01d1 100644
--- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java
@@ -45,7 +45,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 import static org.springframework.cloud.gateway.test.TestUtils.assertStatus;
 import static org.springframework.cloud.gateway.test.TestUtils.getMap;
-import static org.springframework.web.reactive.function.BodyExtractors.toMono;
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -61,22 +60,18 @@ public class GatewayIntegrationTests extends BaseWebClientTests {
 
 	@Test
 	public void complexContentTypeWorks() {
-		Mono<Map> result = webClient.post()
+		testClient.post()
 				.uri("/headers")
 				.contentType(MediaType.APPLICATION_JSON_UTF8)
 				.syncBody("testdata")
 				.header("Host", "www.complexcontenttype.org")
 				.exchange()
-				.flatMap(response -> response.body(toMono(Map.class)));
-
-		StepVerifier.create(result)
-				.consumeNextWith(
-						response -> {
-							Map<String, Object> headers = getMap(response, "headers");
-							assertThat(headers).containsEntry(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
-						})
-				.expectComplete()
-				.verify(DURATION);
+				.expectStatus().isOk()
+				.expectBody(Map.class)
+				.consumeWith(result -> {
+					Map<String, Object> headers = getMap(result.getResponseBody(), "headers");
+					assertThat(headers).containsEntry(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
+				});
 	}
 
 	@Test