diff --git a/build.gradle b/build.gradle index 17c65cfdfc4..192e90daefd 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.9' apply false + id 'io.spring.nullability' version '0.0.10' apply false } ext { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java index 5cbf519a65c..1310230d94c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java @@ -113,7 +113,6 @@ class BeanDefinitionPropertiesCodeGenerator { .createValueCodeGenerator(generatedMethods, customDelegates); } - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128 CodeBlock generateCode(RootBeanDefinition beanDefinition) { CodeBlock.Builder code = CodeBlock.builder(); addStatementForValue(code, beanDefinition, BeanDefinition::getScope, diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java index 1d171848a3e..6b997bbaf3d 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java @@ -46,7 +46,6 @@ public abstract class AbstractJCacheConfiguration extends AbstractCachingConfigu @Override - @SuppressWarnings("NullAway") // See https://github.com/uber/NullAway/issues/1290 protected void useCachingConfigurer(CachingConfigurerSupplier cachingConfigurerSupplier) { super.useCachingConfigurer(cachingConfigurerSupplier); this.exceptionCacheResolver = cachingConfigurerSupplier.adapt(config -> { diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java index 149b5add4f1..087699289e8 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java @@ -94,7 +94,6 @@ public abstract class AbstractCachingConfiguration implements ImportAware { /** * Extract the configuration from the nominated {@link CachingConfigurer}. */ - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128 protected void useCachingConfigurer(CachingConfigurerSupplier cachingConfigurerSupplier) { this.cacheManager = cachingConfigurerSupplier.adapt(CachingConfigurer::cacheManager); this.cacheResolver = cachingConfigurerSupplier.adapt(CachingConfigurer::cacheResolver); diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java index 825fe6f335e..6f9a4e1a9ae 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java @@ -67,7 +67,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware { * Collect any {@link AsyncConfigurer} beans through autowiring. */ @Autowired - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128 + @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1290 void setConfigurers(ObjectProvider configurers) { SingletonSupplier configurer = SingletonSupplier.ofNullable(() -> { List candidates = configurers.stream().toList(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java index f7b375ec433..be857725647 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java @@ -63,13 +63,11 @@ public class WebFluxConfigurerComposite implements WebFluxConfigurer { } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128 public @Nullable Validator getValidator() { return createSingleBean(WebFluxConfigurer::getValidator, Validator.class); } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128 public @Nullable MessageCodesResolver getMessageCodesResolver() { return createSingleBean(WebFluxConfigurer::getMessageCodesResolver, MessageCodesResolver.class); } @@ -124,7 +122,6 @@ public class WebFluxConfigurerComposite implements WebFluxConfigurer { } @Override - @SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128 public @Nullable WebSocketService getWebSocketService() { return createSingleBean(WebFluxConfigurer::getWebSocketService, WebSocketService.class); }