Skip to content

Commit 4048f78

Browse files
committed
Fix Allow ignoreMigrationPatterns to be empty
Removes the `.whenNot(List::isEmpty)` condition to allow clearing the ignore-migration-patterns property via an empty string. To avoid affecting existing users, the property's default is now aligned with Flyway's default of `*:future` Signed-off-by: Chanwon-Seo <[email protected]>
1 parent 3c3849e commit 4048f78

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public class FlywayProperties {
323323
/**
324324
* List of patterns that identify migrations to ignore when performing validation.
325325
*/
326-
private @Nullable List<String> ignoreMigrationPatterns;
326+
private List<String> ignoreMigrationPatterns = new ArrayList<>(Collections.singletonList("*:future"));
327327

328328
/**
329329
* Whether to attempt to automatically detect SQL migration file encoding.
@@ -757,11 +757,11 @@ public void setSkipExecutingMigrations(@Nullable Boolean skipExecutingMigrations
757757
this.skipExecutingMigrations = skipExecutingMigrations;
758758
}
759759

760-
public @Nullable List<String> getIgnoreMigrationPatterns() {
760+
public List<String> getIgnoreMigrationPatterns() {
761761
return this.ignoreMigrationPatterns;
762762
}
763763

764-
public void setIgnoreMigrationPatterns(@Nullable List<String> ignoreMigrationPatterns) {
764+
public void setIgnoreMigrationPatterns(List<String> ignoreMigrationPatterns) {
765765
this.ignoreMigrationPatterns = ignoreMigrationPatterns;
766766
}
767767

module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigurationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -898,11 +898,10 @@ void ignoreMigrationPatternsCorrectlyMapped() {
898898
}
899899

900900
@Test
901-
void ignoreMigrationPatternsIsEmpty() {
901+
void ignoreMigrationPatternsIsFutureByDefault() {
902902
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
903-
.withPropertyValues("spring.flyway.ignore-migration-patterns=")
904903
.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getIgnoreMigrationPatterns())
905-
.isEmpty());
904+
.containsExactly(ValidatePattern.fromPattern("*:future")));
906905
}
907906

908907
private ContextConsumer<AssertableApplicationContext> validateFlywayTeamsPropertyOnly(String propertyName) {

0 commit comments

Comments
 (0)