From f59fc4020aa6830abe3375abea7194dd5b24f0ab Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 26 Sep 2025 14:47:29 +0200 Subject: [PATCH] Add nullability annotations to tests in module/spring-boot-hibernate See gh-47263 --- module/spring-boot-hibernate/build.gradle | 4 ++++ .../autoconfigure/HibernateJpaAutoConfigurationTests.java | 4 +++- .../hibernate/autoconfigure/HibernatePropertiesTests.java | 1 + .../metrics/HibernateMetricsAutoConfigurationTests.java | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/module/spring-boot-hibernate/build.gradle b/module/spring-boot-hibernate/build.gradle index 3178700510d..a8fb44d48d8 100644 --- a/module/spring-boot-hibernate/build.gradle +++ b/module/spring-boot-hibernate/build.gradle @@ -54,3 +54,7 @@ dependencies { testRuntimeOnly("ch.qos.logback:logback-classic") testRuntimeOnly("com.h2database:h2") } + +tasks.named("compileTestJava") { + options.nullability.checking = "tests" +} diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java index cb8258119b8..8df2dcdede3 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java @@ -1086,7 +1086,9 @@ class HibernateJpaAutoConfigurationTests { properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE); factoryBean.setJpaPropertyMap(properties); factoryBean.afterPropertiesSet(); - return factoryBean.getObject(); + EntityManagerFactory bean = factoryBean.getObject(); + assertThat(bean).isNotNull(); + return bean; } @Bean diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesTests.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesTests.java index 578faf5aaa3..f606b034980 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesTests.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesTests.java @@ -56,6 +56,7 @@ class HibernatePropertiesTests { .withUserConfiguration(TestConfiguration.class); @Mock + @SuppressWarnings("NullAway.Init") private Supplier ddlAutoSupplier; @Test diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java index 2dcc495c8f4..0808f489e02 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java @@ -29,6 +29,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.PersistenceException; import org.hibernate.SessionFactory; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; @@ -181,7 +182,7 @@ class HibernateMetricsAutoConfigurationTests { @Id @GeneratedValue - private Long id; + private @Nullable Long id; }