Skip to content

Commit 8fbd147

Browse files
committed
Upgrade nullability plugin to 0.10.0
Closes spring-projectsgh-36188
1 parent 1c56ec3 commit 8fbd147

6 files changed

Lines changed: 2 additions & 8 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id 'com.github.bjornvester.xjc' version '1.8.2' apply false
77
id 'com.gradleup.shadow' version "9.2.2" apply false
88
id 'me.champeau.jmh' version '0.7.2' apply false
9-
id 'io.spring.nullability' version '0.0.9' apply false
9+
id 'io.spring.nullability' version '0.0.10' apply false
1010
}
1111

1212
ext {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ class BeanDefinitionPropertiesCodeGenerator {
113113
.createValueCodeGenerator(generatedMethods, customDelegates);
114114
}
115115

116-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128
117116
CodeBlock generateCode(RootBeanDefinition beanDefinition) {
118117
CodeBlock.Builder code = CodeBlock.builder();
119118
addStatementForValue(code, beanDefinition, BeanDefinition::getScope,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public abstract class AbstractJCacheConfiguration extends AbstractCachingConfigu
4646

4747

4848
@Override
49-
@SuppressWarnings("NullAway") // See https://github.com/uber/NullAway/issues/1290
5049
protected void useCachingConfigurer(CachingConfigurerSupplier cachingConfigurerSupplier) {
5150
super.useCachingConfigurer(cachingConfigurerSupplier);
5251
this.exceptionCacheResolver = cachingConfigurerSupplier.adapt(config -> {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ void setConfigurers(ObjectProvider<CachingConfigurer> configurers) {
9494
/**
9595
* Extract the configuration from the nominated {@link CachingConfigurer}.
9696
*/
97-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128
9897
protected void useCachingConfigurer(CachingConfigurerSupplier cachingConfigurerSupplier) {
9998
this.cacheManager = cachingConfigurerSupplier.adapt(CachingConfigurer::cacheManager);
10099
this.cacheResolver = cachingConfigurerSupplier.adapt(CachingConfigurer::cacheResolver);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
6767
* Collect any {@link AsyncConfigurer} beans through autowiring.
6868
*/
6969
@Autowired
70-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128
70+
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1290
7171
void setConfigurers(ObjectProvider<AsyncConfigurer> configurers) {
7272
SingletonSupplier<AsyncConfigurer> configurer = SingletonSupplier.ofNullable(() -> {
7373
List<AsyncConfigurer> candidates = configurers.stream().toList();

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,11 @@ public void addFormatters(FormatterRegistry registry) {
6363
}
6464

6565
@Override
66-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128
6766
public @Nullable Validator getValidator() {
6867
return createSingleBean(WebFluxConfigurer::getValidator, Validator.class);
6968
}
7069

7170
@Override
72-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128
7371
public @Nullable MessageCodesResolver getMessageCodesResolver() {
7472
return createSingleBean(WebFluxConfigurer::getMessageCodesResolver, MessageCodesResolver.class);
7573
}
@@ -124,7 +122,6 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
124122
}
125123

126124
@Override
127-
@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1128
128125
public @Nullable WebSocketService getWebSocketService() {
129126
return createSingleBean(WebFluxConfigurer::getWebSocketService, WebSocketService.class);
130127
}

0 commit comments

Comments
 (0)