Merge pull request #50567 from radcortez/fix-50495

Pass all the configuration minus PackageConfig and NativeConfig defaults to Gradle tasks

Author: geoand

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java

@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -45,6 +46,7 @@
 public final class EffectiveConfig {
     private final SmallRyeConfig config;
     private final Map<String, String> values;
+    private final Map<String, String> quarkusValues;
 
     private EffectiveConfig(Builder builder) {
         // Effective "ordinals" for the config sources:
@@ -90,6 +92,7 @@ private EffectiveConfig(Builder builder) {
                 .withInterceptors(ConfigCompatibility.FrontEnd.instance(), ConfigCompatibility.BackEnd.instance())
                 .build();
         this.values = generateFullConfigMap(config);
+        this.quarkusValues = generateQuarkusConfigMap(config);
     }
 
     public SmallRyeConfig getConfig() {
@@ -100,23 +103,8 @@ public Map<String, String> getValues() {
         return values;
     }
 
-    public Map<String, String> getOnlyQuarkusValues() {
-        return Expressions.withoutExpansion(new Supplier<Map<String, String>>() {
-            @Override
-            public Map<String, String> get() {
-                Map<String, String> properties = new HashMap<>();
-                for (String propertyName : config.getPropertyNames()) {
-                    if (propertyName.startsWith("quarkus.") || propertyName.startsWith("platform.quarkus.")) {
-                        ConfigValue configValue = config.getConfigValue(propertyName);
-                        if (configValue.getValue() != null
-                                && !DefaultValuesConfigSource.NAME.equals(configValue.getConfigSourceName())) {
-                            properties.put(propertyName, configValue.getValue());
-                        }
-                    }
-                }
-                return unmodifiableMap(properties);
-            }
-        });
+    public Map<String, String> getQuarkusValues() {
+        return quarkusValues;
     }
 
     private Map<String, String> asStringMap(Map<String, ?> map) {
@@ -131,18 +119,48 @@ private Map<String, String> asStringMap(Map<String, ?> map) {
 
     @VisibleForTesting
     static Map<String, String> generateFullConfigMap(SmallRyeConfig config) {
+        Set<String> defaultNames = new HashSet<>();
+        defaultNames.addAll(configClass(PackageConfig.class).getProperties().keySet());
+        defaultNames.addAll(configClass(NativeConfig.class).getProperties().keySet());
         return Expressions.withoutExpansion(new Supplier<Map<String, String>>() {
             @Override
             public Map<String, String> get() {
                 Map<String, String> properties = new HashMap<>();
                 for (String propertyName : config.getPropertyNames()) {
                     ConfigValue configValue = config.getConfigValue(propertyName);
-                    if (configValue.getValue() != null) {
+                    // Remove defaults coming from PackageConfig and NativeConfig, as this Map as passed as
+                    // system properties to Gradle workers and, we loose the ability to determine if it was set by
+                    // the user to evaluate deprecated configuration
+                    if (configValue.getValue() != null && (!defaultNames.contains(configValue.getName())
+                            || !DefaultValuesConfigSource.NAME.equals(configValue.getConfigSourceName()))) {
                         properties.put(propertyName, configValue.getValue());
                     }
                 }
-                configClass(PackageConfig.class).getProperties().keySet().forEach(properties::remove);
-                configClass(NativeConfig.class).getProperties().keySet().forEach(properties::remove);
+                return unmodifiableMap(properties);
+            }
+        });
+    }
+
+    static Map<String, String> generateQuarkusConfigMap(SmallRyeConfig config) {
+        Set<String> defaultNames = new HashSet<>();
+        defaultNames.addAll(configClass(PackageConfig.class).getProperties().keySet());
+        defaultNames.addAll(configClass(NativeConfig.class).getProperties().keySet());
+        return Expressions.withoutExpansion(new Supplier<Map<String, String>>() {
+            @Override
+            public Map<String, String> get() {
+                Map<String, String> properties = new HashMap<>();
+                for (String propertyName : config.getPropertyNames()) {
+                    if (propertyName.startsWith("quarkus.") || propertyName.startsWith("platform.quarkus.")) {
+                        ConfigValue configValue = config.getConfigValue(propertyName);
+                        // Remove defaults coming from PackageConfig and NativeConfig, as this Map as passed as
+                        // system properties to Gradle workers and, we loose the ability to determine if it was set by
+                        // the user to evaluate deprecated configuration
+                        if (configValue.getValue() != null && (!defaultNames.contains(configValue.getName())
+                                || !DefaultValuesConfigSource.NAME.equals(configValue.getConfigSourceName()))) {
+                            properties.put(propertyName, configValue.getValue());
+                        }
+                    }
+                }
                 return unmodifiableMap(properties);
             }
         });

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java

@@ -272,7 +272,7 @@ void generateBuild() {
         ApplicationModel appModel = resolveAppModelForBuild();
         Map<String, String> quarkusProperties = effectiveProvider()
                 .buildEffectiveConfiguration(appModel, getAdditionalForcedProperties().get().getProperties())
-                .getOnlyQuarkusValues();
+                .getQuarkusValues();
 
         if (nativeEnabled()) {
             if (nativeSourcesOnly()) {

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusRun.java

@@ -103,7 +103,7 @@ public void setJvmArgs(List<String> jvmArgs) {
     public void runQuarkus() {
         ApplicationModel appModel = resolveAppModelForBuild();
         Properties sysProps = new Properties();
-        sysProps.putAll(extension().buildEffectiveConfiguration(appModel).getOnlyQuarkusValues());
+        sysProps.putAll(extension().buildEffectiveConfiguration(appModel).getQuarkusValues());
         try (CuratedApplication curatedApplication = QuarkusBootstrap.builder()
                 .setBaseClassLoader(getClass().getClassLoader())
                 .setExistingModel(appModel)