Merge branch '6.0.x'

# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java

@@ -714,13 +714,8 @@ public boolean matches(Method method, Class<?> targetClass) {
 
 		@Override
 		public boolean equals(@Nullable Object other) {
-			if (this == other) {
-				return true;
-			}
-			if (!(other instanceof AdviceExcludingMethodMatcher otherMm)) {
-				return false;
-			}
-			return this.adviceMethod.equals(otherMm.adviceMethod);
+			return (this == other || (other instanceof AdviceExcludingMethodMatcher that &&
+					this.adviceMethod.equals(that.adviceMethod)));
 		}
 
 		@Override

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -516,21 +516,16 @@ else if (shadowMatch.maybeMatches() && fallbackExpression != null) {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof AspectJExpressionPointcut otherPc)) {
-			return false;
-		}
-		return ObjectUtils.nullSafeEquals(this.getExpression(), otherPc.getExpression()) &&
-				ObjectUtils.nullSafeEquals(this.pointcutDeclarationScope, otherPc.pointcutDeclarationScope) &&
-				ObjectUtils.nullSafeEquals(this.pointcutParameterNames, otherPc.pointcutParameterNames) &&
-				ObjectUtils.nullSafeEquals(this.pointcutParameterTypes, otherPc.pointcutParameterTypes);
+		return (this == other || (other instanceof AspectJExpressionPointcut that &&
+				ObjectUtils.nullSafeEquals(getExpression(), that.getExpression()) &&
+				ObjectUtils.nullSafeEquals(this.pointcutDeclarationScope, that.pointcutDeclarationScope) &&
+				ObjectUtils.nullSafeEquals(this.pointcutParameterNames, that.pointcutParameterNames) &&
+				ObjectUtils.nullSafeEquals(this.pointcutParameterTypes, that.pointcutParameterTypes)));
 	}
 
 	@Override
 	public int hashCode() {
-		int hashCode = ObjectUtils.nullSafeHashCode(this.getExpression());
+		int hashCode = ObjectUtils.nullSafeHashCode(getExpression());
 		hashCode = 31 * hashCode + ObjectUtils.nullSafeHashCode(this.pointcutDeclarationScope);
 		hashCode = 31 * hashCode + ObjectUtils.nullSafeHashCode(this.pointcutParameterNames);
 		hashCode = 31 * hashCode + ObjectUtils.nullSafeHashCode(this.pointcutParameterTypes);

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java

@@ -89,13 +89,8 @@ public String getAspectName() {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof AspectJPointcutAdvisor otherAdvisor)) {
-			return false;
-		}
-		return this.advice.equals(otherAdvisor.advice);
+		return (this == other || (other instanceof AspectJPointcutAdvisor that &&
+				this.advice.equals(that.advice)));
 	}
 
 	@Override

spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java

@@ -597,15 +597,10 @@ public Object intercept(Object proxy, Method method, Object[] args, MethodProxy
 			}
 			if (other instanceof Factory factory) {
 				Callback callback = factory.getCallback(INVOKE_EQUALS);
-				if (!(callback instanceof EqualsInterceptor equalsInterceptor)) {
-					return false;
-				}
-				AdvisedSupport otherAdvised = equalsInterceptor.advised;
-				return AopProxyUtils.equalsInProxy(this.advised, otherAdvised);
-			}
-			else {
-				return false;
+				return (callback instanceof EqualsInterceptor that &&
+						AopProxyUtils.equalsInProxy(this.advised, that.advised));
 			}
+			return false;
 		}
 	}
 
@@ -920,20 +915,14 @@ public int accept(Method method) {
 
 		@Override
 		public boolean equals(@Nullable Object other) {
-			if (this == other) {
-				return true;
-			}
-			if (!(other instanceof ProxyCallbackFilter otherCallbackFilter)) {
-				return false;
-			}
-			AdvisedSupport otherAdvised = otherCallbackFilter.advised;
-			return (this.advised.getAdvisorKey().equals(otherAdvised.getAdvisorKey()) &&
-					AopProxyUtils.equalsProxiedInterfaces(this.advised, otherAdvised) &&
-					ObjectUtils.nullSafeEquals(this.advised.getTargetClass(), otherAdvised.getTargetClass()) &&
-					this.advised.getTargetSource().isStatic() == otherAdvised.getTargetSource().isStatic() &&
-					this.advised.isFrozen() == otherAdvised.isFrozen() &&
-					this.advised.isExposeProxy() == otherAdvised.isExposeProxy() &&
-					this.advised.isOpaque() == otherAdvised.isOpaque());
+			return (this == other || (other instanceof ProxyCallbackFilter that &&
+					this.advised.getAdvisorKey().equals(that.advised.getAdvisorKey()) &&
+					AopProxyUtils.equalsProxiedInterfaces(this.advised, that.advised) &&
+					ObjectUtils.nullSafeEquals(this.advised.getTargetClass(), that.advised.getTargetClass()) &&
+					this.advised.getTargetSource().isStatic() == that.advised.getTargetSource().isStatic() &&
+					this.advised.isFrozen() == that.advised.isFrozen() &&
+					this.advised.isExposeProxy() == that.advised.isExposeProxy() &&
+					this.advised.isOpaque() == that.advised.isOpaque()));
 		}
 
 		@Override

spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java

@@ -133,13 +133,9 @@ private Object readResolve() {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof EmptyTargetSource otherTs)) {
-			return false;
-		}
-		return (ObjectUtils.nullSafeEquals(this.targetClass, otherTs.targetClass) && this.isStatic == otherTs.isStatic);
+		return (this == other || (other instanceof EmptyTargetSource that &&
+				ObjectUtils.nullSafeEquals(this.targetClass, that.targetClass) &&
+				this.isStatic == that.isStatic));
 	}
 
 	@Override

spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,15 +82,10 @@ public Object getSource() {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof BeanMetadataAttribute otherMa)) {
-			return false;
-		}
-		return (this.name.equals(otherMa.name) &&
-				ObjectUtils.nullSafeEquals(this.value, otherMa.value) &&
-				ObjectUtils.nullSafeEquals(this.source, otherMa.source));
+		return (this == other ||(other instanceof BeanMetadataAttribute that &&
+				this.name.equals(that.name) &&
+				ObjectUtils.nullSafeEquals(this.value, that.value) &&
+				ObjectUtils.nullSafeEquals(this.source, that.source)));
 	}
 
 	@Override

spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java

@@ -491,16 +491,11 @@ public void setPropertyEditorClass(@Nullable Class<?> propertyEditorClass) {
 		 */
 		@Override
 		public boolean equals(@Nullable Object other) {
-			if (this == other) {
-				return true;
-			}
-			if (!(other instanceof IndexedPropertyDescriptor otherPd)) {
-				return false;
-			}
-			return (ObjectUtils.nullSafeEquals(getIndexedReadMethod(), otherPd.getIndexedReadMethod()) &&
-					ObjectUtils.nullSafeEquals(getIndexedWriteMethod(), otherPd.getIndexedWriteMethod()) &&
-					ObjectUtils.nullSafeEquals(getIndexedPropertyType(), otherPd.getIndexedPropertyType()) &&
-					PropertyDescriptorUtils.equals(this, otherPd));
+			return (this == other || (other instanceof IndexedPropertyDescriptor that &&
+					ObjectUtils.nullSafeEquals(getIndexedReadMethod(), that.getIndexedReadMethod()) &&
+					ObjectUtils.nullSafeEquals(getIndexedWriteMethod(), that.getIndexedWriteMethod()) &&
+					ObjectUtils.nullSafeEquals(getIndexedPropertyType(), that.getIndexedPropertyType()) &&
+					PropertyDescriptorUtils.equals(this, that)));
 		}
 
 		@Override

spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,13 +165,9 @@ public Class<?> getPropertyEditorClass() {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof GenericTypeAwarePropertyDescriptor otherPd)) {
-			return false;
-		}
-		return (getBeanClass().equals(otherPd.getBeanClass()) && PropertyDescriptorUtils.equals(this, otherPd));
+		return (this == other || (other instanceof GenericTypeAwarePropertyDescriptor that &&
+				getBeanClass().equals(that.getBeanClass()) &&
+				PropertyDescriptorUtils.equals(this, that)));
 	}
 
 	@Override

spring-beans/src/main/java/org/springframework/beans/PropertyValue.java

@@ -189,15 +189,10 @@ public synchronized Object getConvertedValue() {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof PropertyValue otherPv)) {
-			return false;
-		}
-		return (this.name.equals(otherPv.name) &&
-				ObjectUtils.nullSafeEquals(this.value, otherPv.value) &&
-				ObjectUtils.nullSafeEquals(getSource(), otherPv.getSource()));
+		return (this == other || (other instanceof PropertyValue that &&
+				this.name.equals(that.name) &&
+				ObjectUtils.nullSafeEquals(this.value, that.value) &&
+				ObjectUtils.nullSafeEquals(getSource(), that.getSource())));
 	}
 
 	@Override

spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java

@@ -340,13 +340,8 @@ protected Object getResourceToInject(Object target, @Nullable String requestingB
 
 		@Override
 		public boolean equals(@Nullable Object other) {
-			if (this == other) {
-				return true;
-			}
-			if (!(other instanceof InjectedElement otherElement)) {
-				return false;
-			}
-			return this.member.equals(otherElement.member);
+			return (this == other || (other instanceof InjectedElement that &&
+					this.member.equals(that.member)));
 		}
 
 		@Override