From 889c40355cc2020f8254ba14ed0eb981caaaadd8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 9 Aug 2022 16:51:49 +0100 Subject: [PATCH] Tolerate Flyway 9 Closes gh-32034 --- .../flyway/FlywayAutoConfiguration.java | 13 +++-- .../Flyway9xAutoConfigurationTests.java | 52 +++++++++++++++++++ 2 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/Flyway9xAutoConfigurationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 4892198113be..064cb205dfa4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -261,10 +261,15 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper @SuppressWarnings("deprecation") private void configureIgnoredMigrations(FluentConfiguration configuration, FlywayProperties properties, PropertyMapper map) { - map.from(properties.isIgnoreMissingMigrations()).to(configuration::ignoreMissingMigrations); - map.from(properties.isIgnoreIgnoredMigrations()).to(configuration::ignoreIgnoredMigrations); - map.from(properties.isIgnorePendingMigrations()).to(configuration::ignorePendingMigrations); - map.from(properties.isIgnoreFutureMigrations()).to(configuration::ignoreFutureMigrations); + try { + map.from(properties.isIgnoreMissingMigrations()).to(configuration::ignoreMissingMigrations); + map.from(properties.isIgnoreIgnoredMigrations()).to(configuration::ignoreIgnoredMigrations); + map.from(properties.isIgnorePendingMigrations()).to(configuration::ignorePendingMigrations); + map.from(properties.isIgnoreFutureMigrations()).to(configuration::ignoreFutureMigrations); + } + catch (BootstrapMethodError ex) { + // Flyway 9+ + } } private void configureFailOnMissingLocations(FluentConfiguration configuration, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/Flyway9xAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/Flyway9xAutoConfigurationTests.java new file mode 100644 index 000000000000..5f223f791d1c --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/Flyway9xAutoConfigurationTests.java @@ -0,0 +1,52 @@ +/* + * Copyright 2012-2022 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.flyway; + +import org.flywaydb.core.Flyway; +import org.flywaydb.core.api.Location; +import org.junit.jupiter.api.Test; + +import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.boot.testsupport.classpath.ClassPathOverrides; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link FlywayAutoConfiguration} with Flyway 9.x. + * + * @author Andy Wilkinson + */ +@ClassPathOverrides({ "org.flywaydb:flyway-core:9.1.2", "com.h2database:h2:2.1.210" }) +class Flyway9xAutoConfigurationTests { + + private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withConfiguration(AutoConfigurations.of(FlywayAutoConfiguration.class)) + .withPropertyValues("spring.datasource.generate-unique-name=true"); + + @Test + void defaultFlyway() { + this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class).run((context) -> { + assertThat(context).hasSingleBean(Flyway.class); + Flyway flyway = context.getBean(Flyway.class); + assertThat(flyway.getConfiguration().getLocations()) + .containsExactly(new Location("classpath:db/migration")); + }); + } + +}