From 96f7d50abfff287b13625009d3118937a26c36ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Tue, 7 Jan 2025 09:51:57 +0100 Subject: [PATCH] Remove unneeded NullAway warning suppressions This commit removes warning suppressions related to uber/NullAway#1113 which is now fixed. See gh-28797 --- .../aop/framework/ReflectiveMethodInvocation.java | 2 -- .../aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java | 1 - .../beans/factory/support/SimpleInstantiationStrategy.java | 1 - .../cache/jcache/interceptor/AbstractJCacheOperation.java | 1 - .../cache/jcache/interceptor/KeyGeneratorAdapter.java | 1 - .../springframework/cache/interceptor/SimpleKeyGenerator.java | 1 - .../reactive/function/server/DefaultServerResponseBuilder.java | 1 - .../web/servlet/function/DefaultServerResponseBuilder.java | 1 - 8 files changed, 9 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java index 1e640e4ac575..30110017453d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java @@ -146,7 +146,6 @@ public final Method getMethod() { } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public void setArguments(@Nullable Object... arguments) { this.arguments = arguments; } @@ -219,7 +218,6 @@ public MethodInvocation invocableClone() { * @see java.lang.Object#clone() */ @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public MethodInvocation invocableClone(@Nullable Object... arguments) { // Force initialization of the user attributes Map, // for having a shared Map reference in the clone. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java index ba13786d4c23..a9ed90d1cc7f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java @@ -35,7 +35,6 @@ public class SimpleAsyncUncaughtExceptionHandler implements AsyncUncaughtExcepti @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public void handleUncaughtException(Throwable ex, Method method, @Nullable Object... params) { if (logger.isErrorEnabled()) { logger.error("Unexpected exception occurred invoking async method: " + method, ex); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java index c12a588ee0c0..51d427dc2091 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java @@ -145,7 +145,6 @@ protected Object instantiateWithMethodInjection(RootBeanDefinition bd, @Nullable } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, BeanFactory owner, @Nullable Object factoryBean, Method factoryMethod, @Nullable Object... args) { diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java index 56d46f49f59c..fdf8b27749fb 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java @@ -107,7 +107,6 @@ public CacheResolver getCacheResolver() { } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public CacheInvocationParameter[] getAllParameters(@Nullable Object... values) { if (this.allParameterDetails.size() != values.length) { throw new IllegalStateException("Values mismatch, operation has " + diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java index 60af69197410..34ea80c85079 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java @@ -84,7 +84,6 @@ public Object getTarget() { } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public Object generate(Object target, Method method, @Nullable Object... params) { JCacheOperation operation = this.cacheOperationSource.getCacheOperation(method, target.getClass()); if (!(operation instanceof AbstractJCacheKeyOperation)) { diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKeyGenerator.java b/spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKeyGenerator.java index f5b5437abcbe..b9df9ca657b9 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKeyGenerator.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKeyGenerator.java @@ -43,7 +43,6 @@ public class SimpleKeyGenerator implements KeyGenerator { @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public Object generate(Object target, Method method, @Nullable Object... params) { return generateKey((KotlinDetector.isSuspendingFunction(method) ? Arrays.copyOf(params, params.length - 1) : params)); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java index d62d0882573a..f43ecf354411 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java @@ -91,7 +91,6 @@ public DefaultServerResponseBuilder(HttpStatusCode status) { @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public ServerResponse.BodyBuilder header(String headerName, @Nullable String... headerValues) { Assert.notNull(headerName, "HeaderName must not be null"); for (String headerValue : headerValues) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java index 518241761032..9adb6790ede0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java @@ -69,7 +69,6 @@ public DefaultServerResponseBuilder(HttpStatusCode status) { } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113 public ServerResponse.BodyBuilder header(String headerName, @Nullable String... headerValues) { Assert.notNull(headerName, "HeaderName must not be null"); for (String headerValue : headerValues) {