Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG 2412 - restconf @GET getModule(identifier,uri) method migration"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
modification
/
MutableCompositeModification.java
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 5d7947b19fc6ddaeafe133ec546dfc879dd07855..b597742319f08a2c04a8b633baf6d525e97dff14 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
@@
-27,10
+27,15
@@
import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
public class MutableCompositeModification implements CompositeModification {
private static final long serialVersionUID = 1L;
public class MutableCompositeModification implements CompositeModification {
private static final long serialVersionUID = 1L;
- private final List<Modification> modifications;
+ private final List<Modification> modifications = new ArrayList<>();
+ private short version;
public MutableCompositeModification() {
public MutableCompositeModification() {
- modifications = new ArrayList<>();
+ this(DataStoreVersions.CURRENT_VERSION);
+ }
+
+ public MutableCompositeModification(short version) {
+ this.version = version;
}
@Override
}
@Override
@@
-45,6
+50,14
@@
public class MutableCompositeModification implements CompositeModification {
return COMPOSITE;
}
return COMPOSITE;
}
+ public short getVersion() {
+ return version;
+ }
+
+ public void setVersion(short version) {
+ this.version = version;
+ }
+
/**
* Add a new Modification to the list of Modifications represented by this
* composite
/**
* Add a new Modification to the list of Modifications represented by this
* composite
@@
-62,7
+75,7
@@
public class MutableCompositeModification implements CompositeModification {
@Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
@Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- in.readShort();
+
version =
in.readShort();
int size = in.readInt();
int size = in.readInt();
@@
-75,15
+88,15
@@
public class MutableCompositeModification implements CompositeModification {
byte type = in.readByte();
switch(type) {
case Modification.WRITE:
byte type = in.readByte();
switch(type) {
case Modification.WRITE:
- modifications.add(WriteModification.fromStream(in));
+ modifications.add(WriteModification.fromStream(in
, version
));
break;
case Modification.MERGE:
break;
case Modification.MERGE:
- modifications.add(MergeModification.fromStream(in));
+ modifications.add(MergeModification.fromStream(in
, version
));
break;
case Modification.DELETE:
break;
case Modification.DELETE:
- modifications.add(DeleteModification.fromStream(in));
+ modifications.add(DeleteModification.fromStream(in
, version
));
break;
}
}
break;
}
}
@@
-94,7
+107,7
@@
public class MutableCompositeModification implements CompositeModification {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
- out.writeShort(
DataStoreVersions.CURRENT_VERSION
);
+ out.writeShort(
version
);
out.writeInt(modifications.size());
out.writeInt(modifications.size());
@@
-121,8
+134,7
@@
public class MutableCompositeModification implements CompositeModification {
builder.setTimeStamp(System.nanoTime());
for (Modification m : modifications) {
builder.setTimeStamp(System.nanoTime());
for (Modification m : modifications) {
- builder.addModification(
- (PersistentMessages.Modification) m.toSerializable());
+ builder.addModification((PersistentMessages.Modification) m.toSerializable());
}
return builder.build();
}
return builder.build();