Move package config to an interface

* Change `PackageConfig` to an interface * Move JAR-specific configuration to `JarConfig` group * Replace package type with combination of JAR type and JAR/native enable flags * Introduce compatibility interceptors for complex remappings * Update all build steps, tests, and POMs to use the new properties
quarkusio · Mar 11, 2024 · 5fc0fc0 · 5fc0fc0
1 parent 5c25ff5
commit 5fc0fc0
Show file tree

Hide file tree

Showing 251 changed files with 1,660 additions and 1,066 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -51,7 +51,7 @@
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>3.1.1</microprofile-openapi.version>
         <smallrye-common.version>2.3.0</smallrye-common.version>
-        <smallrye-config.version>3.6.1</smallrye-config.version>
+        <smallrye-config.version>3.6.2-SNAPSHOT</smallrye-config.version>
         <smallrye-health.version>4.1.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.10.0</smallrye-open-api.version>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/cmd/RunCommandProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/cmd/RunCommandProcessor.java
@@ -1,5 +1,6 @@
 package io.quarkus.deployment.cmd;
 
+import static io.quarkus.deployment.pkg.PackageConfig.JarConfig.JarType.*;
 import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.DEFAULT_FAST_JAR_DIRECTORY_NAME;
 import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.QUARKUS_RUN_JAR;
 
@@ -25,6 +26,7 @@ public RunCommandActionResultBuildItem commands(List<RunCommandActionBuildItem>
         return new RunCommandActionResultBuildItem(cmds);
     }
 
