From 0c6b7aefc058e65b0ec5f07c19fc72ebfc4c1a79 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 14 Mar 2025 11:44:59 -0400 Subject: [PATCH] Fixing merge --- .../cloud/gateway/config/GatewayAutoConfiguration.java | 4 ++-- .../cloud/gateway/config/HttpClientProperties.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index 9c923a9c..be86096b 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -275,8 +275,8 @@ public class GatewayAutoConfiguration { @Bean @ConditionalOnMissingBean - public FilteringWebHandler filteringWebHandler(List globalFilters) { - return new FilteringWebHandler(globalFilters); + public FilteringWebHandler filteringWebHandler(List globalFilters, GatewayProperties properties) { + return new FilteringWebHandler(globalFilters, properties.isRouteFilterCacheEnabled()); } @Bean diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java index e8df7eaf..fef1d54c 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java @@ -209,8 +209,8 @@ public class HttpClientProperties { private boolean metrics = false; /** - * Configures the leasing strategy for the pool (fifo or lifo), defaults - * to FIFO which is Netty's default. + * Configures the leasing strategy for the pool (fifo or lifo), defaults to FIFO + * which is Netty's default. */ private LeasingStrategy leasingStrategy = LeasingStrategy.FIFO; @@ -332,8 +332,7 @@ public class HttpClientProperties { public static class Proxy { /** - * proxyType for proxy configuration of Netty HttpClient (http, socks4 or - * socks5). + * proxyType for proxy configuration of Netty HttpClient (http, socks4 or socks5). */ private ProxyProvider.Proxy type = ProxyProvider.Proxy.HTTP;