From 81d196bd9bf03b2b8b6de48dc60e62ce98872c03 Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Wed, 13 Aug 2025 14:46:32 +0200
Subject: [PATCH] Fix NullAway suppression in EntityManagerFactoryBuilder

See gh-46587
---
 .../boot/jpa/EntityManagerFactoryBuilder.java        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
index 9f32da75362..f819c1a0bc2 100644
--- a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
+++ b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
@@ -266,8 +266,8 @@ public class EntityManagerFactoryBuilder {
 			if (this.managedTypes != null) {
 				entityManagerFactoryBean.setManagedTypes(this.managedTypes);
 			}
-			else {
-				setPackagesToScan(entityManagerFactoryBean);
+			else if (this.packagesToScan != null) {
+				entityManagerFactoryBean.setPackagesToScan(this.packagesToScan);
 			}
 			Map<String, ?> jpaProperties = EntityManagerFactoryBuilder.this.jpaPropertiesFactory.apply(this.dataSource);
 			entityManagerFactoryBean.getJpaPropertyMap().putAll(new LinkedHashMap<>(jpaProperties));
@@ -289,14 +289,6 @@ public class EntityManagerFactoryBuilder {
 			return entityManagerFactoryBean;
 		}
 
-		// TODO: Review this. The test
-		// HibernateJpaAutoConfigurationTests.usesManuallyDefinedLocalContainerEntityManagerFactoryBeanUsingBuilder
-		// fails if an non-null assert is added
-		@SuppressWarnings("NullAway")
-		private void setPackagesToScan(LocalContainerEntityManagerFactoryBean entityManagerFactoryBean) {
-			entityManagerFactoryBean.setPackagesToScan(this.packagesToScan);
-		}
-
 	}
 
 }