From da806477aeff64b035d8258f4c9156142a715d3d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 11 Apr 2020 03:58:56 +0200
Subject: [PATCH] Remove
 BindingToNormalizedNodeCodec.instanceIdentifierToNode()

This method has a single in-package user, move it to centralize
logic and reduce codec clutter.

Change-Id: If234858384de767c71971c1a310cf45cb59f428c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../dom/adapter/BindingDOMWriteTransactionAdapter.java   | 4 +++-
 .../dom/adapter/BindingToNormalizedNodeCodec.java        | 9 ++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMWriteTransactionAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMWriteTransactionAdapter.java
index f7f079b5c2..8f1e639436 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMWriteTransactionAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMWriteTransactionAdapter.java
@@ -19,6 +19,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 
 class BindingDOMWriteTransactionAdapter<T extends DOMDataTreeWriteTransaction> extends AbstractForwardedTransaction<T>
         implements WriteTransaction {
@@ -87,7 +88,8 @@ class BindingDOMWriteTransactionAdapter<T extends DOMDataTreeWriteTransaction> e
             final InstanceIdentifier<?> path) {
         final YangInstanceIdentifier parentPath = domPath.getParent();
         if (parentPath != null && !parentPath.isEmpty()) {
-            final NormalizedNode<?, ?> parentNode = getCodec().instanceIdentifierToNode(parentPath);
+            final NormalizedNode<?, ?> parentNode = ImmutableNodes.fromInstanceId(
+                getCodec().runtimeContext().getSchemaContext(), parentPath);
             getDelegate().merge(store, YangInstanceIdentifier.create(parentNode.getIdentifier()), parentNode);
         }
     }
diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
index 49cee98b28..fcdb37eff6 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
@@ -62,7 +62,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
@@ -359,13 +358,13 @@ public class BindingToNormalizedNodeCodec implements BindingNormalizedNodeSerial
         return new SimpleEntry<>(bindingPath, codecContext);
     }
 
-    SchemaPath getActionPath(final Class<? extends Action<?, ?, ?>> type) {
+    final SchemaPath getActionPath(final Class<? extends Action<?, ?, ?>> type) {
         final ActionDefinition schema = runtimeContext().getActionDefinition(type);
         checkArgument(schema != null, "Failed to find schema for %s", type);
         return schema.getPath();
     }
 
-    private BindingRuntimeContext runtimeContext() {
+    final BindingRuntimeContext runtimeContext() {
         return futureSchema.runtimeContext();
     }
 
@@ -373,10 +372,6 @@ public class BindingToNormalizedNodeCodec implements BindingNormalizedNodeSerial
         return ImmutableSet.copyOf(Iterators.transform(path.getPathArguments().iterator(), PathArgument::getType));
     }
 
-    protected NormalizedNode<?, ?> instanceIdentifierToNode(final YangInstanceIdentifier parentPath) {
-        return ImmutableNodes.fromInstanceId(runtimeContext().getSchemaContext(), parentPath);
-    }
-
     protected Collection<DOMDataTreeIdentifier> toDOMDataTreeIdentifiers(
             final Collection<DataTreeIdentifier<?>> subtrees) {
         return subtrees.stream().map(this::toDOMDataTreeIdentifier).collect(Collectors.toSet());
-- 
2.36.6