Merge branch '4.1.x'

spencergibb · spencergibb · commit 370aa036768f · 2024-11-14T12:05:13.000-05:00
diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/ForwardedRequestHeadersFilter.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/ForwardedRequestHeadersFilter.java
@@ -93,7 +93,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {
 		HttpHeaders updated = new HttpHeaders();
 
 		// copy all headers except Forwarded
-		for (Map.Entry<String, List<String>> entry : original.entrySet()) {
+		for (Map.Entry<String, List<String>> entry : original.headerSet()) {
 			if (!entry.getKey().equalsIgnoreCase(FORWARDED_HEADER)) {
 				updated.addAll(entry.getKey(), entry.getValue());
 			}
diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RemoveHopByHopRequestHeadersFilter.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RemoveHopByHopRequestHeadersFilter.java
@@ -55,7 +55,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest serverRequest) {
 	static HttpHeaders filter(HttpHeaders input, Set<String> headersToRemove) {
 		HttpHeaders filtered = new HttpHeaders();
 
-		for (Map.Entry<String, List<String>> entry : input.entrySet()) {
+		for (Map.Entry<String, List<String>> entry : input.headerSet()) {
 			if (!headersToRemove.contains(entry.getKey().toLowerCase(Locale.ROOT))) {
 				filtered.addAll(entry.getKey(), entry.getValue());
 			}
diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/XForwardedRequestHeadersFilter.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/XForwardedRequestHeadersFilter.java
@@ -374,7 +374,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {
 		HttpHeaders original = input;
 		HttpHeaders updated = new HttpHeaders();
 
-		for (Map.Entry<String, List<String>> entry : original.entrySet()) {
+		for (Map.Entry<String, List<String>> entry : original.headerSet()) {
 			updated.addAll(entry.getKey(), entry.getValue());
 		}
 
diff --git a/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/test/client/ExchangeResult.java b/spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/test/client/ExchangeResult.java
@@ -264,7 +264,7 @@ private String formatStatus(HttpStatusCode statusCode) {
 	}
 
 	private String formatHeaders(HttpHeaders headers, String delimiter) {
-		return headers.entrySet()
+		return headers.headerSet()
 			.stream()
 			.map(entry -> entry.getKey() + ": " + entry.getValue())
 			.collect(Collectors.joining(delimiter));
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java
@@ -143,7 +143,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 
 			headersFilters.add((headers, exchange) -> {
 				HttpHeaders filtered = new HttpHeaders();
-				for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+				for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
 					if (!entry.getKey().toLowerCase(Locale.ROOT).startsWith("sec-websocket")) {
 						filtered.addAll(entry.getKey(), entry.getValue());
 					}
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactory.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactory.java
@@ -69,7 +69,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 				HttpHeaders headers = request.getHeaders();
 				HashMap<String, Long> longHeaders = new HashMap<>();
 
-				for (Map.Entry<String, List<String>> headerEntry : headers.entrySet()) {
+				for (Map.Entry<String, List<String>> headerEntry : headers.headerSet()) {
 					long headerSizeInBytes = 0L;
 					headerSizeInBytes += headerEntry.getKey().getBytes().length;
 					List<String> values = headerEntry.getValue();
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java
@@ -96,7 +96,7 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
 		HttpHeaders updated = new HttpHeaders();
 
 		// copy all headers except Forwarded
-		for (Map.Entry<String, List<String>> entry : original.entrySet()) {
+		for (Map.Entry<String, List<String>> entry : original.headerSet()) {
 			if (!entry.getKey().equalsIgnoreCase(FORWARDED_HEADER)) {
 				updated.addAll(entry.getKey(), entry.getValue());
 			}
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/GRPCRequestHeadersFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/GRPCRequestHeadersFilter.java
@@ -33,7 +33,7 @@ public class GRPCRequestHeadersFilter implements HttpHeadersFilter, Ordered {
 	public HttpHeaders filter(HttpHeaders headers, ServerWebExchange exchange) {
 		HttpHeaders updated = new HttpHeaders();
 
-		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+		for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
 			updated.addAll(entry.getKey(), entry.getValue());
 		}
 
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/RemoveHopByHopHeadersFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/RemoveHopByHopHeadersFilter.java
@@ -74,7 +74,7 @@ public HttpHeaders filter(HttpHeaders originalHeaders, ServerWebExchange exchang
 		Set<String> headersToRemove = new HashSet<>(headers);
 		headersToRemove.addAll(connectionOptions);
 
-		for (Map.Entry<String, List<String>> entry : originalHeaders.entrySet()) {
+		for (Map.Entry<String, List<String>> entry : originalHeaders.headerSet()) {
 			if (!headersToRemove.contains(entry.getKey().toLowerCase(Locale.ROOT))) {
 				filtered.addAll(entry.getKey(), entry.getValue());
 			}
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilter.java
@@ -202,7 +202,7 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
 		HttpHeaders original = input;
 		HttpHeaders updated = new HttpHeaders();
 
-		for (Map.Entry<String, List<String>> entry : original.entrySet()) {
+		for (Map.Entry<String, List<String>> entry : original.headerSet()) {
 			updated.addAll(entry.getKey(), entry.getValue());
 		}
 
diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SpringCloudCircuitBreakerFilterFactoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SpringCloudCircuitBreakerFilterFactoryTests.java
@@ -22,6 +22,7 @@
 import org.springframework.cloud.gateway.test.BaseWebClientTests;
 import org.springframework.http.HttpStatus;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
 
 /**
@@ -154,11 +155,11 @@ public void filterErrorPage() {
 			.is5xxServerError()
 			.expectBody()
 			.jsonPath("$.status")
-			.isEqualTo(504)
+			.value(status -> assertThat(HttpStatus.valueOf((Integer) status).is5xxServerError()).isTrue())
 			.jsonPath("$.message")
 			.isNotEmpty()
 			.jsonPath("$.error")
-			.isEqualTo("Gateway Timeout");
+			.isNotEmpty();
 	}
 
 	@Test
diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilterMixedTypeTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilterMixedTypeTests.java
@@ -59,7 +59,7 @@ private HttpHeadersFilter filterRemovingHeaders(Type type, String... headerNames
 			@Override
 			public HttpHeaders filter(HttpHeaders headers, ServerWebExchange exchange) {
 				HttpHeaders result = new HttpHeaders();
-				headers.entrySet().forEach(entry -> {
+				headers.headerSet().forEach(entry -> {
 					if (!headerNamesSet.contains(entry.getKey())) {
 						result.put(entry.getKey(), entry.getValue());
 					}
diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilterTests.java
@@ -52,7 +52,7 @@ public void httpHeadersFilterTests() {
 	private HttpHeaders filter(HttpHeaders input, String keyToFilter) {
 		HttpHeaders filtered = new HttpHeaders();
 
-		input.entrySet()
+		input.headerSet()
 			.stream()
 			.filter(entry -> !entry.getKey().equals(keyToFilter))
 			.forEach(entry -> filtered.addAll(entry.getKey(), entry.getValue()));
diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/predicate/PathRoutePredicateFactoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/predicate/PathRoutePredicateFactoryTests.java
@@ -96,6 +96,7 @@ public void mulitPathDslRouteWorks() {
 	}
 
 	@Test
+	// @Disabled
 	public void pathRouteWorksWithPercent() {
 		testClient.get()
 			.uri("/abc/123%/function")
diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/test/HttpBinCompatibleController.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/test/HttpBinCompatibleController.java
@@ -177,7 +177,7 @@ public ResponseEntity<String> status(@PathVariable int status) {
 	public ResponseEntity<Map<String, Object>> responseHeaders(@PathVariable int status, ServerWebExchange exchange) {
 		HttpHeaders httpHeaders = exchange.getRequest()
 			.getHeaders()
-			.entrySet()
+			.headerSet()
 			.stream()
 			.filter(entry -> entry.getKey().startsWith("X-Test-"))
 			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {`
`93`	`93`	`HttpHeaders updated = new HttpHeaders();`
`94`	`94`
`95`	`95`	`// copy all headers except Forwarded`
`96`		`- for (Map.Entry<String, List<String>> entry : original.entrySet()) {`
	`96`	`+ for (Map.Entry<String, List<String>> entry : original.headerSet()) {`
`97`	`97`	`if (!entry.getKey().equalsIgnoreCase(FORWARDED_HEADER)) {`
`98`	`98`	`updated.addAll(entry.getKey(), entry.getValue());`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest serverRequest) {`
`55`	`55`	`static HttpHeaders filter(HttpHeaders input, Set<String> headersToRemove) {`
`56`	`56`	`HttpHeaders filtered = new HttpHeaders();`
`57`	`57`
`58`		`- for (Map.Entry<String, List<String>> entry : input.entrySet()) {`
	`58`	`+ for (Map.Entry<String, List<String>> entry : input.headerSet()) {`
`59`	`59`	`if (!headersToRemove.contains(entry.getKey().toLowerCase(Locale.ROOT))) {`
`60`	`60`	`filtered.addAll(entry.getKey(), entry.getValue());`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {`
`374`	`374`	`HttpHeaders original = input;`
`375`	`375`	`HttpHeaders updated = new HttpHeaders();`
`376`	`376`
`377`		`- for (Map.Entry<String, List<String>> entry : original.entrySet()) {`
	`377`	`+ for (Map.Entry<String, List<String>> entry : original.headerSet()) {`
`378`	`378`	`updated.addAll(entry.getKey(), entry.getValue());`
`379`	`379`	`}`
`380`	`380`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ private String formatStatus(HttpStatusCode statusCode) {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`private String formatHeaders(HttpHeaders headers, String delimiter) {`
`267`		`- return headers.entrySet()`
	`267`	`+ return headers.headerSet()`
`268`	`268`	`.stream()`
`269`	`269`	`.map(entry -> entry.getKey() + ": " + entry.getValue())`
`270`	`270`	`.collect(Collectors.joining(delimiter));`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {`
`143`	`143`
`144`	`144`	`headersFilters.add((headers, exchange) -> {`
`145`	`145`	`HttpHeaders filtered = new HttpHeaders();`
`146`		`- for (Map.Entry<String, List<String>> entry : headers.entrySet()) {`
	`146`	`+ for (Map.Entry<String, List<String>> entry : headers.headerSet()) {`
`147`	`147`	`if (!entry.getKey().toLowerCase(Locale.ROOT).startsWith("sec-websocket")) {`
`148`	`148`	`filtered.addAll(entry.getKey(), entry.getValue());`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {`
`96`	`96`	`HttpHeaders updated = new HttpHeaders();`
`97`	`97`
`98`	`98`	`// copy all headers except Forwarded`
`99`		`- for (Map.Entry<String, List<String>> entry : original.entrySet()) {`
	`99`	`+ for (Map.Entry<String, List<String>> entry : original.headerSet()) {`
`100`	`100`	`if (!entry.getKey().equalsIgnoreCase(FORWARDED_HEADER)) {`
`101`	`101`	`updated.addAll(entry.getKey(), entry.getValue());`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class GRPCRequestHeadersFilter implements HttpHeadersFilter, Ordered {`
`33`	`33`	`public HttpHeaders filter(HttpHeaders headers, ServerWebExchange exchange) {`
`34`	`34`	`HttpHeaders updated = new HttpHeaders();`
`35`	`35`
`36`		`- for (Map.Entry<String, List<String>> entry : headers.entrySet()) {`
	`36`	`+ for (Map.Entry<String, List<String>> entry : headers.headerSet()) {`
`37`	`37`	`updated.addAll(entry.getKey(), entry.getValue());`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public HttpHeaders filter(HttpHeaders originalHeaders, ServerWebExchange exchang`
`74`	`74`	`Set<String> headersToRemove = new HashSet<>(headers);`
`75`	`75`	`headersToRemove.addAll(connectionOptions);`
`76`	`76`
`77`		`- for (Map.Entry<String, List<String>> entry : originalHeaders.entrySet()) {`
	`77`	`+ for (Map.Entry<String, List<String>> entry : originalHeaders.headerSet()) {`
`78`	`78`	`if (!headersToRemove.contains(entry.getKey().toLowerCase(Locale.ROOT))) {`
`79`	`79`	`filtered.addAll(entry.getKey(), entry.getValue());`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {`
`202`	`202`	`HttpHeaders original = input;`
`203`	`203`	`HttpHeaders updated = new HttpHeaders();`
`204`	`204`
`205`		`- for (Map.Entry<String, List<String>> entry : original.entrySet()) {`
	`205`	`+ for (Map.Entry<String, List<String>> entry : original.headerSet()) {`
`206`	`206`	`updated.addAll(entry.getKey(), entry.getValue());`
`207`	`207`	`}`
`208`	`208`