From 0501c7a1c88b33a42591478acc080b648cf48d6d Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 23 Jul 2019 16:35:40 -0400
Subject: [PATCH] formatting

---
 .../gateway/config/HttpClientProperties.java  | 27 ++++++++++---------
 .../filter/WebClientWriteResponseFilter.java  | 13 +++++----
 .../GatewayControllerEndpointTests.java       |  6 +++--
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
index 4c4333c2..55c71f29 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
@@ -424,20 +424,21 @@ public class HttpClientProperties {
 
 		public KeyStore createKeyStore() {
 			try {
-			KeyStore store = ssl.getKeyStoreProvider() != null ? KeyStore.getInstance(ssl.getKeyStoreType(),
-							ssl.getKeyStoreProvider())
-					: KeyStore.getInstance(ssl.getKeyStoreType());
-			try {
-				URL url = ResourceUtils.getURL(ssl.getKeyStore());
-				store.load(url.openStream(), ssl.getKeyStorePassword() != null
-						? ssl.getKeyStorePassword().toCharArray() : null);
-			}
-			catch (Exception e) {
-				throw new WebServerException(
-						"Could not load key store ' " + ssl.getKeyStore() + "'", e);
-			}
+				KeyStore store = ssl.getKeyStoreProvider() != null
+						? KeyStore.getInstance(ssl.getKeyStoreType(),
+								ssl.getKeyStoreProvider())
+						: KeyStore.getInstance(ssl.getKeyStoreType());
+				try {
+					URL url = ResourceUtils.getURL(ssl.getKeyStore());
+					store.load(url.openStream(), ssl.getKeyStorePassword() != null
+							? ssl.getKeyStorePassword().toCharArray() : null);
+				}
+				catch (Exception e) {
+					throw new WebServerException(
+							"Could not load key store ' " + ssl.getKeyStore() + "'", e);
+				}
 
-			return store;
+				return store;
 			}
 			catch (KeyStoreException | NoSuchProviderException e) {
 				throw new WebServerException(
diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientWriteResponseFilter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientWriteResponseFilter.java
index aa3dc960..63ed4248 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientWriteResponseFilter.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientWriteResponseFilter.java
@@ -49,18 +49,20 @@ public class WebClientWriteResponseFilter implements GlobalFilter, Ordered {
 	public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 		// NOTICE: nothing in "pre" filter stage as CLIENT_RESPONSE_ATTR is not added
 		// until the WebHandler is run
-		return chain.filter(exchange)
-				.doOnError(throwable -> cleanup(exchange))
+		return chain.filter(exchange).doOnError(throwable -> cleanup(exchange))
 				.then(Mono.defer(() -> {
-					ClientResponse clientResponse = exchange.getAttribute(CLIENT_RESPONSE_ATTR);
+					ClientResponse clientResponse = exchange
+							.getAttribute(CLIENT_RESPONSE_ATTR);
 					if (clientResponse == null) {
 						return Mono.empty();
 					}
 					log.trace("WebClientWriteResponseFilter start");
 					ServerHttpResponse response = exchange.getResponse();
 
-					return response.writeWith(clientResponse.body(BodyExtractors.toDataBuffers()))
-							//.log("webClient response")
+					return response
+							.writeWith(
+									clientResponse.body(BodyExtractors.toDataBuffers()))
+							// .log("webClient response")
 							.doOnCancel(() -> cleanup(exchange));
 				}));
 	}
@@ -71,4 +73,5 @@ public class WebClientWriteResponseFilter implements GlobalFilter, Ordered {
 			clientResponse.bodyToMono(Void.class).subscribe();
 		}
 	}
+
 }
diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java
index ff7e7730..c52ddd2a 100644
--- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java
@@ -39,8 +39,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(properties = { "management.endpoints.web.exposure.include=*",
-		"spring.cloud.gateway.actuator.verbose.enabled=true" }, webEnvironment = RANDOM_PORT)
+@SpringBootTest(
+		properties = { "management.endpoints.web.exposure.include=*",
+				"spring.cloud.gateway.actuator.verbose.enabled=true" },
+		webEnvironment = RANDOM_PORT)
 public class GatewayControllerEndpointTests {
 
 	@Autowired