feat: make PersistenceUnitPostProcessor beans use on EntityManagerFactoryBuilder

Signed-off-by: Lansana DIOMANDE <[email protected]>

Author: Asanio06

module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java

@@ -113,6 +113,7 @@
 import org.springframework.orm.jpa.persistenceunit.ManagedClassNameFilter;
 import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypes;
 import org.springframework.orm.jpa.persistenceunit.PersistenceUnitManager;
+import org.springframework.orm.jpa.persistenceunit.PersistenceUnitPostProcessor;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
@@ -350,6 +351,19 @@ void customPersistenceUnitPostProcessors() {
 			});
 	}
 
+	@Test
+	void shouldProcessAllPersistenceUnitPostProcessorsDeclaredAsBeans() {
+		this.contextRunner.withUserConfiguration(TestConfigurationWithMultipleCustomPersistenceUnitPostProcessors.class)
+			.run((context) -> {
+				LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = context
+					.getBean(LocalContainerEntityManagerFactoryBean.class);
+				PersistenceUnitInfo persistenceUnitInfo = entityManagerFactoryBean.getPersistenceUnitInfo();
+				assertThat(persistenceUnitInfo).isNotNull();
+				assertThat(persistenceUnitInfo.getManagedClassNames()).contains(
+						"customized.attribute.converter.class.name", "customized.attribute.converter.class.othername");
+			});
+	}
+
 	@Test
 	void customManagedClassNameFilter() {
 		this.contextRunner.withBean(ManagedClassNameFilter.class, () -> (s) -> !s.endsWith("City"))
@@ -1149,6 +1163,22 @@ EntityManagerFactoryBuilderCustomizer entityManagerFactoryBuilderCustomizer() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@TestAutoConfigurationPackage(HibernateJpaAutoConfigurationTests.class)
+	static class TestConfigurationWithMultipleCustomPersistenceUnitPostProcessors {
+
+		@Bean
+		PersistenceUnitPostProcessor persistenceUnitPostProcessor() {
+			return (pui) -> pui.addManagedClassName("customized.attribute.converter.class.name");
+		}
+
+		@Bean
+		PersistenceUnitPostProcessor otherPersistenceUnitPostProcessor() {
+			return (pui) -> pui.addManagedClassName("customized.attribute.converter.class.othername");
+		}
+
+	}
+
 	static class CustomJpaTransactionManager extends JpaTransactionManager {
 
 	}

module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/JpaBaseConfiguration.java

@@ -52,6 +52,7 @@
 import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypes;
 import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypesScanner;
 import org.springframework.orm.jpa.persistenceunit.PersistenceUnitManager;
+import org.springframework.orm.jpa.persistenceunit.PersistenceUnitPostProcessor;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor;
 import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
@@ -120,9 +121,13 @@ public JpaVendorAdapter jpaVendorAdapter() {
 	@ConditionalOnMissingBean
 	public EntityManagerFactoryBuilder entityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter,
 			ObjectProvider<PersistenceUnitManager> persistenceUnitManager,
-			ObjectProvider<EntityManagerFactoryBuilderCustomizer> customizers) {
+			ObjectProvider<EntityManagerFactoryBuilderCustomizer> customizers,
+			ObjectProvider<PersistenceUnitPostProcessor[]> persistenceUnitPostProcessors) {
 		EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder(jpaVendorAdapter,
 				this::buildJpaProperties, persistenceUnitManager.getIfAvailable());
+
+		persistenceUnitPostProcessors.ifAvailable(builder::setPersistenceUnitPostProcessors);
+
 		customizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
 		return builder;
 	}