Merge pull request #30960 from radcortez/fix-29631

Register CDI Bean when ConfigMapping is marked as Unremovable
quarkusio · Feb 8, 2023 · af74ebb · af74ebb
2 parents 6782256 + f153119
commit af74ebb
Show file tree

Hide file tree

Showing 2 changed files with 25 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
@@ -299,8 +299,17 @@ void registerConfigMappingsBean(
             return;
         }
 
-        Map<Type, ConfigClassBuildItem> configMappingTypes = configClassesToTypesMap(configClasses, MAPPING);
         Set<ConfigClassBuildItem> configMappings = new HashSet<>();
+
+        // Add beans for all unremovable mappings
+        for (ConfigClassBuildItem configClass : configClasses) {
+            if (configClass.getConfigClass().isAnnotationPresent(Unremovable.class)) {
+                configMappings.add(configClass);
+            }
+        }
+
+        // Add beans for all injection points
+        Map<Type, ConfigClassBuildItem> configMappingTypes = configClassesToTypesMap(configClasses, MAPPING);
         for (InjectionPointInfo injectionPoint : beanRegistration.getInjectionPoints()) {
             Type type = Type.create(injectionPoint.getRequiredType().name(), Type.Kind.CLASS);
             ConfigClassBuildItem configClass = configMappingTypes.get(type);
@@ -309,6 +318,7 @@ void registerConfigMappingsBean(
             }
         }
 
+        // Generate the mappings beans
         for (ConfigClassBuildItem configClass : configMappings) {
             BeanConfigurator<Object> bean = beanRegistration.getContext()
                     .configure(configClass.getConfigClass())

diff --git a/...s/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java b/...s/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java
@@ -3,8 +3,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import jakarta.enterprise.inject.spi.CDI;
 import jakarta.inject.Inject;
 
+import org.eclipse.microprofile.config.inject.ConfigProperties;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -29,6 +31,12 @@ public class UnremovedConfigMappingTest {
     void unremoved() {
         UnremovedConfigMapping mapping = config.getConfigMapping(UnremovedConfigMapping.class);
         assertEquals("1234", mapping.prop());
+
+        mapping = CDI.current().select(UnremovedConfigMapping.class).get();
+        assertEquals("1234", mapping.prop());
+
+        UnremovedConfigProperties properties = CDI.current().select(UnremovedConfigProperties.class).get();
+        assertEquals("1234", properties.prop);
     }
 
     @Test
@@ -54,4 +62,10 @@ public interface ExtendsBase extends Base {
         @WithDefault("default")
         String myProp();
     }
+
+    @Unremovable
+    @ConfigProperties(prefix = "mapping")
+    public static class UnremovedConfigProperties {
+        String prop;
+    }
 }