Merge pull request quarkusio#49112 from gsmet/fix-run-mode

Make sure RUN mode is correctly taken into account

Author: gsmet

core/deployment/src/main/java/io/quarkus/deployment/IsNormal.java

@@ -8,7 +8,12 @@
 /**
  * boolean supplier that returns true if the application is running in normal
  * mode. Intended for use with {@link BuildStep#onlyIf()}
+ *
+ * @deprecated This class was marked as deprecated to raise awareness that the semantic you want is probably provided by
+ *             {@link IsProduction}. If you actually need this specific supplier, please open an issue so that we undeprecate
+ *             it.
  */
+@Deprecated(since = "3.25")
 public class IsNormal implements BooleanSupplier {
 
     private final LaunchMode launchMode;
@@ -19,6 +24,6 @@ public IsNormal(LaunchMode launchMode) {
 
     @Override
     public boolean getAsBoolean() {
-        return launchMode == LaunchMode.NORMAL || launchMode == LaunchMode.RUN;
+        return launchMode == LaunchMode.NORMAL;
     }
 }

core/deployment/src/main/java/io/quarkus/deployment/IsProduction.java

@@ -0,0 +1,24 @@
+package io.quarkus.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.runtime.LaunchMode;
+
+/**
+ * boolean supplier that returns true if the application is running in production
+ * mode i.e. either NORMAL or RUN. Intended for use with {@link BuildStep#onlyIf()}
+ */
+public class IsProduction implements BooleanSupplier {
+
+    private final LaunchMode launchMode;
+
+    public IsProduction(LaunchMode launchMode) {
+        this.launchMode = launchMode;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return launchMode == LaunchMode.NORMAL || launchMode == LaunchMode.RUN;
+    }
+}

core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java

@@ -160,7 +160,7 @@ public BuildResult run() throws Exception {
             BuildResult buildResult = execBuilder.execute();
             String message = "Quarkus augmentation completed in " + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)
                     + "ms";
-            if (launchMode == LaunchMode.NORMAL) {
+            if (launchMode.isProduction()) {
                 log.info(message);
                 if (Boolean.parseBoolean(System.getProperty("quarkus.debug.dump-build-metrics"))) {
                     buildResult.getMetrics().dumpTo(targetDir.resolve("build-metrics.json"));
@@ -170,7 +170,7 @@ public BuildResult run() throws Exception {
                 log.debug(message);
 
                 // Dump the metrics in the dev mode but not remote-dev (as it could cause issues with container permissions)
-                if ((launchMode == LaunchMode.DEVELOPMENT) && !LaunchMode.isRemoteDev()) {
+                if (launchMode.isDev() && !launchMode.isRemoteDev()) {
                     buildResult.getMetrics().dumpTo(targetDir.resolve("build-metrics.json"));
                 }
             }

core/deployment/src/main/java/io/quarkus/deployment/SnapStartProcessor.java

@@ -25,7 +25,7 @@
  */
 public class SnapStartProcessor {
 
-    @BuildStep(onlyIf = IsNormal.class, onlyIfNot = NativeBuild.class)
+    @BuildStep(onlyIf = IsProduction.class, onlyIfNot = NativeBuild.class)
     @Record(ExecutionTime.STATIC_INIT)
     public void processSnapStart(BuildProducer<PreloadClassesEnabledBuildItem> preload,
             BuildProducer<SnapStartEnabledBuildItem> snapStartEnabled,
@@ -46,7 +46,7 @@ public void processSnapStart(BuildProducer<PreloadClassesEnabledBuildItem> prelo
         recorder.register(config.fullWarmup());
     }
 
-    @BuildStep(onlyIf = IsNormal.class, onlyIfNot = NativeBuild.class)
+    @BuildStep(onlyIf = IsProduction.class, onlyIfNot = NativeBuild.class)
     public void generateClassListFromApplication(
             SnapStartConfig config,
             Optional<SnapStartDefaultValueBuildItem> defaultVal,

core/deployment/src/main/java/io/quarkus/deployment/dev/io/NioThreadPoolDevModeProcessor.java

@@ -1,6 +1,6 @@
 package io.quarkus.deployment.dev.io;
 
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsProduction;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Produce;
@@ -12,7 +12,7 @@
 public class NioThreadPoolDevModeProcessor {
 
     @Produce(TestSetupBuildItem.class)
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIfNot = IsProduction.class)
     @Record(ExecutionTime.STATIC_INIT)
     void setupTCCL(NioThreadPoolRecorder recorder, ShutdownContextBuildItem shutdownContextBuildItem) {
         recorder.updateTccl(shutdownContextBuildItem);

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java

@@ -27,7 +27,7 @@
 
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.deployment.IsDevelopment;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsProduction;
 import io.quarkus.deployment.IsTest;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -56,7 +56,7 @@
  */
 public class TestTracingProcessor {
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIfNot = IsProduction.class)
     LogCleanupFilterBuildItem handle() {
         return new LogCleanupFilterBuildItem("org.junit.platform.launcher.core.EngineDiscoveryOrchestrator", "0 containers");
     }

core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java

@@ -60,7 +60,7 @@
 import io.quarkus.bootstrap.workspace.WorkspaceModule;
 import io.quarkus.deployment.ApplicationArchive;
 import io.quarkus.deployment.GeneratedClassGizmo2Adaptor;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsProduction;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Consume;
@@ -391,7 +391,7 @@ private DiscoveredLogComponents discoverLogComponents(IndexView index) {
         return result;
     }
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIfNot = IsProduction.class)
     @Produce(TestSetupBuildItem.class)
     @Produce(LogConsoleFormatBuildItem.class)
     @Consume(ConsoleInstalledBuildItem.class)

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/FileSystemResourcesBuildStep.java

@@ -7,7 +7,7 @@
 import java.nio.file.Path;
 import java.util.List;
 
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsProduction;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.GeneratedFileSystemResourceBuildItem;
@@ -19,7 +19,7 @@
 
 public class FileSystemResourcesBuildStep {
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIfNot = IsProduction.class)
     public void notNormalMode(OutputTargetBuildItem outputTargetBuildItem,
             LaunchModeBuildItem launchMode,
             List<GeneratedFileSystemResourceBuildItem> generatedFileSystemResources,
@@ -30,7 +30,7 @@ public void notNormalMode(OutputTargetBuildItem outputTargetBuildItem,
         producer.produce(new GeneratedFileSystemResourceHandledBuildItem());
     }
 
-    @BuildStep(onlyIf = IsNormal.class)
+    @BuildStep(onlyIf = IsProduction.class)
     public void normalMode(OutputTargetBuildItem outputTargetBuildItem,
             List<GeneratedFileSystemResourceBuildItem> generatedFileSystemResources,
             // this is added to ensure that the build step will be run

core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java

@@ -44,7 +44,7 @@
 
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsProduction;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
@@ -185,7 +185,7 @@ void buildTimeRunTimeConfig(
         runTimeConfigBuilder.produce(new RunTimeConfigBuilderBuildItem(builderClassName));
     }
 
-    @BuildStep(onlyIfNot = { IsNormal.class }) // for dev or test
+    @BuildStep(onlyIfNot = { IsProduction.class }) // for dev or test
     void runtimeOverrideConfig(
             BuildProducer<StaticInitConfigBuilderBuildItem> staticInitConfigBuilder,
             BuildProducer<RunTimeConfigBuilderBuildItem> runTimeConfigBuilder) {
@@ -425,7 +425,7 @@ public void checkForBuildTimeConfigChange(
         recorder.handleConfigChange(values);
     }
 
-    @BuildStep(onlyIfNot = { IsNormal.class })
+    @BuildStep(onlyIfNot = { IsProduction.class })
     public void setupConfigOverride(
             BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer) {
 
@@ -548,7 +548,7 @@ void warnDifferentProfileUsedBetweenBuildAndRunTime(ConfigRecorder configRecorde
         configRecorder.handleNativeProfileChange(config.getProfiles());
     }
 
-    @BuildStep(onlyIf = IsNormal.class)
+    @BuildStep(onlyIf = IsProduction.class)
     void persistReadConfigOptions(
             BuildProducer<ArtifactResultBuildItem> dummy,
             QuarkusBuildCloseablesBuildItem closeables,

core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java

@@ -24,21 +24,6 @@ public enum LaunchMode {
     public static final String PROD_PROFILE = "prod";
     public static final String TEST_PROFILE = "test";
 
-    public boolean isDevOrTest() {
-        return this != NORMAL;
-    }
-
-    public static boolean isDev() {
-        return current() == DEVELOPMENT;
-    }
-
-    /**
-     * Returns true if the current launch is the server side of remote dev.
-     */
-    public static boolean isRemoteDev() {
-        return (current() == DEVELOPMENT) && "true".equals(System.getenv("QUARKUS_LAUNCH_DEVMODE"));
-    }
-
     private final String defaultProfile;
     private final String profileKey;
     private final boolean devServicesSupported;
@@ -60,6 +45,28 @@ public String getProfileKey() {
         return profileKey;
     }
 
+    public boolean isDev() {
+        return this == DEVELOPMENT;
+    }
+
+    /**
+     * Returns true if the current launch is the server side of remote dev.
+     */
+    public boolean isRemoteDev() {
+        return (this == DEVELOPMENT) && "true".equals(System.getenv("QUARKUS_LAUNCH_DEVMODE"));
+    }
+
+    public boolean isDevOrTest() {
+        return this == DEVELOPMENT || this == TEST;
+    }
+
+    /**
+     * Returns true if the current launch is a production mode, such as NORMAL or RUN.
+     */
+    public boolean isProduction() {
+        return LaunchMode.PROD_PROFILE.equals(getDefaultProfile());
+    }
+
     public boolean isDevServicesSupported() {
         return devServicesSupported;
     }