Merge pull request #39194 from radcortez/remove-profile-manager

Remove ProfileManager
quarkusio · May 7, 2024 · fb12a4d · fb12a4d
2 parents ea5c6fd + 4c2550a
commit fb12a4d
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 205 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
@@ -88,7 +88,6 @@
 import io.quarkus.runtime.annotations.QuarkusMain;
 import io.quarkus.runtime.appcds.AppCDSUtil;
 import io.quarkus.runtime.configuration.ConfigUtils;
-import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.runtime.util.StepTiming;
 
 public class MainClassBuildStep {
@@ -175,7 +174,7 @@ void build(List<StaticBytecodeRecorderBuildItem> staticInitTasks,
         //set the launch mode
         ResultHandle lm = mv
                 .readStaticField(FieldDescriptor.of(LaunchMode.class, launchMode.getLaunchMode().name(), LaunchMode.class));
-        mv.invokeStaticMethod(ofMethod(ProfileManager.class, "setLaunchMode", void.class, LaunchMode.class),
+        mv.invokeStaticMethod(ofMethod(LaunchMode.class, "set", void.class, LaunchMode.class),
                 lm);
 
         mv.invokeStaticMethod(CONFIGURE_STEP_TIME_ENABLED);

diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java
@@ -12,7 +12,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -51,7 +50,6 @@
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
 import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.runtime.LaunchMode;
-import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.runtime.configuration.QuarkusConfigFactory;
 
 /**
@@ -277,11 +275,7 @@ private BuildResult runAugment(boolean firstRun, Set<String> changedResources,
         try {
             QuarkusClassLoader classLoader = curatedApplication.getAugmentClassLoader();
             Thread.currentThread().setContextClassLoader(classLoader);
-            ProfileManager.setLaunchMode(launchMode);
-            ProfileManager.setRuntimeDefaultProfile(
-                    Optional.ofNullable(quarkusBootstrap.getBuildSystemProperties())
-                            .map(properties -> properties.getProperty(ProfileManager.QUARKUS_PROFILE_PROP))
-                            .orElse(null));
+            LaunchMode.set(launchMode);
 
             QuarkusAugmentor.Builder builder = QuarkusAugmentor.builder()
                     .setRoot(quarkusBootstrap.getApplicationRoot())
@@ -337,7 +331,6 @@ private BuildResult runAugment(boolean firstRun, Set<String> changedResources,
                 throw new RuntimeException(e);
             }
         } finally {
-            ProfileManager.setRuntimeDefaultProfile(null);
             Thread.currentThread().setContextClassLoader(old);
             QuarkusConfigFactory.setConfig(null);
         }

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java b/core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java
@@ -1,7 +1,5 @@
 package io.quarkus.runtime;
 
-import io.quarkus.runtime.configuration.ProfileManager;
-
 public enum LaunchMode {
 
     /**
@@ -45,11 +43,17 @@ public String getProfileKey() {
         return profileKey;
     }
 
+    private static volatile LaunchMode launchMode = LaunchMode.NORMAL;
+
+    public static void set(LaunchMode mode) {
+        launchMode = mode;
+    }
+
     /**
      *
      * @return The current launch mode
      */
     public static LaunchMode current() {
-        return ProfileManager.getLaunchMode();
+        return launchMode;
     }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ProfileManager.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ProfileManager.java
@@ -18,14 +18,7 @@
  *
  */
 public class ProfileManager {
-
-    public static final String QUARKUS_PROFILE_ENV = "QUARKUS_PROFILE";
-    public static final String QUARKUS_PROFILE_PROP = "quarkus.profile";
-    public static final String QUARKUS_TEST_PROFILE_PROP = "quarkus.test.profile";
-    private static final String BACKWARD_COMPATIBLE_QUARKUS_PROFILE_PROP = "quarkus-profile";
-
     private static volatile LaunchMode launchMode = LaunchMode.NORMAL;
-    private static volatile String runtimeDefaultProfile;
 
     public static void setLaunchMode(LaunchMode mode) {
         launchMode = mode;
@@ -35,47 +28,6 @@ public static LaunchMode getLaunchMode() {
         return launchMode;
     }
 
-    public static void setRuntimeDefaultProfile(final String profile) {
-        runtimeDefaultProfile = profile;
-    }
-
     //NOTE: changes made here must be replicated in BootstrapProfile
 
-    /**
-     * @deprecated This method is not suited to multiple profiles, because it returns a single string. Please use
-     *             {@link ConfigUtils#getProfiles()} instead, which returns a List of profiles.
-     */
-    @Deprecated
-    public static String getActiveProfile() {
-        if (launchMode == LaunchMode.TEST) {
-            String profile = System.getProperty(QUARKUS_TEST_PROFILE_PROP);
-            if (profile != null) {
-                return profile;
-            }
-            return launchMode.getDefaultProfile();
-        }
-
-        String profile = System.getProperty(QUARKUS_PROFILE_PROP);
-        if (profile != null) {
-            return profile;
-        }
-
-        profile = System.getProperty(BACKWARD_COMPATIBLE_QUARKUS_PROFILE_PROP);
-        if (profile != null) {
-            return profile;
-        }
-
-        profile = System.getenv(QUARKUS_PROFILE_ENV);
-        if (profile != null) {
-            return profile;
-        }
-
-        profile = runtimeDefaultProfile;
-        if (profile != null) {
-            return profile;
-        }
-
-        return launchMode.getDefaultProfile();
-    }
-
 }
diff --git a/...untime/src/main/java/io/quarkus/runtime/configuration/QuarkusConfigBuilderCustomizer.java b/...untime/src/main/java/io/quarkus/runtime/configuration/QuarkusConfigBuilderCustomizer.java
@@ -25,7 +25,7 @@
 public class QuarkusConfigBuilderCustomizer implements SmallRyeConfigBuilderCustomizer {
     @Override
     public void configBuilder(final SmallRyeConfigBuilder builder) {
-        LaunchMode launchMode = ProfileManager.getLaunchMode();
+        LaunchMode launchMode = LaunchMode.current();
         builder.withDefaultValue(launchMode.getProfileKey(), launchMode.getDefaultProfile());
 
         builder.withInterceptorFactories(new ConfigSourceInterceptorFactory() {

diff --git a/...nsions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServerReloader.java b/...nsions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServerReloader.java
@@ -13,7 +13,6 @@
 import io.quarkus.grpc.stubs.ServerCalls;
 import io.quarkus.grpc.stubs.StreamCollector;
 import io.quarkus.runtime.LaunchMode;
-import io.quarkus.runtime.configuration.ProfileManager;
 import io.vertx.grpc.VertxServer;
 
 public class GrpcServerReloader {
@@ -29,7 +28,7 @@ public static void init(VertxServer grpcServer) {
     }
 
     public static StreamCollector devModeCollector() {
-        if (ProfileManager.getLaunchMode() != LaunchMode.DEVELOPMENT) {
+        if (LaunchMode.current() != LaunchMode.DEVELOPMENT) {
             throw new IllegalStateException("Attempted to initialize development mode StreamCollector in non-development mode");
         }
         return new DevModeStreamsCollector();

diff --git a/...s/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxEventBusConsumerRecorder.java b/...s/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxEventBusConsumerRecorder.java
@@ -28,7 +28,6 @@
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
-import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.vertx.ConsumeEvent;
 import io.quarkus.vertx.LocalEventBusCodec;
 import io.quarkus.virtual.threads.VirtualThreadsRecorder;
@@ -260,7 +259,7 @@ private EventConsumerInvoker createInvoker(String invokerClassName) {
     @SuppressWarnings("unchecked")
     private void registerCodecs(Map<Class<?>, Class<?>> codecByClass, List<Class<?>> selectorTypes) {
         EventBus eventBus = vertx.eventBus();
-        boolean isDevMode = ProfileManager.getLaunchMode() == LaunchMode.DEVELOPMENT;
+        boolean isDevMode = LaunchMode.current() == LaunchMode.DEVELOPMENT;
         for (Map.Entry<Class<?>, Class<?>> codecEntry : codecByClass.entrySet()) {
             Class<?> target = codecEntry.getKey();
             Class<?> codec = codecEntry.getValue();

diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerITCase.java
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ProfileManagerTestCase.java
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/BuildIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/BuildIT.java
@@ -22,7 +22,6 @@
 
 import io.quarkus.maven.it.verifier.MavenProcessInvocationResult;
 import io.quarkus.maven.it.verifier.RunningInvoker;
-import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.test.devmode.util.DevModeClient;
 
 @DisableForNative
@@ -122,7 +121,7 @@ void testModuleWithBuildProfileInProperty() throws MavenInvocationException, Int
     @Test
     void testModuleWithOverriddenBuildProfile() throws MavenInvocationException, InterruptedException, IOException {
         testDir = initProject("projects/build-mode-quarkus-profile-override");
-        build(String.format("-D%s=foo", ProfileManager.QUARKUS_PROFILE_PROP));
+        build(String.format("-D%s=foo", "quarkus.profile"));
         launch();
     }
 

diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
@@ -50,7 +50,6 @@
 import io.quarkus.maven.dependency.GACT;
 import io.quarkus.paths.PathList;
 import io.quarkus.runtime.LaunchMode;
-import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.test.common.GroovyClassValue;
 import io.quarkus.test.common.PathTestHelper;
 import io.quarkus.test.common.PropertyTestUtil;
@@ -232,7 +231,7 @@ public void beforeAll(ExtensionContext context) throws Exception {
         TestConfigUtil.cleanUp();
         GroovyClassValue.disable();
         //set the right launch mode in the outer CL, used by the HTTP host config source
-        ProfileManager.setLaunchMode(LaunchMode.DEVELOPMENT);
+        LaunchMode.set(LaunchMode.DEVELOPMENT);
         originalRootLoggerHandlers = rootLogger.getHandlers();
         rootLogger.addHandler(inMemoryLogHandler);
     }

diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
@@ -69,7 +69,6 @@
 import io.quarkus.runner.bootstrap.AugmentActionImpl;
 import io.quarkus.runner.bootstrap.StartupActionImpl;
 import io.quarkus.runtime.LaunchMode;
-import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.runtime.logging.JBossVersion;
 import io.quarkus.test.common.GroovyClassValue;
 import io.quarkus.test.common.PathTestHelper;
@@ -511,7 +510,7 @@ public void beforeAll(ExtensionContext extensionContext) throws Exception {
         TestConfigUtil.cleanUp();
         GroovyClassValue.disable();
         //set the right launch mode in the outer CL, used by the HTTP host config source
-        ProfileManager.setLaunchMode(LaunchMode.TEST);
+        LaunchMode.set(LaunchMode.TEST);
         if (beforeAllCustomizer != null) {
             beforeAllCustomizer.run();
         }

diff --git a/...framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java b/...framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
@@ -37,7 +37,7 @@
 import io.quarkus.bootstrap.workspace.WorkspaceModule;
 import io.quarkus.deployment.dev.testing.CurrentTestApplication;
 import io.quarkus.paths.PathList;
-import io.quarkus.runtime.configuration.ProfileManager;
+import io.quarkus.runtime.LaunchMode;
 import io.quarkus.test.common.PathTestHelper;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.RestorableSystemProperties;
@@ -166,7 +166,7 @@ protected PrepareResult createAugmentor(ExtensionContext context, Class<? extend
                 additional.put("quarkus.arc.test.disable-application-lifecycle-observers", "true");
             }
             if (profileInstance.getConfigProfile() != null) {
-                additional.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profileInstance.getConfigProfile());
+                additional.put(LaunchMode.TEST.getProfileKey(), profileInstance.getConfigProfile());
             }
             //we just use system properties for now
             //it's a lot simpler

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/BasicLoggingEnabler.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/BasicLoggingEnabler.java
@@ -11,7 +11,6 @@
 import io.quarkus.bootstrap.logging.InitialConfigurator;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
-import io.quarkus.runtime.configuration.ProfileManager;
 
 /**
  * A (global) JUnit callback that enables/sets up basic logging if logging has not already been set up.
@@ -132,7 +131,7 @@ public synchronized void beforeAll(ExtensionContext context) {
 
     private static Config buildConfig() {
         // make sure to load ConfigSources with the proper LaunchMode in place
-        ProfileManager.setLaunchMode(LaunchMode.TEST);
+        LaunchMode.set(LaunchMode.TEST);
         // notes:
         // - addDiscovered might seem a bit much, but this ensures that yaml files are loaded (if extension is around)
         // - LaunchMode.NORMAL instead of TEST avoids failing on missing RuntimeOverrideConfigSource$$GeneratedMapHolder