SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishes route filter cache.

Browse Source 
renames variable, formatting

See gh-2760
This commit is contained in:
spencergibb
2024-11-14 10:56:27 -05:00
parent d3823652b2
commit 389f950a33
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java
View File

@@ -60,16 +60,16 @@ public class FilteringWebHandler implements WebHandler, ApplicationListener<Refr
private final ConcurrentHashMap<Route, List<GatewayFilter>> routeFilterMap = new ConcurrentHashMap();
private final boolean filterCacheEnabled;
private final boolean routeFilterCacheEnabled;
@Deprecated
public FilteringWebHandler(List<GlobalFilter> globalFilters) {
this(globalFilters, false);
}
public FilteringWebHandler(List<GlobalFilter> globalFilters, boolean filterCacheEnabled) {
public FilteringWebHandler(List<GlobalFilter> globalFilters, boolean routeFilterCacheEnabled) {
this.globalFilters = loadFilters(globalFilters);
this.filterCacheEnabled = filterCacheEnabled;
this.routeFilterCacheEnabled = routeFilterCacheEnabled;
}
/* for testing */ ConcurrentHashMap<Route, List<GatewayFilter>> getRouteFilterMap() {
@@ -95,7 +95,7 @@ public class FilteringWebHandler implements WebHandler, ApplicationListener<Refr
@Override
public void onApplicationEvent(RefreshRoutesEvent event) {
if (this.filterCacheEnabled) {
if (this.routeFilterCacheEnabled) {
routeFilterMap.clear();
}
}
@@ -113,7 +113,7 @@ public class FilteringWebHandler implements WebHandler, ApplicationListener<Refr
}
protected List<GatewayFilter> getCombinedFilters(Route route) {
if (this.filterCacheEnabled) {
if (this.routeFilterCacheEnabled) {
return routeFilterMap.computeIfAbsent(route, this::getAllFilters);
}
else {

5
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/handler/FilteringWebHandlerCacheEnabledIntegrationTests.java
View File

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