root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Call FlywayConfigurationCustomizers after applying all other config 

Closes gh-32070
This commit is contained in:
Andy Wilkinson 2022-09-07 17:36:37 +01:00
parent d546ea515a
commit 5470a6b349
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@ -119,10 +119,9 @@ public class FlywayAutoConfiguration {
configureProperties(configuration, properties); configureProperties(configuration, properties);
List<Callback> orderedCallbacks = callbacks.orderedStream().collect(Collectors.toList()); List<Callback> orderedCallbacks = callbacks.orderedStream().collect(Collectors.toList());
configureCallbacks(configuration, orderedCallbacks); configureCallbacks(configuration, orderedCallbacks);
fluentConfigurationCustomizers.orderedStream().forEach((customizer) -> customizer.customize(configuration));
configureFlywayCallbacks(configuration, orderedCallbacks);
List<JavaMigration> migrations = javaMigrations.stream().collect(Collectors.toList()); List<JavaMigration> migrations = javaMigrations.stream().collect(Collectors.toList());
configureJavaMigrations(configuration, migrations); configureJavaMigrations(configuration, migrations);
fluentConfigurationCustomizers.orderedStream().forEach((customizer) -> customizer.customize(configuration));
return configuration.load(); return configuration.load();
} }
@ -245,12 +244,6 @@ public class FlywayAutoConfiguration {
} }
} }
private void configureFlywayCallbacks(FluentConfiguration flyway, List<Callback> callbacks) {
if (!callbacks.isEmpty()) {
flyway.callbacks(callbacks.toArray(new Callback[0]));
}
}
private void configureJavaMigrations(FluentConfiguration flyway, List<JavaMigration> migrations) { private void configureJavaMigrations(FluentConfiguration flyway, List<JavaMigration> migrations) {
if (!migrations.isEmpty()) { if (!migrations.isEmpty()) {
flyway.javaMigrations(migrations.toArray(new JavaMigration[0])); flyway.javaMigrations(migrations.toArray(new JavaMigration[0]));

11
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View File

@ -467,6 +467,17 @@ class FlywayAutoConfigurationTests {
}); });
} }
@Test
void callbackAndMigrationBeansAreAppliedToConfigurationBeforeCustomizersAreCalled() {
this.contextRunner
.withUserConfiguration(EmbeddedDataSourceConfiguration.class, FlywayJavaMigrationsConfiguration.class,
CallbackConfiguration.class)
.withBean(FlywayConfigurationCustomizer.class, () -> (configuration) -> {
assertThat(configuration.getCallbacks()).isNotEmpty();
assertThat(configuration.getJavaMigrations()).isNotEmpty();
}).run((context) -> assertThat(context).hasNotFailed());
}
@Test @Test
void batchIsCorrectlyMapped() { void batchIsCorrectlyMapped() {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)