Bump MRI upstreams

[netconf.git] / netconf / netconf-topology-singleton / src / main / java / org / opendaylight / netconf / topology / singleton / messages / NormalizedNodeMessage.java

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java
index a27089e6acf3b2368ccec3b6873ba064a1fe5633..a9c8ab9fc2781827414c88e844a0d07cc7b9af9c 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java
@@ -22,14 +22,14 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 public class NormalizedNodeMessage implements Externalizable {
     private static final long serialVersionUID = 1L;
 
-    private YangInstanceIdentifier identifier = null;
-    private NormalizedNode<?, ?> node = null;
+    private YangInstanceIdentifier identifier;
+    private NormalizedNode node;
 
     public NormalizedNodeMessage() {
         // empty constructor needed for Externalizable
     }
 
-    public NormalizedNodeMessage(final YangInstanceIdentifier identifier, final NormalizedNode<?, ?> node) {
+    public NormalizedNodeMessage(final YangInstanceIdentifier identifier, final NormalizedNode node) {
         this.identifier = identifier;
         this.node = node;
     }
@@ -38,18 +38,23 @@ public class NormalizedNodeMessage implements Externalizable {
         return identifier;
     }
 
-    public NormalizedNode<?, ?> getNode() {
+    public NormalizedNode getNode() {
         return node;
     }
 
     @Override
     public void writeExternal(final ObjectOutput out) throws IOException {
-        SerializationUtils.serializePathAndNode(getIdentifier(), node, out);
+        SerializationUtils.writeNodeAndPath(out, getIdentifier(), node);
     }
 
     @Override
-    public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-        SerializationUtils.deserializePathAndNode(in, this, APPLIER);
+    public void readExternal(final ObjectInput in) throws IOException {
+        SerializationUtils.readNodeAndPath(in, this, APPLIER);
+    }
+
+    @Override
+    public String toString() {
+        return "NormalizedNodeMessage [identifier=" + identifier + ", node=" + node + "]";
     }
 
     private static final SerializationUtils.Applier<NormalizedNodeMessage> APPLIER = (instance, path, node) -> {