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 83116cae22..fe0688004d 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java +++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java @@ -1773,19 +1773,19 @@ public class HttpHeaders implements MultiValueMap, Serializable @Override - public boolean equals(@Nullable Object other) { - if (this == other) { + public boolean equals(@Nullable Object obj) { + if (this == obj) { return true; } - if (!(other instanceof HttpHeaders)) { + if (!(obj instanceof HttpHeaders other)) { return false; } - return unwrap(this).equals(unwrap((HttpHeaders) other)); + return unwrap(this).equals(unwrap(other)); } private static MultiValueMap unwrap(HttpHeaders headers) { - while (headers.headers instanceof HttpHeaders) { - headers = (HttpHeaders) headers.headers; + while (headers.headers instanceof HttpHeaders httpHeaders) { + headers = httpHeaders; } return headers.headers; } @@ -1810,8 +1810,8 @@ public class HttpHeaders implements MultiValueMap, Serializable * @since 5.3 */ public static HttpHeaders readOnlyHttpHeaders(MultiValueMap headers) { - return (headers instanceof HttpHeaders ? - readOnlyHttpHeaders((HttpHeaders) headers) : new ReadOnlyHttpHeaders(headers)); + return (headers instanceof HttpHeaders httpHeaders ? readOnlyHttpHeaders(httpHeaders) : + new ReadOnlyHttpHeaders(headers)); } /**