BUG-5280: expand ShardDataTree to cover transaction mechanics

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java
index ecddebcc55a708c171e9d1e4e5fb207d5fece58c..d859f6790531d80f3375fe674964b5517019c22d 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java
@@ -11,6 +11,7 @@ import org.opendaylight.controller.cluster.datastore.messages.BatchedModificatio
 import org.opendaylight.controller.cluster.datastore.modification.DeleteModification;
 import org.opendaylight.controller.cluster.datastore.modification.MergeModification;
 import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
+import org.opendaylight.controller.cluster.datastore.util.AbstractDataTreeModificationCursor;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
@@ -20,20 +21,21 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  * @author Thomas Pantelis
  */
 public abstract class AbstractBatchedModificationsCursor extends AbstractDataTreeModificationCursor {
+
     protected abstract BatchedModifications getModifications();
 
     @Override
-    public void delete(final PathArgument child) {
-        getModifications().addModification(new DeleteModification(next(child)));
+    public final void delete(final PathArgument child) {
+        getModifications().addModification(new DeleteModification(current().node(child)));
     }
 
     @Override
-    public void merge(final PathArgument child, final NormalizedNode<?, ?> data) {
-        getModifications().addModification(new MergeModification(next(child), data));
+    public final void merge(final PathArgument child, final NormalizedNode<?, ?> data) {
+        getModifications().addModification(new MergeModification(current().node(child), data));
     }
 
     @Override
-    public void write(final PathArgument child, final NormalizedNode<?, ?> data) {
-        getModifications().addModification(new WriteModification(next(child), data));
+    public final void write(final PathArgument child, final NormalizedNode<?, ?> data) {
+        getModifications().addModification(new WriteModification(current().node(child), data));
     }
 }