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
index 30970910..a54087fe 100644
--- 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
@@ -21,6 +21,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -326,7 +327,7 @@ public class XForwardedHeadersFilter implements HttpHeadersFilter, Ordered {
 			}
 			// these headers should be treated as a single comma separated header
 			if (headers.containsKey(name)) {
-				List<String> values = headers.get(name).stream().filter(shouldWrite).toList();
+				List<String> values = headers.get(name).stream().filter(shouldWrite).collect(Collectors.toList());
 				String delimitedValue = StringUtils.collectionToCommaDelimitedString(values);
 				headers.set(name, delimitedValue);
 			}
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
index ac989832..e2b4ddca 100644
--- 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
@@ -33,7 +33,6 @@ import org.springframework.cloud.gateway.test.BaseWebClientTests;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.web.server.firewall.StrictServerWebExchangeFirewall;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.web.server.ServerWebExchange;
 
@@ -135,13 +134,6 @@ public class PathRoutePredicateFactoryTests extends BaseWebClientTests {
 					.build();
 		}
 
-		@Bean
-		StrictServerWebExchangeFirewall strictServerWebExchangeFirewall() {
-			StrictServerWebExchangeFirewall firewall = new StrictServerWebExchangeFirewall();
-			firewall.setAllowUrlEncodedPercent(true);
-			return firewall;
-		}
-
 	}
 
 }