BUG-5280: switch transaction IDs from String to TransactionIdentifier

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / entityownership / EntityOwnershipShardTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java
index 5e528e8c76d2ae026e704685de13b88c886038ce..3162981029916d2270c78752d5fa24cebfa20880 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java
@@ -725,7 +725,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest {
     }
 
     private static BatchedModifications newBatchedModifications() {
-        BatchedModifications modifications = new BatchedModifications("tnx", DataStoreVersions.CURRENT_VERSION, "");
+        BatchedModifications modifications = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION);
         modifications.setDoCommitOnReady(true);
         modifications.setReady(true);
         modifications.setTotalMessagesSent(1);
@@ -823,8 +823,8 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest {
     }
 
     private static ShardIdentifier newShardId(String memberName) {
-        return ShardIdentifier.builder().memberName(MemberName.forName(memberName)).shardName("entity-ownership").
-                type("operational" + NEXT_SHARD_NUM.getAndIncrement()).build();
+        return ShardIdentifier.create("entity-ownership", MemberName.forName(memberName),
+            "operational" + NEXT_SHARD_NUM.getAndIncrement());
     }
 
     private static class TestEntityOwnershipShard extends EntityOwnershipShard {
@@ -848,6 +848,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest {
         volatile boolean dropAppendEntries;
         private final String myId;
 
+        @SuppressWarnings("unused")
         public MockFollower(String myId) {
             this(myId, true);
         }