From 70c50744fb72572c4e1e76f802e7106441b0761f Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 12 Mar 2021 15:37:06 -0500 Subject: [PATCH] Formatting --- .../AddRequestHeaderGatewayFilterFactory.java | 3 +- ...equestHeaderGatewayFilterFactoryTests.java | 40 +++++++++++-------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactory.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactory.java index 6966af70..1dae5f1f 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactory.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactory.java @@ -40,7 +40,8 @@ public class AddRequestHeaderGatewayFilterFactory GatewayFilterChain chain) { String value = ServerWebExchangeUtils.expand(exchange, config.getValue()); ServerHttpRequest request = exchange.getRequest().mutate() - .headers(httpHeaders -> httpHeaders.add(config.getName(), value)).build(); + .headers(httpHeaders -> httpHeaders.add(config.getName(), value)) + .build(); return chain.filter(exchange.mutate().request(request).build()); } diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactoryTests.java index 4736f1dd..fa0ba583 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactoryTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderGatewayFilterFactoryTests.java @@ -63,11 +63,13 @@ public class AddRequestHeaderGatewayFilterFactoryTests extends BaseWebClientTest @Test public void addRequestHeaderFilterWorksMultipleValues() { - testClient.get().uri("/multivalueheaders").header("Host", "www.addrequestheader.org").exchange() - .expectBody(Map.class) - .consumeWith(result -> { - Map headers = getMap(result.getResponseBody(), "headers"); - assertThat(headers).containsEntry("X-Request-Example", Arrays.asList("ValueA", "ValueB")); + testClient.get().uri("/multivalueheaders") + .header("Host", "www.addrequestheader.org").exchange() + .expectBody(Map.class).consumeWith(result -> { + Map headers = getMap(result.getResponseBody(), + "headers"); + assertThat(headers).containsEntry("X-Request-Example", + Arrays.asList("ValueA", "ValueB")); }); } @@ -83,11 +85,13 @@ public class AddRequestHeaderGatewayFilterFactoryTests extends BaseWebClientTest @Test public void addRequestHeaderFilterMultipleValuesWorksJavaDsl() { - testClient.get().uri("/multivalueheaders").header("Host", "www.addrequestheaderjava.org").exchange() - .expectBody(Map.class) - .consumeWith(result -> { - Map headers = getMap(result.getResponseBody(), "headers"); - assertThat(headers).containsEntry("X-Request-Acme", Arrays.asList("ValueB-www", "ValueC-www")); + testClient.get().uri("/multivalueheaders") + .header("Host", "www.addrequestheaderjava.org").exchange() + .expectBody(Map.class).consumeWith(result -> { + Map headers = getMap(result.getResponseBody(), + "headers"); + assertThat(headers).containsEntry("X-Request-Acme", + Arrays.asList("ValueB-www", "ValueC-www")); }); } @@ -111,14 +115,16 @@ public class AddRequestHeaderGatewayFilterFactoryTests extends BaseWebClientTest public RouteLocator testRouteLocator(RouteLocatorBuilder builder) { return builder.routes().route("add_request_header_java_test", r -> r.path("/headers").and().host("{sub}.addrequestheaderjava.org") - .filters(f -> f.prefixPath("/httpbin").addRequestHeader("X-Request-Acme", "ValueB-{sub}")) + .filters(f -> f.prefixPath("/httpbin") + .addRequestHeader("X-Request-Acme", "ValueB-{sub}")) + .uri(uri)) + .route("add_multiple_request_header_java_test", r -> r + .path("/multivalueheaders").and() + .host("{sub}.addrequestheaderjava.org") + .filters(f -> f.prefixPath("/httpbin") + .addRequestHeader("X-Request-Acme", "ValueB-{sub}") + .addRequestHeader("X-Request-Acme", "ValueC-{sub}")) .uri(uri)) - .route("add_multiple_request_header_java_test", - r -> r.path("/multivalueheaders").and().host("{sub}.addrequestheaderjava.org") - .filters(f -> f.prefixPath("/httpbin") - .addRequestHeader("X-Request-Acme", "ValueB-{sub}") - .addRequestHeader("X-Request-Acme", "ValueC-{sub}")) - .uri(uri)) .build(); }