Use Empty instead of Void in cohorts

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
index 8f952acdd5a9e6a53c568e33ddd71db8fd044983..5da78530a1d31745c222827a797aa066ef9fa9ef 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
@@ -24,6 +24,7 @@ import akka.dispatch.Dispatchers;
 import akka.testkit.TestActorRef;
 import akka.testkit.javadsl.TestKit;
 import com.google.common.base.Throwables;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,10 +49,10 @@ import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 public class ShardTransactionTest extends AbstractActorTest {
 
@@ -61,7 +62,7 @@ public class ShardTransactionTest extends AbstractActorTest {
 
     private static final ShardIdentifier SHARD_IDENTIFIER =
         ShardIdentifier.create("inventory", MEMBER_NAME, "config");
-    private static final SchemaContext TEST_MODEL = TestModel.createTestContext();
+    private static final EffectiveModelContext TEST_MODEL = TestModel.createTestContext();
 
     private DatastoreContext datastoreContext = DatastoreContext.newBuilder().persistent(false).build();
 
@@ -103,10 +104,10 @@ public class ShardTransactionTest extends AbstractActorTest {
     }
 
     private void testOnReceiveReadData(final ActorRef transaction) {
-        transaction.tell(new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION),
+        transaction.tell(new ReadData(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION),
             testKit.getRef());
 
-        ReadDataReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"), ReadDataReply.class);
+        ReadDataReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), ReadDataReply.class);
 
         assertNotNull(reply.getNormalizedNode());
     }
@@ -122,7 +123,7 @@ public class ShardTransactionTest extends AbstractActorTest {
     private void testOnReceiveReadDataWhenDataNotFound(final ActorRef transaction) {
         transaction.tell(new ReadData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION), testKit.getRef());
 
-        ReadDataReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"), ReadDataReply.class);
+        ReadDataReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), ReadDataReply.class);
 
         assertNull(reply.getNormalizedNode());
     }
@@ -134,10 +135,10 @@ public class ShardTransactionTest extends AbstractActorTest {
     }
 
     private void testOnReceiveDataExistsPositive(final ActorRef transaction) {
-        transaction.tell(new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION),
+        transaction.tell(new DataExists(YangInstanceIdentifier.empty(), DataStoreVersions.CURRENT_VERSION),
             testKit.getRef());
 
-        DataExistsReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"), DataExistsReply.class);
+        DataExistsReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), DataExistsReply.class);
 
         assertTrue(reply.exists());
     }
@@ -151,7 +152,7 @@ public class ShardTransactionTest extends AbstractActorTest {
     private void testOnReceiveDataExistsNegative(final ActorRef transaction) {
         transaction.tell(new DataExists(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION), testKit.getRef());
 
-        DataExistsReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"), DataExistsReply.class);
+        DataExistsReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), DataExistsReply.class);
 
         assertFalse(reply.exists());
     }
@@ -165,12 +166,12 @@ public class ShardTransactionTest extends AbstractActorTest {
         final ActorRef transaction = newTransactionActor(RW, mockWriteTx, "testOnReceiveBatchedModifications");
 
         YangInstanceIdentifier writePath = TestModel.TEST_PATH;
-        NormalizedNode<?, ?> writeData = ImmutableContainerNodeBuilder.create()
+        NormalizedNode writeData = ImmutableContainerNodeBuilder.create()
                 .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))
                 .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
 
         YangInstanceIdentifier mergePath = TestModel.OUTER_LIST_PATH;
-        NormalizedNode<?, ?> mergeData = ImmutableContainerNodeBuilder.create()
+        NormalizedNode mergeData = ImmutableContainerNodeBuilder.create()
                 .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.OUTER_LIST_QNAME))
                 .build();
 
@@ -184,7 +185,7 @@ public class ShardTransactionTest extends AbstractActorTest {
 
         transaction.tell(batched, testKit.getRef());
 
-        BatchedModificationsReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"),
+        BatchedModificationsReply reply = testKit.expectMsgClass(Duration.ofSeconds(5),
             BatchedModificationsReply.class);
         assertEquals("getNumBatched", 3, reply.getNumBatched());
 
@@ -203,7 +204,7 @@ public class ShardTransactionTest extends AbstractActorTest {
         watcher.watch(transaction);
 
         YangInstanceIdentifier writePath = TestModel.TEST_PATH;
-        NormalizedNode<?, ?> writeData = ImmutableContainerNodeBuilder.create()
+        NormalizedNode writeData = ImmutableContainerNodeBuilder.create()
                 .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))
                 .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
 
