Consistent equals/hashCode style (and related polishing)

Author: jhoeller

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

@@ -117,8 +117,8 @@ private String replaceBooleanOperators(String pcExpr) {
 	}
 
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		return (this == obj || (obj instanceof TypePatternClassFilter that &&
+	public boolean equals(@Nullable Object other) {
+		return (this == other || (other instanceof TypePatternClassFilter that &&
 				ObjectUtils.nullSafeEquals(this.typePattern, that.typePattern)));
 	}
 

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

@@ -109,8 +109,8 @@ public boolean matches(Class<?> clazz) {
 		}
 
 		@Override
-		public boolean equals(@Nullable Object obj) {
-			return (this == obj || (obj instanceof UnionClassFilter that &&
+		public boolean equals(@Nullable Object other) {
+			return (this == other || (other instanceof UnionClassFilter that &&
 					ObjectUtils.nullSafeEquals(this.filters, that.filters)));
 		}
 
@@ -150,8 +150,8 @@ public boolean matches(Class<?> clazz) {
 		}
 
 		@Override
-		public boolean equals(@Nullable Object obj) {
-			return (this == obj || (obj instanceof IntersectionClassFilter that &&
+		public boolean equals(@Nullable Object other) {
+			return (this == other || (other instanceof IntersectionClassFilter that &&
 					ObjectUtils.nullSafeEquals(this.filters, that.filters)));
 		}
 

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

@@ -100,8 +100,8 @@ protected boolean isMatch(String methodName, String mappedName) {
 
 
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		return (this == obj || (obj instanceof NameMatchMethodPointcut that &&
+	public boolean equals(@Nullable Object other) {
+		return (this == other || (other instanceof NameMatchMethodPointcut that &&
 				this.mappedNames.equals(that.mappedNames)));
 	}
 

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

@@ -46,8 +46,8 @@ public boolean matches(Class<?> candidate) {
 	}
 
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		return (this == obj || (obj instanceof RootClassFilter that &&
+	public boolean equals(@Nullable Object other) {
+		return (this == other || (other instanceof RootClassFilter that &&
 				this.clazz.equals(that.clazz)));
 	}
 

spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/NopInterceptor.java

@@ -47,14 +47,8 @@ public int getCount() {
 
 
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!(obj instanceof NopInterceptor that)) {
-			return false;
-		}
-		return this.count == that.count;
+	public boolean equals(@Nullable Object other) {
+		return (this == other || (other instanceof NopInterceptor that && this.count == that.count));
 	}
 
 	@Override

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

@@ -338,8 +338,8 @@ public void setPropertyEditorClass(@Nullable Class<?> propertyEditorClass) {
 		}
 
 		@Override
-		public boolean equals(@Nullable Object obj) {
-			return (this == obj || (obj instanceof PropertyDescriptor that &&
+		public boolean equals(@Nullable Object other) {
+			return (this == other || (other instanceof PropertyDescriptor that &&
 					PropertyDescriptorUtils.equals(this, that)));
 		}
 

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

@@ -366,8 +366,8 @@ public boolean isConverted() {
 
 
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		return (this == obj || (obj instanceof MutablePropertyValues that &&
+	public boolean equals(@Nullable Object other) {
+		return (this == other || (other instanceof MutablePropertyValues that &&
 				this.propertyValueList.equals(that.propertyValueList)));
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -52,8 +52,8 @@ private Object readResolve() {
 
 
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		return (this == obj);
+	public boolean equals(@Nullable Object other) {
+		return (this == other);
 	}
 
 	@Override

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java

@@ -81,8 +81,8 @@ public String getDescription() {
 	 * This implementation compares the underlying BeanDefinition.
 	 */
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		return (this == obj || (obj instanceof BeanDefinitionResource that &&
+	public boolean equals(@Nullable Object other) {
+		return (this == other || (other instanceof BeanDefinitionResource that &&
 				this.beanDefinition.equals(that.beanDefinition)));
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/support/NullBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 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.
@@ -40,8 +40,8 @@ final class NullBean {
 
 
 	@Override
-	public boolean equals(@Nullable Object obj) {
-		return (this == obj || obj == null);
+	public boolean equals(@Nullable Object other) {
+		return (this == other || other == null);
 	}
 
 	@Override