Skip to content

Allow EntityManagerFactoryBuilder to also add PersistenceUnitPostProcessor instances #47802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+53 −0
Open

Allow EntityManagerFactoryBuilder to also add PersistenceUnitPostProcessor instances #47802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .../org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -1149,6 +1163,24 @@ EntityManagerFactoryBuilderCustomizer entityManagerFactoryBuilderCustomizer() {

}

@Configuration(proxyBeanMethods = false)
@TestAutoConfigurationPackage(HibernateJpaAutoConfigurationTests.class)
static class TestConfigurationWithMultipleCustomPersistenceUnitPostProcessors {

@Bean
EntityManagerFactoryBuilderCustomizer entityManagerFactoryBuilderCustomizer() {
return (builder) -> builder.addPersistenceUnitPostProcessors(
(pui) -> pui.addManagedClassName("customized.attribute.converter.class.name"));
}

@Bean
EntityManagerFactoryBuilderCustomizer otherEntityManagerFactoryBuilderCustomizer() {
return (builder) -> builder.addPersistenceUnitPostProcessors(
(pui) -> pui.addManagedClassName("customized.attribute.converter.class.othername"));
}

}

static class CustomJpaTransactionManager extends JpaTransactionManager {

}
Expand Down
21 changes: 21 additions & 0 deletions ...ring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
package org.springframework.boot.jpa;

import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
Expand Down Expand Up @@ -129,6 +132,24 @@ public void setPersistenceUnitPostProcessors(PersistenceUnitPostProcessor... per
this.persistenceUnitPostProcessors = persistenceUnitPostProcessors;
}

/**
* Add some {@linkplain PersistenceUnitPostProcessor persistence unit post processors}
* to be applied to the PersistenceUnitInfo used for creating the
* {@link LocalContainerEntityManagerFactoryBean}.
* @param persistenceUnitPostProcessors the persistence unit post processors to use
*/
public void addPersistenceUnitPostProcessors(PersistenceUnitPostProcessor... persistenceUnitPostProcessors) {
if (this.persistenceUnitPostProcessors == null) {
this.persistenceUnitPostProcessors = persistenceUnitPostProcessors;
return;
}

var combined = new ArrayList<>(Arrays.asList(this.persistenceUnitPostProcessors));
combined.addAll(Arrays.asList(persistenceUnitPostProcessors));

this.persistenceUnitPostProcessors = combined.toArray(PersistenceUnitPostProcessor[]::new);
}

/**
* A fluent builder for a LocalContainerEntityManagerFactoryBean.
*/
Expand Down