Merge pull request #13524 from geoand/#13523

Ensure that primitive types in @ConfigProperties work as expected
quarkusio · Nov 27, 2020 · 088570f · 088570f
2 parents 1a43dbe + 12e8fcc
commit 088570f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...t/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java b/...t/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java
@@ -420,8 +420,10 @@ private static void populateTypicalProperty(MethodCreator methodCreator, ResultH
             createWriteValue(methodCreator, configObject, field, setter, useFieldAccess, setterValue);
 
         }
-        configPropertyBuildItemCandidates
-                .add(new ConfigPropertyBuildItemCandidate(field.name(), fullConfigName, fieldType));
+        if (field.type().kind() != Type.Kind.PRIMITIVE) { // the JVM assigns primitive types a default even though it doesn't show up in the bytecode
+            configPropertyBuildItemCandidates
+                    .add(new ConfigPropertyBuildItemCandidate(field.name(), fullConfigName, fieldType));
+        }
     }
 
     private static String getFullConfigName(String prefixStr, ConfigProperties.NamingStrategy namingStrategy, FieldInfo field) {

diff --git a/...va/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java b/...va/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java
@@ -40,6 +40,7 @@ public void testConfiguredValues() {
         assertEquals(Arrays.asList(1, 2, 3, 4), dummyBean.getNumbers());
         assertEquals("default", dummyBean.getUnset());
         assertTrue(dummyBean.isBoolWithDefault());
+        assertFalse(dummyBean.isUnsetBoolean());
         assertTrue(dummyBean.getOptionalInt().isPresent());
         assertEquals(100, dummyBean.getOptionalInt().get());
         assertFalse(dummyBean.getOptionalString().isPresent());
@@ -69,6 +70,10 @@ boolean isBoolWithDefault() {
             return dummyProperties.boolWithDefault;
         }
 
+        boolean isUnsetBoolean() {
+            return dummyProperties.unsetBoolean;
+        }
+
         Optional<Integer> getOptionalInt() {
             return dummyProperties.optionalInt;
         }
@@ -92,6 +97,7 @@ public static class DummyProperties {
         public String name;
         public String unset = "default";
         public boolean boolWithDefault = false;
+        public boolean unsetBoolean;
         public List<Integer> numbers;
         public Optional<Integer> optionalInt;
         public Optional<String> optionalString;