From 12272d6e41c339720b5d083414323c061632f454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Mon, 6 May 2024 17:58:14 +0200 Subject: [PATCH] Remove unneeded `@SuppressWarnings("NullAway")` Closes gh-32542 --- gradle/spring-module.gradle | 2 +- .../jdbc/datasource/lookup/AbstractRoutingDataSource.java | 1 - .../annotation/reactive/MessageMappingMessageHandler.java | 1 - .../messaging/support/MessageHeaderAccessor.java | 1 - .../org/springframework/r2dbc/core/DefaultDatabaseClient.java | 1 - .../test/web/reactive/server/DefaultWebTestClient.java | 1 - .../test/web/servlet/result/ViewResultMatchers.java | 2 -- .../springframework/http/codec/multipart/MultipartParser.java | 1 - .../java/org/springframework/web/client/DefaultRestClient.java | 1 - .../mvc/method/annotation/ServletInvocableHandlerMethod.java | 1 - 10 files changed, 1 insertion(+), 11 deletions(-) diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle index a6f4b94a20..e41e81f83a 100644 --- a/gradle/spring-module.gradle +++ b/gradle/spring-module.gradle @@ -13,7 +13,7 @@ dependencies { jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37' jmh 'org.openjdk.jmh:jmh-generator-bytecode:1.37' jmh 'net.sf.jopt-simple:jopt-simple' - errorprone 'com.uber.nullaway:nullaway:0.10.24' + errorprone 'com.uber.nullaway:nullaway:0.10.26' errorprone 'com.google.errorprone:error_prone_core:2.9.0' } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java index 05065f41c3..b9d203f202 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java @@ -134,7 +134,6 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple * @see #getResolvedDataSources() * @see #getResolvedDefaultDataSource() */ - @SuppressWarnings("NullAway") public void initialize() { if (this.targetDataSources == null) { throw new IllegalArgumentException("Property 'targetDataSources' is required"); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java index 571ef653b3..c4872d1825 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java @@ -305,7 +305,6 @@ public class MessageMappingMessageHandler extends AbstractMethodMessageHandler sqlSupplier) { BiFunction statementFunction = (connection, sql) -> { if (logger.isDebugEnabled()) { 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 152a207855..da784ae0fa 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 @@ -374,7 +374,6 @@ class DefaultWebTestClient implements WebTestClient { DefaultWebTestClient.this.entityResultConsumer, getResponseTimeout()); } - @SuppressWarnings("NullAway") private ClientRequest.Builder initRequestBuilder() { return ClientRequest.create(this.httpMethod, initUri()) .headers(headersToUse -> { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java index c6ac644126..af88cb202e 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java @@ -47,7 +47,6 @@ public class ViewResultMatchers { /** * Assert the selected view name with the given Hamcrest {@link Matcher}. */ - @SuppressWarnings("NullAway") public ResultMatcher name(Matcher matcher) { return result -> { ModelAndView mav = result.getModelAndView(); @@ -61,7 +60,6 @@ public class ViewResultMatchers { /** * Assert the selected view name. */ - @SuppressWarnings("NullAway") public ResultMatcher name(String expectedViewName) { return result -> { ModelAndView mav = result.getModelAndView(); diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java index 00e3567738..9eb8bff26a 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java @@ -116,7 +116,6 @@ final class MultipartParser extends BaseSubscriber { } @Override - @SuppressWarnings("NullAway") protected void hookOnNext(DataBuffer value) { this.requestOutstanding.set(false); this.state.get().onNext(value); diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java index 98b2de69ae..471f5ced20 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java +++ b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java @@ -543,7 +543,6 @@ final class DefaultRestClient implements RestClient { } } - @SuppressWarnings("NullAway") private ClientHttpRequest createRequest(URI uri) throws IOException { ClientHttpRequestFactory factory; if (DefaultRestClient.this.interceptors != null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java index b5372321d3..4e44175032 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java @@ -215,7 +215,6 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod { private final MethodParameter returnType; - @SuppressWarnings("NullAway") public ConcurrentResultHandlerMethod(@Nullable Object result, ConcurrentResultMethodParameter returnType) { super((Callable) () -> { if (result instanceof Exception exception) {