@@ -212,7 +213,7 @@ public class ShardTransactionTest extends AbstractActorTest {
         batched.addModification(new WriteModification(writePath, writeData));
 
         transaction.tell(batched, testKit.getRef());
-        BatchedModificationsReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"),
+        BatchedModificationsReply reply = testKit.expectMsgClass(Duration.ofSeconds(5),
             BatchedModificationsReply.class);
         assertEquals("getNumBatched", 1, reply.getNumBatched());
 
@@ -221,8 +222,8 @@ public class ShardTransactionTest extends AbstractActorTest {
         batched.setTotalMessagesSent(2);
 
         transaction.tell(batched, testKit.getRef());
-        testKit.expectMsgClass(testKit.duration("5 seconds"), ReadyTransactionReply.class);
-        watcher.expectMsgClass(watcher.duration("5 seconds"), Terminated.class);
+        testKit.expectMsgClass(Duration.ofSeconds(5), ReadyTransactionReply.class);
+        watcher.expectMsgClass(Duration.ofSeconds(5), Terminated.class);
     }
 
     @Test
@@ -234,7 +235,7 @@ public class ShardTransactionTest extends AbstractActorTest {
         watcher.watch(transaction);
 
         YangInstanceIdentifier writePath = TestModel.TEST_PATH;
-        NormalizedNode<?, ?> writeData = ImmutableContainerNodeBuilder.create()
+        NormalizedNode writeData = ImmutableContainerNodeBuilder.create()
                 .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))
                 .withChild(ImmutableNodes.leafNode(TestModel.DESC_QNAME, "foo")).build();
 
@@ -246,8 +247,8 @@ public class ShardTransactionTest extends AbstractActorTest {
         batched.setTotalMessagesSent(1);
 
         transaction.tell(batched, testKit.getRef());
-        testKit.expectMsgClass(testKit.duration("5 seconds"), CommitTransactionReply.class);
-        watcher.expectMsgClass(testKit.duration("5 seconds"), Terminated.class);
+        testKit.expectMsgClass(Duration.ofSeconds(5), CommitTransactionReply.class);
+        watcher.expectMsgClass(Duration.ofSeconds(5), Terminated.class);
     }
 
     @Test(expected = TestException.class)
@@ -272,15 +273,15 @@ public class ShardTransactionTest extends AbstractActorTest {
         batched.addModification(new WriteModification(path, node));
 
         transaction.tell(batched, testKit.getRef());
-        testKit.expectMsgClass(testKit.duration("5 seconds"), akka.actor.Status.Failure.class);
+        testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class);
 
         batched = new BatchedModifications(tx1, DataStoreVersions.CURRENT_VERSION);
         batched.setReady();
         batched.setTotalMessagesSent(2);
 
         transaction.tell(batched, testKit.getRef());
-        Failure failure = testKit.expectMsgClass(testKit.duration("5 seconds"), akka.actor.Status.Failure.class);
-        watcher.expectMsgClass(testKit.duration("5 seconds"), Terminated.class);
+        Failure failure = testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class);
+        watcher.expectMsgClass(Duration.ofSeconds(5), Terminated.class);
 
         if (failure != null) {
             Throwables.propagateIfPossible(failure.cause(), Exception.class);
@@ -303,8 +304,8 @@ public class ShardTransactionTest extends AbstractActorTest {
 
         transaction.tell(batched, testKit.getRef());
 
-        Failure failure = testKit.expectMsgClass(testKit.duration("5 seconds"), akka.actor.Status.Failure.class);
-        watcher.expectMsgClass(watcher.duration("5 seconds"), Terminated.class);
+        Failure failure = testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class);
+        watcher.expectMsgClass(Duration.ofSeconds(5), Terminated.class);
 
         if (failure != null) {
             Throwables.throwIfInstanceOf(failure.cause(), Exception.class);
@@ -322,8 +323,8 @@ public class ShardTransactionTest extends AbstractActorTest {
 
         transaction.tell(new CloseTransaction().toSerializable(), testKit.getRef());
 
-        testKit.expectMsgClass(testKit.duration("3 seconds"), CloseTransactionReply.class);
-        testKit.expectTerminated(testKit.duration("3 seconds"), transaction);
+        testKit.expectMsgClass(Duration.ofSeconds(3), CloseTransactionReply.class);
+        testKit.expectTerminated(Duration.ofSeconds(3), transaction);
     }
 
     @Test
@@ -335,8 +336,8 @@ public class ShardTransactionTest extends AbstractActorTest {
 
         transaction.tell(new CloseTransaction().toSerializable(), testKit.getRef());
 
-        testKit.expectMsgClass(testKit.duration("3 seconds"), CloseTransactionReply.class);
-        testKit.expectTerminated(testKit.duration("3 seconds"), transaction);
+        testKit.expectMsgClass(Duration.ofSeconds(3), CloseTransactionReply.class);
+        testKit.expectTerminated(Duration.ofSeconds(3), transaction);
     }
 
     @Test
@@ -348,7 +349,7 @@ public class ShardTransactionTest extends AbstractActorTest {
 
         transaction.tell(new CloseTransaction().toSerializable(), testKit.getRef());
 
-        testKit.expectMsgClass(testKit.duration("3 seconds"), Terminated.class);
+        testKit.expectMsgClass(Duration.ofSeconds(3), Terminated.class);
     }
 
     @Test
@@ -361,7 +362,7 @@ public class ShardTransactionTest extends AbstractActorTest {
 
         testKit.watch(transaction);
 
-        testKit.expectMsgClass(testKit.duration("3 seconds"), Terminated.class);
+        testKit.expectMsgClass(Duration.ofSeconds(3), Terminated.class);
     }
 
     public static class TestException extends RuntimeException {