Remove legacy NormalizedNode serialization classes

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java
index 6867f46e8d73d5d3bd9b3585df92e84033ee35b4..c48adf2d80befc8ca62e25acb2fb6b4ad19ae04c 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java
@@ -15,6 +15,7 @@ import java.io.ObjectOutput;
 import java.util.Map;
 import java.util.Set;
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
+import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputStreamReader;
@@ -45,7 +46,7 @@ public class DataChanged implements Externalizable {
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         in.readShort(); // Read the version
 
-        NormalizedNodeInputStreamReader streamReader = new NormalizedNodeInputStreamReader(in);
+        NormalizedNodeDataInput streamReader = new NormalizedNodeInputStreamReader(in);
 
         // Note: the scope passed to builder is not actually used.
         Builder builder = DOMImmutableDataChangeEvent.builder(DataChangeScope.SUBTREE);
@@ -53,7 +54,7 @@ public class DataChanged implements Externalizable {
         // Read created data
 
         int size = in.readInt();
-        for(int i = 0; i < size; i++) {
+        for (int i = 0; i < size; i++) {
             YangInstanceIdentifier path = streamReader.readYangInstanceIdentifier();
             NormalizedNode<?, ?> node = streamReader.readNormalizedNode();
             builder.addCreated(path, node);
@@ -62,7 +63,7 @@ public class DataChanged implements Externalizable {
         // Read updated data
 
         size = in.readInt();
-        for(int i = 0; i < size; i++) {
+        for (int i = 0; i < size; i++) {
             YangInstanceIdentifier path = streamReader.readYangInstanceIdentifier();
             NormalizedNode<?, ?> before = streamReader.readNormalizedNode();
             NormalizedNode<?, ?> after = streamReader.readNormalizedNode();
@@ -72,7 +73,7 @@ public class DataChanged implements Externalizable {
         // Read removed data
 
         size = in.readInt();
-        for(int i = 0; i < size; i++) {
+        for (int i = 0; i < size; i++) {
             YangInstanceIdentifier path = streamReader.readYangInstanceIdentifier();
             NormalizedNode<?, ?> node = streamReader.readNormalizedNode();
             builder.addRemoved(path, node);
@@ -81,14 +82,14 @@ public class DataChanged implements Externalizable {
         // Read original subtree
 
         boolean present = in.readBoolean();
-        if(present) {
+        if (present) {
             builder.setBefore(streamReader.readNormalizedNode());
         }
 
         // Read updated subtree
 
         present = in.readBoolean();
-        if(present) {
+        if (present) {
             builder.setAfter(streamReader.readNormalizedNode());
         }
 
@@ -105,7 +106,7 @@ public class DataChanged implements Externalizable {
 
         Map<YangInstanceIdentifier, NormalizedNode<?, ?>> createdData = change.getCreatedData();
         out.writeInt(createdData.size());
-        for(Map.Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> e: createdData.entrySet()) {
+        for (Map.Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> e: createdData.entrySet()) {
             streamWriter.writeYangInstanceIdentifier(e.getKey());
             streamWriter.writeNormalizedNode(e.getValue());
         }
@@ -115,7 +116,7 @@ public class DataChanged implements Externalizable {
         Map<YangInstanceIdentifier, NormalizedNode<?, ?>> originalData = change.getOriginalData();
         Map<YangInstanceIdentifier, NormalizedNode<?, ?>> updatedData = change.getUpdatedData();
         out.writeInt(updatedData.size());
-        for(Map.Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> e: updatedData.entrySet()) {
+        for (Map.Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> e: updatedData.entrySet()) {
             streamWriter.writeYangInstanceIdentifier(e.getKey());
             streamWriter.writeNormalizedNode(originalData.get(e.getKey()));
             streamWriter.writeNormalizedNode(e.getValue());
@@ -125,7 +126,7 @@ public class DataChanged implements Externalizable {
 
         Set<YangInstanceIdentifier> removed = change.getRemovedPaths();
         out.writeInt(removed.size());
-        for(YangInstanceIdentifier path: removed) {
+        for (YangInstanceIdentifier path: removed) {
             streamWriter.writeYangInstanceIdentifier(path);
             streamWriter.writeNormalizedNode(originalData.get(path));
         }
@@ -134,7 +135,7 @@ public class DataChanged implements Externalizable {
 
         NormalizedNode<?, ?> originalSubtree = change.getOriginalSubtree();
         out.writeBoolean(originalSubtree != null);
-        if(originalSubtree != null) {
+        if (originalSubtree != null) {
             streamWriter.writeNormalizedNode(originalSubtree);
         }
 
@@ -142,7 +143,7 @@ public class DataChanged implements Externalizable {
 
         NormalizedNode<?, ?> updatedSubtree = change.getUpdatedSubtree();
         out.writeBoolean(updatedSubtree != null);
-        if(updatedSubtree != null) {
+        if (updatedSubtree != null) {
             streamWriter.writeNormalizedNode(updatedSubtree);
         }
     }