X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FVersionedExternalizableMessage.java;h=9eff5afebed28178bdb1c8fbb46b5ffced1ac101;hb=9d6b18257717db4f6f722422ee3224154150cbf7;hp=51a9079d20cbc11c12295d02a6487d80b0d2c154;hpb=24c074a4b32ac97980a652b78824b7c2f97ffb78;p=controller.git 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 51a9079d20..9eff5afebe 100644 --- 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,28 +28,34 @@ public abstract class VersionedExternalizableMessage implements Externalizable, 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; } + 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); } @Override public final Object toSerializable() { if (getVersion() < DataStoreVersions.BORON_VERSION) { - throw new UnsupportedOperationException("Versions prior to " + DataStoreVersions.BORON_VERSION + " are not supported"); + throw new UnsupportedOperationException("Versions prior to " + DataStoreVersions.BORON_VERSION + + " are not supported"); } return this;