Merge branch 'spring-projects:main' into main

Author: asifebrahim

build.gradle

@@ -6,7 +6,7 @@ plugins {
 	id 'com.github.bjornvester.xjc' version '1.8.2' apply false
 	id 'io.github.goooler.shadow' version '8.1.8' apply false
 	id 'me.champeau.jmh' version '0.7.2' apply false
-	id "io.spring.nullability" version "0.0.1" apply false
+	id 'io.spring.nullability' version '0.0.4' apply false
 }
 
 ext {

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

@@ -20,8 +20,6 @@
 import java.beans.IntrospectionException;
 import java.lang.reflect.Method;
 
-import org.jspecify.annotations.NonNull;
-
 import org.springframework.core.Ordered;
 
 /**
@@ -44,7 +42,7 @@
 public class ExtendedBeanInfoFactory extends StandardBeanInfoFactory {
 
 	@Override
-	public @NonNull BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
+	public BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
 		BeanInfo beanInfo = super.getBeanInfo(beanClass);
 		return (supports(beanClass) ? new ExtendedBeanInfo(beanInfo) : beanInfo);
 	}

spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotations.java

@@ -29,7 +29,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -483,7 +482,7 @@ private void addAggregateAnnotations(List<Annotation> aggregateAnnotations, @Nul
 		}
 
 		@Override
-		public @NonNull List<Aggregate> finish(@Nullable List<Aggregate> processResult) {
+		public List<Aggregate> finish(@Nullable List<Aggregate> processResult) {
 			return this.aggregates;
 		}
 	}

spring-core/src/main/java/org/springframework/util/ObjectUtils.java

@@ -255,7 +255,7 @@ public static <E extends Enum<?>> E caseInsensitiveValueOf(E[] enumValues, Strin
 	 * @param obj the object to append
 	 * @return the new array (of the same component type; never {@code null})
 	 */
-	public static <A, O extends A> A[] addObjectToArray(A @Nullable [] array, @Nullable O obj) {
+	public static <A, O extends A> A[] addObjectToArray(A @Nullable [] array, O obj) {
 		return addObjectToArray(array, obj, (array != null ? array.length : 0));
 	}
 
@@ -268,17 +268,18 @@ public static <A, O extends A> A[] addObjectToArray(A @Nullable [] array, @Nulla
 	 * @return the new array (of the same component type; never {@code null})
 	 * @since 6.0
 	 */
-	public static <A, O extends A> @Nullable A[] addObjectToArray(A @Nullable [] array, @Nullable O obj, int position) {
+	public static <A, O extends A> A[] addObjectToArray(A @Nullable [] array, O obj, int position) {
 		Class<?> componentType = Object.class;
 		if (array != null) {
 			componentType = array.getClass().componentType();
 		}
+		// Defensive code for use cases not following the declared nullability
 		else if (obj != null) {
 			componentType = obj.getClass();
 		}
 		int newArrayLength = (array != null ? array.length + 1 : 1);
 		@SuppressWarnings("unchecked")
-		@Nullable A[] newArray = (A[]) Array.newInstance(componentType, newArrayLength);
+		A[] newArray = (A[]) Array.newInstance(componentType, newArrayLength);
 		if (array != null) {
 			System.arraycopy(array, 0, newArray, 0, position);
 			System.arraycopy(array, position, newArray, position + 1, array.length - position);

spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java

@@ -29,7 +29,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
@@ -470,13 +469,13 @@ void scanWhenProcessorReturnsFromDoWithAggregateExitsEarly() {
 				new AnnotationsProcessor<Object, String>() {
 
 					@Override
-					public @NonNull String doWithAggregate(Object context, int aggregateIndex) {
+					public String doWithAggregate(Object context, int aggregateIndex) {
 						return "";
 					}
 
 					@Override
-					public @NonNull String doWithAnnotations(Object context, int aggregateIndex,
-							@Nullable Object source, @Nullable Annotation @Nullable [] annotations) {
+					public String doWithAnnotations(Object context, int aggregateIndex,
+							@Nullable Object source, @Nullable Annotation[] annotations) {
 						throw new IllegalStateException("Should not call");
 					}
 
@@ -502,13 +501,13 @@ void scanWhenProcessorHasFinishMethodUsesFinishResult() {
 				new AnnotationsProcessor<Object, String>() {
 
 					@Override
-					public @NonNull String doWithAnnotations(Object context, int aggregateIndex,
-							@Nullable Object source, @Nullable Annotation @Nullable [] annotations) {
+					public String doWithAnnotations(Object context, int aggregateIndex,
+							@Nullable Object source, @Nullable Annotation[] annotations) {
 						return "K";
 					}
 
 					@Override
-					public @NonNull String finish(@Nullable String result) {
+					public String finish(@Nullable String result) {
 						return "O" + result;
 					}
 

spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@@ -1413,7 +1413,7 @@ else if (param.getResultSetExtractor() != null) {
 	 * @return the RowMapper to use
 	 * @see SingleColumnRowMapper
 	 */
-	protected <T> RowMapper<@Nullable T> getSingleColumnRowMapper(Class<T> requiredType) {
+	protected <T extends @Nullable Object> RowMapper<T> getSingleColumnRowMapper(Class<T> requiredType) {
 		return new SingleColumnRowMapper<>(requiredType);
 	}
 

spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java

@@ -116,7 +116,9 @@ public abstract class DataAccessUtils {
 	 * element has been found in the given Collection
 	 * @since 6.1
 	 */
-	public static <T extends @Nullable Object> Optional<@NonNull T> optionalResult(@Nullable Collection<T> results) throws IncorrectResultSizeDataAccessException {
+	public static <T extends @Nullable Object> Optional<@NonNull T> optionalResult(@Nullable Collection<T> results)
+			throws IncorrectResultSizeDataAccessException {
+
 		return Optional.ofNullable(singleResult(results));
 	}
 
@@ -159,7 +161,9 @@ public static <T> Optional<T> optionalResult(@Nullable Iterator<T> results) thro
 	 * @throws EmptyResultDataAccessException if no element at all
 	 * has been found in the given Collection
 	 */
-	public static <T extends @Nullable Object> @NonNull T requiredSingleResult(@Nullable Collection<T> results) throws IncorrectResultSizeDataAccessException {
+	public static <T extends @Nullable Object> @NonNull T requiredSingleResult(@Nullable Collection<T> results)
+			throws IncorrectResultSizeDataAccessException {
+
 		if (CollectionUtils.isEmpty(results)) {
 			throw new EmptyResultDataAccessException(1);
 		}
@@ -185,7 +189,9 @@ public static <T> Optional<T> optionalResult(@Nullable Iterator<T> results) thro
 	 * has been found in the given Collection
 	 * @since 5.0.2
 	 */
-	public static <T extends @Nullable Object> T nullableSingleResult(@Nullable Collection<T> results) throws IncorrectResultSizeDataAccessException {
+	public static <T extends @Nullable Object> T nullableSingleResult(@Nullable Collection<T> results)
+			throws IncorrectResultSizeDataAccessException {
+
 		// This is identical to the requiredSingleResult implementation but differs in the
 		// semantics of the incoming Collection (which we currently can't formally express)
 		if (CollectionUtils.isEmpty(results)) {