Fix for issue helidon-io#1070. Use a set instead of a list to collect injection point configuration to avoid adding duplicate producers for inherited fields. (helidon-io#1074)

Signed-off-by: Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com>

Author: spericas

microprofile/config/config-cdi/src/main/java/io/helidon/microprofile/config/cdi/ConfigCdiExtension.java

@@ -29,6 +29,7 @@
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -85,7 +86,7 @@ public class ConfigCdiExtension implements Extension {
     private static final Logger LOGGER = Logger.getLogger(ConfigCdiExtension.class.getName());
     private static final Logger VALUE_LOGGER = Logger.getLogger(ConfigCdiExtension.class.getName() + ".VALUES");
 
-    private final List<IpConfig> ipConfigs = new LinkedList<>();
+    private final Set<IpConfig> ipConfigs = new HashSet<>();
 
     /**
      * Constructor invoked by CDI container.
@@ -380,6 +381,19 @@ private IpConfig(ConfigQualifier qualifier, Type type) {
             this.qualifier = qualifier;
             this.type = type;
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            IpConfig ipConfig = (IpConfig) o;
+            return Objects.equals(qualifier, ipConfig.qualifier) && Objects.equals(type, ipConfig.type);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(qualifier, type);
+        }
     }
 
     /**

microprofile/config/config-cdi/src/test/java/io/helidon/microprofile/config/cdi/MpConfigInjectionTest.java

@@ -20,20 +20,25 @@
 import javax.enterprise.inject.se.SeContainer;
 import javax.enterprise.inject.se.SeContainerInitializer;
 import javax.enterprise.inject.spi.CDI;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 import io.helidon.config.test.infra.RestoreSystemPropertiesExt;
 import io.helidon.microprofile.config.Converters.Ctor;
 import io.helidon.microprofile.config.Converters.Of;
 import io.helidon.microprofile.config.Converters.Parse;
 import io.helidon.microprofile.config.Converters.ValueOf;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -81,6 +86,21 @@ public void testImplicitConversion() {
         );
     }
 
+    @Test
+    public void testImplicitConversionSubclass() {
+
+        Bean bean = CDI.current().select(SubBean.class,
+                new AnnotationLiteral<Specific>() {
+                }).get();
+
+        assertAll("Implicit conversion injection",
+                () -> assertThat("of", bean.of, is(Of.of("of"))),
+                () -> assertThat("valueOf", bean.valueOf, is(ValueOf.valueOf("valueOf"))),
+                () -> assertThat("parse", bean.parse, is(Parse.parse("parse"))),
+                () -> assertThat("ctor", bean.ctor, is(new Ctor("ctor")))
+        );
+    }
+
     @Dependent
     public static class Bean {
 
@@ -100,4 +120,15 @@ public static class Bean {
         @ConfigProperty(name = "inject.ctor")
         public Ctor ctor;
     }
+
+    @Qualifier
+    @Retention(RUNTIME)
+    @Target(TYPE)
+    public @interface Specific {
+    }
+
+    @Dependent
+    @Specific
+    public static class SubBean extends Bean {
+    }
 }