From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 15 Oct 2021 18:31:06 +0000 (+0200)
Subject: Remove getOriginalIfPossible()
X-Git-Tag: v8.0.6~25
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b9580d1a52021f8b77907c3068c6910a69a04178;hp=23fefaa6f0341c29b057a6fbc8d4041ffb19d0a5;p=mdsal.git

Remove getOriginalIfPossible()

We already have originalNodeOf(), which does precisely the same thing
as we just transplanted.

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

diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java
index 0cf67bc68f..cbbeda4110 100644
--- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java
+++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java
@@ -126,18 +126,14 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon
 
     private static @Nullable SchemaNode getRootOriginalIfPossible(final SchemaNode data) {
         SchemaNode previous = null;
-        SchemaNode next = getOriginalIfPossible(data);
+        SchemaNode next = originalNodeOf(data);
         while (next != null) {
             previous = next;
-            next = getOriginalIfPossible(next);
+            next = originalNodeOf(next);
         }
         return previous;
     }
 
-    private static @Nullable SchemaNode getOriginalIfPossible(final SchemaNode node) {
-        return node instanceof DerivableSchemaNode ? ((DerivableSchemaNode) node).getOriginal().orElse(null) : null;
-    }
-
     @Override
     public final ActionDefinition getActionDefinition(final Class<? extends Action<?, ?, ?>> cls) {
         return (ActionDefinition) getTypes().findSchema(Type.of(cls)).orElse(null);