Skip to content

Improve JpaBaseConfiguration to resolve beans lazily to avoid circular reference #50813

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

Closed
quaff wants to merge 1 commit into from
+26 −5
Closed

Improve JpaBaseConfiguration to resolve beans lazily to avoid circular reference #50813

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
18 changes: 18 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 @@ -1017,6 +1017,15 @@ void whenSpringJpaGenerateDdlIsTrueSpringJpaHibernateDdlAutoIsCreateAndJakartaSc
.run((context) -> assertThat(tablesFrom(context)).doesNotContain("CITY"));
}

@Test // GH-50797
void circularReference() {
this.contextRunner.withUserConfiguration(CircularReferenceConfiguration.class).run((context) -> {
assertThat(context).hasSingleBean(DataSource.class);
assertThat(context).hasSingleBean(JpaTransactionManager.class);
assertThat(context).hasSingleBean(EntityManagerFactory.class);
});
}

private List<String> tablesFrom(AssertableApplicationContext context) {
DataSource dataSource = context.getBean(DataSource.class);
JdbcTemplate jdbc = new JdbcTemplate(dataSource);
Expand Down Expand Up @@ -1474,4 +1483,13 @@ SimpleAsyncTaskExecutor applicationTaskExecutor() {

}

@Configuration
static class CircularReferenceConfiguration extends MultipleAsyncTaskExecutorsConfiguration {

CircularReferenceConfiguration(PlatformTransactionManager transactionManager) {

}

}

}
13 changes: 8 additions & 5 deletions ...ot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/JpaBaseConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
Expand Down Expand Up @@ -124,8 +125,9 @@ public JpaVendorAdapter jpaVendorAdapter() {
public EntityManagerFactoryBuilder entityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter,
ObjectProvider<PersistenceUnitManager> persistenceUnitManager,
ObjectProvider<EntityManagerFactoryBuilderCustomizer> customizers,
Map<String, AsyncTaskExecutor> taskExecutors) {
@Nullable AsyncTaskExecutor bootstrapExecutor = determineBootstrapExecutor(taskExecutors);
ObjectProvider<AsyncTaskExecutor> taskExecutors,
@Qualifier(TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME) ObjectProvider<AsyncTaskExecutor> applicationTaskExecutor) {
@Nullable AsyncTaskExecutor bootstrapExecutor = determineBootstrapExecutor(taskExecutors, applicationTaskExecutor);
EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder(jpaVendorAdapter,
this::buildJpaProperties, persistenceUnitManager.getIfAvailable(), null, bootstrapExecutor);
if (this.properties.getBootstrap() == Bootstrap.ASYNC) {
Expand All @@ -136,9 +138,10 @@ public EntityManagerFactoryBuilder entityManagerFactoryBuilder(JpaVendorAdapter
return builder;
}

private @Nullable AsyncTaskExecutor determineBootstrapExecutor(Map<String, AsyncTaskExecutor> taskExecutors) {
return (taskExecutors.size() == 1) ? taskExecutors.values().iterator().next()
: taskExecutors.get(TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME);
private @Nullable AsyncTaskExecutor determineBootstrapExecutor(ObjectProvider<AsyncTaskExecutor> taskExecutors,
ObjectProvider<AsyncTaskExecutor> applicationTaskExecutor) {
@Nullable AsyncTaskExecutor asyncTaskExecutor = taskExecutors.getIfUnique();
return (asyncTaskExecutor != null) ? asyncTaskExecutor : applicationTaskExecutor.getIfAvailable();
}

private Map<String, ?> buildJpaProperties(DataSource dataSource) {
Expand Down
Loading