From 7ee1bd2acc67b2ae44f2d99adecd73d4d5e3925b Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 19 Sep 2023 10:36:36 +0200 Subject: [PATCH] Avoid split packages in Flyway extension (cherry picked from commit e0f9964af1db4792f4861e358f4c13a67f27886f) --- .../flyway/{ => deployment}/FlywayAlwaysEnabledProcessor.java | 2 +- .../flyway/{ => deployment}/FlywayCallbacksLocator.java | 2 +- .../java/io/quarkus/flyway/{ => deployment}/FlywayEnabled.java | 2 +- .../io/quarkus/flyway/{ => deployment}/FlywayProcessor.java | 3 ++- .../flyway/{ => deployment}/devui/FlywayDevUIProcessor.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename extensions/flyway/deployment/src/main/java/io/quarkus/flyway/{ => deployment}/FlywayAlwaysEnabledProcessor.java (97%) rename extensions/flyway/deployment/src/main/java/io/quarkus/flyway/{ => deployment}/FlywayCallbacksLocator.java (99%) rename extensions/flyway/deployment/src/main/java/io/quarkus/flyway/{ => deployment}/FlywayEnabled.java (92%) rename extensions/flyway/deployment/src/main/java/io/quarkus/flyway/{ => deployment}/FlywayProcessor.java (99%) rename extensions/flyway/deployment/src/main/java/io/quarkus/flyway/{ => deployment}/devui/FlywayDevUIProcessor.java (97%) diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayAlwaysEnabledProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayAlwaysEnabledProcessor.java similarity index 97% rename from extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayAlwaysEnabledProcessor.java rename to extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayAlwaysEnabledProcessor.java index 54a2023318acc..bff1407d07cf1 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayAlwaysEnabledProcessor.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayAlwaysEnabledProcessor.java @@ -1,4 +1,4 @@ -package io.quarkus.flyway; +package io.quarkus.flyway.deployment; import org.flywaydb.core.extensibility.Plugin; diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayCallbacksLocator.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayCallbacksLocator.java similarity index 99% rename from extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayCallbacksLocator.java rename to extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayCallbacksLocator.java index 8d90513e8de45..92e5a125affc5 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayCallbacksLocator.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayCallbacksLocator.java @@ -1,4 +1,4 @@ -package io.quarkus.flyway; +package io.quarkus.flyway.deployment; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayEnabled.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayEnabled.java similarity index 92% rename from extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayEnabled.java rename to extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayEnabled.java index 18060719451c6..928e009e8ef16 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayEnabled.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayEnabled.java @@ -1,4 +1,4 @@ -package io.quarkus.flyway; +package io.quarkus.flyway.deployment; import java.util.function.BooleanSupplier; diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayProcessor.java similarity index 99% rename from extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java rename to extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayProcessor.java index 950894ff35b16..ecd2439175b89 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayProcessor.java @@ -1,4 +1,4 @@ -package io.quarkus.flyway; +package io.quarkus.flyway.deployment; import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; @@ -59,6 +59,7 @@ import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.logging.LoggingSetupBuildItem; import io.quarkus.deployment.recording.RecorderContext; +import io.quarkus.flyway.FlywayDataSource; import io.quarkus.flyway.runtime.FlywayBuildTimeConfig; import io.quarkus.flyway.runtime.FlywayContainer; import io.quarkus.flyway.runtime.FlywayContainerProducer; diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/devui/FlywayDevUIProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/devui/FlywayDevUIProcessor.java similarity index 97% rename from extensions/flyway/deployment/src/main/java/io/quarkus/flyway/devui/FlywayDevUIProcessor.java rename to extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/devui/FlywayDevUIProcessor.java index e1d1c7cfcb838..90dd8c6ad9e19 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/devui/FlywayDevUIProcessor.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/devui/FlywayDevUIProcessor.java @@ -1,4 +1,4 @@ -package io.quarkus.flyway.devui; +package io.quarkus.flyway.deployment.devui; import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;