Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Switch CompositeModification to bypass thread-local streams
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
modification
/
DeleteModification.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java
index 347cde9f3fed6f727a96350e386d952a4bd513a9..0a76cf9e5b6644f8cf75dde97ce01ec1d1196731 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java
@@
-8,9
+8,12
@@
package org.opendaylight.controller.cluster.datastore.modification;
package org.opendaylight.controller.cluster.datastore.modification;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
+import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput;
+import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput;
import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@
-26,21
+29,25
@@
public class DeleteModification extends AbstractModification {
this(DataStoreVersions.CURRENT_VERSION);
}
this(DataStoreVersions.CURRENT_VERSION);
}
- public DeleteModification(short version) {
+ public DeleteModification(
final
short version) {
super(version);
}
super(version);
}
- public DeleteModification(YangInstanceIdentifier path) {
+ public DeleteModification(
final
YangInstanceIdentifier path) {
super(path);
}
super(path);
}
+ DeleteModification(final short version, final YangInstanceIdentifier path) {
+ super(version, path);
+ }
+
@Override
@Override
- public void apply(DOMStoreWriteTransaction transaction) {
+ public void apply(
final
DOMStoreWriteTransaction transaction) {
transaction.delete(getPath());
}
@Override
transaction.delete(getPath());
}
@Override
- public void apply(DataTreeModification transaction) {
+ public void apply(
final
DataTreeModification transaction) {
transaction.delete(getPath());
}
transaction.delete(getPath());
}
@@
-50,18
+57,29
@@
public class DeleteModification extends AbstractModification {
}
@Override
}
@Override
- public void readExternal(ObjectInput in) {
+ public void readExternal(
final
ObjectInput in) {
setPath(SerializationUtils.deserializePath(in));
}
@Override
setPath(SerializationUtils.deserializePath(in));
}
@Override
- public void writeExternal(ObjectOutput out) {
+ public void writeExternal(
final
ObjectOutput out) {
SerializationUtils.serializePath(getPath(), out);
}
SerializationUtils.serializePath(getPath(), out);
}
- public static DeleteModification fromStream(ObjectInput in, short version) {
+ @Override
+ public void writeTo(final NormalizedNodeDataOutput out) throws IOException {
+ out.writeYangInstanceIdentifier(getPath());
+ }
+
+ @Deprecated
+ public static DeleteModification fromStream(final ObjectInput in, final short version) {
DeleteModification mod = new DeleteModification(version);
mod.readExternal(in);
return mod;
}
DeleteModification mod = new DeleteModification(version);
mod.readExternal(in);
return mod;
}
+
+ public static DeleteModification fromStream(final NormalizedNodeDataInput in, final short version)
+ throws IOException {
+ return new DeleteModification(version, in.readYangInstanceIdentifier());
+ }
}
}