Merge pull request #3220 from gwenneg/issue-3218-cors-in-generated-ap…

…plication-properties Add ConfigPhase.BUILD_AND_RUN_TIME_FIXED values to example config file
quarkusio · Jul 14, 2019 · 08fe2d3 · 08fe2d3
2 parents 4e5409d + 7c11227
commit 08fe2d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigPhase.java b/core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigPhase.java
@@ -118,7 +118,6 @@ private void doProcess(CurateOutcome appState) throws AppCreatorException {
             runnerClassLoader = new URLClassLoader(cpUrls.toArray(new URL[cpUrls.size()]), getClass().getClassLoader());
 
             ClassLoader old = Thread.currentThread().getContextClassLoader();
-            BuildResult result;
             try {
                 Thread.currentThread().setContextClassLoader(runnerClassLoader);
 

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java
@@ -10,6 +10,7 @@
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.BuildTimeConfigurationBuildItem;
+import io.quarkus.deployment.builditem.BuildTimeRunTimeFixedConfigurationBuildItem;
 import io.quarkus.deployment.builditem.ConfigDescriptionBuildItem;
 import io.quarkus.deployment.builditem.RunTimeConfigurationBuildItem;
 import io.quarkus.deployment.configuration.ConfigDefinition;
@@ -20,7 +21,8 @@ public class ConfigDescriptionBuildStep {
     @BuildStep
     List<ConfigDescriptionBuildItem> createConfigDescriptions(
             RunTimeConfigurationBuildItem runtimeConfig,
-            BuildTimeConfigurationBuildItem buildTimeConfig) throws Exception {
+            BuildTimeConfigurationBuildItem buildTimeConfig,
+            BuildTimeRunTimeFixedConfigurationBuildItem buildTimeRuntimeConfig) throws Exception {
         Properties javadoc = new Properties();
         Enumeration<URL> resources = Thread.currentThread().getContextClassLoader()
                 .getResources("META-INF/quarkus-javadoc.properties");
@@ -32,6 +34,7 @@ List<ConfigDescriptionBuildItem> createConfigDescriptions(
         List<ConfigDescriptionBuildItem> ret = new ArrayList<>();
         processConfig(runtimeConfig.getConfigDefinition(), ret, javadoc);
         processConfig(buildTimeConfig.getConfigDefinition(), ret, javadoc);
+        processConfig(buildTimeRuntimeConfig.getConfigDefinition(), ret, javadoc);
         return ret;
     }
 

diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpBuildConfig.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpBuildConfig.java
@@ -11,7 +11,7 @@
 public class HttpBuildConfig {
 
     /**
-     * The CORS config
+     * Enable the CORS filter.
      */
     @ConfigItem(name = "cors")
     public boolean corsEnabled = false;