Skip to content

Commit 96f7d50

Browse files
committed
Remove unneeded NullAway warning suppressions
This commit removes warning suppressions related to uber/NullAway#1113 which is now fixed. See gh-28797
1 parent 2697aea commit 96f7d50

File tree

8 files changed

+0
-9
lines changed

8 files changed

+0
-9
lines changed

spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java

-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ public final Method getMethod() {
146146
}
147147

148148
@Override
149-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
150149
public void setArguments(@Nullable Object... arguments) {
151150
this.arguments = arguments;
152151
}
@@ -219,7 +218,6 @@ public MethodInvocation invocableClone() {
219218
* @see java.lang.Object#clone()
220219
*/
221220
@Override
222-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
223221
public MethodInvocation invocableClone(@Nullable Object... arguments) {
224222
// Force initialization of the user attributes Map,
225223
// for having a shared Map reference in the clone.

spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class SimpleAsyncUncaughtExceptionHandler implements AsyncUncaughtExcepti
3535

3636

3737
@Override
38-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
3938
public void handleUncaughtException(Throwable ex, Method method, @Nullable Object... params) {
4039
if (logger.isErrorEnabled()) {
4140
logger.error("Unexpected exception occurred invoking async method: " + method, ex);

spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java

-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ protected Object instantiateWithMethodInjection(RootBeanDefinition bd, @Nullable
145145
}
146146

147147
@Override
148-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
149148
public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, BeanFactory owner,
150149
@Nullable Object factoryBean, Method factoryMethod, @Nullable Object... args) {
151150

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public CacheResolver getCacheResolver() {
107107
}
108108

109109
@Override
110-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
111110
public CacheInvocationParameter[] getAllParameters(@Nullable Object... values) {
112111
if (this.allParameterDetails.size() != values.length) {
113112
throw new IllegalStateException("Values mismatch, operation has " +

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public Object getTarget() {
8484
}
8585

8686
@Override
87-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
8887
public Object generate(Object target, Method method, @Nullable Object... params) {
8988
JCacheOperation<?> operation = this.cacheOperationSource.getCacheOperation(method, target.getClass());
9089
if (!(operation instanceof AbstractJCacheKeyOperation)) {

spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKeyGenerator.java

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
public class SimpleKeyGenerator implements KeyGenerator {
4444

4545
@Override
46-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
4746
public Object generate(Object target, Method method, @Nullable Object... params) {
4847
return generateKey((KotlinDetector.isSuspendingFunction(method) ?
4948
Arrays.copyOf(params, params.length - 1) : params));

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public DefaultServerResponseBuilder(HttpStatusCode status) {
9191

9292

9393
@Override
94-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
9594
public ServerResponse.BodyBuilder header(String headerName, @Nullable String... headerValues) {
9695
Assert.notNull(headerName, "HeaderName must not be null");
9796
for (String headerValue : headerValues) {

spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public DefaultServerResponseBuilder(HttpStatusCode status) {
6969
}
7070

7171
@Override
72-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1113
7372
public ServerResponse.BodyBuilder header(String headerName, @Nullable String... headerValues) {
7473
Assert.notNull(headerName, "HeaderName must not be null");
7574
for (String headerValue : headerValues) {

0 commit comments

Comments
 (0)