import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataNodeContainerValidator;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataValidationException;
import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
import com.google.common.base.Preconditions;
private InstanceIdentifier.NodeIdentifierWithPredicates constructNodeIdentifier() {
Collection<QName> keys = schema.getKeyDefinition();
- // If no keys defined, add all child elements as key
- // FIXME should be all PRESENT child nodes, not all from schema
if(keys.isEmpty()) {
keys = childrenQNamesToPaths.keySet();
}
final Map<QName, Object> keysToValues = Maps.newHashMap();
- for (final QName key : keys) {
- // TODO two maps ? find better solution
- final DataContainerChild<?, ?> valueForKey = getChild(childrenQNamesToPaths.get(key));
- Preconditions.checkState(valueForKey != null, "Key value: %s cannot be empty for: %s", key, schema.getQName());
+ for (QName key : keys) {
+ final DataContainerChild<?, ?> valueForKey = getChild(childrenQNamesToPaths.get(key));
+ DataValidationException.checkListKey(valueForKey, key, new InstanceIdentifier.NodeIdentifierWithPredicates(
+ schema.getQName(), keysToValues));
keysToValues.put(key, valueForKey.getValue());
}
-
return new InstanceIdentifier.NodeIdentifierWithPredicates(schema.getQName(), keysToValues);
}