Upgrade Flyway 4.0

See gh-5296

Author: eddumelendez

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

@@ -26,6 +26,7 @@
 
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.MigrationVersion;
+import org.flywaydb.core.api.callback.FlywayCallback;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -58,6 +59,7 @@
  * @author Vedran Pavic
  * @author Stephane Nicoll
  * @author Jacques-Etienne Beaudet
+ * @author Eddú Meléndez
  * @since 1.1.0
  */
 @Configuration
@@ -89,16 +91,20 @@ public static class FlywayConfiguration {
 
 		private final FlywayMigrationStrategy migrationStrategy;
 
+		private FlywayCallback[] flywayCallbacks;
+
 		public FlywayConfiguration(FlywayProperties properties,
 				ResourceLoader resourceLoader,
 				ObjectProvider<DataSource> dataSourceProvider,
 				@FlywayDataSource ObjectProvider<DataSource> flywayDataSourceProvider,
-				ObjectProvider<FlywayMigrationStrategy> migrationStrategyProvider) {
+				ObjectProvider<FlywayMigrationStrategy> migrationStrategy,
+				ObjectProvider<FlywayCallback[]> flywayCallbacks) {
 			this.properties = properties;
 			this.resourceLoader = resourceLoader;
 			this.dataSource = dataSourceProvider.getIfUnique();
 			this.flywayDataSource = flywayDataSourceProvider.getIfAvailable();
-			this.migrationStrategy = migrationStrategyProvider.getIfAvailable();
+			this.migrationStrategy = migrationStrategy.getIfAvailable();
+			this.flywayCallbacks = flywayCallbacks.getIfAvailable();
 		}
 
 		@PostConstruct
@@ -138,6 +144,9 @@ else if (this.flywayDataSource != null) {
 			else {
 				flyway.setDataSource(this.dataSource);
 			}
+			if (this.flywayCallbacks != null && this.flywayCallbacks.length > 0) {
+				flyway.setCallbacks(this.flywayCallbacks);
+			}
 			flyway.setLocations(this.properties.getLocations().toArray(new String[0]));
 			return flyway;
 		}

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

@@ -25,6 +25,7 @@
 
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.MigrationVersion;
+import org.flywaydb.core.api.callback.BaseFlywayCallback;
 import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
 import org.junit.After;
 import org.junit.Before;
@@ -56,6 +57,7 @@
  * @author Phillip Webb
  * @author Andy Wilkinson
  * @author Vedran Pavic
+ * @author Eddú Meléndez
  */
 public class FlywayAutoConfigurationTests {
 
@@ -200,6 +202,16 @@ public void customFlywayMigrationInitializer() throws Exception {
 		assertThat(initializer.getOrder()).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
 	}
 
+	@Test
+	public void customFlywayCallback() throws Exception {
+		registerAndRefresh(EmbeddedDataSourceConfiguration.class,
+				FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
+				MockOneFlywayCallback.class, MockTwoFlywayCallback.class);
+		assertThat(this.context.getBean(Flyway.class)).isNotNull();
+		this.context.getBean(MockOneFlywayCallback.class).assertCalled();
+		this.context.getBean(MockTwoFlywayCallback.class).assertCalled();
+	}
+
 	@Test
 	public void customFlywayWithJpa() throws Exception {
 		registerAndRefresh(CustomFlywayWithJpaConfiguration.class,
@@ -303,4 +315,34 @@ public void assertCalled() {
 		}
 	}
 
+	@Component
+	protected static class MockOneFlywayCallback
+			extends BaseFlywayCallback {
+
+		private boolean called = false;
+
+		public MockOneFlywayCallback() {
+			this.called = true;
+		}
+
+		public void assertCalled() {
+			assertThat(this.called).isTrue();
+		}
+	}
+
+	@Component
+	protected static class MockTwoFlywayCallback
+			extends BaseFlywayCallback {
+
+		private boolean called = false;
+
+		public MockTwoFlywayCallback() {
+			this.called = true;
+		}
+
+		public void assertCalled() {
+			assertThat(this.called).isTrue();
+		}
+	}
+
 }

spring-boot-dependencies/pom.xml

@@ -69,7 +69,7 @@
 		<dropwizard-metrics.version>3.1.2</dropwizard-metrics.version>
 		<ehcache.version>2.10.1</ehcache.version>
 		<embedded-mongo.version>1.50.2</embedded-mongo.version>
-		<flyway.version>3.2.1</flyway.version>
+		<flyway.version>4.0</flyway.version>
 		<freemarker.version>2.3.23</freemarker.version>
 		<elasticsearch.version>2.2.2</elasticsearch.version>
 		<gemfire.version>8.2.0</gemfire.version>