Serialization/Deserialization and a host of other fixes

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / messages / ReadDataReply.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java
index a8926be77979e19882c84be8a1a5fd8fd4ac1ea2..c5498ca228b3f846b5fd528b2da4dd2a4afef7a2 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java
@@ -10,11 +10,12 @@ package org.opendaylight.controller.cluster.datastore.messages;
 
 import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec;
 import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
-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;
 
 public class ReadDataReply implements SerializableMessage{
+
   private final NormalizedNode<?, ?> normalizedNode;
   private final SchemaContext schemaContext;
   public static final Class SERIALIZABLE_CLASS = ShardTransactionMessages.ReadDataReply.class;
@@ -32,7 +33,7 @@ public class ReadDataReply implements SerializableMessage{
     if(normalizedNode != null) {
       return ShardTransactionMessages.ReadDataReply.newBuilder()
           .setNormalizedNode(new NormalizedNodeToNodeCodec(schemaContext)
-                  .encode(InstanceIdentifier.builder().build(), normalizedNode).getNormalizedNode()
+                  .encode(YangInstanceIdentifier.builder().build(), normalizedNode).getNormalizedNode()
           ).build();
     }else{
       return ShardTransactionMessages.ReadDataReply.newBuilder().build();
@@ -41,7 +42,7 @@ public class ReadDataReply implements SerializableMessage{
 
   }
 
-  public static ReadDataReply fromSerializable(SchemaContext schemaContext,InstanceIdentifier id,Object serializable){
+  public static ReadDataReply fromSerializable(SchemaContext schemaContext,YangInstanceIdentifier id,Object serializable){
     ShardTransactionMessages.ReadDataReply o = (ShardTransactionMessages.ReadDataReply) serializable;
     return new ReadDataReply(schemaContext,new NormalizedNodeToNodeCodec(schemaContext).decode(id, o.getNormalizedNode()));
   }