Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary DatabasePopulator init/destroy processing

Browse Source 
Closes gh-23405
This commit is contained in:
Juergen Hoeller
2023-12-23 13:40:12 +01:00
parent 4afac17e58
commit a428955438
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@ abstract class DatabasePopulatorConfigUtils {
}
}
@Nullable
private static BeanDefinition createDatabasePopulator(Element element, List<Element> scripts, String execution) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CompositeDatabasePopulator.class);
@@ -80,8 +81,12 @@ abstract class DatabasePopulatorConfigUtils {
}
delegates.add(delegate.getBeanDefinition());
}
builder.addPropertyValue("populators", delegates);
if (delegates.isEmpty()) {
return null;
}
builder.addPropertyValue("populators", delegates);
return builder.getBeanDefinition();
}

13
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,21 +58,22 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean {
}
/**
* Set the {@link DatabasePopulator} to execute during the bean initialization phase.
* Set the {@link DatabasePopulator} to execute during the bean initialization phase,
* if any.
* @param databasePopulator the {@code DatabasePopulator} to use during initialization
* @see #setDatabaseCleaner
*/
public void setDatabasePopulator(DatabasePopulator databasePopulator) {
public void setDatabasePopulator(@Nullable DatabasePopulator databasePopulator) {
this.databasePopulator = databasePopulator;
}
/**
* Set the {@link DatabasePopulator} to execute during the bean destruction
* phase, cleaning up the database and leaving it in a known state for others.
* Set the {@link DatabasePopulator} to execute during the bean destruction phase,
* if any, cleaning up the database and leaving it in a known state for others.
* @param databaseCleaner the {@code DatabasePopulator} to use during destruction
* @see #setDatabasePopulator
*/
public void setDatabaseCleaner(DatabasePopulator databaseCleaner) {
public void setDatabaseCleaner(@Nullable DatabasePopulator databaseCleaner) {
this.databaseCleaner = databaseCleaner;
}