fix: equals(@nullable Object)

MukjepScarlet · MukjepScarlet · commit b56e87751bb3 · 2025-12-26T22:15:01.000+08:00
String found: org.springframework.cglib.core.EmitUtils/KeyFactory
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
@@ -731,7 +731,7 @@ public Advice getAdvice() {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof AdvisorKeyEntry that &&
 					this.adviceType == that.adviceType &&
 					ObjectUtils.nullSafeEquals(this.classFilterKey, that.classFilterKey) &&
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
@@ -198,7 +198,7 @@ public boolean matches(Class<?> clazz) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof NegateClassFilter that &&
 					this.original.equals(that.original)));
 		}
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
@@ -378,7 +378,7 @@ public boolean matches(Method method, Class<?> targetClass, @Nullable Object...
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof NegateMethodMatcher that &&
 					this.original.equals(that.original)));
 		}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
@@ -247,7 +247,7 @@ private void clearBit(int index) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof BitsCronField that &&
 				type() == that.type() && this.bits == that.bits));
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -180,7 +180,7 @@ public interface Named {
 		String getName();
 
 		@Override
-		boolean equals(Object other);
+		boolean equals(@Nullable Object other);
 
 		@Override
 		int hashCode();
diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java b/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
@@ -27,6 +27,8 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.cglib.core.AbstractClassGenerator;
 import org.springframework.cglib.core.KeyFactory;
@@ -276,7 +278,7 @@ public void putAll(Map t) {
 	}
 
 	@Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
 		if (o == null || !(o instanceof Map other)) {
 			return false;
 		}
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ClassEmitter.java b/spring-core/src/main/java/org/springframework/cglib/core/ClassEmitter.java
@@ -18,6 +18,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.FieldVisitor;
 import org.springframework.asm.MethodVisitor;
@@ -229,7 +231,7 @@ public FieldInfo(int access, String name, Type type, Object value) {
         }
 
         @Override
-		public boolean equals(Object o) {
+		public boolean equals(@Nullable Object o) {
             if (o == null) {
 				return false;
 			}
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ClassInfo.java b/spring-core/src/main/java/org/springframework/cglib/core/ClassInfo.java
@@ -16,6 +16,8 @@
 
 package org.springframework.cglib.core;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.asm.Type;
 
 abstract public class ClassInfo {
@@ -29,7 +31,7 @@ protected ClassInfo() {
     abstract public int getModifiers();
 
 	@Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
 		if (o == null) {
 			return false;
 		}
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/DefaultNamingPolicy.java b/spring-core/src/main/java/org/springframework/cglib/core/DefaultNamingPolicy.java
@@ -16,6 +16,8 @@
 
 package org.springframework.cglib.core;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * The default policy used by {@link AbstractClassGenerator}.
  * Generates names such as
@@ -68,7 +70,7 @@ public int hashCode() {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(@Nullable Object o) {
         return (o instanceof DefaultNamingPolicy defaultNamingPolicy) &&
                 defaultNamingPolicy.getTag().equals(getTag());
     }
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/GeneratorStrategy.java b/spring-core/src/main/java/org/springframework/cglib/core/GeneratorStrategy.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.cglib.core;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * The <code>GeneratorStrategy</code> is responsible for taking a
  * {@link ClassGenerator} and producing a byte array containing the
@@ -41,5 +43,5 @@ public interface GeneratorStrategy {
      * to avoid generating too many classes.
      */
     @Override
-	boolean equals(Object o);
+	boolean equals(@Nullable Object o);
 }
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/MethodInfo.java b/spring-core/src/main/java/org/springframework/cglib/core/MethodInfo.java
@@ -16,6 +16,8 @@
 
 package org.springframework.cglib.core;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.asm.Type;
 
 abstract public class MethodInfo {
@@ -29,7 +31,7 @@ protected MethodInfo() {
 	abstract public Type[] getExceptionTypes();
 
 	@Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
 		if (o == null) {
 			return false;
 		}
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/NamingPolicy.java b/spring-core/src/main/java/org/springframework/cglib/core/NamingPolicy.java
@@ -16,6 +16,8 @@
 
 package org.springframework.cglib.core;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Customize the generated class name for {@link AbstractClassGenerator}-based utilities.
  */
@@ -39,5 +41,5 @@ public interface NamingPolicy {
      * to avoid generating too many classes.
      */
     @Override
-    boolean equals(Object o);
+    boolean equals(@Nullable Object o);
 }
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/Signature.java b/spring-core/src/main/java/org/springframework/cglib/core/Signature.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.cglib.core;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.asm.Type;
 
 /**
@@ -60,7 +62,7 @@ public String toString() {
     }
 
     @Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
         if (o == null) {
 			return false;
 		}
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/WeakCacheKey.java b/spring-core/src/main/java/org/springframework/cglib/core/WeakCacheKey.java
@@ -2,6 +2,8 @@
 
 import java.lang.ref.WeakReference;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Allows to check for object equality, yet the class does not keep strong reference to the target.
  * {@link #equals(Object)} returns true if and only if the reference is not yet expired and target
@@ -20,7 +22,7 @@ public WeakCacheKey(T referent) {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (!(obj instanceof WeakCacheKey<?> weakCacheKey)) {
             return false;
         }
diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackFilter.java b/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackFilter.java
@@ -17,6 +17,8 @@
 
 import java.lang.reflect.Method;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Map methods of subclasses generated by {@link Enhancer} to a particular
  * callback. The type of the callbacks chosen for each method affects
@@ -43,5 +45,5 @@ public interface CallbackFilter {
      * implementations in order to improve performance.
     */
     @Override
-	boolean equals(Object o);
+	boolean equals(@Nullable Object o);
 }
diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackHelper.java b/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackHelper.java
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.cglib.core.ReflectUtils;
 
 /**
@@ -97,7 +99,7 @@ public int hashCode() {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(@Nullable Object o) {
         if (o == null) {
             return false;
         }
diff --git a/spring-core/src/main/java/org/springframework/cglib/reflect/FastClass.java b/spring-core/src/main/java/org/springframework/cglib/reflect/FastClass.java
@@ -20,6 +20,8 @@
 import java.lang.reflect.Method;
 import java.security.ProtectionDomain;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Type;
 import org.springframework.cglib.core.AbstractClassGenerator;
@@ -153,7 +155,7 @@ public int hashCode() {
     }
 
     @Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
         if (o == null || !(o instanceof FastClass that)) {
             return false;
         }
diff --git a/spring-core/src/main/java/org/springframework/cglib/reflect/FastMember.java b/spring-core/src/main/java/org/springframework/cglib/reflect/FastMember.java
@@ -17,6 +17,8 @@
 
 import java.lang.reflect.Member;
 
+import org.jspecify.annotations.Nullable;
+
 @SuppressWarnings({"rawtypes", "unchecked"})
 abstract public class FastMember
 {
@@ -60,7 +62,7 @@ public int hashCode() {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(@Nullable Object o) {
         if (o == null || !(o instanceof FastMember other)) {
             return false;
         }
diff --git a/spring-core/src/main/java/org/springframework/cglib/reflect/MethodDelegate.java b/spring-core/src/main/java/org/springframework/cglib/reflect/MethodDelegate.java
@@ -19,6 +19,8 @@
 import java.lang.reflect.Method;
 import java.security.ProtectionDomain;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Type;
 import org.springframework.cglib.core.AbstractClassGenerator;
@@ -144,7 +146,7 @@ public static MethodDelegate create(Object target, String methodName, Class ifac
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(@Nullable Object obj) {
         MethodDelegate other = (MethodDelegate)obj;
         return (other != null && target == other.target) && eqMethod.equals(other.eqMethod);
     }
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBuffer.java
@@ -300,7 +300,7 @@ public String toString(int index, int length, Charset charset) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof JettyDataBuffer otherBuffer &&
 				this.delegate.equals(otherBuffer.delegate)));
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java b/spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java
@@ -26,6 +26,7 @@
 import java.util.function.Supplier;
 
 import org.assertj.core.api.ThrowingConsumer;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -850,7 +851,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other ||
 					(other instanceof CustomException that && getMessage().equals(that.getMessage())));
 		}
diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java
@@ -18,6 +18,8 @@
 
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextCustomizer;
@@ -69,7 +71,7 @@ Set<BeanOverrideHandler> getBeanOverrideHandlers() {
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (other == this) {
 			return true;
 		}
diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideHandler.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideHandler.java
@@ -369,7 +369,7 @@ protected void trackOverrideInstance(Object override, SingletonBeanRegistry sing
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (other == this) {
 			return true;
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/ETag.java b/spring-web/src/main/java/org/springframework/http/ETag.java
@@ -21,6 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.StringUtils;
 
@@ -68,7 +69,7 @@ public boolean compare(ETag other, boolean strong) {
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		return (this == other ||
 				(other instanceof ETag oet && this.tag.equals(oet.tag) && this.weak == oet.weak));
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -2331,7 +2331,7 @@ public List<String> setValue(List<String> value) {
 			}
 
 			@Override
-			public boolean equals(Object o) {
+			public boolean equals(@Nullable Object o) {
 				if (this == o) {
 					return true;
 				}
diff --git a/spring-web/src/main/java/org/springframework/web/accept/SemanticApiVersionParser.java b/spring-web/src/main/java/org/springframework/web/accept/SemanticApiVersionParser.java
@@ -19,6 +19,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.util.Assert;
 
 /**
@@ -106,7 +108,7 @@ public int compareTo(SemanticApiVersionParser.Version other) {
 		}
 
 		@Override
-		public boolean equals(Object other) {
+		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof Version otherVersion &&
 					this.major == otherVersion.major &&
 					this.minor == otherVersion.minor &&
diff --git a/spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceMethod.java b/spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceMethod.java
@@ -364,7 +364,7 @@ private static class AnnotationDescriptor {
 			}
 
 			@Override
-			public boolean equals(Object obj) {
+			public boolean equals(@Nullable Object obj) {
 				return (obj instanceof AnnotationDescriptor that && this.httpExchange.equals(that.httpExchange));
 			}
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/WhatWgUrlParser.java b/spring-web/src/main/java/org/springframework/web/util/WhatWgUrlParser.java
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java

Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ public Advice getAdvice() {`
`731`	`731`	`}`
`732`	`732`
`733`	`733`	`@Override`
`734`		`- public boolean equals(Object other) {`
	`734`	`+ public boolean equals(@Nullable Object other) {`
`735`	`735`	`return (this == other \|\| (other instanceof AdvisorKeyEntry that &&`
`736`	`736`	`this.adviceType == that.adviceType &&`
`737`	`737`	`ObjectUtils.nullSafeEquals(this.classFilterKey, that.classFilterKey) &&`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public boolean matches(Class<?> clazz) {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`@Override`
`201`		`- public boolean equals(Object other) {`
	`201`	`+ public boolean equals(@Nullable Object other) {`
`202`	`202`	`return (this == other \|\| (other instanceof NegateClassFilter that &&`
`203`	`203`	`this.original.equals(that.original)));`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ public boolean matches(Method method, Class<?> targetClass, @Nullable Object...`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`@Override`
`381`		`- public boolean equals(Object other) {`
	`381`	`+ public boolean equals(@Nullable Object other) {`
`382`	`382`	`return (this == other \|\| (other instanceof NegateMethodMatcher that &&`
`383`	`383`	`this.original.equals(that.original)));`
`384`	`384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ private void clearBit(int index) {`
`247`	`247`
`248`	`248`
`249`	`249`	`@Override`
`250`		`- public boolean equals(Object other) {`
	`250`	`+ public boolean equals(@Nullable Object other) {`
`251`	`251`	`return (this == other \|\| (other instanceof BitsCronField that &&`
`252`	`252`	`type() == that.type() && this.bits == that.bits));`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`package org.springframework.cglib.core;`
`18`	`18`
	`19`	`+import org.jspecify.annotations.Nullable;`
	`20`	`+`
`19`	`21`	`/**`
`20`	`22`	`* The default policy used by {@link AbstractClassGenerator}.`
`21`	`23`	`* Generates names such as`
`@@ -68,7 +70,7 @@ public int hashCode() {`
`68`	`70`	`}`
`69`	`71`
`70`	`72`	`@Override`
`71`		`- public boolean equals(Object o) {`
	`73`	`+ public boolean equals(@Nullable Object o) {`
`72`	`74`	`return (o instanceof DefaultNamingPolicy defaultNamingPolicy) &&`
`73`	`75`	`defaultNamingPolicy.getTag().equals(getTag());`
`74`	`76`	`}`