From 6e138c40b626b31f3289ea9b8f5937b1003c2a97 Mon Sep 17 00:00:00 2001
From: Tony Clarke <tony.clarke@amdocs.com>
Date: Thu, 28 Jun 2018 13:53:26 -0400
Subject: [PATCH] Update formatting

---
 .../gateway/config/GlobalCorsProperties.java  | 14 ++---
 .../cloud/gateway/cors/CorsTests.java         | 62 ++++++++-----------
 2 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GlobalCorsProperties.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GlobalCorsProperties.java
index 8216d2f3..8675ac41 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GlobalCorsProperties.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GlobalCorsProperties.java
@@ -25,16 +25,16 @@ import org.springframework.cloud.gateway.handler.RoutePredicateHandlerMapping;
 import org.springframework.web.cors.CorsConfiguration;
 
 /**
- * Configuration properties for global configuration of cors. See {@link RoutePredicateHandlerMapping}
+ * Configuration properties for global configuration of cors. See
+ * {@link RoutePredicateHandlerMapping}
  */
 @ConfigurationProperties("spring.cloud.gateway.globalcors")
 public class GlobalCorsProperties {
-    
-    private final Map<String, CorsConfiguration> corsConfigurations = new LinkedHashMap<>();
 
-    public Map<String, CorsConfiguration> getCorsConfigurations()
-    {
-        return corsConfigurations;
-    }
+	private final Map<String, CorsConfiguration> corsConfigurations = new LinkedHashMap<>();
+
+	public Map<String, CorsConfiguration> getCorsConfigurations() {
+		return corsConfigurations;
+	}
 
 }
diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/cors/CorsTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/cors/CorsTests.java
index 7aef6073..e699637c 100644
--- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/cors/CorsTests.java
+++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/cors/CorsTests.java
@@ -45,49 +45,41 @@ public class CorsTests extends BaseWebClientTests {
 	@Test
 	public void testPreFlightCorsRequest() {
 		ClientResponse clientResponse = webClient.options().uri("/abc/123/function")
-		.header("Origin", "domain.com")
-		.header("Access-Control-Request-Method", "GET")
+				.header("Origin", "domain.com")
+				.header("Access-Control-Request-Method", "GET").exchange().block();
+		HttpHeaders asHttpHeaders = clientResponse.headers().asHttpHeaders();
+		Mono<String> bodyToMono = clientResponse.bodyToMono(String.class);
+		// pre-flight request shouldn't return the response body
+		assertNull(bodyToMono.block());
+		assertEquals(
+				"Missing header value in response: "
+						+ HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN,
+				"*", asHttpHeaders.getAccessControlAllowOrigin());
+		assertEquals("Pre Flight call failed.", HttpStatus.OK,
+				clientResponse.statusCode());
+	}
+
+	@Test
+	public void testCorsRequest() {
+		ClientResponse clientResponse = webClient.get().uri("/abc/123/function")
+				.header("Origin", "domain.com").header(HttpHeaders.HOST, "www.path.org")
 				.exchange().block();
 		HttpHeaders asHttpHeaders = clientResponse.headers().asHttpHeaders();
 		Mono<String> bodyToMono = clientResponse.bodyToMono(String.class);
-		//pre-flight request shouldn't return the response body
-		assertNull(bodyToMono.block());
-		assertEquals("Missing header value in response: "+HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN,"*", asHttpHeaders.getAccessControlAllowOrigin());
-		assertEquals("Pre Flight call failed.", HttpStatus.OK, clientResponse.statusCode());
+		assertNotNull(bodyToMono.block());
+		assertEquals(
+				"Missing header value in response: "
+						+ HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN,
+				"*", asHttpHeaders.getAccessControlAllowOrigin());
+		assertEquals("Pre Flight call failed.", HttpStatus.OK,
+				clientResponse.statusCode());
 	}
-	
-	@Test
-        public void testCorsRequest() {
-                ClientResponse clientResponse = webClient.get().uri("/abc/123/function")
-                .header("Origin", "domain.com")
-                .header(HttpHeaders.HOST, "www.path.org")                
-                                .exchange().block();
-                HttpHeaders asHttpHeaders = clientResponse.headers().asHttpHeaders();
-                Mono<String> bodyToMono = clientResponse.bodyToMono(String.class);
-                assertNotNull(bodyToMono.block());
-                assertEquals("Missing header value in response: "+HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN,"*", asHttpHeaders.getAccessControlAllowOrigin());
-                assertEquals("Pre Flight call failed.", HttpStatus.OK, clientResponse.statusCode());
-        }
 
 	@EnableAutoConfiguration
 	@SpringBootConfiguration
 	@Import(DefaultTestConfig.class)
-	public static class TestConfig { 
-	    
-	    // this enables the access-control-allow-origin header from the target MS
-//	    @Bean
-//	    public WebFluxConfigurer corsConfigurer() {
-//	        return new WebFluxConfigurerComposite() {
-//
-//	            @Override
-//	            public void addCorsMappings(CorsRegistry registry) {
-//	                registry.addMapping("/**")
-//	                        .allowedOrigins("*")
-//	                        .allowedMethods("*");
-//	            }
-//	        };
-//	    }
-	    
+	public static class TestConfig {
+
 	}
 
 }