import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Iterator;
-import java.util.Map.Entry;
import java.util.Optional;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.ModifyAction;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
public final class ImmutableNodes {
+ // FIXME: YANGTOOLS-1074: we do not want this name
private static final NodeIdentifier SCHEMACONTEXT_NAME = NodeIdentifier.create(SchemaContext.NAME);
private ImmutableNodes() {
- throw new UnsupportedOperationException("Utilities class should not be instantiated");
+ // Hidden on purpose
}
public static @NonNull CollectionNodeBuilder<MapEntryNode, MapNode> mapNodeBuilder() {
* @return Leaf node with supplied identifier and value
*/
public static <T> @NonNull LeafNode<T> leafNode(final NodeIdentifier name, final T value) {
- return ImmutableLeafNodeBuilder.<T>create()
- .withNodeIdentifier(name)
- .withValue(value)
- .build();
+ return ImmutableLeafNodeBuilder.createNode(name, value);
}
/**
public static @NonNull DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryBuilder(
final QName nodeName, final QName keyName, final Object keyValue) {
return ImmutableMapEntryNodeBuilder.create()
- .withNodeIdentifier(new NodeIdentifierWithPredicates(nodeName, keyName, keyValue))
+ .withNodeIdentifier(NodeIdentifierWithPredicates.of(nodeName, keyName, keyValue))
.withChild(leafNode(keyName, keyValue));
}
*/
public static @NonNull NormalizedNode<?, ?> fromInstanceId(final SchemaContext ctx,
final YangInstanceIdentifier id) {
- return fromInstanceId(ctx, id, Optional.empty(), Optional.empty());
+ return fromInstanceId(ctx, id, Optional.empty());
}
/**
*/
public static @NonNull NormalizedNode<?, ?> fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id,
final NormalizedNode<?, ?> deepestElement) {
- return fromInstanceId(ctx, id, Optional.of(deepestElement), Optional.empty());
+ return fromInstanceId(ctx, id, Optional.of(deepestElement));
}
/**
* @param id instance identifier to convert to node structure starting from root
* @param deepestElement pre-built deepest child that will be inserted at the last path argument of provided
* instance identifier
- * @param operation modify operation attribute to be added to the deepest child. QName is the operation attribute
- * key and ModifyAction is the value.
* @return serialized normalized node for provided instance Id with (optionally) overridden last child
* and (optionally) marked with specific operation attribute.
*/
public static @NonNull NormalizedNode<?, ?> fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id,
- final Optional<NormalizedNode<?, ?>> deepestElement, final Optional<Entry<QName, ModifyAction>> operation) {
+ final Optional<NormalizedNode<?, ?>> deepestElement) {
final PathArgument topLevelElement;
final InstanceIdToNodes<?> instanceIdToNodes;
final Iterator<PathArgument> it = id.getPathArguments().iterator();
if (it.hasNext()) {
topLevelElement = it.next();
- final DataSchemaNode dataChildByName = ctx.getDataChildByName(topLevelElement.getNodeType());
+ final DataSchemaNode dataChildByName = ctx.dataChildByName(topLevelElement.getNodeType());
checkNotNull(dataChildByName,
"Cannot find %s node in schema context. Instance identifier has to start from root", topLevelElement);
instanceIdToNodes = InstanceIdToNodes.fromSchemaAndQNameChecked(ctx, topLevelElement.getNodeType());
instanceIdToNodes = InstanceIdToNodes.fromDataSchemaNode(ctx);
}
- return instanceIdToNodes.create(topLevelElement, it, deepestElement, operation);
+ return instanceIdToNodes.create(topLevelElement, it, deepestElement);
}
}