Fixing merge

This commit is contained in:
Ryan Baxter
2025-03-14 11:44:59 -04:00
parent 43b1506ef2
commit 0c6b7aefc0
2 changed files with 5 additions and 6 deletions

View File

@@ -275,8 +275,8 @@ public class GatewayAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public FilteringWebHandler filteringWebHandler(List<GlobalFilter> globalFilters) {
return new FilteringWebHandler(globalFilters);
public FilteringWebHandler filteringWebHandler(List<GlobalFilter> globalFilters, GatewayProperties properties) {
return new FilteringWebHandler(globalFilters, properties.isRouteFilterCacheEnabled());
}
@Bean

View File

@@ -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;