import java.util.Map;
import java.util.Map.Entry;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.yangtools.util.ImmutableMapTemplate;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
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.api.DataContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataNodeContainerValidator;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataValidationException.IllegalListKeyException;
import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
}
@Override
- public DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> withChild(
- final DataContainerChild<?, ?> child) {
+ public DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> withChild(
+ final DataContainerChild child) {
validator.validateChild(child.getIdentifier());
return super.withChild(child);
}
return super.build();
}
- public static @NonNull DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> create(
+ public static @NonNull DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> create(
final ListSchemaNode schema) {
return new ImmutableMapEntryNodeSchemaAwareBuilder(schema);
}
} else {
predicates = ImmutableMap.of();
}
- return new NodeIdentifierWithPredicates(schema.getQName(), predicates);
+ return NodeIdentifierWithPredicates.of(schema.getQName(), predicates);
}
private Map<QName, Object> childrenToPredicates() {
final Object[] values = new Object[childrenQNamesToPaths.size()];
int offset = 0;
for (Entry<QName, PathArgument> entry : childrenQNamesToPaths.entrySet()) {
- values[offset++] = nonnullKeyValue(entry.getKey(), getChild(entry.getValue())).getValue();
+ values[offset++] = nonnullKeyValue(entry.getKey(), getChild(entry.getValue())).body();
}
return ImmutableMapTemplate.ordered(childrenQNamesToPaths.keySet()).instantiateWithValues(values);
}
final Object[] values = new Object[keys.size()];
int offset = 0;
for (QName key : keys) {
- values[offset++] = nonnullKeyValue(key, getChild(childrenQNamesToPaths.get(key))).getValue();
+ values[offset++] = nonnullKeyValue(key, getChild(childrenQNamesToPaths.get(key))).body();
}
return ImmutableMapTemplate.ordered(keys).instantiateWithValues(values);
}
- private DataContainerChild<?, ?> nonnullKeyValue(final QName key, final DataContainerChild<?, ?> value) {
+ private DataContainerChild nonnullKeyValue(final QName key, final @Nullable DataContainerChild value) {
if (value != null) {
return value;
}