Remove unneeded @NonNull annotations

sdeleuze · sdeleuze · commit 0e85d950b376 · 2024-12-19T11:07:33.000+01:00
See gh-28797
diff --git a/spring-beans/src/main/java/org/springframework/beans/SimpleBeanInfoFactory.java b/spring-beans/src/main/java/org/springframework/beans/SimpleBeanInfoFactory.java
@@ -23,8 +23,6 @@
 import java.beans.SimpleBeanInfo;
 import java.util.Collection;
 
-import org.jspecify.annotations.NonNull;
-
 import org.springframework.core.Ordered;
 
 /**
@@ -48,7 +46,7 @@
 class SimpleBeanInfoFactory implements BeanInfoFactory, Ordered {
 
 	@Override
-	public @NonNull BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
+	public BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
 		Collection<? extends PropertyDescriptor> pds =
 				PropertyDescriptorUtils.determineBasicProperties(beanClass);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/StandardBeanInfoFactory.java b/spring-beans/src/main/java/org/springframework/beans/StandardBeanInfoFactory.java
@@ -20,8 +20,6 @@
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 
-import org.jspecify.annotations.NonNull;
-
 import org.springframework.core.Ordered;
 import org.springframework.core.SpringProperties;
 
@@ -67,7 +65,7 @@ public class StandardBeanInfoFactory implements BeanInfoFactory, Ordered {
 
 
 	@Override
-	public @NonNull BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
+	public BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
 		BeanInfo beanInfo = (shouldIntrospectorIgnoreBeaninfoClasses ?
 				Introspector.getBeanInfo(beanClass, Introspector.IGNORE_ALL_BEANINFO) :
 				Introspector.getBeanInfo(beanClass));
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionOverrideException.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionOverrideException.java
@@ -16,8 +16,6 @@
 
 package org.springframework.beans.factory.support;
 
-import org.jspecify.annotations.NonNull;
-
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
 
@@ -76,15 +74,15 @@ public BeanDefinitionOverrideException(
 	 * Return the description of the resource that the bean definition came from.
 	 */
 	@Override
