Add nullability annotations to tests in module/spring-boot-data-mongodb

mhalbritter · mhalbritter · commit 09967b1a5d86 · 2025-10-02T15:35:05.000+02:00
See gh-47263
diff --git a/module/spring-boot-data-mongodb/build.gradle b/module/spring-boot-data-mongodb/build.gradle
@@ -39,6 +39,7 @@ dependencies {
 	optional("org.mongodb:mongodb-driver-sync")
 
 	testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")
+	testCompileOnly("com.google.code.findbugs:jsr305")
 
 	testImplementation(project(":core:spring-boot-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
@@ -47,3 +48,7 @@ dependencies {
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")
 }
+
+tasks.named("compileTestJava") {
+	options.nullability.checking = "tests"
+}
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java
@@ -26,6 +26,7 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.gridfs.GridFSBucket;
 import org.assertj.core.api.InstanceOfAssertFactories;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
@@ -84,27 +85,23 @@ void templateExists() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void whenGridFsDatabaseIsConfiguredThenGridFsTemplateIsAutoConfiguredAndUsesIt() {
 		this.contextRunner.withPropertyValues("spring.data.mongodb.gridfs.database:grid").run((context) -> {
 			assertThat(context).hasSingleBean(GridFsTemplate.class);
 			GridFsTemplate template = context.getBean(GridFsTemplate.class);
-			GridFSBucket bucket = ((Supplier<GridFSBucket>) ReflectionTestUtils.getField(template, "bucketSupplier"))
-				.get();
+			GridFSBucket bucket = getBucket(template);
 			assertThat(bucket).extracting("filesCollection", InstanceOfAssertFactories.type(MongoCollection.class))
 				.extracting((collection) -> collection.getNamespace().getDatabaseName())
 				.isEqualTo("grid");
 		});
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void whenGridFsBucketIsConfiguredThenGridFsTemplateIsAutoConfiguredAndUsesIt() {
 		this.contextRunner.withPropertyValues("spring.data.mongodb.gridfs.bucket:test-bucket").run((context) -> {
 			assertThat(context).hasSingleBean(GridFsTemplate.class);
 			GridFsTemplate template = context.getBean(GridFsTemplate.class);
-			GridFSBucket bucket = ((Supplier<GridFSBucket>) ReflectionTestUtils.getField(template, "bucketSupplier"))
-				.get();
+			GridFSBucket bucket = getBucket(template);
 			assertThat(bucket.getBucketName()).isEqualTo("test-bucket");
 		});
 	}
@@ -169,8 +166,7 @@ void usesAutoConfigurationPackageToPickUpDocumentTypes() {
 	void defaultFieldNamingStrategy() {
 		this.contextRunner.run((context) -> {
 			MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
-			FieldNamingStrategy fieldNamingStrategy = (FieldNamingStrategy) ReflectionTestUtils.getField(mappingContext,
-					"fieldNamingStrategy");
+			FieldNamingStrategy fieldNamingStrategy = getFieldNamingStrategy(mappingContext);
 			assertThat(fieldNamingStrategy.getClass()).isEqualTo(PropertyNameFieldNamingStrategy.class);
 		});
 	}
@@ -182,8 +178,7 @@ void customFieldNamingStrategy() {
 					+ CamelCaseAbbreviatingFieldNamingStrategy.class.getName())
 			.run((context) -> {
 				MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
-				FieldNamingStrategy fieldNamingStrategy = (FieldNamingStrategy) ReflectionTestUtils
-					.getField(mappingContext, "fieldNamingStrategy");
+				FieldNamingStrategy fieldNamingStrategy = getFieldNamingStrategy(mappingContext);
 				assertThat(fieldNamingStrategy.getClass()).isEqualTo(CamelCaseAbbreviatingFieldNamingStrategy.class);
 			});
 	}
@@ -216,6 +211,7 @@ void entityScanShouldSetManagedTypes() {
 		this.contextRunner.withUserConfiguration(EntityScanConfig.class).run((context) -> {
 			MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
 			ManagedTypes managedTypes = (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes");
+			assertThat(managedTypes).isNotNull();
 			assertThat(managedTypes.toList()).containsOnly(City.class, Country.class);
 		});
 
@@ -226,7 +222,9 @@ void registersDefaultSimpleTypesWithMappingContext() {
 		this.contextRunner.run((context) -> {
 			MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
 			MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(Sample.class);
+			assertThat(entity).isNotNull();
 			MongoPersistentProperty dateProperty = entity.getPersistentProperty("date");
+			assertThat(dateProperty).isNotNull();
 			assertThat(dateProperty.isEntity()).isFalse();
 		});
 
@@ -346,9 +344,24 @@ void mappingMongoConverterHasADefaultDbRefResolver() {
 
 	private static void assertDomainTypesDiscovered(MongoMappingContext mappingContext, Class<?>... types) {
 		ManagedTypes managedTypes = (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes");
+		assertThat(managedTypes).isNotNull();
 		assertThat(managedTypes.toList()).containsOnly(types);
 	}
 
+	@SuppressWarnings("unchecked")
+	private GridFSBucket getBucket(GridFsTemplate template) {
+		Supplier<GridFSBucket> field = (Supplier<GridFSBucket>) ReflectionTestUtils.getField(template,
+				"bucketSupplier");
+		assertThat(field).isNotNull();
+		return field.get();
+	}
+
+	private FieldNamingStrategy getFieldNamingStrategy(MongoMappingContext mappingContext) {
+		Object field = ReflectionTestUtils.getField(mappingContext, "fieldNamingStrategy");
+		assertThat(field).isNotNull();
+		return (FieldNamingStrategy) field;
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomConversionsConfig {
 
@@ -388,15 +401,15 @@ MongoDatabaseFactory mongoDatabaseFactory() {
 	static class MyConverter implements Converter<MongoClient, Boolean> {
 
 		@Override
-		public Boolean convert(MongoClient source) {
+		public @Nullable Boolean convert(MongoClient source) {
 			return null;
 		}
 
 	}
 
 	static class Sample {
 
-		LocalDateTime date;
+		@Nullable LocalDateTime date;
 
 	}
 
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoPropertiesTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoPropertiesTests.java
@@ -51,8 +51,9 @@ void defaultBigDecimalRepresentationIsAlignedWithSpringData() {
 	}
 
 	private BigDecimalRepresentation springDataDefaultBigDecimalRepresentation() {
-		return (BigDecimalRepresentation) ReflectionTestUtils.getField(new MongoConverterConfigurationAdapter(),
-				"bigDecimals");
+		Object field = ReflectionTestUtils.getField(new MongoConverterConfigurationAdapter(), "bigDecimals");
+		assertThat(field).isNotNull();
+		return (BigDecimalRepresentation) field;
 	}
 
 }
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -46,11 +47,13 @@
  */
 class DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests {
 
-	private AnnotationConfigApplicationContext context;
+	private @Nullable AnnotationConfigApplicationContext context;
 
 	@AfterEach
 	void close() {
-		this.context.close();
+		if (this.context != null) {
+			this.context.close();
+		}
 	}
 
 	@Test
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfigurationTests.java
@@ -19,6 +19,7 @@
 import java.time.Duration;
 
 import com.mongodb.reactivestreams.client.MongoCollection;
+import com.mongodb.reactivestreams.client.MongoDatabase;
 import com.mongodb.reactivestreams.client.gridfs.GridFSBucket;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
@@ -76,8 +77,10 @@ void whenGridFsBucketIsConfiguredThenGridFsTemplateUsesIt() {
 		this.contextRunner.withPropertyValues("spring.data.mongodb.gridfs.bucket:test-bucket").run((context) -> {
 			assertThat(context).hasSingleBean(ReactiveGridFsTemplate.class);
 			ReactiveGridFsTemplate template = context.getBean(ReactiveGridFsTemplate.class);
-			GridFSBucket bucket = ((Mono<GridFSBucket>) ReflectionTestUtils.getField(template, "bucketSupplier"))
-				.block(Duration.ofSeconds(30));
+			Mono<GridFSBucket> field = (Mono<GridFSBucket>) ReflectionTestUtils.getField(template, "bucketSupplier");
+			assertThat(field).isNotNull();
+			GridFSBucket bucket = field.block(Duration.ofSeconds(30));
+			assertThat(bucket).isNotNull();
 			assertThat(bucket.getBucketName()).isEqualTo("test-bucket");
 		});
 	}
@@ -94,7 +97,9 @@ void databaseHasDefault() {
 		this.contextRunner.run((context) -> {
 			ReactiveMongoDatabaseFactory factory = context.getBean(ReactiveMongoDatabaseFactory.class);
 			assertThat(factory).isInstanceOf(SimpleReactiveMongoDatabaseFactory.class);
-			assertThat(factory.getMongoDatabase().block().getName()).isEqualTo("test");
+			MongoDatabase mongoDatabase = factory.getMongoDatabase().block();
+			assertThat(mongoDatabase).isNotNull();
+			assertThat(mongoDatabase.getName()).isEqualTo("test");
 		});
 	}
 
@@ -103,7 +108,9 @@ void databasePropertyIsUsed() {
 		this.contextRunner.withPropertyValues("spring.mongodb.database=mydb").run((context) -> {
 			ReactiveMongoDatabaseFactory factory = context.getBean(ReactiveMongoDatabaseFactory.class);
 			assertThat(factory).isInstanceOf(SimpleReactiveMongoDatabaseFactory.class);
-			assertThat(factory.getMongoDatabase().block().getName()).isEqualTo("mydb");
+			MongoDatabase mongoDatabase = factory.getMongoDatabase().block();
+			assertThat(mongoDatabase).isNotNull();
+			assertThat(mongoDatabase.getName()).isEqualTo("mydb");
 		});
 	}
 
@@ -112,7 +119,9 @@ void databaseInUriPropertyIsUsed() {
 		this.contextRunner.withPropertyValues("spring.mongodb.uri=mongodb://mongo.example.com/mydb").run((context) -> {
 			ReactiveMongoDatabaseFactory factory = context.getBean(ReactiveMongoDatabaseFactory.class);
 			assertThat(factory).isInstanceOf(SimpleReactiveMongoDatabaseFactory.class);
-			assertThat(factory.getMongoDatabase().block().getName()).isEqualTo("mydb");
+			MongoDatabase mongoDatabase = factory.getMongoDatabase().block();
+			assertThat(mongoDatabase).isNotNull();
+			assertThat(mongoDatabase.getName()).isEqualTo("mydb");
 		});
 	}
 
@@ -124,7 +133,9 @@ void databasePropertyOverridesUriProperty() {
 			.run((context) -> {
 				ReactiveMongoDatabaseFactory factory = context.getBean(ReactiveMongoDatabaseFactory.class);
 				assertThat(factory).isInstanceOf(SimpleReactiveMongoDatabaseFactory.class);
-				assertThat(factory.getMongoDatabase().block().getName()).isEqualTo("mydb");
+				MongoDatabase mongoDatabase = factory.getMongoDatabase().block();
+				assertThat(mongoDatabase).isNotNull();
+				assertThat(mongoDatabase.getName()).isEqualTo("mydb");
 			});
 	}
 
@@ -135,7 +146,9 @@ void databasePropertyIsUsedWhenNoDatabaseInUri() {
 			.run((context) -> {
 				ReactiveMongoDatabaseFactory factory = context.getBean(ReactiveMongoDatabaseFactory.class);
 				assertThat(factory).isInstanceOf(SimpleReactiveMongoDatabaseFactory.class);
-				assertThat(factory.getMongoDatabase().block().getName()).isEqualTo("mydb");
+				MongoDatabase mongoDatabase = factory.getMongoDatabase().block();
+				assertThat(mongoDatabase).isNotNull();
+				assertThat(mongoDatabase.getName()).isEqualTo("mydb");
 			});
 	}
 
@@ -157,9 +170,12 @@ void mappingMongoConverterHasANoOpDbRefResolver() {
 	private String grisFsTemplateDatabaseName(AssertableApplicationContext context) {
 		assertThat(context).hasSingleBean(ReactiveGridFsTemplate.class);
 		ReactiveGridFsTemplate template = context.getBean(ReactiveGridFsTemplate.class);
-		GridFSBucket bucket = ((Mono<GridFSBucket>) ReflectionTestUtils.getField(template, "bucketSupplier"))
-			.block(Duration.ofSeconds(30));
+		Mono<GridFSBucket> field = (Mono<GridFSBucket>) ReflectionTestUtils.getField(template, "bucketSupplier");
+		assertThat(field).isNotNull();
+		GridFSBucket bucket = field.block(Duration.ofSeconds(30));
+		assertThat(bucket).isNotNull();
 		MongoCollection<?> collection = (MongoCollection<?>) ReflectionTestUtils.getField(bucket, "filesCollection");
+		assertThat(collection).isNotNull();
 		return collection.getNamespace().getDatabaseName();
 	}
 
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfigurationTests.java
@@ -59,6 +59,7 @@ void testDefaultRepositoryConfiguration() {
 			assertThat(context).hasSingleBean(MongoClient.class);
 			MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
 			ManagedTypes managedTypes = (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes");
+			assertThat(managedTypes).isNotNull();
 			assertThat(managedTypes.toList()).hasSize(1);
 		});
 	}
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfigurationTests.java
@@ -55,6 +55,7 @@ void testDefaultRepositoryConfiguration() {
 			assertThat(context).hasSingleBean(MongoClient.class);
 			MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
 			ManagedTypes managedTypes = (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes");
+			assertThat(managedTypes).isNotNull();
 			assertThat(managedTypes.toList()).hasSize(1);
 		});
 	}

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,9 @@ void defaultBigDecimalRepresentationIsAlignedWithSpringData() {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private BigDecimalRepresentation springDataDefaultBigDecimalRepresentation() {`
`54`		`- return (BigDecimalRepresentation) ReflectionTestUtils.getField(new MongoConverterConfigurationAdapter(),`
`55`		`- "bigDecimals");`
	`54`	`+ Object field = ReflectionTestUtils.getField(new MongoConverterConfigurationAdapter(), "bigDecimals");`
	`55`	`+ assertThat(field).isNotNull();`
	`56`	`+ return (BigDecimalRepresentation) field;`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ void testDefaultRepositoryConfiguration() {`
`59`	`59`	`assertThat(context).hasSingleBean(MongoClient.class);`
`60`	`60`	`MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);`
`61`	`61`	`ManagedTypes managedTypes = (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes");`
	`62`	`+ assertThat(managedTypes).isNotNull();`
`62`	`63`	`assertThat(managedTypes.toList()).hasSize(1);`
`63`	`64`	`});`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ void testDefaultRepositoryConfiguration() {`
`55`	`55`	`assertThat(context).hasSingleBean(MongoClient.class);`
`56`	`56`	`MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);`
`57`	`57`	`ManagedTypes managedTypes = (ManagedTypes) ReflectionTestUtils.getField(mappingContext, "managedTypes");`
	`58`	`+ assertThat(managedTypes).isNotNull();`
`58`	`59`	`assertThat(managedTypes.toList()).hasSize(1);`
`59`	`60`	`});`
`60`	`61`	`}`