spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix NullAway suppression in EntityManagerFactoryBuilder

Browse Source 
See gh-46587
This commit is contained in:
Moritz Halbritter
2025-08-13 14:46:32 +02:00
parent fb429bcc1f
commit 81d196bd9b
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
+2 -10
View File
@@ -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);
}
}
}