BUG-1092: adjust to YangInstanceIdentifier

[controller.git] / opendaylight / md-sal / sal-protocolbuffer-encoding / src / main / java / org / opendaylight / controller / cluster / datastore / node / NormalizedNodeToNodeCodec.java

diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java
index 8a940af8bcbb60ba812385537cdc0f43dcf69df0..aca94359b7d44ca14fca2f733abea72d828e3c1a 100644 (file)
--- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java
+++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java
@@ -3,7 +3,7 @@ package org.opendaylight.controller.cluster.datastore.node;
 import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
 import org.opendaylight.controller.cluster.datastore.node.utils.PathUtils;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.slf4j.Logger;
@@ -18,7 +18,7 @@ public class NormalizedNodeToNodeCodec {
 
     }
 
-    public NormalizedNodeMessages.Container encode(InstanceIdentifier id, NormalizedNode node){
+    public NormalizedNodeMessages.Container encode(YangInstanceIdentifier id, NormalizedNode node){
         String parentPath = "";
 
         if(id != null){
@@ -34,10 +34,10 @@ public class NormalizedNodeToNodeCodec {
 
     }
 
-    public NormalizedNode<?,?> decode(InstanceIdentifier id, NormalizedNodeMessages.Node node){
+    public NormalizedNode<?,?> decode(YangInstanceIdentifier id, NormalizedNodeMessages.Node node){
             NodeToNormalizedNodeBuilder currentOp = NodeToNormalizedNodeBuilder.from(ctx);
 
-            for(InstanceIdentifier.PathArgument pathArgument : id.getPath()){
+            for(YangInstanceIdentifier.PathArgument pathArgument : id.getPath()){
                 currentOp = currentOp.getChild(pathArgument);
             }
 
@@ -46,8 +46,8 @@ public class NormalizedNodeToNodeCodec {
             if(id.getPath().size() < 1){
                 nodeType = null;
             } else {
-                final InstanceIdentifier.PathArgument pathArgument = id.getPath().get(id.getPath().size() - 1);
-                if(pathArgument instanceof InstanceIdentifier.AugmentationIdentifier){
+                final YangInstanceIdentifier.PathArgument pathArgument = id.getPath().get(id.getPath().size() - 1);
+                if(pathArgument instanceof YangInstanceIdentifier.AugmentationIdentifier){
                     nodeType = null;
                 } else {
                     nodeType = pathArgument.getNodeType();