From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 23 Apr 2022 13:10:15 +0000 (+0200)
Subject: Remove NormalizedNodes.findNode(NormalizedNode, SchemaPath)
X-Git-Tag: v9.0.0~124
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=accb596f97bc127839c8e1e4da235574cbea626d

Remove NormalizedNodes.findNode(NormalizedNode, SchemaPath)

This method has been deprecated more than two years ago, remove it.

Change-Id: Ibf2ca6fef7b7353e3cdd5be99f739bac954f43f3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

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 41463fe574..f54d353f7f 100644
--- 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
@@ -7,11 +7,10 @@
  */
 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;
@@ -25,7 +24,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
 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;
 
 /**
@@ -87,22 +85,9 @@ public final class NormalizedNodes {
         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,