Annotate Object#equals parameter with @nullable

Closes spring-projectsgh-23093
kopiek · Jun 6, 2019 · 098ac0b · 098ac0b
1 parent 33becd8
commit 098ac0b
Show file tree

Hide file tree

Showing 158 changed files with 222 additions and 176 deletions.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
@@ -720,7 +720,7 @@ public boolean matches(Method method, Class<?> targetClass) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
@@ -519,7 +519,7 @@ else if (shadowMatch.maybeMatches() && fallbackExpression != null) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
@@ -93,7 +93,7 @@ public String getAspectName() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -592,7 +592,7 @@ public MethodCacheKey(Method method) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof MethodCacheKey &&
 					this.method == ((MethodCacheKey) other).method));
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
@@ -349,7 +349,7 @@ private Callback[] getCallbacks(Class<?> rootClass) throws Exception {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof CglibAopProxy &&
 				AopProxyUtils.equalsInProxy(this.advised, ((CglibAopProxy) other).advised)));
 	}
@@ -703,7 +703,7 @@ public Object intercept(Object proxy, Method method, Object[] args, MethodProxy
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other ||
 					(other instanceof DynamicAdvisedInterceptor &&
 							this.advised.equals(((DynamicAdvisedInterceptor) other).advised)));
@@ -899,7 +899,7 @@ public int accept(Method method) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
@@ -65,7 +65,7 @@ public boolean isPerInstance() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
@@ -20,6 +20,7 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
@@ -195,7 +196,7 @@ protected boolean matchesPattern(String signatureString) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 
 import org.springframework.aop.ClassFilter;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -106,7 +107,7 @@ public boolean matches(Class<?> clazz) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof UnionClassFilter &&
 					ObjectUtils.nullSafeEquals(this.filters, ((UnionClassFilter) other).filters)));
 		}
@@ -141,7 +142,7 @@ public boolean matches(Class<?> clazz) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof IntersectionClassFilter &&
 					ObjectUtils.nullSafeEquals(this.filters, ((IntersectionClassFilter) other).filters)));
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
@@ -21,6 +21,7 @@
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -180,7 +181,7 @@ public MethodMatcher getMethodMatcher() {
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
@@ -123,7 +123,7 @@ public MethodMatcher getMethodMatcher() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
@@ -150,7 +150,7 @@ public boolean matches(Class<?> clazz) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
@@ -22,6 +22,7 @@
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.IntroductionAwareMethodMatcher;
 import org.springframework.aop.MethodMatcher;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -140,7 +141,7 @@ public boolean matches(Method method, Class<?> targetClass, Object... args) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
@@ -207,7 +208,7 @@ protected boolean matchesClass2(Class<?> targetClass) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
@@ -296,7 +297,7 @@ public boolean matches(Method method, Class<?> targetClass, Object... args) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}

diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.PatternMatchUtils;
 
 /**
@@ -98,7 +99,7 @@ protected boolean isMatch(String methodName, String mappedName) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof NameMatchMethodPointcut &&
 				this.mappedNames.equals(((NameMatchMethodPointcut) other).mappedNames)));
 	}

diff --git a/...g-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java b/...g-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
@@ -20,6 +20,7 @@
 
 import org.springframework.aop.ClassFilter;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -67,7 +68,7 @@ public boolean matches(Class<?> clazz) {
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/.../src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java b/.../src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
@@ -120,7 +120,7 @@ public MethodMatcher getMethodMatcher() {
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/...aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java b/...aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
@@ -23,6 +23,7 @@
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcher;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -86,7 +87,7 @@ private boolean matchesMethod(Method method) {
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
@@ -81,7 +81,7 @@ public Object getSource() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
@@ -339,7 +339,7 @@ public void setPropertyEditorClass(@Nullable Class<?> propertyEditorClass) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof PropertyDescriptor &&
 					PropertyDescriptorUtils.equals(this, (PropertyDescriptor) other)));
 		}
@@ -491,7 +491,7 @@ public void setPropertyEditorClass(@Nullable Class<?> propertyEditorClass) {
 		 * See java.beans.IndexedPropertyDescriptor#equals(java.lang.Object)
 		 */
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}

diff --git a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -163,7 +163,7 @@ public Class<?> getPropertyEditorClass() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
@@ -367,7 +367,7 @@ public boolean isConverted() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof MutablePropertyValues &&
 				this.propertyValueList.equals(((MutablePropertyValues) other).propertyValueList)));
 	}

diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
@@ -188,7 +188,7 @@ public synchronized Object getConvertedValue() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/InjectionPoint.java b/spring-beans/src/main/java/org/springframework/beans/factory/InjectionPoint.java
@@ -176,7 +176,7 @@ public AnnotatedElement getAnnotatedElement() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/.../org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/.../org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
@@ -390,7 +390,7 @@ public void invoke(Object target) throws Throwable {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}

diff --git a/...g-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/...g-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
@@ -296,7 +296,7 @@ protected Object getResourceToInject(Object target, @Nullable String requestingB
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}

diff --git a/...ng-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/...ng-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
@@ -166,7 +166,7 @@ public String toString() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/...g-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java b/...g-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
@@ -69,7 +69,7 @@ else if (this.scope != null) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/...ans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/...ans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
@@ -384,7 +384,7 @@ public void clear() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/...ng-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/...ng-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -416,7 +416,7 @@ else if (type instanceof ParameterizedType) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/...eans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/...eans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
@@ -67,7 +67,7 @@ public Object getSource() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/...ng-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/...ng-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
@@ -92,7 +92,7 @@ public Object getSource() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
@@ -215,7 +215,7 @@ public boolean isDynamic() {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}

diff --git a/...eans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/...eans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
@@ -128,7 +128,7 @@ public String toString() {
 	 * as well, in addition to the superclass's equality requirements.
 	 */
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof BeanComponentDefinition && super.equals(other)));
 	}