From 4a62872d63fdd1393119c5c7c7b8d8c9b51c9606 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 18 Sep 2025 12:24:38 +0200 Subject: [PATCH] Add nullability annotations to tests in module/spring-boot-data-cassandra See gh-47263 --- module/spring-boot-data-cassandra/build.gradle | 8 ++++++++ .../DataCassandraAutoConfigurationTests.java | 3 ++- ...ssandraReactiveRepositoriesAutoConfigurationTests.java | 4 +++- .../DataCassandraRepositoriesAutoConfigurationTests.java | 4 +++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/module/spring-boot-data-cassandra/build.gradle b/module/spring-boot-data-cassandra/build.gradle index 4c57667c70f..42cfd72eb5f 100644 --- a/module/spring-boot-data-cassandra/build.gradle +++ b/module/spring-boot-data-cassandra/build.gradle @@ -45,3 +45,11 @@ dependencies { testRuntimeOnly("ch.qos.logback:logback-classic") } + +tasks.named("compileTestJava") { + options.nullability.checking = "tests" +} + +tasks.named("compileDockerTestJava") { + options.nullability.checking = "tests" +} diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java index 920165d1ffd..d671f9d1524 100644 --- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java +++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.data.cassandra.autoconfigure; import java.util.Collections; import com.datastax.oss.driver.api.core.CqlSession; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -144,7 +145,7 @@ class DataCassandraAutoConfigurationTests { static class MyConverter implements Converter { @Override - public String convert(Person o) { + public @Nullable String convert(Person o) { return null; } diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfigurationTests.java index 522d0dbda00..3329312e436 100644 --- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfigurationTests.java +++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfigurationTests.java @@ -94,7 +94,9 @@ class DataCassandraReactiveRepositoriesAutoConfigurationTests { private ManagedTypes getManagedTypes(ApplicationContext context) { CassandraMappingContext mappingContext = context.getBean(CassandraMappingContext.class); - return (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes"); + Object field = ReflectionTestUtils.getField(mappingContext, "managedTypes"); + assertThat(field).isNotNull(); + return (ManagedTypes) field; } @Configuration(proxyBeanMethods = false) diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfigurationTests.java index 5a3e084b5a6..4d44d3689b5 100644 --- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfigurationTests.java +++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfigurationTests.java @@ -91,7 +91,9 @@ class DataCassandraRepositoriesAutoConfigurationTests { private ManagedTypes getManagedTypes(AssertableApplicationContext context) { CassandraMappingContext mappingContext = context.getBean(CassandraMappingContext.class); - return (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes"); + Object field = ReflectionTestUtils.getField(mappingContext, "managedTypes"); + assertThat(field).isNotNull(); + return (ManagedTypes) field; } @Configuration(proxyBeanMethods = false)