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

Change initializing map to use computeIfAbsent

Browse Source
This commit is contained in:
Spencer Gibb
2017-03-15 12:32:20 -06:00
parent c8a27f5547
commit d7bfdd85bf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java
View File

@@ -114,25 +114,25 @@ public class FilteringWebHandler extends WebHandlerDecorator {
if (!route.isPresent()) {
return Collections.emptyList();
}
List<WebFilter> combinedFilters = this.combinedFiltersForRoute.get(route.get().getId());
if (combinedFilters == null) {
List<WebFilter> combinedFilters = this.combinedFiltersForRoute.computeIfAbsent(
route.get().getId(), s -> {
//TODO: probably a java 8 stream way of doing this
combinedFilters = new ArrayList<>(loadFilters(this.globalFilters));
List<WebFilter> combined = new ArrayList<>(loadFilters(this.globalFilters));
//TODO: support option to apply defaults after route specific filters?
if (!this.gatewayProperties.getDefaultFilters().isEmpty()) {
combinedFilters.addAll(loadWebFilters("defaultFilters",
combined.addAll(loadWebFilters("defaultFilters",
this.gatewayProperties.getDefaultFilters()));
}
if (route.isPresent() && !route.get().getFilters().isEmpty()) {
combinedFilters.addAll(loadWebFilters(route.get().getId(), route.get().getFilters()));
combined.addAll(loadWebFilters(route.get().getId(), route.get().getFilters()));
}
AnnotationAwareOrderComparator.sort(combinedFilters);
this.combinedFiltersForRoute.put(route.get().getId(), combinedFilters);
}
AnnotationAwareOrderComparator.sort(combined);
return combined;
});
return combinedFilters;
}