From 4ece82280562a41816c7503526a3c18938fb2aeb Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 30 Jul 2025 11:38:57 +0200 Subject: [PATCH] Add nullability annotations to module/spring-boot-data-jpa See gh-46587 --- .../jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java | 4 +++- .../boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java | 4 +++- .../boot/data/jpa/autoconfigure/package-info.java | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java index 444f869983a..2d956c5b08b 100644 --- a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java +++ b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java @@ -20,6 +20,8 @@ import java.util.Map; import javax.sql.DataSource; +import org.jspecify.annotations.Nullable; + import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; @@ -91,7 +93,7 @@ public final class JpaRepositoriesAutoConfiguration { }; } - private AsyncTaskExecutor determineBootstrapExecutor(Map taskExecutors) { + private @Nullable AsyncTaskExecutor determineBootstrapExecutor(Map taskExecutors) { if (taskExecutors.size() == 1) { return taskExecutors.values().iterator().next(); } diff --git a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java index 47288194918..328a13cdc4c 100644 --- a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java +++ b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java @@ -19,6 +19,8 @@ package org.springframework.boot.data.jpa.autoconfigure; import java.lang.annotation.Annotation; import java.util.Locale; +import org.jspecify.annotations.Nullable; + import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.env.Environment; @@ -38,7 +40,7 @@ import org.springframework.util.StringUtils; */ class JpaRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport { - private BootstrapMode bootstrapMode = null; + private @Nullable BootstrapMode bootstrapMode; @Override protected Class getAnnotation() { diff --git a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/package-info.java b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/package-info.java index f6141201414..095dc254cde 100644 --- a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/package-info.java +++ b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/package-info.java @@ -17,4 +17,7 @@ /** * Auto-configuration for Spring Data JPA. */ +@NullMarked package org.springframework.boot.data.jpa.autoconfigure; + +import org.jspecify.annotations.NullMarked;