Polishes route filter cache.

renames variable, formatting

See gh-2760

Author: spencergibb

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

@@ -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 @@ private static List<GatewayFilter> loadFilters(List<GlobalFilter> filters) {
 
 	@Override
 	public void onApplicationEvent(RefreshRoutesEvent event) {
-		if (this.filterCacheEnabled) {
+		if (this.routeFilterCacheEnabled) {
 			routeFilterMap.clear();
 		}
 	}
@@ -113,7 +113,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {
 	}
 
 	protected List<GatewayFilter> getCombinedFilters(Route route) {
-		if (this.filterCacheEnabled) {
+		if (this.routeFilterCacheEnabled) {
 			return routeFilterMap.computeIfAbsent(route, this::getAllFilters);
 		}
 		else {

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

@@ -42,8 +42,9 @@
 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 {