From ca6acfee308efd658c82f0f7175fa438cf1367a9 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 22 Nov 2022 14:23:17 +0100 Subject: [PATCH] Polishing --- .../web/context/request/ServletWebRequest.java | 5 ++--- .../web/server/adapter/DefaultServerWebExchange.java | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java index 0e070c3c80..7da825ff30 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java @@ -19,12 +19,11 @@ package org.springframework.web.context.request; import java.security.Principal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Arrays; import java.util.Enumeration; import java.util.Iterator; -import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -52,7 +51,7 @@ import org.springframework.web.util.WebUtils; */ public class ServletWebRequest extends ServletRequestAttributes implements NativeWebRequest { - private static final List SAFE_METHODS = Arrays.asList("GET", "HEAD"); + private static final Set SAFE_METHODS = Set.of("GET", "HEAD"); /** * Pattern matching ETag multiple field values in headers such as "If-Match", "If-None-Match". diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java b/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java index 06b949f955..221b5c6efb 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java @@ -19,9 +19,9 @@ package org.springframework.web.server.adapter; import java.security.Principal; import java.time.Instant; import java.time.temporal.ChronoUnit; -import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; @@ -62,7 +62,7 @@ import org.springframework.web.server.session.WebSessionManager; */ public class DefaultServerWebExchange implements ServerWebExchange { - private static final List SAFE_METHODS = Arrays.asList(HttpMethod.GET, HttpMethod.HEAD); + private static final Set SAFE_METHODS = Set.of(HttpMethod.GET, HttpMethod.HEAD); private static final ResolvableType FORM_DATA_TYPE = ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, String.class); @@ -281,7 +281,7 @@ public class DefaultServerWebExchange implements ServerWebExchange { if (SAFE_METHODS.contains(getRequest().getMethod())) { return false; } - if (CollectionUtils.isEmpty(getRequest().getHeaders().get(HttpHeaders.IF_MATCH))) { + if (CollectionUtils.isEmpty(getRequestHeaders().get(HttpHeaders.IF_MATCH))) { return false; } this.notModified = matchRequestedETags(getRequestHeaders().getIfMatch(), eTag, false); @@ -357,7 +357,7 @@ public class DefaultServerWebExchange implements ServerWebExchange { private boolean validateIfNoneMatch(@Nullable String eTag) { try { - if (CollectionUtils.isEmpty(getRequest().getHeaders().get(HttpHeaders.IF_NONE_MATCH))) { + if (CollectionUtils.isEmpty(getRequestHeaders().get(HttpHeaders.IF_NONE_MATCH))) { return false; } this.notModified = !matchRequestedETags(getRequestHeaders().getIfNoneMatch(), eTag, true);