Polishing

spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java

@@ -209,10 +209,8 @@ public abstract class MethodMatchers {
 
 		@Override
 		public int hashCode() {
-			int hashCode = super.hashCode();
-			hashCode = 37 * hashCode + this.cf1.hashCode();
-			hashCode = 37 * hashCode + this.cf2.hashCode();
-			return hashCode;
+			// Allow for matching with regular UnionMethodMatcher by providing same hash...
+			return super.hashCode();
 		}
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java

@@ -353,7 +353,6 @@ public class DependencyDescriptor extends InjectionPoint implements Serializable
 						Type[] args = ((ParameterizedType) type).getActualTypeArguments();
 						type = args[args.length - 1];
 					}
-					// TODO: Object.class if unresolvable
 				}
 				if (type instanceof Class) {
 					return (Class<?>) type;
@@ -375,6 +374,7 @@ public class DependencyDescriptor extends InjectionPoint implements Serializable
 		}
 	}
 
+
 	@Override
 	public boolean equals(Object other) {
 		if (this == other) {

spring-web/src/main/java/org/springframework/http/ContentDisposition.java

@@ -199,7 +199,7 @@ public final class ContentDisposition {
 			sb.append(this.name).append('\"');
 		}
 		if (this.filename != null) {
-			if(this.charset == null || StandardCharsets.US_ASCII.equals(this.charset)) {
+			if (this.charset == null || StandardCharsets.US_ASCII.equals(this.charset)) {
 				sb.append("; filename=\"");
 				sb.append(this.filename).append('\"');
 			}

spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java

@@ -40,7 +40,7 @@ import org.springframework.web.server.ServerWebExchange;
  *
  * @author Rossen Stoyanchev
  * @since 5.0
- * @deprecated as of 5.1 in favor of using {@link EncodedResourceResolver}.
+ * @deprecated as of 5.1, in favor of using {@link EncodedResourceResolver}
  */
 @Deprecated
 public class GzipResourceResolver extends AbstractResourceResolver {
@@ -161,13 +161,8 @@ public class GzipResourceResolver extends AbstractResourceResolver {
 
 		@Override
 		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers;
-			if(this.original instanceof HttpResource) {
-				headers = ((HttpResource) this.original).getResponseHeaders();
-			}
-			else {
-				headers = new HttpHeaders();
-			}
+			HttpHeaders headers = (this.original instanceof HttpResource ?
+					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
 			headers.add(HttpHeaders.CONTENT_ENCODING, "gzip");
 			headers.add(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING);
 			return headers;

spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java

@@ -314,13 +314,8 @@ public class VersionResourceResolver extends AbstractResourceResolver {
 
 		@Override
 		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers;
-			if(this.original instanceof HttpResource) {
-				headers = ((HttpResource) this.original).getResponseHeaders();
-			}
-			else {
-				headers = new HttpHeaders();
-			}
+			HttpHeaders headers = (this.original instanceof HttpResource ?
+					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
 			headers.setETag("\"" + this.version + "\"");
 			return headers;
 		}

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java

@@ -153,14 +153,13 @@ public class ResponseEntityResultHandler extends AbstractMessageWriterResultHand
 
 			HttpHeaders entityHeaders = httpEntity.getHeaders();
 			HttpHeaders responseHeaders = exchange.getResponse().getHeaders();
-
 			if (!entityHeaders.isEmpty()) {
 				entityHeaders.entrySet().stream()
 						.filter(entry -> !responseHeaders.containsKey(entry.getKey()))
 						.forEach(entry -> responseHeaders.put(entry.getKey(), entry.getValue()));
 			}
 
-			if(httpEntity.getBody() == null || returnValue instanceof HttpHeaders) {
+			if (httpEntity.getBody() == null || returnValue instanceof HttpHeaders) {
 				return exchange.getResponse().setComplete();
 			}
 

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java

@@ -40,7 +40,7 @@ import org.springframework.lang.Nullable;
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  * @since 4.1
- * @deprecated as of 5.1 in favor of using {@link EncodedResourceResolver}.
+ * @deprecated as of 5.1, in favor of using {@link EncodedResourceResolver}
  */
 @Deprecated
 public class GzipResourceResolver extends AbstractResourceResolver {
@@ -162,13 +162,8 @@ public class GzipResourceResolver extends AbstractResourceResolver {
 
 		@Override
 		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers;
-			if (this.original instanceof HttpResource) {
-				headers = ((HttpResource) this.original).getResponseHeaders();
-			}
-			else {
-				headers = new HttpHeaders();
-			}
+			HttpHeaders headers = (this.original instanceof HttpResource ?
+					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
 			headers.add(HttpHeaders.CONTENT_ENCODING, "gzip");
 			headers.add(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING);
 			return headers;

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java

@@ -310,13 +310,8 @@ public class VersionResourceResolver extends AbstractResourceResolver {
 
 		@Override
 		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers;
-			if (this.original instanceof HttpResource) {
-				headers = ((HttpResource) this.original).getResponseHeaders();
-			}
-			else {
-				headers = new HttpHeaders();
-			}
+			HttpHeaders headers = (this.original instanceof HttpResource ?
+					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
 			headers.setETag("\"" + this.version + "\"");
 			return headers;
 		}