Fix native regressions in Config validation

Fixes: quarkusio#18814 (cherry picked from commit c85b802)
gsmet · Jul 21, 2021 · abb2e13 · abb2e13
1 parent 262e53d
commit abb2e13
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 0 deletions.
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
@@ -192,6 +192,9 @@ void validateConfigProperties(ConfigRecorder recorder, List<ConfigPropertyBuildI
                 actualTypeArgumentNames = new ArrayList<>(argumentTypes.size());
                 for (Type argumentType : argumentTypes) {
                     actualTypeArgumentNames.add(argumentType.name().toString());
+                    if (argumentType.kind() != Kind.PRIMITIVE) {
+                        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, argumentType.name().toString()));
+                    }
                 }
 
             }

diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java
@@ -69,6 +69,10 @@ interface Form {
 
         @JsonProperty
         Optional<String> cookie();
+
+        @JsonProperty
+        @WithDefault("1")
+        List<Integer> positions();
     }
 
     interface Proxy {

diff --git a/...ion-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java b/...ion-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java
@@ -1,5 +1,7 @@
 package io.quarkus.it.smallrye.config;
 
+import java.util.List;
+
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.json.Json;
@@ -28,6 +30,9 @@ public class ServerResource {
     @Inject
     @ConfigProperty(name = "server.info.message")
     Instance<String> message;
+    @Inject
+    @ConfigProperty(name = "http.server.form.positions")
+    List<Integer> positions;
 
     @GET
     public Response getServer() {
@@ -65,4 +70,10 @@ public Response validator() {
     public String info() {
         return message.get();
     }
+
+    @GET
+    @Path("/positions")
+    public List<Integer> positions() {
+        return positions;
+    }
 }
diff --git a/integration-tests/smallrye-config/src/main/resources/application.yaml b/integration-tests/smallrye-config/src/main/resources/application.yaml
@@ -11,6 +11,9 @@ http:
       login-page: login.html
       error-page: error.html
       landing-page: index.html
+      positions:
+        - 10
+        - 20
 
     ssl:
       port: 8443

diff --git a/...tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java b/...tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java
@@ -43,6 +43,7 @@ void mapping() {
                 .body("form.form.loginPage", equalTo("login.html"))
                 .body("form.form.errorPage", equalTo("error.html"))
                 .body("form.form.landingPage", equalTo("index.html"))
+                .body("form.form.positions.size()", equalTo(2))
                 .body("ssl.port", equalTo(8443))
                 .body("ssl.certificate", equalTo("certificate"))
                 .body("cors.methods[0]", equalTo("GET"))
@@ -68,6 +69,15 @@ void properties() {
                 .body("port", equalTo(8080));
     }
 
+    @Test
+    void positions() {
+        given()
+                .get("/server/positions")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body(equalTo("[10,20]"));
+    }
+
     @Test
     void info() {
         given()