Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump datastore 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 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 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,7
+28,7
@@
public abstract class VersionedExternalizableMessage implements Externalizable,
public VersionedExternalizableMessage() {
}
public VersionedExternalizableMessage() {
}
- public VersionedExternalizableMessage(short version) {
+ public VersionedExternalizableMessage(
final
short version) {
this.version = version <= DataStoreVersions.CURRENT_VERSION ? version : DataStoreVersions.CURRENT_VERSION;
}
this.version = version <= DataStoreVersions.CURRENT_VERSION ? version : DataStoreVersions.CURRENT_VERSION;
}
@@
-34,13
+36,18
@@
public abstract class VersionedExternalizableMessage implements Externalizable,
return version;
}
return version;
}
+ protected final @NonNull NormalizedNodeStreamVersion getStreamVersion() {
+ return version < DataStoreVersions.SODIUM_VERSION
+ ? NormalizedNodeStreamVersion.LITHIUM : NormalizedNodeStreamVersion.SODIUM;
+ }
+
@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);
}