Formatting

Author: spencergibb

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/AfterFilterFunctions.java

@@ -135,17 +135,19 @@ public static BiFunction<ServerRequest, ServerResponse, ServerResponse> rewriteR
 		return (request, response) -> {
 			BiFunction<String, List<String>, List<String>> remappingFunction = (key, values) -> {
 				List<String> rewrittenValues = values.stream()
-						.map(value -> pattern.matcher(value).replaceAll(replacement))
-						.toList();
+					.map(value -> pattern.matcher(value).replaceAll(replacement))
+					.toList();
 				return new ArrayList<>(rewrittenValues);
 			};
 			if (response.headers().get(name) != null) {
 				List<String> oldValue = response.headers().get(name);
 				List<String> newValue = remappingFunction.apply(name, oldValue);
-				if (newValue != null)
+				if (newValue != null) {
 					response.headers().put(name, newValue);
-				else
+				}
+				else {
 					response.headers().remove(name);
+				}
 			}
 			return response;
 		};

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/BodyFilterFunctions.java

@@ -50,7 +50,6 @@
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.server.PathContainer;
 import org.springframework.http.server.RequestPath;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/LoadBalancerFilterFunctions.java

@@ -40,7 +40,6 @@
 import org.springframework.cloud.client.loadbalancer.ResponseData;
 import org.springframework.cloud.gateway.server.mvc.common.MvcUtils;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java

@@ -337,7 +337,8 @@ public void addResponseHeaderWorks() {
 				Map<String, Object> map = res.getResponseBody();
 				Map<String, Object> headers = getMap(map, "headers");
 				assertThat(headers).doesNotContainKey("x-bar");
-				assertThat(res.getResponseHeaders().asMultiValueMap()).containsEntry("x-bar", Collections.singletonList("val1"));
+				assertThat(res.getResponseHeaders().asMultiValueMap()).containsEntry("x-bar",
+						Collections.singletonList("val1"));
 			});
 	}
 

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/TransferEncodingNormalizationRequestHeadersFilterTests.java

@@ -36,7 +36,8 @@ public void noTransferEncodingWithContentLength() {
 			.buildRequest(null);
 
 		HttpHeaders headers = testFilter(ServerRequest.create(servletRequest, Collections.emptyList()));
-		assertThat(headers.headerNames()).contains(HttpHeaders.CONTENT_LENGTH).doesNotContain(HttpHeaders.TRANSFER_ENCODING);
+		assertThat(headers.headerNames()).contains(HttpHeaders.CONTENT_LENGTH)
+			.doesNotContain(HttpHeaders.TRANSFER_ENCODING);
 	}
 
 	@Test
@@ -47,7 +48,8 @@ public void transferEncodingWithContentLength() {
 			.buildRequest(null);
 
 		HttpHeaders headers = testFilter(ServerRequest.create(servletRequest, Collections.emptyList()));
-		assertThat(headers.headerNames()).doesNotContain(HttpHeaders.CONTENT_LENGTH).contains(HttpHeaders.TRANSFER_ENCODING);
+		assertThat(headers.headerNames()).doesNotContain(HttpHeaders.CONTENT_LENGTH)
+			.contains(HttpHeaders.TRANSFER_ENCODING);
 	}
 
 	@Test
@@ -58,7 +60,8 @@ public void transferEncodingCaseInsensitiveWithContentLength() {
 			.buildRequest(null);
 
 		HttpHeaders headers = testFilter(ServerRequest.create(servletRequest, Collections.emptyList()));
-		assertThat(headers.headerNames()).doesNotContain(HttpHeaders.CONTENT_LENGTH).contains(HttpHeaders.TRANSFER_ENCODING);
+		assertThat(headers.headerNames()).doesNotContain(HttpHeaders.CONTENT_LENGTH)
+			.contains(HttpHeaders.TRANSFER_ENCODING);
 	}
 
 	private HttpHeaders testFilter(ServerRequest request) {

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/filter/XForwardedRequestHeadersFilterTests.java

@@ -114,8 +114,8 @@ public void xForwardedHeadersNotTrusted() throws Exception {
 
 		HttpHeaders headers = filter.apply(request.headers().asHttpHeaders(), request);
 
-		assertThat(headers.headerNames()).doesNotContain(X_FORWARDED_FOR_HEADER, X_FORWARDED_HOST_HEADER, X_FORWARDED_PORT_HEADER,
-				X_FORWARDED_PROTO_HEADER);
+		assertThat(headers.headerNames()).doesNotContain(X_FORWARDED_FOR_HEADER, X_FORWARDED_HOST_HEADER,
+				X_FORWARDED_PORT_HEADER, X_FORWARDED_PROTO_HEADER);
 	}
 
 	// verify that existing forwarded header is not forwarded if not trusted
@@ -135,8 +135,8 @@ public void untrustedXForwardedForNotAppended() {
 
 		HttpHeaders headers = filter.apply(request.headers().asHttpHeaders(), request);
 
-		assertThat(headers.headerNames()).contains(X_FORWARDED_FOR_HEADER, X_FORWARDED_HOST_HEADER, X_FORWARDED_PORT_HEADER,
-				X_FORWARDED_PROTO_HEADER);
+		assertThat(headers.headerNames()).contains(X_FORWARDED_FOR_HEADER, X_FORWARDED_HOST_HEADER,
+				X_FORWARDED_PORT_HEADER, X_FORWARDED_PROTO_HEADER);
 
 		assertThat(headers.getFirst(X_FORWARDED_FOR_HEADER)).doesNotContain("127.0.0.1")
 			.contains("10.0.0.1", "10.0.0.10");
@@ -156,8 +156,8 @@ public void remoteAdddressIsNullUnTrustedProxyNotAppended() {
 
 		HttpHeaders headers = filter.apply(request.headers().asHttpHeaders(), request);
 
-		assertThat(headers.headerNames()).contains(X_FORWARDED_FOR_HEADER, X_FORWARDED_HOST_HEADER, X_FORWARDED_PORT_HEADER,
-				X_FORWARDED_PROTO_HEADER);
+		assertThat(headers.headerNames()).contains(X_FORWARDED_FOR_HEADER, X_FORWARDED_HOST_HEADER,
+				X_FORWARDED_PORT_HEADER, X_FORWARDED_PROTO_HEADER);
 
 		assertThat(headers.getFirst(X_FORWARDED_FOR_HEADER)).doesNotContain("127.0.0.1");
 	}