*/
package org.opendaylight.yangtools.yang.data.api.schema;
-import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import com.google.common.annotations.Beta;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant;
/**
public static Optional<NormalizedNode> findNode(final YangInstanceIdentifier rootPath,
final NormalizedNode rootNode, final YangInstanceIdentifier childPath) {
- final Optional<YangInstanceIdentifier> relativePath = childPath.relativeTo(rootPath);
- return relativePath.isPresent() ? findNode(rootNode, relativePath.get()) : Optional.empty();
+ final var relativePath = childPath.relativeTo(rootPath);
+ return relativePath.isPresent() ? findNode(rootNode, relativePath.orElseThrow()) : Optional.empty();
}
public static Optional<NormalizedNode> findNode(final Optional<NormalizedNode> parent,
final Iterable<PathArgument> relativePath) {
- final Iterator<PathArgument> pathIterator = requireNonNull(relativePath, "Relative path must not be null")
- .iterator();
- Optional<NormalizedNode> currentNode = requireNonNull(parent, "Parent must not be null");
+ final var pathIterator = requireNonNull(relativePath, "Relative path must not be null").iterator();
+ var currentNode = requireNonNull(parent, "Parent must not be null");
while (currentNode.isPresent() && pathIterator.hasNext()) {
- currentNode = getDirectChild(currentNode.get(), pathIterator.next());
+ currentNode = getDirectChild(currentNode.orElseThrow(), pathIterator.next());
}
return currentNode;
}
return findNode(Optional.ofNullable(parent), relativePath);
}
- /**
- * Lookup a node based on relative SchemaPath.
- *
- * @deprecated Use {@link #findNode(NormalizedNode, Descendant)} instead.
- */
- @Deprecated(forRemoval = true)
- public static Optional<NormalizedNode> findNode(final NormalizedNode parent,
- final SchemaPath relativePath) {
- checkArgument(!relativePath.isAbsolute(), "%s is not a relative path", relativePath);
- return findNode(Optional.ofNullable(parent), Iterables.transform(relativePath.getPathFromRoot(),
- NodeIdentifier::new));
- }
-
public static Optional<NormalizedNode> findNode(final NormalizedNode parent, final Descendant path) {
return findNode(Optional.ofNullable(parent),
- Iterables.transform(path.getNodeIdentifiers(), NodeIdentifier::new));
+ Lists.transform(path.getNodeIdentifiers(), NodeIdentifier::new));
}
public static Optional<NormalizedNode> findNode(final NormalizedNode parent,
requireNonNull(path, "Path must not be null").getPathArguments());
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
public static Optional<NormalizedNode> getDirectChild(final NormalizedNode node,
final PathArgument pathArg) {
- if (node instanceof DataContainerNode) {
- return (Optional) ((DataContainerNode) node).findChildByArg(pathArg);
- } else if (node instanceof MapNode && pathArg instanceof NodeIdentifierWithPredicates) {
- return (Optional) ((MapNode) node).findChildByArg((NodeIdentifierWithPredicates) pathArg);
- } else if (node instanceof LeafSetNode && pathArg instanceof NodeWithValue) {
- return (Optional) ((LeafSetNode<?>) node).findChildByArg((NodeWithValue<?>) pathArg);
+ final NormalizedNode child;
+ if (node instanceof DataContainerNode dataContainer && pathArg instanceof NodeIdentifier nid) {
+ child = dataContainer.childByArg(nid);
+ } else if (node instanceof MapNode map && pathArg instanceof NodeIdentifierWithPredicates nip) {
+ child = map.childByArg(nip);
+ } else if (node instanceof LeafSetNode<?> leafSet && pathArg instanceof NodeWithValue<?> nwv) {
+ child = leafSet.childByArg(nwv);
+ } else {
+ // Anything else, including ValueNode
+ child = null;
}
- // Anything else, including ValueNode
- return Optional.empty();
+ return Optional.ofNullable(child);
}
/**
private static void toStringTree(final StringBuilder sb, final NormalizedNode node, final int offset) {
final String prefix = " ".repeat(offset);
- appendPathArgument(sb.append(prefix), node.getIdentifier());
- if (node instanceof NormalizedNodeContainer) {
+ appendPathArgument(sb.append(prefix), node.name());
+ if (node instanceof NormalizedNodeContainer<?> container) {
sb.append(" {\n");
- for (NormalizedNode child : ((NormalizedNodeContainer<?>) node).body()) {
+ for (var child : container.body()) {
toStringTree(sb, child, offset + STRINGTREE_INDENT);
}
sb.append(prefix).append('}');
}
private static void appendPathArgument(final StringBuilder sb, final PathArgument arg) {
- if (arg instanceof NodeIdentifierWithPredicates) {
- sb.append(arg.getNodeType().getLocalName()).append(((NodeIdentifierWithPredicates) arg).values());
- } else if (arg instanceof AugmentationIdentifier) {
- sb.append("augmentation");
- } else {
- sb.append(arg.getNodeType().getLocalName());
+ sb.append(arg.getNodeType().getLocalName());
+ if (arg instanceof NodeIdentifierWithPredicates nip) {
+ sb.append(nip.values());
}
}
}
Code Review / yangtools.git / blobdiff