Merge pull request quarkusio#53600 from gsmet/unify-effective-config

Gradle - Use same pattern everywhere to get effective config

Author: radcortez

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

@@ -6,7 +6,6 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -22,11 +21,9 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.process.JavaForkOptions;
 
-import io.quarkus.bootstrap.model.ApplicationModel;
 import io.quarkus.deployment.pkg.NativeConfig;
 import io.quarkus.deployment.pkg.PackageConfig;
 import io.quarkus.gradle.dsl.Manifest;
-import io.quarkus.maven.dependency.ResolvedDependency;
 
 /**
  * This base class exists to hide internal properties, make those only available in the {@link io.quarkus.gradle.tasks}
@@ -122,34 +119,6 @@ public NativeConfig nativeConfig() {
         return baseConfig().nativeConfig();
     }
 
-    protected EffectiveConfig buildEffectiveConfiguration(ApplicationModel appModel) {
-        ResolvedDependency appArtifact = appModel.getAppArtifact();
-
-        Map<String, Object> properties = new HashMap<>();
-        exportCustomManifestProperties(properties);
-
-        Set<File> resourcesDirs = getSourceSet(project, SourceSet.MAIN_SOURCE_SET_NAME).getResources().getSourceDirectories()
-                .getFiles();
-
-        Map<String, String> defaultProperties = new HashMap<>();
-        String userIgnoredEntries = String.join(",", ignoredEntries.get());
-        if (!userIgnoredEntries.isEmpty()) {
-            defaultProperties.put("quarkus.package.jar.user-configured-ignored-entries", userIgnoredEntries);
-        }
-        defaultProperties.putIfAbsent("quarkus.application.name", appArtifact.getArtifactId());
-        defaultProperties.putIfAbsent("quarkus.application.version", appArtifact.getVersion());
-
-        return EffectiveConfig.builder()
-                .withPlatformProperties(appModel.getPlatformProperties())
-                .withTaskProperties(properties)
-                .withBuildProperties(quarkusBuildProperties.get())
-                .withProjectProperties(project.getProperties())
-                .withDefaultProperties(defaultProperties)
-                .withSourceDirectories(resourcesDirs)
-                .withProfile(quarkusProfile())
-                .build();
-    }
-
     private String quarkusProfile() {
         String profile = System.getProperty(QUARKUS_PROFILE);
         if (profile == null) {
@@ -176,20 +145,6 @@ private static FileCollection dependencyClasspath(SourceSet mainSourceSet) {
                 .plus(mainSourceSet.getResources());
     }
 
-    private void exportCustomManifestProperties(Map<String, Object> properties) {
-        for (Map.Entry<String, Object> attribute : baseConfig().manifest().getAttributes().entrySet()) {
-            properties.put(toManifestAttributeKey(attribute.getKey()),
-                    attribute.getValue());
-        }
-
-        for (Map.Entry<String, Attributes> section : baseConfig().manifest().getSections().entrySet()) {
-            for (Map.Entry<String, Object> attribute : section.getValue().entrySet()) {
-                properties
-                        .put(toManifestSectionAttributeKey(section.getKey(), attribute.getKey()), attribute.getValue());
-            }
-        }
-    }
-
     protected static String toManifestAttributeKey(String key) {
         if (key.contains("\"")) {
             throw new GradleException("Manifest entry name " + key + " is invalid. \" characters are not allowed.");

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

@@ -65,7 +65,7 @@ public void buildAotEnhancedImage() {
         getLogger().debug("Found AOT file '{}'; proceeding to build AOT enhanced container image", aotFilePath);
 
         ApplicationModel appModel = resolveAppModelForBuild();
-        Map<String, String> quarkusProperties = extension().buildEffectiveConfiguration(appModel).getValues();
+        Map<String, String> quarkusProperties = effectiveProvider().buildEffectiveConfiguration(appModel, Map.of()).getValues();
 
         WorkQueue workQueue = workQueue(quarkusProperties, getExtensionView().getBuildForkOptions().get());
 

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

@@ -96,12 +96,12 @@ public Deploy() {
     public void checkRequiredExtensions() {
         ApplicationModel appModel = resolveAppModelForBuild();
         Properties sysProps = new Properties();
-        sysProps.putAll(extension().buildEffectiveConfiguration(appModel).getQuarkusValues());
+        sysProps.putAll(effectiveProvider().buildEffectiveConfiguration(appModel, Map.of()).getQuarkusValues());
         try (CuratedApplication curatedApplication = QuarkusBootstrap.builder()
                 .setBaseClassLoader(getClass().getClassLoader())
                 .setExistingModel(appModel)
                 .setTargetDirectory(getProject().getLayout().getBuildDirectory().getAsFile().get().toPath())
-                .setBaseName(extension().finalName())
+                .setBaseName(getExtensionView().getFinalName().get())
                 .setBuildSystemProperties(sysProps)
                 .setAppArtifact(appModel.getAppArtifact())
                 .setLocalProjectDiscovery(false)

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

@@ -103,12 +103,12 @@ public void setJvmArgs(List<String> jvmArgs) {
     public void runQuarkus() {
         ApplicationModel appModel = resolveAppModelForBuild();
         Properties sysProps = new Properties();
-        sysProps.putAll(extension().buildEffectiveConfiguration(appModel).getQuarkusValues());
+        sysProps.putAll(effectiveProvider().buildEffectiveConfiguration(appModel, Map.of()).getQuarkusValues());
         try (CuratedApplication curatedApplication = QuarkusBootstrap.builder()
                 .setBaseClassLoader(getClass().getClassLoader())
                 .setExistingModel(appModel)
                 .setTargetDirectory(getProject().getLayout().getBuildDirectory().getAsFile().get().toPath())
-                .setBaseName(extension().finalName())
+                .setBaseName(getExtensionView().getFinalName().get())
                 .setBuildSystemProperties(sysProps)
                 .setAppArtifact(appModel.getAppArtifact())
                 .setLocalProjectDiscovery(false)