From a1038a5e64918ef74004341922605aaa29c2eef0 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 6 Oct 2025 11:54:21 +0200 Subject: [PATCH] Add nullability annotations to tests in module/spring-boot-data-mongodb-test See gh-47263 --- module/spring-boot-data-mongodb-test/build.gradle | 10 ++++++++++ .../DataMongoTestReactiveIntegrationTests.java | 1 + .../test/autoconfigure/ExampleDocument.java | 14 ++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/module/spring-boot-data-mongodb-test/build.gradle b/module/spring-boot-data-mongodb-test/build.gradle index f82d30cbf15..356c2df6e12 100644 --- a/module/spring-boot-data-mongodb-test/build.gradle +++ b/module/spring-boot-data-mongodb-test/build.gradle @@ -44,7 +44,17 @@ dependencies { dockerTestImplementation("org.testcontainers:mongodb") dockerTestImplementation("org.testcontainers:testcontainers") + dockerTestCompileOnly("com.google.code.findbugs:jsr305") + testImplementation(project(":test-support:spring-boot-test-support")) 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-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java index 81aa0052b9e..df3ef6ecf11 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java @@ -57,6 +57,7 @@ class DataMongoTestReactiveIntegrationTests { ExampleDocument exampleDocument = new ExampleDocument(); exampleDocument.setText("Look, new @DataMongoTest!"); exampleDocument = this.exampleRepository.save(exampleDocument).block(Duration.ofSeconds(30)); + assertThat(exampleDocument).isNotNull(); assertThat(exampleDocument.getId()).isNotNull(); assertThat(this.mongoTemplate.collectionExists("exampleDocuments").block(Duration.ofSeconds(30))).isTrue(); } diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/ExampleDocument.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/ExampleDocument.java index dc87d4a101c..391c6b13c82 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/ExampleDocument.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/ExampleDocument.java @@ -16,6 +16,8 @@ package org.springframework.boot.data.mongodb.test.autoconfigure; +import org.jspecify.annotations.Nullable; + import org.springframework.data.mongodb.core.mapping.Document; /** @@ -26,23 +28,23 @@ import org.springframework.data.mongodb.core.mapping.Document; @Document(collection = "exampleDocuments") public class ExampleDocument { - private String id; + private @Nullable String id; - private String text; + private @Nullable String text; - public String getId() { + public @Nullable String getId() { return this.id; } - public void setId(String id) { + public void setId(@Nullable String id) { this.id = id; } - public String getText() { + public @Nullable String getText() { return this.text; } - public void setText(String text) { + public void setText(@Nullable String text) { this.text = text; }