diff --git a/build.gradle b/build.gradle index 03ed9c64985..a51f2eed9c1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'com.github.bjornvester.xjc' version '1.8.2' apply false id 'com.gradleup.shadow' version "9.2.2" apply false id 'me.champeau.jmh' version '0.7.2' apply false - id 'io.spring.nullability' version '0.0.14' apply false + id 'io.spring.nullability' version '0.0.15' apply false } ext { diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java index c94b70ee796..522c6b7a60a 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java @@ -20,6 +20,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.concurrent.FutureTask; +import org.jspecify.annotations.Nullable; import org.quartz.SchedulerConfigException; import org.quartz.simpl.SimpleThreadPool; @@ -83,7 +84,7 @@ public class SimpleThreadPoolTaskExecutor extends SimpleThreadPool } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { FutureTask future = new FutureTask<>(task); execute(future); return future; diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java index 7b15ed5e872..19c28bd3fa8 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java @@ -165,7 +165,7 @@ public class ConcurrentTaskExecutor implements AsyncTaskExecutor, SchedulingTask } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { return this.adaptedExecutor.submit(task); } @@ -208,7 +208,7 @@ public class ConcurrentTaskExecutor implements AsyncTaskExecutor, SchedulingTask } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { return super.submit(ManagedTaskBuilder.buildManagedTask(task, task.toString())); } } diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java index da0202e316a..8dc4215d62c 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java @@ -211,7 +211,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { return super.submit(new DelegatingErrorHandlingCallable<>(task, this.errorHandler)); } diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java index 7e050ef212e..9e5062a04ba 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java @@ -262,7 +262,7 @@ public class SimpleAsyncTaskScheduler extends SimpleAsyncTaskExecutor implements } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { return super.submit(new DelegatingErrorHandlingCallable<>(task, this.errorHandler)); } diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java index b798f3fbaa1..9af8a4e11a6 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java @@ -401,7 +401,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { ExecutorService executor = getThreadPoolExecutor(); try { return executor.submit(task); diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index ad06bf052a6..9e9c8d075b2 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -336,7 +336,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { ExecutorService executor = getScheduledExecutor(); try { return executor.submit(new DelegatingErrorHandlingCallable<>(task, this.errorHandler)); diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java index dcb489d5f61..36efadfec3e 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java +++ b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java @@ -69,6 +69,7 @@ public class ConvertingComparator implements Comp * @param conversionService the conversion service * @param targetType the target type */ + @SuppressWarnings("NullAway") // Retain support for comparators that handle a null conversion result public ConvertingComparator( Comparator comparator, ConversionService conversionService, Class targetType) { diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java index ac88807a73c..c6be0277b8b 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java @@ -43,7 +43,7 @@ import org.springframework.util.NumberUtils; final class CharacterToNumberFactory implements ConverterFactory { @Override - public Converter getConverter(Class targetType) { + public Converter getConverter(Class targetType) { return new CharacterToNumber<>(targetType); } diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java index abf200874e9..d8c9b230e44 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java @@ -45,7 +45,7 @@ import org.springframework.util.NumberUtils; final class NumberToNumberConverterFactory implements ConverterFactory, ConditionalConverter { @Override - public Converter getConverter(Class targetType) { + public Converter getConverter(Class targetType) { return new NumberToNumber<>(targetType); } diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java index d09482040e5..e0ae6a917a6 100644 --- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java @@ -345,7 +345,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator @SuppressWarnings("deprecation") @Override - public Future submit(Callable task) { + public Future submit(Callable task) { FutureTask future = new FutureTask<>(task); execute(future, TIMEOUT_INDEFINITE); return future; diff --git a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java index b9a81cecf6a..38be515d885 100644 --- a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java +++ b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java @@ -113,7 +113,7 @@ public class TaskExecutorAdapter implements AsyncTaskExecutor { } @Override - public Future submit(Callable task) { + public Future submit(Callable task) { try { if (this.taskDecorator == null && this.concurrentExecutor instanceof ExecutorService executorService) { diff --git a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java index 438acd1d27d..b221ca9a265 100644 --- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java +++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java @@ -48,7 +48,7 @@ import org.jspecify.annotations.Nullable; * @since 3.0 * @param the value type */ -public class LinkedCaseInsensitiveMap implements Map, Serializable, Cloneable { +public class LinkedCaseInsensitiveMap implements Map, Serializable, Cloneable { @Serial private static final long serialVersionUID = -1797561627545787622L; diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java index b8e38381c49..1657d7cd1ba 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java @@ -37,7 +37,7 @@ import org.springframework.util.Assert; * @param the type of objects that may be compared by this comparator * @see Comparator#thenComparing(Comparator) */ -public class InstanceComparator implements Comparator { +public class InstanceComparator implements Comparator { private final Class[] instanceOrder; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java index 0eec243d061..cd3c04cfcd2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java @@ -502,7 +502,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { } @Override - public Stream queryForStream(String sql, RowMapper rowMapper) throws DataAccessException { + public Stream queryForStream(String sql, RowMapper rowMapper) throws DataAccessException { class StreamStatementCallback implements StatementCallback>, SqlProvider { @Override public Stream doInStatement(Statement stmt) throws SQLException { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java index db76fa820de..68ac7af95f6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java @@ -232,7 +232,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations } @Override - public List query(String sql, RowMapper rowMapper) throws DataAccessException { + public List query(String sql, RowMapper rowMapper) throws DataAccessException { return query(sql, EmptySqlParameterSource.INSTANCE, rowMapper); } diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java index 5109efe2ef5..af645f0a8b8 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java @@ -487,12 +487,12 @@ class DefaultWebTestClient implements WebTestClient { } @Override - public ListBodySpec expectBodyList(Class elementType) { + public ListBodySpec expectBodyList(Class elementType) { return getListBodySpec(this.response.bodyToFlux(elementType)); } @Override - public ListBodySpec expectBodyList(ParameterizedTypeReference elementType) { + public ListBodySpec expectBodyList(ParameterizedTypeReference elementType) { Flux flux = this.response.bodyToFlux(elementType); return getListBodySpec(flux); }