Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package io.quarkus.arc.deployment;

import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.mapping;
import static java.util.stream.Collectors.toSet;

import java.util.List;
import java.util.stream.Collectors;
import java.util.Map;
import java.util.Set;

import javax.inject.Inject;

Expand Down Expand Up @@ -142,9 +146,11 @@ public void transform(TransformationContext transformationContext) {
void validateConfigProperties(ConfigDeploymentTemplate template, List<ConfigPropertyBuildItem> configProperties,
BeanContainerBuildItem beanContainer) {
// IMPL NOTE: we do depend on BeanContainerBuildItem to make sure that the BeanDeploymentValidator finished its processing
template.validateConfigProperties(
configProperties.stream().collect(
Collectors.toMap(ConfigPropertyBuildItem::getPropertyName, ConfigPropertyBuildItem::getPropertyType)));

Map<String, Set<Class<?>>> propNamesToClasses = configProperties.stream().collect(
groupingBy(ConfigPropertyBuildItem::getPropertyName,
mapping(ConfigPropertyBuildItem::getPropertyType, toSet())));
template.validateConfigProperties(propNamesToClasses);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;

import javax.enterprise.inject.spi.DeploymentException;

Expand All @@ -33,16 +34,19 @@
@Template
public class ConfigDeploymentTemplate {

public void validateConfigProperties(Map<String, Class<?>> properties) {
public void validateConfigProperties(Map<String, Set<Class<?>>> properties) {
Config config = ConfigProvider.getConfig();
for (Entry<String, Class<?>> entry : properties.entrySet()) {
Class<?> propertyType = entry.getValue();
// Copy SmallRye logic - for collections, we only check if the property config exists without trying to convert it
if (Collection.class.isAssignableFrom(propertyType)) {
propertyType = String.class;
}
if (!config.getOptionalValue(entry.getKey(), propertyType).isPresent()) {
throw new DeploymentException("No config value of type " + entry.getValue() + " exists for: " + entry.getKey());
for (Entry<String, Set<Class<?>>> entry : properties.entrySet()) {
Set<Class<?>> propertyTypes = entry.getValue();
for (Class<?> propertyType : propertyTypes) {
// Copy SmallRye logic - for collections, we only check if the property config exists without trying to convert it
if (Collection.class.isAssignableFrom(propertyType)) {
propertyType = String.class;
}
if (!config.getOptionalValue(entry.getKey(), propertyType).isPresent()) {
throw new DeploymentException(
"No config value of type " + entry.getValue() + " exists for: " + entry.getKey());
}
}
}
}
Expand Down