Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Register CDI Bean when ConfigMapping is marked as Unremovable #30960

Merged
merged 1 commit into from
Feb 8, 2023
Merged

Register CDI Bean when ConfigMapping is marked as Unremovable #30960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -309,6 +318,7 @@ void registerConfigMappingsBean(
}
}

// Generate the mappings beans
for (ConfigClassBuildItem configClass : configMappings) {
BeanConfigurator<Object> bean = beanRegistration.getContext()
.configure(configClass.getConfigClass())
Expand Down
14 changes: 14 additions & 0 deletions ...s/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand All @@ -54,4 +62,10 @@ public interface ExtendsBase extends Base {
@WithDefault("default")
String myProp();
}

@Unremovable
@ConfigProperties(prefix = "mapping")
public static class UnremovedConfigProperties {
String prop;
}
}