Remove Augmentation{Identifier,Node}

[yangtools.git] / data / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / schema / NormalizedNodes.java

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java
index f54d353f7f0561e74d3e0a60d6c2b245afedd94e..82b26112621548615c4772b18afc947fb13f2d9e 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java
@@ -13,13 +13,11 @@ import com.google.common.annotations.Beta;
 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;
@@ -50,17 +48,16 @@ public final class NormalizedNodes {
 
     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;
     }
@@ -104,12 +101,12 @@ public final class NormalizedNodes {
     @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);
+        if (node instanceof DataContainerNode dataContainer) {
+            return (Optional) dataContainer.findChildByArg(pathArg);
+        } else if (node instanceof MapNode map && pathArg instanceof NodeIdentifierWithPredicates nip) {
+            return (Optional) map.findChildByArg(nip);
+        } else if (node instanceof LeafSetNode<?> leafSet && pathArg instanceof NodeWithValue<?> nwv) {
+            return (Optional) leafSet.findChildByArg(nwv);
         }
         // Anything else, including ValueNode
         return Optional.empty();
@@ -130,9 +127,9 @@ public final class NormalizedNodes {
     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) {
+        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('}');
@@ -143,12 +140,9 @@ public final class NormalizedNodes {
     }
 
     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());
         }
     }
 }