Define DataStoreVersions.MAGNESIUM_VERSION

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

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 e1f96ca457cede16e9459f040ad755e0e5cc4f69..f28250b766ba86885dd909aac78a91824682f8c4 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 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.DataStoreVersions;

+import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeStreamVersion;

 
 /**
  * Abstract base class for a versioned Externalizable message.
 
 /**
  * Abstract base class for a versioned Externalizable message.


@@ -26,29 +28,45 @@ public abstract class VersionedExternalizableMessage implements Externalizable,
     public VersionedExternalizableMessage() {
     }
 
     public VersionedExternalizableMessage() {
     }
 

-    public VersionedExternalizableMessage(short version) {
-        this.version = version <= DataStoreVersions.CURRENT_VERSION ? version: DataStoreVersions.CURRENT_VERSION;
+    public VersionedExternalizableMessage(final short version) {
+        this.version = version <= DataStoreVersions.CURRENT_VERSION ? version : DataStoreVersions.CURRENT_VERSION;

     }
 
     public short getVersion() {
         return version;
     }
 
     }
 
     public short getVersion() {
         return version;
     }
 

+    protected final @NonNull NormalizedNodeStreamVersion getStreamVersion() {
+        if (version >= DataStoreVersions.MAGNESIUM_VERSION) {
+            return NormalizedNodeStreamVersion.MAGNESIUM;
+        } else if (version == DataStoreVersions.SODIUM_SR1_VERSION) {
+            return NormalizedNodeStreamVersion.SODIUM_SR1;
+        } else if (version == DataStoreVersions.NEON_SR2_VERSION) {
+            return NormalizedNodeStreamVersion.NEON_SR2;
+        } else {
+            return NormalizedNodeStreamVersion.LITHIUM;
+        }
+    }
+

     @Override
     @Override

-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {

         version = in.readShort();
     }
 
     @Override
         version = in.readShort();
     }
 
     @Override

-    public void writeExternal(ObjectOutput out) throws IOException {
+    public void writeExternal(final ObjectOutput out) throws IOException {

         out.writeShort(version);
     }
 
         out.writeShort(version);
     }
 

-    protected abstract Object newLegacySerializedInstance();
-

     @Override
     public final Object toSerializable() {
     @Override
     public final Object toSerializable() {

-        return getVersion() >= DataStoreVersions.BORON_VERSION ? this : newLegacySerializedInstance();
+        final short ver = getVersion();
+        if (ver < DataStoreVersions.BORON_VERSION) {
+            throw new UnsupportedOperationException("Version " + ver
+                + " is older than the oldest version supported version " + DataStoreVersions.BORON_VERSION);
+        }
+
+        return this;

     }
 
     @Override
     }
 
     @Override