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/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
index 076e96c29390dcf5b54c9f9ccffb3b5bad5ab1c0..6735cdb684ccaf3f2abc18c1460381c1de61a27b 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/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);

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java
index 0b4115a6fa01af210893a9f64d5d2eba576aa1b8..742c31f9aa7511ae8f8e88b0cf6477c2f932ebf3 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java
@@ -8,16 +8,21 @@
 package org.opendaylight.controller.cluster.datastore;
 
 /**
- * Defines version numbers.
+ * Defines version numbers where ask-based protocol is concerned.
  *
  * @author Thomas Pantelis
  */
-public interface DataStoreVersions {
-    short BASE_HELIUM_VERSION = 0;
-    short HELIUM_1_VERSION = 1;
-    short HELIUM_2_VERSION = 2;
-    short LITHIUM_VERSION = 3;
-    short BORON_VERSION = 5;
-    short FLUORINE_VERSION = 9;
-    short CURRENT_VERSION = FLUORINE_VERSION;
+public final class DataStoreVersions {
+    public static final short BASE_HELIUM_VERSION = 0;
+    public static final short HELIUM_1_VERSION = 1;
+    public static final short HELIUM_2_VERSION = 2;
+    public static final short LITHIUM_VERSION = 3;
+    public static final short BORON_VERSION = 5;
+    public static final short FLUORINE_VERSION = 9;
+    public static final short SODIUM_VERSION = 10;
+    public static final short CURRENT_VERSION = SODIUM_VERSION;
+
+    private DataStoreVersions() {
+
+    }
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java
index acd35d210f0db2da07ca54d3a940f76e9c668e08..dd4c9b8b01f207cb4dfba7792c590b2e47a1d24a 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java
@@ -49,7 +49,7 @@ public abstract class AbstractRead<T> extends VersionedExternalizableMessage {
     @Override
     public void writeExternal(final ObjectOutput out) throws IOException {
         super.writeExternal(out);
-        SerializationUtils.writePath(out, path);
+        SerializationUtils.writePath(out, getStreamVersion(), path);
     }
 
     public AbstractRead<T> asVersion(final short version) {

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 5c00cf16507344febb6fcce8d87d897863f1145d..91d38ccd079ab7aad5ec069eb2208bcbe0c560b6 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
@@ -40,7 +40,7 @@ public class ReadDataReply extends VersionedExternalizableMessage {
     @Override
     public void writeExternal(final ObjectOutput out) throws IOException {
         super.writeExternal(out);
-        SerializationUtils.writeNormalizedNode(out, normalizedNode);
+        SerializationUtils.writeNormalizedNode(out, getStreamVersion(), normalizedNode);
     }
 
     public static ReadDataReply fromSerializable(final Object serializable) {

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java
index 781580a643ec3e03a98e26327fb2a5374b41d319..9eff5afebed28178bdb1c8fbb46b5ffced1ac101 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java
@@ -11,7 +11,9 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
+import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeStreamVersion;
 
 /**
  * Abstract base class for a versioned Externalizable message.
@@ -26,7 +28,7 @@ public abstract class VersionedExternalizableMessage implements Externalizable,
     public VersionedExternalizableMessage() {
     }
 
-    public VersionedExternalizableMessage(short version) {
+    public VersionedExternalizableMessage(final short version) {
         this.version = version <= DataStoreVersions.CURRENT_VERSION ? version : DataStoreVersions.CURRENT_VERSION;
     }
 
@@ -34,13 +36,18 @@ public abstract class VersionedExternalizableMessage implements Externalizable,
         return version;
     }
 
+    protected final @NonNull NormalizedNodeStreamVersion getStreamVersion() {
+        return version < DataStoreVersions.SODIUM_VERSION
+                ? NormalizedNodeStreamVersion.LITHIUM : NormalizedNodeStreamVersion.SODIUM;
+    }
+
     @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
         version = in.readShort();
     }
 
     @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
+    public void writeExternal(final ObjectOutput out) throws IOException {
         out.writeShort(version);
     }
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java
index 79e3b149617bfd4a2ecebb7c245a949435ecaf00..ba05f27e0deced6e95cc702f12e0f6eb764ed156 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java
@@ -5,10 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.datastore.modification;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
@@ -65,8 +66,7 @@ public class MutableCompositeModification extends VersionedExternalizableMessage
      * @param modification the modification to add.
      */
     public void addModification(final Modification modification) {
-        Preconditions.checkNotNull(modification);
-        modifications.add(modification);
+        modifications.add(requireNonNull(modification));
     }
 
     public void addModifications(final Iterable<Modification> newMods) {
@@ -119,7 +119,7 @@ public class MutableCompositeModification extends VersionedExternalizableMessage
         final int size = modifications.size();
         out.writeInt(size);
         if (size > 0) {
-            try (NormalizedNodeDataOutput stream = NormalizedNodeInputOutput.newDataOutput(out)) {
+            try (NormalizedNodeDataOutput stream = NormalizedNodeInputOutput.newDataOutput(out, getStreamVersion())) {
                 for (Modification mod : modifications) {
                     out.writeByte(mod.getType());
                     mod.writeTo(stream);
@@ -129,7 +129,7 @@ public class MutableCompositeModification extends VersionedExternalizableMessage
     }
 
     public static MutableCompositeModification fromSerializable(final Object serializable) {
-        Preconditions.checkArgument(serializable instanceof MutableCompositeModification);
+        checkArgument(serializable instanceof MutableCompositeModification);
         return (MutableCompositeModification)serializable;
     }