From 011d42cb2a686bb8551beb132694b314fdf2cfd2 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 27 Aug 2025 15:18:29 +0200 Subject: [PATCH] Improve null-safety of module/spring-boot-hibernate See gh-46926 --- .../springframework/boot/hibernate/SpringJtaPlatform.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java index 447d9ab5c65..6342a107318 100644 --- a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java +++ b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java @@ -19,6 +19,7 @@ package org.springframework.boot.hibernate; import jakarta.transaction.TransactionManager; import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; +import org.jspecify.annotations.Nullable; import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.Assert; @@ -44,14 +45,12 @@ public class SpringJtaPlatform extends AbstractJtaPlatform { } @Override - @SuppressWarnings("NullAway") // TODO: Not sure about returning nullness here - protected TransactionManager locateTransactionManager() { + protected @Nullable TransactionManager locateTransactionManager() { return this.transactionManager.getTransactionManager(); } @Override - @SuppressWarnings("NullAway") // TODO: Not sure about returning nullness here - protected UserTransaction locateUserTransaction() { + protected @Nullable UserTransaction locateUserTransaction() { return this.transactionManager.getUserTransaction(); }