Flyway callbacks can now access the Flyway instance

extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java

@@ -35,6 +35,7 @@
 import io.quarkus.agroal.spi.JdbcInitialSQLGeneratorBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.builder.item.SimpleBuildItem;
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
@@ -43,6 +44,7 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Consume;
 import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Produce;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -151,16 +153,15 @@ private void addJavaMigrations(Collection<ClassInfo> candidates, RecorderContext
     }
 
     @BuildStep
+    @Produce(SyntheticBeansRuntimeInitBuildItem.class)
     @Consume(LoggingSetupBuildItem.class)
     @Record(ExecutionTime.RUNTIME_INIT)
-    ServiceStartBuildItem createBeansAndStartActions(FlywayRecorder recorder,
+    void createBeans(FlywayRecorder recorder,
             List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
             List<JdbcInitialSQLGeneratorBuildItem> sqlGeneratorBuildItems,
             BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
-            BuildProducer<JdbcDataSourceSchemaReadyBuildItem> schemaReadyBuildItem,
             MigrationStateBuildItem migrationsBuildItem) {
-
         // make a FlywayContainerProducer bean
         additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClasses(FlywayContainerProducer.class).setUnremovable()
                 .setDefaultScope(DotNames.SINGLETON).build());
@@ -197,7 +198,14 @@ ServiceStartBuildItem createBeansAndStartActions(FlywayRecorder recorder,
 
             syntheticBeanBuildItemBuildProducer.produce(configurator.done());
         }
+    }
 
+    @BuildStep
+    @Consume(SyntheticBeansRuntimeInitBuildItem.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public ServiceStartBuildItem startActions(FlywayRecorder recorder,
+            BuildProducer<JdbcDataSourceSchemaReadyBuildItem> schemaReadyBuildItem,
+            MigrationStateBuildItem migrationsBuildItem) {
         // will actually run the actions at runtime
         recorder.doStartActions();
 

extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCDICallback.java

@@ -0,0 +1,48 @@
+package io.quarkus.flyway.test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.inject.spi.CDI;
+
+import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.callback.Callback;
+import org.flywaydb.core.api.callback.Context;
+import org.flywaydb.core.api.callback.Event;
+
+public class FlywayExtensionCDICallback implements Callback {
+
+    public static List<Event> DEFAULT_EVENTS = Arrays.asList(
+            Event.BEFORE_BASELINE,
+            Event.AFTER_BASELINE,
+            Event.BEFORE_MIGRATE,
+            Event.BEFORE_EACH_MIGRATE,
+            Event.AFTER_EACH_MIGRATE,
+            Event.AFTER_VERSIONED,
+            Event.AFTER_MIGRATE,
+            Event.AFTER_MIGRATE_OPERATION_FINISH);
+
+    @Override
+    public boolean supports(Event event, Context context) {
+        return DEFAULT_EVENTS.contains(event);
+    }
+
+    @Override
+    public boolean canHandleInTransaction(Event event, Context context) {
+        return true;
+    }
+
+    @Override
+    public void handle(Event event, Context context) {
+        try {
+            CDI.current().select(Flyway.class).get();
+        } catch (Exception exception) {
+            throw new IllegalStateException(exception);
+        }
+    }
+
+    @Override
+    public String getCallbackName() {
+        return "Quarked Flyway Callback with CDI";
+    }
+}

extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java

@@ -40,7 +40,7 @@ public class FlywayExtensionCallbackTest {
             .setAfterAllCustomizer(customizer::stopH2)
             .withApplicationRoot((jar) -> jar
                     .addClasses(FlywayH2TestCustomizer.class,
-                            FlywayExtensionCallback.class, FlywayExtensionCallback2.class)
+                            FlywayExtensionCallback.class, FlywayExtensionCallback2.class, FlywayExtensionCDICallback.class)
                     .addAsResource("db/migration/V1.0.3__Quarkus_Callback.sql")
                     .addAsResource("callback-config.properties", "application.properties"));
 

extensions/flyway/deployment/src/test/resources/callback-config.properties

@@ -7,4 +7,4 @@ quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost:11303/mem:quarkus-flyway-cal
 quarkus.flyway.migrate-at-start=true
 quarkus.flyway.baseline-on-migrate=true
 quarkus.flyway.baseline-version=0.0.1
-quarkus.flyway.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback,io.quarkus.flyway.test.FlywayExtensionCallback2
+quarkus.flyway.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback,io.quarkus.flyway.test.FlywayExtensionCallback2,io.quarkus.flyway.test.FlywayExtensionCDICallback