Support @WithConverter in the Collection type (#948)

smallrye · Jun 16, 2023 · 936699c · 936699c
1 parent dbc3675
commit 936699c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/implementation/src/main/java/io/smallrye/config/ConfigMappingInterface.java b/implementation/src/main/java/io/smallrye/config/ConfigMappingInterface.java
@@ -822,8 +822,12 @@ private static Property getPropertyDef(Method method, AnnotatedType type) {
                     return new CollectionProperty(rawType, new GroupProperty(method, propertyName, configurationInterface));
                 }
 
+                Class<? extends Converter<?>> converter = getConverter(elementType, method);
+                if (converter != null) {
+                    convertWith = converter;
+                }
                 return new CollectionProperty(rawType,
-                        new LeafProperty(method, propertyName, elementType.getType(), null, getDefaultValue(method)));
+                        new LeafProperty(method, propertyName, elementType.getType(), convertWith, getDefaultValue(method)));
             }
             ConfigMappingInterface configurationInterface = getConfigurationInterface(rawType);
             if (configurationInterface != null) {
@@ -835,9 +839,13 @@ private static Property getPropertyDef(Method method, AnnotatedType type) {
 
         String defaultValue = getDefaultValue(method);
         if (rawType == List.class || rawType == Set.class) {
-            Type elementType = typeOfParameter(type.getType(), 0);
+            AnnotatedType elementType = typeOfParameter(type, 0);
+            Class<? extends Converter<?>> converter = getConverter(elementType, method);
+            if (converter != null) {
+                convertWith = converter;
+            }
             return new CollectionProperty(rawType,
-                    new LeafProperty(method, propertyName, elementType, convertWith, defaultValue));
+                    new LeafProperty(method, propertyName, elementType.getType(), convertWith, defaultValue));
         } else if (rawType == Optional.class) {
             return new OptionalProperty(method, propertyName,
                     new LeafProperty(method, propertyName, type.getType(), convertWith, defaultValue));

diff --git a/implementation/src/test/java/io/smallrye/config/ConfigMappingInterfaceTest.java b/implementation/src/test/java/io/smallrye/config/ConfigMappingInterfaceTest.java
@@ -2252,4 +2252,38 @@ interface EmptyDefault {
         @WithDefault("")
         String empty();
     }
+
+    @Test
+    void withConverterListElement() {
+        SmallRyeConfig config = new SmallRyeConfigBuilder()
+                .addDefaultInterceptors()
+                .withMapping(WithConverterListElement.class)
+                .withSources(config(
+                        "converter.list", "one, two",
+                        "converter.elements", "one, two"))
+                .build();
+
+        WithConverterListElement mapping = config.getConfigMapping(WithConverterListElement.class);
+
+        assertTrue(mapping.list().isPresent());
+        assertEquals("one", mapping.list().get().get(0));
+        assertEquals("two", mapping.list().get().get(1));
+        assertTrue(mapping.elements().isPresent());
+        assertEquals("one", mapping.elements().get().get(0));
+        assertEquals("two", mapping.elements().get().get(1));
+    }
+
+    @ConfigMapping(prefix = "converter")
+    interface WithConverterListElement {
+        Optional<@WithConverter(TrimConverter.class) List<String>> list();
+
+        Optional<List<@WithConverter(TrimConverter.class) String>> elements();
+    }
+
+    public static class TrimConverter implements Converter<String> {
+        @Override
+        public String convert(final String value) throws IllegalArgumentException, NullPointerException {
+            return value.trim();
+        }
+    }
 }