Update formatting

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()
+	private final Map<String, CorsConfiguration> corsConfigurations = new LinkedHashMap<>();
-    {
+
-        return corsConfigurations;
+	public Map<String, CorsConfiguration> getCorsConfigurations() {
-    }
+		return corsConfigurations;
+	}
 
 }

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("Origin", "domain.com")
-		.header("Access-Control-Request-Method", "GET")
+				.header("Access-Control-Request-Method", "GET").exchange().block();
-				.exchange().block();
 		HttpHeaders asHttpHeaders = clientResponse.headers().asHttpHeaders();
 		Mono<String> bodyToMono = clientResponse.bodyToMono(String.class);
-		//pre-flight request shouldn't return the response body
+		// 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(
-		assertEquals("Pre Flight call failed.", HttpStatus.OK, clientResponse.statusCode());
+				"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() {
+	public void testCorsRequest() {
-                ClientResponse clientResponse = webClient.get().uri("/abc/123/function")
+		ClientResponse clientResponse = webClient.get().uri("/abc/123/function")
-                .header("Origin", "domain.com")
+				.header("Origin", "domain.com").header(HttpHeaders.HOST, "www.path.org")
-                .header(HttpHeaders.HOST, "www.path.org")                
+				.exchange().block();
-                                .exchange().block();
+		HttpHeaders asHttpHeaders = clientResponse.headers().asHttpHeaders();
-                HttpHeaders asHttpHeaders = clientResponse.headers().asHttpHeaders();
+		Mono<String> bodyToMono = clientResponse.bodyToMono(String.class);
-                Mono<String> bodyToMono = clientResponse.bodyToMono(String.class);
+		assertNotNull(bodyToMono.block());
-                assertNotNull(bodyToMono.block());
+		assertEquals(
-                assertEquals("Missing header value in response: "+HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN,"*", asHttpHeaders.getAccessControlAllowOrigin());
+				"Missing header value in response: "
-                assertEquals("Pre Flight call failed.", HttpStatus.OK, clientResponse.statusCode());
+						+ 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 { 
+	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("*");
-//	            }
-//	        };
-//	    }
-	    
 	}
 
 }