diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java index 5ccc4ce1..9f3beb37 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java @@ -60,16 +60,16 @@ public class FilteringWebHandler implements WebHandler, ApplicationListener> routeFilterMap = new ConcurrentHashMap(); - private final boolean filterCacheEnabled; + private final boolean routeFilterCacheEnabled; @Deprecated public FilteringWebHandler(List globalFilters) { this(globalFilters, false); } - public FilteringWebHandler(List globalFilters, boolean filterCacheEnabled) { + public FilteringWebHandler(List globalFilters, boolean routeFilterCacheEnabled) { this.globalFilters = loadFilters(globalFilters); - this.filterCacheEnabled = filterCacheEnabled; + this.routeFilterCacheEnabled = routeFilterCacheEnabled; } /* for testing */ ConcurrentHashMap> getRouteFilterMap() { @@ -95,7 +95,7 @@ public class FilteringWebHandler implements WebHandler, ApplicationListener getCombinedFilters(Route route) { - if (this.filterCacheEnabled) { + if (this.routeFilterCacheEnabled) { return routeFilterMap.computeIfAbsent(route, this::getAllFilters); } else { diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/FilteringWebHandlerCacheEnabledIntegrationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/FilteringWebHandlerCacheEnabledIntegrationTests.java index 87aab806..650a8a08 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/FilteringWebHandlerCacheEnabledIntegrationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/FilteringWebHandlerCacheEnabledIntegrationTests.java @@ -42,8 +42,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @SpringBootTest(webEnvironment = RANDOM_PORT, - properties = { "spring.cloud.gateway.route-filter-cache-enabled=true", "management.endpoint.gateway.enabled=true", - "management.endpoints.web.exposure.include=*", "spring.cloud.gateway.actuator.verbose.enabled=true" }) + properties = { "spring.cloud.gateway.route-filter-cache-enabled=true", + "management.endpoint.gateway.enabled=true", "management.endpoints.web.exposure.include=*", + "spring.cloud.gateway.actuator.verbose.enabled=true" }) @DirtiesContext public class FilteringWebHandlerCacheEnabledIntegrationTests extends BaseWebClientTests {