BUG-5280: fix compilation after unrebased merge

Merging the last batch of patches resulted in a mismatch
between newly-introduced tests and method movement. Fix
that up.

Change-Id: I326ad06ff07b902987e397f13f8b0afdb8c45231
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
index 44ffdeb97b8dde203fa4314f6709dbf2379b1d19..6f07390ba207afe5aad2b5b5c50aad8883123d57 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
@@ -324,8 +324,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{
         BatchedModifications batched = newBatchedModifications(nextTransactionId(), id, node, true, true, 1);
         DataTreeModification modification = store.getDataTree().takeSnapshot().newModification();
         batched.apply(modification);
         BatchedModifications batched = newBatchedModifications(nextTransactionId(), id, node, true, true, 1);
         DataTreeModification modification = store.getDataTree().takeSnapshot().newModification();
         batched.apply(modification);

-        modification.ready();
-        store.applyForeignCandidate(batched.getTransactionID(), store.getDataTree().prepare(modification));
+        store.commit(modification);

     }
 
     public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
     }
 
     public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id,


@@ -338,8 +337,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{
 
         DataTreeModification modification = store.getDataTree().takeSnapshot().newModification();
         batched.apply(modification);
 
         DataTreeModification modification = store.getDataTree().takeSnapshot().newModification();
         batched.apply(modification);

-        modification.ready();
-        store.applyForeignCandidate(batched.getTransactionID(), store.getDataTree().prepare(modification));
+        store.commit(modification);

     }
 
     public static void writeToStore(final DataTree store, final YangInstanceIdentifier id,
     }
 
     public static void writeToStore(final DataTree store, final YangInstanceIdentifier id,