Use NormalizedNodeInputOutput to get the writer/reader we need

Change-Id: I774e5677fd3c31afc6c43860e8839d43f549c843
Signed-off-by: Tomas Cere <tcere@cisco.com>

diff --git a/opendaylight/netconf/abstract-topology/src/main/java/org/opendaylight/netconf/topology/util/messages/NormalizedNodeMessage.java b/opendaylight/netconf/abstract-topology/src/main/java/org/opendaylight/netconf/topology/util/messages/NormalizedNodeMessage.java
index 9129c261dc02ae00da5626c7460a2831852c2ef3..9d12735936ec6fbc57243e4a89655d321d98454c 100644 (file)
--- a/opendaylight/netconf/abstract-topology/src/main/java/org/opendaylight/netconf/topology/util/messages/NormalizedNodeMessage.java
+++ b/opendaylight/netconf/abstract-topology/src/main/java/org/opendaylight/netconf/topology/util/messages/NormalizedNodeMessage.java
@@ -12,10 +12,12 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputStreamReader;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeOutputStreamWriter;
+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.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
 
 public class NormalizedNodeMessage implements Externalizable{
@@ -42,19 +44,19 @@ public class NormalizedNodeMessage implements Externalizable{
     }
 
     @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-        final NormalizedNodeOutputStreamWriter streamWriter = new NormalizedNodeOutputStreamWriter(out);
-        final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(streamWriter);
+    public void writeExternal(final ObjectOutput out) throws IOException {
+        final NormalizedNodeDataOutput dataOutput = NormalizedNodeInputOutput.newDataOutput(out);
+        final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter((NormalizedNodeStreamWriter) dataOutput);
 
-        streamWriter.writeYangInstanceIdentifier(identifier);
+        dataOutput.writeYangInstanceIdentifier(identifier);
         normalizedNodeWriter.write(node);
     }
 
     @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        final NormalizedNodeInputStreamReader streamReader = new NormalizedNodeInputStreamReader(in);
+    public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
+        final NormalizedNodeDataInput dataInput = NormalizedNodeInputOutput.newDataInput(in);
 
-        identifier = streamReader.readYangInstanceIdentifier();
-        node = streamReader.readNormalizedNode();
+        identifier = dataInput.readYangInstanceIdentifier();
+        node = dataInput.readNormalizedNode();
     }
 }