Allow empty configuration values for String injection points

Fixes #2765
quarkusio · Jun 9, 2019 · 33c3485 · 33c3485
1 parent 66f9b36
commit 33c3485
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigDeploymentTemplate.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigDeploymentTemplate.java
@@ -16,6 +16,7 @@
 
 package io.quarkus.arc.runtime;
 
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -39,6 +40,7 @@ public void validateConfigProperties(Map<String, Set<String>> properties) {
         if (cl == null) {
             ConfigDeploymentTemplate.class.getClassLoader();
         }
+        Set<String> allPropertyNames = new HashSet<>();
         for (Entry<String, Set<String>> entry : properties.entrySet()) {
             Set<String> propertyTypes = entry.getValue();
             for (String propertyType : propertyTypes) {
@@ -49,8 +51,21 @@ public void validateConfigProperties(Map<String, Set<String>> properties) {
                 }
                 try {
                     if (!config.getOptionalValue(entry.getKey(), propertyClass).isPresent()) {
-                        throw new DeploymentException(
-                                "No config value of type " + entry.getValue() + " exists for: " + entry.getKey());
+
+                        if (allPropertyNames.isEmpty()) {
+                            final Iterable<String> propertyNamesIter = config.getPropertyNames();
+                            for (String propertyName : propertyNamesIter) {
+                                allPropertyNames.add(propertyName);
+                            }
+                        }
+
+                        // getOptionalValue returns an empty Optional when the string value is an empty string
+                        // this should not be considered an error
+                        if (!(String.class.equals(propertyClass) && allPropertyNames.contains(entry.getKey()))) {
+                            throw new DeploymentException(
+                                    "No config value of type " + entry.getValue() + " exists for: " + entry.getKey());
+                        }
+
                     }
                 } catch (IllegalArgumentException e) {
                     throw new DeploymentException(e);

diff --git a/...el-servlet/runtime/src/main/java/io/quarkus/camel/servlet/runtime/CamelServletConfig.java b/...el-servlet/runtime/src/main/java/io/quarkus/camel/servlet/runtime/CamelServletConfig.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.Servlet;
-
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
@@ -82,4 +80,4 @@ public String getEffectiveServletName(final String key) {
 
     }
 
-}
+}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileConfigResource.java b/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileConfigResource.java
@@ -38,6 +38,9 @@ public class MicroProfileConfigResource {
     @Inject
     Config config;
 
+    @ConfigProperty(name = "greeting.empty")
+    String empty;
+
     @GET
     @Path("/get-property-names")
     public String getPropertyNames() throws Exception {
@@ -52,4 +55,10 @@ public String getPropertyNames() throws Exception {
     public String getCustomValue() {
         return Integer.toString(value.getNumber());
     }
+
+    @GET
+    @Path("/empty")
+    public String empty() {
+        return empty;
+    }
 }
diff --git a/integration-tests/main/src/main/resources/application.properties b/integration-tests/main/src/main/resources/application.properties
@@ -40,4 +40,6 @@ quarkus.log.category.\"org.apache.zookeeper\".level=WARN
 
 microprofile.custom.value = 456
 
-quarkus.swagger-ui.always-include=true
+quarkus.swagger-ui.always-include=true
+
+greeting.empty=
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MicroProfileConfigTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MicroProfileConfigTestCase.java
@@ -41,4 +41,11 @@ public void testMicroprofileConfigGetCustomValue() {
                 .when().get("/microprofile-config/get-custom-value")
                 .then().body(is("456"));
     }
+
+    @Test
+    public void testEmptyStringValue() {
+        RestAssured
+                .when().get("/microprofile-config/empty")
+                .then().body(is(""));
+    }
 }