diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java index edd76f189db..e4bc8352de4 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java +++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java @@ -2056,9 +2056,8 @@ public class HttpHeaders implements MultiValueMap, Serializable return DATE_FORMATTER.format(time); } - private static Set toCaseInsensitiveSet(Set originalSet) { - final Set deduplicatedSet = Collections.newSetFromMap( + Set deduplicatedSet = Collections.newSetFromMap( new LinkedCaseInsensitiveMap<>(originalSet.size(), Locale.ROOT)); // add/addAll (put/putAll in LinkedCaseInsensitiveMap) retain the casing of the last occurrence. // Here we prefer the first. @@ -2075,6 +2074,7 @@ public class HttpHeaders implements MultiValueMap, Serializable private static final class CaseInsensitiveEntrySet extends AbstractSet>> { private final MultiValueMap headers; + private final Set deduplicatedNames; public CaseInsensitiveEntrySet(MultiValueMap headers) { @@ -2092,6 +2092,7 @@ public class HttpHeaders implements MultiValueMap, Serializable return this.deduplicatedNames.size(); } + private final class CaseInsensitiveIterator implements Iterator>> { private final Iterator namesIterator; @@ -2127,6 +2128,7 @@ public class HttpHeaders implements MultiValueMap, Serializable } } + private final class CaseInsensitiveEntry implements Map.Entry> { private final String key; @@ -2147,10 +2149,9 @@ public class HttpHeaders implements MultiValueMap, Serializable @Override public List setValue(List value) { - List previousValues = Objects.requireNonNull( - CaseInsensitiveEntrySet.this.headers.get(this.key)); + List previous = Objects.requireNonNull(CaseInsensitiveEntrySet.this.headers.get(this.key)); CaseInsensitiveEntrySet.this.headers.put(this.key, value); - return previousValues; + return previous; } } }