-	public @NonNull String getResourceDescription() {
+	public String getResourceDescription() {
 		return String.valueOf(super.getResourceDescription());
 	}
 
 	/**
 	 * Return the name of the bean.
 	 */
 	@Override
-	public @NonNull String getBeanName() {
+	public String getBeanName() {
 		return String.valueOf(super.getBeanName());
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -26,7 +26,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jspecify.annotations.NonNull;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
@@ -448,7 +447,7 @@ public AnnotationMetadata getMetadata() {
 		}
 
 		@Override
-		public @NonNull MethodMetadata getFactoryMethodMetadata() {
+		public MethodMetadata getFactoryMethodMetadata() {
 			return this.factoryMethodMetadata;
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
@@ -16,8 +16,6 @@
 
 package org.springframework.scheduling.annotation;
 
-import org.jspecify.annotations.NonNull;
-
 import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AdviceModeImportSelector;
 
@@ -44,7 +42,7 @@ public class AsyncConfigurationSelector extends AdviceModeImportSelector<EnableA
 	 * respectively.
 	 */
 	@Override
-	public @NonNull String[] selectImports(AdviceMode adviceMode) {
+	public String[] selectImports(AdviceMode adviceMode) {
 		return switch (adviceMode) {
 			case PROXY -> new String[] {ProxyAsyncConfiguration.class.getName()};
 			case ASPECTJ -> new String[] {ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME};
diff --git a/spring-context/src/main/java/org/springframework/validation/MapBindingResult.java b/spring-context/src/main/java/org/springframework/validation/MapBindingResult.java
@@ -19,7 +19,6 @@
 import java.io.Serializable;
 import java.util.Map;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
@@ -62,7 +61,7 @@ public MapBindingResult(Map<?, ?> target, String objectName) {
 	}
 
 	@Override
-	public final @NonNull Object getTarget() {
+	public final Object getTarget() {
 		return this.target;
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedMethod.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedMethod.java
@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.BridgeMethodResolver;
@@ -264,7 +263,7 @@ protected AnnotatedMethodParameter(AnnotatedMethodParameter original) {
 		}
 
 		@Override
-		public @NonNull Method getMethod() {
+		public Method getMethod() {
 			return AnnotatedMethod.this.getBridgedMethod();
 		}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.BeanWrapper;
@@ -90,7 +89,7 @@ public int getSqlType(String paramName) {
 	}
 
 	@Override
-	public @NonNull String[] getParameterNames() {
+	public String[] getParameterNames() {
 		return getReadablePropertyNames();
 	}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
@@ -20,7 +20,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.jdbc.core.SqlParameterValue;
@@ -174,7 +173,7 @@ public boolean hasValue(String paramName) {
 	}
 
 	@Override
-	public @NonNull String[] getParameterNames() {
+	public String[] getParameterNames() {
 		return StringUtils.toStringArray(this.values.keySet());
 	}
 
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/Bindings.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/Bindings.java
@@ -26,7 +26,6 @@
 import java.util.function.Consumer;
 
 import io.r2dbc.spi.Statement;
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
@@ -206,7 +205,7 @@ public boolean hasValue() {
 		}
 
 		@Override
-		public @NonNull Object getValue() {
+		public Object getValue() {
 			return this.value;
 		}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
@@ -109,7 +108,7 @@ public String getName() {
 	}
 
 	@Override
-	public @NonNull String getOriginalFilename() {
+	public String getOriginalFilename() {
 		return this.originalFilename;
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 
@@ -379,7 +378,7 @@ static final class PublisherEntity<T, P extends Publisher<T>> extends HttpEntity
 		 * Return the element type for the {@code Publisher} body.
 		 */
 		@Override
-		public @NonNull ResolvableType getResolvableType() {
+		public ResolvableType getResolvableType() {
 			return this.resolvableType;
 		}
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
@@ -37,7 +37,6 @@
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlSeeAlso;
 import jakarta.xml.bind.annotation.XmlType;
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import reactor.core.Exceptions;
@@ -172,7 +171,7 @@ public Mono<Object> decodeToMono(Publisher<DataBuffer> input, ResolvableType ele
 	}
 
 	@Override
-	public @NonNull Object decode(DataBuffer dataBuffer, ResolvableType targetType,
+	public Object decode(DataBuffer dataBuffer, ResolvableType targetType,
 			@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) throws DecodingException {
 
 		try {
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
@@ -35,7 +35,6 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 
@@ -214,12 +213,12 @@ protected MultiValueMap<String, HttpCookie> initCookies() {
 	}
 
 	@Override
-	public @NonNull InetSocketAddress getLocalAddress() {
+	public InetSocketAddress getLocalAddress() {
 		return new InetSocketAddress(this.request.getLocalAddr(), this.request.getLocalPort());
 	}
 
 	@Override
-	public @NonNull InetSocketAddress getRemoteAddress() {
+	public InetSocketAddress getRemoteAddress() {
 		return new InetSocketAddress(this.request.getRemoteHost(), this.request.getRemotePort());
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
@@ -29,7 +29,6 @@
 import java.util.function.BiFunction;
 import java.util.function.UnaryOperator;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
@@ -196,7 +195,7 @@ else if (this.port.contains("{")) {
 	}
 
 	@Override
-	public @NonNull String getPath() {
+	public String getPath() {
 		return this.path.getPath();
 	}
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartFile.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartFile.java
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
@@ -109,7 +108,7 @@ public String getName() {
 	}
 
 	@Override
-	public @NonNull String getOriginalFilename() {
+	public String getOriginalFilename() {
 		return this.originalFilename;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`
`27`	`27`	`import org.apache.commons.logging.Log;`
`28`	`28`	`import org.apache.commons.logging.LogFactory;`
`29`		`-import org.jspecify.annotations.NonNull;`
`30`	`29`
`31`	`30`	`import org.springframework.beans.factory.BeanDefinitionStoreException;`
`32`	`31`	`import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;`
`@@ -448,7 +447,7 @@ public AnnotationMetadata getMetadata() {`
`448`	`447`	`}`
`449`	`448`
`450`	`449`	`@Override`
`451`		`- public @NonNull MethodMetadata getFactoryMethodMetadata() {`
	`450`	`+ public MethodMetadata getFactoryMethodMetadata() {`
`452`	`451`	`return this.factoryMethodMetadata;`
`453`	`452`	`}`
`454`	`453`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`import java.io.Serializable;`
`20`	`20`	`import java.util.Map;`
`21`	`21`
`22`		`-import org.jspecify.annotations.NonNull;`
`23`	`22`	`import org.jspecify.annotations.Nullable;`
`24`	`23`
`25`	`24`	`import org.springframework.util.Assert;`
`@@ -62,7 +61,7 @@ public MapBindingResult(Map<?, ?> target, String objectName) {`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`@Override`
`65`		`- public final @NonNull Object getTarget() {`
	`64`	`+ public final Object getTarget() {`
`66`	`65`	`return this.target;`
`67`	`66`	`}`
`68`	`67`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`import java.util.Arrays;`
`23`	`23`	`import java.util.List;`
`24`	`24`
`25`		`-import org.jspecify.annotations.NonNull;`
`26`	`25`	`import org.jspecify.annotations.Nullable;`
`27`	`26`
`28`	`27`	`import org.springframework.core.BridgeMethodResolver;`
`@@ -264,7 +263,7 @@ protected AnnotatedMethodParameter(AnnotatedMethodParameter original) {`
`264`	`263`	`}`
`265`	`264`
`266`	`265`	`@Override`
`267`		`- public @NonNull Method getMethod() {`
	`266`	`+ public Method getMethod() {`
`268`	`267`	`return AnnotatedMethod.this.getBridgedMethod();`
`269`	`268`	`}`
`270`	`269`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import java.util.ArrayList;`
`21`	`21`	`import java.util.List;`
`22`	`22`
`23`		`-import org.jspecify.annotations.NonNull;`
`24`	`23`	`import org.jspecify.annotations.Nullable;`
`25`	`24`
`26`	`25`	`import org.springframework.beans.BeanWrapper;`
`@@ -90,7 +89,7 @@ public int getSqlType(String paramName) {`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`@Override`
`93`		`- public @NonNull String[] getParameterNames() {`
	`92`	`+ public String[] getParameterNames() {`
`94`	`93`	`return getReadablePropertyNames();`
`95`	`94`	`}`
`96`	`95`