From 685ff1585b2984fe50452e501d8e4d97cd32a182 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 12 Mar 2021 15:40:41 -0500 Subject: [PATCH] Formatting --- .../AddRequestHeaderGatewayFilterFactory.java | 3 +- ...equestHeaderGatewayFilterFactoryTests.java | 31 +++++++------------ 2 files changed, 13 insertions(+), 21 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 f2b54397..1e2a32e4 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 @@ -38,8 +38,7 @@ public class AddRequestHeaderGatewayFilterFactory extends AbstractNameValueGatew public Mono filter(ServerWebExchange exchange, 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 389b9221..f2e3a1b2 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 @@ -62,13 +62,10 @@ public class AddRequestHeaderGatewayFilterFactoryTests extends BaseWebClientTest @Test public void addRequestHeaderFilterWorksMultipleValues() { - testClient.get().uri("/multivalueheaders") - .header("Host", "www.addrequestheader.org").exchange() + 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")); + Map headers = getMap(result.getResponseBody(), "headers"); + assertThat(headers).containsEntry("X-Request-Example", Arrays.asList("ValueA", "ValueB")); }); } @@ -83,13 +80,10 @@ public class AddRequestHeaderGatewayFilterFactoryTests extends BaseWebClientTest @Test public void addRequestHeaderFilterMultipleValuesWorksJavaDsl() { - testClient.get().uri("/multivalueheaders") - .header("Host", "www.addrequestheaderjava.org").exchange() + 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")); + Map headers = getMap(result.getResponseBody(), "headers"); + assertThat(headers).containsEntry("X-Request-Acme", Arrays.asList("ValueB-www", "ValueC-www")); }); } @@ -114,13 +108,12 @@ public class AddRequestHeaderGatewayFilterFactoryTests extends BaseWebClientTest r -> r.path("/headers").and().host("{sub}.addrequestheaderjava.org") .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(); }