Merge pull request #5321 from geoand/#5297

Ensure that array config values are properly validated at startup
quarkusio · Nov 12, 2019 · 52ee9d0 · 52ee9d0
2 parents 383c21d + 5bcb558
commit 52ee9d0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java
@@ -131,7 +131,7 @@ void validateConfigProperties(ConfigRecorder recorder, List<ConfigPropertyBuildI
         for (ConfigPropertyBuildItem item : configProperties) {
             Type requiredType = item.getPropertyType();
             String propertyType = requiredType.name().toString();
-            if (requiredType.kind() != Kind.ARRAY && requiredType.kind() != Kind.PRIMITIVE) {
+            if (requiredType.kind() != Kind.PRIMITIVE) {
                 reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, propertyType));
             }
         }

diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ServiceWithConfig.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ServiceWithConfig.java
@@ -13,11 +13,18 @@ public class ServiceWithConfig {
     @ConfigProperty(name = "web-message")
     String message;
 
+    @ConfigProperty(name = "names")
+    String[] names;
+
     public String host() {
         return quarkusHost;
     }
 
     public String message() {
         return message;
     }
+
+    public String[] names() {
+        return names;
+    }
 }
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java
@@ -77,6 +77,13 @@ public String configMessage() {
         return config.message();
     }
 
+    @GET
+    @Path("/config/names")
+    @Produces("application/json")
+    public String configNames() {
+        return String.join(",", config.names());
+    }
+
     @GET
     @Path("/count")
     public int count() {

diff --git a/integration-tests/main/src/main/resources/application.properties b/integration-tests/main/src/main/resources/application.properties
@@ -22,6 +22,7 @@ quarkus.resteasy.gzip.enabled=true
 quarkus.resteasy.gzip.max-input=10
 quarkus.http.limits.max-body-size=1K
 web-message=A message
+names=quarkus,redhat
 schedulerservice.cron.expr=0/10 * * * * ?
 
 microprofile.custom.value = 456

diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java
@@ -36,6 +36,11 @@ public void testConfigInjectionOfMessage() {
         RestAssured.when().get("/test/config/message").then().body(is("A message"));
     }
 
+    @Test
+    public void testConfigInjectionOfStringArray() {
+        RestAssured.when().get("/test/config/names").then().body(is("quarkus,redhat"));
+    }
+
     @Test
     public void testAnnotatedInterface() {
         RestAssured.when().get("/interface").then().body(is("interface endpoint"));