Bump datastore version

This bumps the ask-based protocol datastore version, so that
SODIUM_VERSION is using Sodium NormalizedNode{Input,Output}.

JIRA: CONTROLLER-1888
Change-Id: Ib4ad1c27566179db958ad7776f81417ab99a78cf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
index 076e96c29390dcf5b54c9f9ccffb3b5bad5ab1c0..6735cdb684ccaf3f2abc18c1460381c1de61a27b 100644 (file)
--- a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
+++ b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
@@ -51,6 +51,19 @@ public final class SerializationUtils {
         }
     }
 
+    public static void writeNormalizedNode(final DataOutput out, final NormalizedNodeStreamVersion version,
+            final @Nullable NormalizedNode<?, ?> node) throws IOException {
+        if (node != null) {
+            out.writeBoolean(true);
+
+            try (NormalizedNodeDataOutput stream = NormalizedNodeInputOutput.newDataOutput(out, version)) {
+                stream.writeNormalizedNode(node);
+            }
+        } else {
+            out.writeBoolean(false);
+        }
+    }
+
     public static YangInstanceIdentifier readPath(final DataInput in) throws IOException {
         return NormalizedNodeInputOutput.newDataInput(in).readYangInstanceIdentifier();
     }
@@ -62,6 +75,13 @@ public final class SerializationUtils {
         }
     }
 
+    public static void writePath(final DataOutput out, final NormalizedNodeStreamVersion version,
+            final @NonNull YangInstanceIdentifier path) throws IOException {
+        try (NormalizedNodeDataOutput stream = NormalizedNodeInputOutput.newDataOutput(out, version)) {
+            stream.writeYangInstanceIdentifier(path);
+        }
+    }
+
     public static <T> void readNodeAndPath(final DataInput in, final T instance, final Applier<T> applier)
             throws IOException {
         final NormalizedNodeDataInput stream = NormalizedNodeInputOutput.newDataInput(in);