Browse Source

Upgrade nullability plugin to 0.10.0

Closes gh-36188
pull/36190/head
Sébastien Deleuze 1 week ago
parent
commit
8fbd147f0b
  1. 2
      build.gradle
  2. 1
      spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java
  3. 1
      spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java
  4. 1
      spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
  5. 2
      spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
  6. 3
      spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java

2
build.gradle

@ -6,7 +6,7 @@ plugins { @@ -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 {

1
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java

@ -113,7 +113,6 @@ class BeanDefinitionPropertiesCodeGenerator { @@ -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,

1
spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java vendored

@ -46,7 +46,6 @@ public abstract class AbstractJCacheConfiguration extends AbstractCachingConfigu @@ -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 -> {

1
spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java vendored

@ -94,7 +94,6 @@ public abstract class AbstractCachingConfiguration implements ImportAware { @@ -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);

2
spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java

@ -67,7 +67,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware { @@ -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<AsyncConfigurer> configurers) {
SingletonSupplier<AsyncConfigurer> configurer = SingletonSupplier.ofNullable(() -> {
List<AsyncConfigurer> candidates = configurers.stream().toList();

3
spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurerComposite.java

@ -63,13 +63,11 @@ public class WebFluxConfigurerComposite implements WebFluxConfigurer { @@ -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 { @@ -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);
}

Loading…
Cancel
Save