Skip to content

Commit 889c403

Browse files
committed
Tolerate Flyway 9
Closes gh-32034
1 parent b308d5d commit 889c403

File tree

2 files changed

+61
-4
lines changed

2 files changed

+61
-4
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,15 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
261261
@SuppressWarnings("deprecation")
262262
private void configureIgnoredMigrations(FluentConfiguration configuration, FlywayProperties properties,
263263
PropertyMapper map) {
264-
map.from(properties.isIgnoreMissingMigrations()).to(configuration::ignoreMissingMigrations);
265-
map.from(properties.isIgnoreIgnoredMigrations()).to(configuration::ignoreIgnoredMigrations);
266-
map.from(properties.isIgnorePendingMigrations()).to(configuration::ignorePendingMigrations);
267-
map.from(properties.isIgnoreFutureMigrations()).to(configuration::ignoreFutureMigrations);
264+
try {
265+
map.from(properties.isIgnoreMissingMigrations()).to(configuration::ignoreMissingMigrations);
266+
map.from(properties.isIgnoreIgnoredMigrations()).to(configuration::ignoreIgnoredMigrations);
267+
map.from(properties.isIgnorePendingMigrations()).to(configuration::ignorePendingMigrations);
268+
map.from(properties.isIgnoreFutureMigrations()).to(configuration::ignoreFutureMigrations);
269+
}
270+
catch (BootstrapMethodError ex) {
271+
// Flyway 9+
272+
}
268273
}
269274

270275
private void configureFailOnMissingLocations(FluentConfiguration configuration,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Copyright 2012-2022 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.autoconfigure.flyway;
18+
19+
import org.flywaydb.core.Flyway;
20+
import org.flywaydb.core.api.Location;
21+
import org.junit.jupiter.api.Test;
22+
23+
import org.springframework.boot.autoconfigure.AutoConfigurations;
24+
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
25+
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
26+
import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
27+
28+
import static org.assertj.core.api.Assertions.assertThat;
29+
30+
/**
31+
* Tests for {@link FlywayAutoConfiguration} with Flyway 9.x.
32+
*
33+
* @author Andy Wilkinson
34+
*/
35+
@ClassPathOverrides({ "org.flywaydb:flyway-core:9.1.2", "com.h2database:h2:2.1.210" })
36+
class Flyway9xAutoConfigurationTests {
37+
38+
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
39+
.withConfiguration(AutoConfigurations.of(FlywayAutoConfiguration.class))
40+
.withPropertyValues("spring.datasource.generate-unique-name=true");
41+
42+
@Test
43+
void defaultFlyway() {
44+
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class).run((context) -> {
45+
assertThat(context).hasSingleBean(Flyway.class);
46+
Flyway flyway = context.getBean(Flyway.class);
47+
assertThat(flyway.getConfiguration().getLocations())
48+
.containsExactly(new Location("classpath:db/migration"));
49+
});
50+
}
51+
52+
}

0 commit comments

Comments
 (0)