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

Removes usages of Optional

Browse Source
This commit is contained in:
spencergibb
2023-01-27 10:46:44 -05:00
parent 1cd938e448
commit f2b132e1d8
1 changed files with 4 additions and 6 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/filter/factory/cache/ResponseCacheManager.java vendored
View File

@@ -71,7 +71,7 @@ public class ResponseCacheManager {
new SetMaxAgeHeaderAfterCacheExchangeMutator(configuredTimeToLive, Clock.systemDefaultZone()));
}
private static final List<HttpStatus> statusesToCache = Arrays.asList(HttpStatus.OK, HttpStatus.PARTIAL_CONTENT,
private static final List<HttpStatusCode> statusesToCache = Arrays.asList(HttpStatus.OK, HttpStatus.PARTIAL_CONTENT,
HttpStatus.MOVED_PERMANENTLY);
public Optional<CachedResponse> getFromCache(ServerHttpRequest request, String metadataKey) {
@@ -158,8 +158,7 @@ public class ResponseCacheManager {
}
private boolean isStatusCodeToCache(ServerHttpResponse response) {
return Optional.ofNullable(response.getStatusCode()).map(HttpStatusCode::value).map(HttpStatus::resolve)
.map(statusesToCache::contains).orElse(Boolean.FALSE);
return statusesToCache.contains(response.getStatusCode());
}
boolean isRequestCacheable(ServerHttpRequest request) {
@@ -168,15 +167,14 @@ public class ResponseCacheManager {
private boolean isVaryWildcard(ServerHttpResponse response) {
HttpHeaders headers = response.getHeaders();
List<String> varyValues = Optional.ofNullable(headers.get(HttpHeaders.VARY)).orElse(Collections.emptyList());
List<String> varyValues = headers.getOrEmpty(HttpHeaders.VARY);
return varyValues.stream().anyMatch(VARY_WILDCARD::equals);
}
private boolean isCacheControlAllowed(HttpMessage request) {
HttpHeaders headers = request.getHeaders();
List<String> cacheControlHeader = Optional.ofNullable(headers.get(HttpHeaders.CACHE_CONTROL))
.orElse(Collections.emptyList());
List<String> cacheControlHeader = headers.getOrEmpty(HttpHeaders.CACHE_CONTROL);
return cacheControlHeader.stream().noneMatch(forbiddenCacheControlValues::contains);
}