+    @SuppressWarnings("deprecation") // legacy jar
     @BuildStep
     public void defaultJavaCommand(PackageConfig packageConfig,
             OutputTargetBuildItem jar,
@@ -34,13 +36,14 @@ public void defaultJavaCommand(PackageConfig packageConfig,
 
         Path jarPath = null;
         if (legacyJarRequired.isEmpty() && (!uberJarRequired.isEmpty()
-                || packageConfig.type.equalsIgnoreCase(PackageConfig.UBER_JAR))) {
+                || packageConfig.jar().type() == UBER_JAR)) {
             jarPath = jar.getOutputDirectory()
-                    .resolve(jar.getBaseName() + packageConfig.getRunnerSuffix() + ".jar");
-        } else if (!legacyJarRequired.isEmpty() || packageConfig.isLegacyJar()
-                || packageConfig.type.equalsIgnoreCase(PackageConfig.LEGACY)) {
+                    .resolve(jar.getBaseName() + packageConfig.computedRunnerSuffix() + ".jar");
+        } else if (!legacyJarRequired.isEmpty()
+                || packageConfig.jar().type() == LEGACY_JAR) {
+            // todo: legacy JAR should be using runnerSuffix()
             jarPath = jar.getOutputDirectory()
-                    .resolve(jar.getBaseName() + packageConfig.getRunnerSuffix() + ".jar");
+                    .resolve(jar.getBaseName() + packageConfig.computedRunnerSuffix() + ".jar");
         } else {
             jarPath = jar.getOutputDirectory().resolve(DEFAULT_FAST_JAR_DIRECTORY_NAME).resolve(QUARKUS_RUN_JAR);
 
@@ -49,7 +52,7 @@ public void defaultJavaCommand(PackageConfig packageConfig,
         List<String> args = new ArrayList<>();
         args.add(determineJavaPath());
 
-        for (Map.Entry e : System.getProperties().entrySet()) {
+        for (Map.Entry<?, ?> e : System.getProperties().entrySet()) {
             args.add("-D" + e.getKey().toString() + "=" + e.getValue().toString());
         }
         args.add("-jar");

diff --git a/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
@@ -409,6 +409,7 @@ public SmallRyeConfig initConfiguration(LaunchMode launchMode, Properties buildS
         }
 
         builder.withInterceptors(buildConfigTracker);
+        builder.withInterceptors(ConfigCompatibility.FrontEnd.instance(), ConfigCompatibility.BackEnd.instance());
         var config = builder.build();
         buildConfigTracker.configure(config);
         return config;

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedRemoteDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedRemoteDevModeMain.java
@@ -37,7 +37,6 @@
 import io.quarkus.deployment.dev.remote.RemoteDevClient;
 import io.quarkus.deployment.dev.remote.RemoteDevClientProvider;
 import io.quarkus.deployment.mutability.DevModeTask;
-import io.quarkus.deployment.pkg.PackageConfig;
 import io.quarkus.deployment.pkg.steps.JarResultBuildStep;
 import io.quarkus.deployment.steps.ClassTransformingBuildStep;
 import io.quarkus.dev.spi.DeploymentFailedStartHandler;
@@ -90,7 +89,7 @@ private synchronized JarResult generateApplication() {
             //ok, we have resolved all the deps
             try {
                 AugmentResult start = augmentAction.createProductionApplication();
-                if (!start.getJar().getType().equalsIgnoreCase(PackageConfig.BuiltInType.MUTABLE_JAR.getValue())) {
+                if (!start.getJar().mutable()) {
                     throw new RuntimeException(
                             "remote-dev can only be used with mutable applications i.e. " +
                                     "using the mutable-jar package type");

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java
@@ -90,7 +90,9 @@ public void accept(BuildChainBuilder builder) {
         builder.addFinal(GeneratedResourceBuildItem.class);
         builder.addFinal(TransformedClassesBuildItem.class);
         builder.addFinal(DeploymentResultBuildItem.class);
-        boolean nativeRequested = "native".equals(System.getProperty("quarkus.package.type"));
+        // note: quarkus.package.type is deprecated
+        boolean nativeRequested = "native".equals(System.getProperty("quarkus.package.type"))
+                || "true".equals(System.getProperty("quarkus.native.enabled"));
         boolean containerBuildRequested = Boolean.getBoolean("quarkus.container-image.build");
         if (nativeRequested) {
             builder.addFinal(NativeImageBuildItem.class);

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/mutability/ReaugmentTask.java b/core/deployment/src/main/java/io/quarkus/deployment/mutability/ReaugmentTask.java
@@ -40,7 +40,7 @@ public static void main(Path appRoot) throws Exception {
             List<AdditionalDependency> additional = new ArrayList<>();
 
             if (appModel.getUserProvidersDirectory() != null) {
-                System.setProperty("quarkus.package.user-providers-directory", appModel.getUserProvidersDirectory()); //bit of a hack, but keeps things simple
+                System.setProperty("quarkus.package.jar.user-providers-directory", appModel.getUserProvidersDirectory()); //bit of a hack, but keeps things simple
                 try (Stream<Path> files = Files.list(appRoot.resolve(appModel.getUserProvidersDirectory()))) {
                     files.forEach(new Consumer<Path>() {
                         @Override
@@ -54,7 +54,7 @@ public void accept(Path path) {
             }
 
             final ApplicationModel existingModel = appModel.getAppModel(appRoot);
-            System.setProperty("quarkus.package.type", "mutable-jar");
+            System.setProperty("quarkus.package.jar.type", "mutable-jar");
             try (CuratedApplication bootstrap = QuarkusBootstrap.builder()
                     .setAppArtifact(existingModel.getAppArtifact())
                     .setExistingModel(existingModel)

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/ManifestConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/ManifestConfig.java
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -23,6 +23,18 @@ public interface NativeConfig {
     String DEFAULT_GRAALVM_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-graalvmce-builder-image:jdk-21";
     String DEFAULT_MANDREL_BUILDER_IMAGE = "quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21";
 
+    /**
+     * Set to enable native-image building using GraalVM.
+     */
+    @WithDefault("false")
+    boolean enabled();
+
+    /**
+     * Set to prevent the native-image process from actually building the native image.
+     */
+    @WithDefault("false")
+    boolean sourcesOnly();
+
     /**
      * Comma-separated, additional arguments to pass to the build process.
      * If an argument includes the {@code ,} symbol, it needs to be escaped, e.g. {@code \\,}